diff --git a/package-lock.json b/package-lock.json
index c8b8a7e04..798e99c01 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
         "@bimdata/bcf-components": "6.7.7",
         "@bimdata/components": "1.10.1",
         "@bimdata/design-system": "2.3.0",
-        "@bimdata/typescript-fetch-api-client": "10.35.0",
+        "@bimdata/typescript-fetch-api-client": "10.36.0",
         "@bimdata/viewer": "2.17.0-beta.4",
         "@paddle/paddle-js": "^1.6.2",
         "async": "^3.2.6",
@@ -1863,9 +1863,9 @@
       "integrity": "sha512-/3vKXSptTUz2yaY4fcPCHu6fNeLYLqr03J4vQ8Tb8zKlIaUdgwcmFSTGM7bgXfyW6BlAkXPxp8wcEkcPnk2/Dw=="
     },
     "node_modules/@bimdata/typescript-fetch-api-client": {
-      "version": "10.35.0",
-      "resolved": "https://registry.npmjs.org/@bimdata/typescript-fetch-api-client/-/typescript-fetch-api-client-10.35.0.tgz",
-      "integrity": "sha512-lm1v7Jvfu95ThoE87s97KtMeBevWXHFNkLzxsaxPQK/hRNdQw1fbpn5+UuqQ3LA5nD2HA+Aa/1iuqP4IyytqHA=="
+      "version": "10.36.0",
+      "resolved": "https://registry.npmjs.org/@bimdata/typescript-fetch-api-client/-/typescript-fetch-api-client-10.36.0.tgz",
+      "integrity": "sha512-SohZ3m/sduOOU+/z/jDY1IH4MwKvZfVPPbzUIoAgQttO96W7uyejaKT+5ZTSoksArMiT0nYVS/SvipcDoT/5Bg=="
     },
     "node_modules/@bimdata/viewer": {
       "version": "2.17.0-beta.4",
diff --git a/package.json b/package.json
index c5caad7f3..07a47101b 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "@bimdata/bcf-components": "6.7.7",
     "@bimdata/components": "1.10.1",
     "@bimdata/design-system": "2.3.0",
-    "@bimdata/typescript-fetch-api-client": "10.35.0",
+    "@bimdata/typescript-fetch-api-client": "10.36.0",
     "@bimdata/viewer": "2.17.0-beta.4",
     "@paddle/paddle-js": "^1.6.2",
     "async": "^3.2.6",
diff --git a/src/components/specific/models/models-manager/generic-models-manager/GenericModelsManager.vue b/src/components/specific/models/models-manager/generic-models-manager/GenericModelsManager.vue
index b8141181d..293cd80ca 100644
--- a/src/components/specific/models/models-manager/generic-models-manager/GenericModelsManager.vue
+++ b/src/components/specific/models/models-manager/generic-models-manager/GenericModelsManager.vue
@@ -121,6 +121,7 @@ import { fileUploadInput } from "../../../../../utils/upload.js";
 import ModelsActionBar from "../models-action-bar/ModelsActionBar.vue";
 import ModelsDeleteModal from "../models-delete-modal/ModelsDeleteModal.vue";
 import ModelsTable from "../../models-table/ModelsTable.vue";
+import { FILE_TYPE } from "../../../../../config/files.js";
 
 export default {
   components: {
@@ -159,7 +160,7 @@ export default {
     const router = useRouter();
     const { isProjectGuest } = useUser();
     const { createModel, updateModels } = useModels();
-    const { downloadFiles: download } = useFiles();
+    const { fileStructureHandler: handler, downloadFiles: download } = useFiles();
 
     const fileUploads = ref([]);
     const fileExtensions = computed(() =>
@@ -220,7 +221,7 @@ export default {
     const downloadModels = async (models) => {
       await download(
         props.project,
-        models.map(({ document }) => document),
+        models.map(m => handler.get({ nature: FILE_TYPE.DOCUMENT, id: m.document_id })),
       );
     };
 
diff --git a/src/components/specific/models/models-manager/models-action-bar/ModelsActionBar.vue b/src/components/specific/models/models-manager/models-action-bar/ModelsActionBar.vue
index 1a85eedd0..3a50ed47f 100644
--- a/src/components/specific/models/models-manager/models-action-bar/ModelsActionBar.vue
+++ b/src/components/specific/models/models-manager/models-action-bar/ModelsActionBar.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="models-action-bar">
     <BIMDataButton
-      :disabled="!hasAdminPermModel(project, models)"
+      :disabled="!hasAdminPerm(project, modelDocument)"
       width="120px"
       color="high"
       ghost
@@ -13,7 +13,7 @@
     </BIMDataButton>
 
     <BIMDataButton
-      :disabled="!hasAdminPermModel(project, models)"
+      :disabled="!hasAdminPerm(project, modelDocument)"
       width="120px"
       ghost
       squared
@@ -56,10 +56,13 @@
 
 <script setup>
 import { computed } from "vue";
+import { FILE_TYPE } from "../../../../../config/files.js";
 import { MODEL_TYPE } from "../../../../../config/models.js";
+import { useFiles } from "../../../../../state/files.js";
 import { useUser } from "../../../../../state/user.js";
 
-const { hasAdminPermModel } = useUser();
+const { hasAdminPerm } = useUser();
+const { fileStructureHandler: handler } = useFiles();
 
 const props = defineProps({
   project: {
@@ -80,6 +83,8 @@ defineEmits([
   "unarchive",
 ]);
 
+const modelDocument = computed(() => handler.get({ nature: FILE_TYPE.DOCUMENT, id: props.model.document_id }));
+
 const isArchived = computed(() => props.models.every(m => m.archived));
 
 const isIFC = computed(() => props.models.every(m => m.type === MODEL_TYPE.IFC));
diff --git a/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.vue b/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.vue
index e3a8ffbbe..cbc5a64c2 100644
--- a/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.vue
+++ b/src/components/specific/models/models-table/model-actions-cell/ModelActionsCell.vue
@@ -90,7 +90,7 @@
       />
     </template>
 
-    <template v-if="model.document">
+    <template v-if="model.document_id">
       <BIMDataButton
         class="model-actions-cell__btn"
         data-test-id="btn-download-model"
@@ -107,7 +107,7 @@
       <BIMDataButton
         class="model-actions-cell__btn"
         data-test-id="btn-toggle-menu"
-        :disabled="!hasAdminPerm(project, model.document)"
+        :disabled="!hasAdminPerm(project, modelDocument)"
         ripple
         rounded
         icon
@@ -137,7 +137,9 @@
 <script>
 import { ref, computed, nextTick } from "vue";
 import { MODEL_STATUS, MODEL_TYPE } from "../../../../../config/models.js";
+import { FILE_TYPE } from "../../../../../config/files.js";
 import { WINDOWS } from "../../../../../config/viewer.js";
+import { useFiles } from "../../../../../state/files.js";
 import { useUser } from "../../../../../state/user.js";
 import { dropdownPositioner } from "../../../../../utils/positioner.js";
 // Components
@@ -171,18 +173,21 @@ export default {
     "view-photosphereBuilding",
   ],
   setup(props, { emit }) {
-    const { isProjectGuest, hasAdminPerm } = useUser();
+    const { fileStructureHandler: handler } = useFiles();
+    const { hasAdminPerm, isProjectGuest } = useUser();
 
     const menu = ref(null);
     const isOpen = ref(false);
     const isModelReady = computed(() => MODEL_STATUS.COMPLETED === props.model.status);
 
+    const modelDocument = computed(() => handler.get({ nature: FILE_TYPE.DOCUMENT, id: props.model.document_id }));
+
     const menuItems = ref([]);
     const openMenu = () => {
       if (!props.parent) return;
 
       isOpen.value = true;
-      if (props.model.document) {
+      if (props.model.document_id) {
         menuItems.value.push({
           key: 1,
           text: "t.rename",
@@ -258,13 +263,14 @@ export default {
       // References
       menu,
       isOpen,
-      hasAdminPerm,
       isModelReady,
       menuItems,
+      modelDocument,
       MODEL_TYPE,
       WINDOWS,
       // Methods
       closeMenu,
+      hasAdminPerm,
       isProjectGuest,
       onClick,
       openMenu,
diff --git a/src/components/specific/models/models-table/model-path-cell/ModelPathCell.vue b/src/components/specific/models/models-table/model-path-cell/ModelPathCell.vue
index 4e26ac619..6122add70 100644
--- a/src/components/specific/models/models-table/model-path-cell/ModelPathCell.vue
+++ b/src/components/specific/models/models-table/model-path-cell/ModelPathCell.vue
@@ -3,7 +3,7 @@
     <div class="model-path-cell__last-folder" v-click-away="() => (showFullPath = false)">
       <BIMDataIconFolderLocation fill color="primary" margin="0 12px 0 0" />
       <BIMDataTextbox
-        :text="lastFolderLocation(model.document)"
+        :text="lastFolderLocation(model.document_id)"
         cutPosition="middle"
         :tooltip="false"
         width="auto"
@@ -13,9 +13,9 @@
     <transition name="fade">
       <div v-if="hovering || showFullPath" class="model-path-cell__location">
         <div
-          v-if="truncatedFolderLocation(model.document).length > 0"
+          v-if="truncatedFolderLocation(model.document_id).length > 0"
           class="flex items-center"
-          v-for="(folder, index) in truncatedFolderLocation(model.document)"
+          v-for="(folder, index) in truncatedFolderLocation(model.document_id)"
           :key="folder.id"
         >
           <div
@@ -24,7 +24,7 @@
             v-if="folder.id !== 'ellipsis'"
           >
             <BIMDataIconFolderLocation
-              v-if="index === truncatedFolderLocation(model.document).length - 1"
+              v-if="index === truncatedFolderLocation(model.document_id).length - 1"
               fill
               color="primary"
               margin="0 6px 0 0"
@@ -51,7 +51,7 @@
             >
             </BIMDataTextbox>
           </div>
-          <div v-if="showChevron(folder, index, model.document)" class="m-x-6">
+          <div v-if="showChevron(folder, index, model.document_id)" class="m-x-6">
             <BIMDataIconChevron size="xxxs" fill color="default" />
           </div>
         </div>
@@ -72,7 +72,10 @@
 <script>
 import { ref, onDeactivated, onActivated } from "vue";
 import { useI18n } from "vue-i18n";
+import { FILE_TYPE } from "../../../../../config/files.js";
+import { useFiles } from "../../../../../state/files.js";
 import { getAscendants } from "../../../../../utils/file-structure.js";
+
 export default {
   props: {
     model: {
@@ -87,6 +90,7 @@ export default {
   emits: ["go-folders-view"],
   setup(props, { emit }) {
     const { t } = useI18n();
+    const { fileStructureHandler: handler } = useFiles();
 
     const folderLocation = (model) => {
       const parentFolders = getAscendants(model, props.allFolders)
@@ -98,8 +102,10 @@ export default {
       return parentFolders;
     };
 
-    const truncatedFolderLocation = (model) => {
-      const parentFolders = folderLocation(model);
+    const truncatedFolderLocation = (docId) => {
+      const doc = handler.get({ nature: FILE_TYPE.DOCUMENT, id: docId });
+
+      const parentFolders = folderLocation(doc);
       const maxFoldersToShow = 4;
 
       if (parentFolders.length > maxFoldersToShow) {
@@ -112,8 +118,10 @@ export default {
       return parentFolders;
     };
 
-    const lastFolderLocation = (model) => {
-      const parentFolders = getAscendants(model, props.allFolders);
+    const lastFolderLocation = (docId) => {
+      const doc = handler.get({ nature: FILE_TYPE.DOCUMENT, id: docId });
+
+      const parentFolders = getAscendants(doc, props.allFolders);
       return parentFolders[0]?.name ?? t("t.rootFolder");
     };
 
@@ -125,11 +133,12 @@ export default {
       emit("go-folders-view", selectedFolder);
     };
 
-    const showChevron = (folder, index, model) => {
+    const showChevron = (folder, index, docId) => {
+      const folderLocation = truncatedFolderLocation(docId);
       return (
-        index < truncatedFolderLocation(model).length - 1 &&
+        index < folderLocation.length - 1 &&
         folder.id !== "ellipsis" &&
-        truncatedFolderLocation(model)[index + 1].id !== "ellipsis"
+        folderLocation[index + 1].id !== "ellipsis"
       );
     };
 
diff --git a/src/services/ModelService.js b/src/services/ModelService.js
index dd651289f..3ccc33ec9 100644
--- a/src/services/ModelService.js
+++ b/src/services/ModelService.js
@@ -10,7 +10,7 @@ class ModelService {
 
   async fetchModels(project) {
     try {
-      return await this.callQueue.push(() => apiClient.modelApi.getModels(project.cloud.id, project.id));
+      return await this.callQueue.push(() => apiClient.modelApi.getModelsSummary(project.cloud.id, project.id));
     } catch (error) {
       ErrorService.handleError(
         new RuntimeError(ERRORS.MODELS_FETCH_ERROR, error)
diff --git a/src/state/models.js b/src/state/models.js
index 4a87396d9..5a404e066 100644
--- a/src/state/models.js
+++ b/src/state/models.js
@@ -41,14 +41,11 @@ const updateModels = async (project, models) => {
 };
 
 const updateModelName = async (project, model, name) => {
-  // In order to update a model name we have to update the name
-  // of its assiociated document.
+  // In order to update a model name we have to update the name of its assiociated document.
   const { updateFiles } = useFiles();
-  const [newDocument] = await updateFiles(project, [
-    { ...model.document, name }
-  ]);
+  await updateFiles(project, [{ id: model.document_id, name }]);
 
-  return { ...model, name, document: newDocument };
+  return { ...model, name };
 };
 
 const mergeModels = async (project, models, name) => {
diff --git a/src/state/user.js b/src/state/user.js
index a538a245f..982000710 100644
--- a/src/state/user.js
+++ b/src/state/user.js
@@ -114,11 +114,6 @@ function hasAdminPerm(project, file) {
     (isProjectAdmin(project) || files.every(f => f?.user_permission === FILE_PERMISSION.READ_WRITE));
 }
 
-function hasAdminPermModel(project, model) {
-  const models = [].concat(model);
-  return hasAdminPerm(project, models.map(m => m.document));
-}
-
 export function useUser() {
   const readonlyState = readonly(state);
   return {
@@ -142,6 +137,5 @@ export function useUser() {
     isFavoriteProject,
     isGuidedTourComplete,
     hasAdminPerm,
-    hasAdminPermModel,
   };
 }