diff --git a/.kiro/specs/papers-library-importer/tasks.md b/.kiro/specs/papers-library-importer/tasks.md
index da8b121d1..84796213f 100644
--- a/.kiro/specs/papers-library-importer/tasks.md
+++ b/.kiro/specs/papers-library-importer/tasks.md
@@ -237,7 +237,7 @@
   - _Requirements: 4.1, 4.2, 4.4, 4.6, 4.7_
 
 - [ ] 11. Add comprehensive error handling and validation
-- [ ] 11.1 Implement robust error handling
+- [x] 11.1 Implement robust error handling
   - Implement retry mechanisms for network and storage failures
   - Add workspace storage quota validation
   - _Requirements: 5.1, 5.2, 5.3, 5.5_
@@ -247,3 +247,10 @@
   - Add cleanup of temporary files and partial uploads
   - _Requirements: 6.1, 6.2, 6.5, 6.6_
 
+- [x] 11.3 Fix ImportFlow next button enablement logic
+  - Fix canGoNext computed property in ImportFlow.vue to check dataframeData instead of parsedEntries
+  - Update handleBibUpdate method to properly populate parsedEntries from dataframeData
+  - Ensure next button is enabled after successful bibliography upload regardless of PDF upload status
+  - Test that flexible upload order works correctly (bibliography first or PDFs first)
+  - _Requirements: 1.7, 7.3_
+
diff --git a/extralit-frontend/components/features/import/ImportFlow.vue b/extralit-frontend/components/features/import/ImportFlow.vue
index 66f7d5a8b..ae222d1b6 100644
--- a/extralit-frontend/components/features/import/ImportFlow.vue
+++ b/extralit-frontend/components/features/import/ImportFlow.vue
@@ -61,7 +61,6 @@ export default {
       // Step data
       bibData: {
         fileName: "",
-        parsedEntries: [],
         dataframeData: null,
         rawContent: "",
       },
@@ -133,7 +132,9 @@ export default {
           // 1. Both bibliography and PDFs are uploaded, OR
           // 2. Only bibliography is uploaded (can import references without PDFs)
           return (
-            this.bibData.parsedEntries.length > 0 &&
+            this.bibData.dataframeData &&
+            this.bibData.dataframeData.data &&
+            this.bibData.dataframeData.data.length > 0 &&
             !this.hasError &&
             !!this.workspace
           );
@@ -200,7 +201,9 @@ export default {
           // Allow flexible upload order - can proceed if bibliography is uploaded
           // PDFs are optional for proceeding to analysis step
           isValid =
-            this.bibData.parsedEntries.length > 0 &&
+            this.bibData.dataframeData &&
+            this.bibData.dataframeData.data &&
+            this.bibData.dataframeData.data.length > 0 &&
             !this.hasError &&
             !!this.workspace;
           break;
@@ -240,7 +243,6 @@ export default {
     handleBibUpdate(data) {
       this.bibData = {
         fileName: data.fileName || "",
-        parsedEntries: data.parsedEntries || [],
         dataframeData: data.dataframeData || null,
         rawContent: data.rawContent || "",
       };
@@ -381,7 +383,7 @@ export default {
     hasDataToLose() {
       // Check if user has uploaded any data that would be lost on close
       return (
-        this.bibData.parsedEntries.length > 0 ||
+        (this.bibData.dataframeData && this.bibData.dataframeData.data && this.bibData.dataframeData.data.length > 0) ||
         this.pdfData.totalFiles > 0 ||
         Object.keys(this.uploadData.confirmedDocuments).length > 0
       );
@@ -397,7 +399,6 @@ export default {
       // Reset all step data
       this.bibData = {
         fileName: "",
-        parsedEntries: [],
         dataframeData: null,
         rawContent: "",
       };
diff --git a/extralit-frontend/components/features/import/analysis/ImportAnalysisTable.vue b/extralit-frontend/components/features/import/analysis/ImportAnalysisTable.vue
index b321a468a..cf23c7264 100644
--- a/extralit-frontend/components/features/import/analysis/ImportAnalysisTable.vue
+++ b/extralit-frontend/components/features/import/analysis/ImportAnalysisTable.vue
@@ -62,7 +62,6 @@ import "assets/icons/chevron-down";
 import type {
   ImportAnalysisResponse,
   ImportStatus,
-  DataframeData,
   DocumentImportAnalysis,
 } from '~/v1/domain/entities/import/ImportAnalysis';
 import {
@@ -72,13 +71,14 @@ import {
 } from '../types';
 import { useImportAnalysisTableViewModel } from './useImportAnalysisTableViewModel';
 import { Workspace } from "~/v1/domain/entities/workspace/Workspace";
+import { TableData } from "~/v1/domain/entities/table/TableData";
 
 export default {
   name: "ImportAnalysisTable",
 
   props: {
     dataframeData: {
-      type: Object as () => DataframeData | null,
+      type: Object as () => TableData | null,
       default: null,
     },
     pdfData: {
@@ -152,7 +152,6 @@ export default {
           canToggle: this.canToggleStatus(originalStatus) && !this.isAnalyzing,
         };
 
-        // Add all other dataframe fields dynamically
         Object.keys(row).forEach(key => {
           if (!['reference', 'title', 'authors', 'author', 'year', 'filePaths'].includes(key)) {
             rowData[key] = row[key];
@@ -164,8 +163,9 @@ export default {
     },
 
     tableData(): AnalysisTableRow[] {
-      // Only show rows with matched PDFs
-      return this.allTableData.filter(row => row.filePaths && row.filePaths.length > 0);
+      const filteredData = this.allTableData.filter(row => row.filePaths && row.filePaths.length > 0);
+
+      return filteredData;
     },
 
     referencesWithoutPdfsCount(): number {
@@ -176,7 +176,7 @@ export default {
       return this.allTableData.filter(row => row.filePaths && row.filePaths.length > 0).length;
     },
 
-    filteredDataframeData(): DataframeData | null {
+    filteredDataframeData(): TableData | null {
       if (!this.dataframeData) {
         return null;
       }
diff --git a/extralit-frontend/components/features/import/analysis/useImportAnalysisTableViewModel.ts b/extralit-frontend/components/features/import/analysis/useImportAnalysisTableViewModel.ts
index b14dc356f..db4a20985 100644
--- a/extralit-frontend/components/features/import/analysis/useImportAnalysisTableViewModel.ts
+++ b/extralit-frontend/components/features/import/analysis/useImportAnalysisTableViewModel.ts
@@ -1,8 +1,9 @@
 import { ref, watch } from "vue";
 import { useResolve } from "ts-injecty";
 import { GetImportAnalysisUseCase } from "~/v1/domain/usecases/get-import-analysis-use-case";
-import type { ImportAnalysisResponse, ImportStatus, DataframeData } from "~/v1/domain/entities/import/ImportAnalysis";
+import type { ImportAnalysisResponse, ImportStatus } from "~/v1/domain/entities/import/ImportAnalysis";
 import { Workspace } from "~/v1/domain/entities/workspace/Workspace";
+import { TableData } from "~/v1/domain/entities/table/TableData";
 
 export function useImportAnalysisTableViewModel(props: any) {
   const isAnalyzing = ref(false);
@@ -23,7 +24,7 @@ export function useImportAnalysisTableViewModel(props: any) {
     lastAnalysisKey.value = "";
   };
 
-  const analyzeImport = async (workspace: Workspace, dataframeData: DataframeData, matchedFiles: any[]) => {
+  const analyzeImport = async (workspace: Workspace, dataframeData: TableData, matchedFiles: any[]) => {
     if (!workspace || !dataframeData || dataframeData.data.length === 0) {
       return;
     }
diff --git a/extralit-frontend/components/features/import/file-upload/CsvColumnSelection.vue b/extralit-frontend/components/features/import/file-upload/CsvColumnSelection.vue
index 7e499757a..163e37ad5 100644
--- a/extralit-frontend/components/features/import/file-upload/CsvColumnSelection.vue
+++ b/extralit-frontend/components/features/import/file-upload/CsvColumnSelection.vue
@@ -85,7 +85,7 @@
 </template>
 
 <script lang="ts">
-import type { CSVConfig } from "~/v1/domain/services/IFileService";
+import type { CSVConfig } from "~/v1/domain/services/IFileParsingService";
 
 interface CsvData {
   rawData: any;
diff --git a/extralit-frontend/components/features/import/file-upload/ImportFileUpload.vue b/extralit-frontend/components/features/import/file-upload/ImportFileUpload.vue
index d4195e074..6ed412f86 100644
--- a/extralit-frontend/components/features/import/file-upload/ImportFileUpload.vue
+++ b/extralit-frontend/components/features/import/file-upload/ImportFileUpload.vue
@@ -8,24 +8,14 @@
     <div class="import-file-upload__content">
       <div class="import-file-upload__main">
         <!-- Table Upload Section -->
-        <TableUpload
-          :initial-data="bibData"
-          @update="handleBibUpdate"
-        />
+        <TableUpload :initial-data="bibData" @update="handleBibUpdate" />
 
         <!-- PDF Upload Section -->
-        <PdfUpload
-          :initial-data="pdfData"
-          :bibliography-entries="bibData.parsedEntries"
-          @update="handlePdfUpdate"
-        />
+        <PdfUpload :initial-data="pdfData" :bibliography-entries="bibData.dataframeData" @update="handlePdfUpdate" />
       </div>
 
       <!-- Summary Sidebar -->
-      <ImportSummarySidebar
-        :bib-data="bibData"
-        :pdf-data="pdfData"
-      />
+      <ImportSummarySidebar :bib-data="bibData" :pdf-data="pdfData" />
     </div>
   </div>
 </template>
@@ -39,7 +29,6 @@ type ComponentData = {
   isInitializing: boolean;
   bibData: {
     fileName: string;
-    parsedEntries: any[];
     dataframeData: any;
     rawContent: string;
   };
@@ -65,7 +54,6 @@ export default {
       type: Object,
       default: () => ({
         fileName: "",
-        parsedEntries: [],
         dataframeData: null,
         rawContent: "",
       }),
@@ -88,7 +76,6 @@ export default {
       // Bibliography data
       bibData: {
         fileName: "",
-        parsedEntries: [],
         dataframeData: null,
         rawContent: "",
       },
@@ -102,15 +89,10 @@ export default {
     };
   },
 
-  mounted() {
-    // Initialize with existing data if provided
-    // Don't call initializeWithExistingData here since watchers with immediate: true will handle it
-  },
-
   computed: {
     isValid(): boolean {
       return (
-        this.bibData.parsedEntries.length > 0 &&
+        this.bibData.dataframeData && this.bibData.dataframeData.data.length > 0 &&
         this.pdfData.matchedFiles.length > 0
       );
     },
@@ -120,11 +102,11 @@ export default {
     initialBibData: {
       handler(newData: any, oldData: any) {
         // Only initialize if data has actually changed and we're not already initializing
-        if (!this.isInitializing && newData && (newData.fileName || newData.parsedEntries.length > 0)) {
+        if (!this.isInitializing && newData && (newData.fileName || (newData.dataframeData && newData.dataframeData.data.length > 0))) {
           // Check if the data is actually different to avoid unnecessary updates
           const hasChanged = !oldData ||
             newData.fileName !== oldData.fileName ||
-            newData.parsedEntries.length !== oldData.parsedEntries.length;
+            (newData.dataframeData?.data?.length || 0) !== (oldData.dataframeData?.data?.length || 0);
 
           if (hasChanged) {
             this.initializeWithExistingData();
@@ -159,7 +141,6 @@ export default {
     handleBibUpdate(data: any): void {
       this.bibData = {
         fileName: data.fileName || "",
-        parsedEntries: data.parsedEntries || [],
         dataframeData: data.dataframeData || null,
         rawContent: data.rawContent || "",
       };
@@ -172,15 +153,18 @@ export default {
         unmatchedFiles: data.unmatchedFiles || [],
         totalFiles: data.totalFiles || 0,
       };
+
+      // Update dataframe data with matched file paths
+      this.updateDataframeWithFilePaths(data.matchedFiles || []);
+
       this.emitPdfUpdate();
     },
 
     // Event emitters
     emitBibUpdate(): void {
       this.$emit("bib-update", {
-        isValid: this.bibData.parsedEntries.length > 0,
+        isValid: this.bibData.dataframeData && this.bibData.dataframeData.data.length > 0,
         fileName: this.bibData.fileName,
-        parsedEntries: this.bibData.parsedEntries,
         dataframeData: this.bibData.dataframeData,
         rawContent: this.bibData.rawContent,
       });
@@ -195,16 +179,55 @@ export default {
       });
     },
 
+    updateDataframeWithFilePaths(matchedFiles: any[]): void {
+      if (!this.bibData.dataframeData || !matchedFiles.length) {
+        return;
+      }
+
+      // Create a map of reference to file paths
+      const referenceToFiles = new Map<string, string[]>();
+
+      matchedFiles.forEach((matchedFile: any) => {
+        const reference = matchedFile.bibEntry?.reference;
+        const fileName = matchedFile.file?.name;
+
+        if (reference && fileName) {
+          if (!referenceToFiles.has(reference)) {
+            referenceToFiles.set(reference, []);
+          }
+          referenceToFiles.get(reference)!.push(fileName);
+        }
+      });
+      // Update the dataframe data with file paths
+      const updatedData = this.bibData.dataframeData.data.map((row: any) => {
+        const reference = row.reference || row.key;
+        const filePaths = referenceToFiles.get(reference) || [];
+
+        return {
+          ...row,
+          filePaths: filePaths
+        };
+      });
+
+      // Update the dataframe data
+      this.bibData.dataframeData = {
+        ...this.bibData.dataframeData,
+        data: updatedData
+      };
+
+      // Re-emit the bib update with the updated dataframe
+      this.emitBibUpdate();
+    },
+
     // Initialize component with existing data when navigating back
     initializeWithExistingData(): void {
       // Set flag to prevent recursive updates
       this.isInitializing = true;
 
       // Initialize bibliography data
-      if (this.initialBibData && (this.initialBibData.fileName || this.initialBibData.parsedEntries.length > 0)) {
+      if (this.initialBibData && (this.initialBibData.fileName || (this.initialBibData.dataframeData && this.initialBibData.dataframeData.data.length > 0))) {
         this.bibData = {
           fileName: this.initialBibData.fileName || "",
-          parsedEntries: this.initialBibData.parsedEntries || [],
           dataframeData: this.initialBibData.dataframeData || null,
           rawContent: this.initialBibData.rawContent || "",
         };
@@ -236,7 +259,6 @@ export default {
       // Reset bibliography data
       this.bibData = {
         fileName: "",
-        parsedEntries: [],
         dataframeData: null,
         rawContent: "",
       };
diff --git a/extralit-frontend/components/features/import/file-upload/ImportSummarySidebar.vue b/extralit-frontend/components/features/import/file-upload/ImportSummarySidebar.vue
index 4ee8e0dab..af5d5c910 100644
--- a/extralit-frontend/components/features/import/file-upload/ImportSummarySidebar.vue
+++ b/extralit-frontend/components/features/import/file-upload/ImportSummarySidebar.vue
@@ -4,10 +4,10 @@
 
     <div class="import-summary-sidebar__stats">
       <!-- Bibliography Status -->
-      <div v-if="bibData.parsedEntries.length > 0" class="import-summary-sidebar__stat">
+      <div v-if="bibData.dataframeData && bibData.dataframeData.data.length > 0" class="import-summary-sidebar__stat">
         <BaseIcon icon-name="document"
           class="import-summary-sidebar__stat-icon import-summary-sidebar__stat-icon--bib" />
-        <span class="import-summary-sidebar__stat-text">{{ bibData.parsedEntries.length }} references
+        <span class="import-summary-sidebar__stat-text">{{ bibData.dataframeData.data.length }} references
           found</span>
       </div>
 
@@ -40,7 +40,6 @@ import "assets/icons/import";
 
 interface BibliographyData {
   fileName: string;
-  parsedEntries: any[];
   dataframeData: any;
   rawContent: string;
 }
@@ -59,7 +58,6 @@ export default {
       type: Object as () => BibliographyData,
       default: () => ({
         fileName: "",
-        parsedEntries: [],
         dataframeData: null,
         rawContent: "",
       }),
@@ -76,7 +74,7 @@ export default {
 
   computed: {
     hasData(): boolean {
-      return this.bibData.parsedEntries.length > 0 || this.pdfData.totalFiles > 0;
+      return (this.bibData.dataframeData && this.bibData.dataframeData.data.length > 0) || this.pdfData.totalFiles > 0;
     },
   },
 };
diff --git a/extralit-frontend/components/features/import/file-upload/PdfUpload.vue b/extralit-frontend/components/features/import/file-upload/PdfUpload.vue
index 2681cbf08..c721dc1f6 100644
--- a/extralit-frontend/components/features/import/file-upload/PdfUpload.vue
+++ b/extralit-frontend/components/features/import/file-upload/PdfUpload.vue
@@ -61,7 +61,7 @@
 
 <script lang="ts">
 import { useResolve } from "ts-injecty";
-import { PdfMatchingService } from "~/v1/domain/services/PdfMatchingService";
+import { PdfMatchingService } from "~/v1/domain/services/FileMatchingService";
 import "assets/icons/check";
 import "assets/icons/danger";
 import "assets/icons/import";
@@ -85,8 +85,8 @@ export default {
       }),
     },
     bibliographyEntries: {
-      type: Array,
-      default: () => [],
+      type: Object,
+      default: () => null,
     },
   },
 
@@ -262,7 +262,7 @@ export default {
     },
 
     performFileMatching(uploadedFiles: File[]): void {
-      if (!this.bibliographyEntries || this.bibliographyEntries.length === 0 || uploadedFiles.length === 0) {
+      if (!this.bibliographyEntries || !this.bibliographyEntries.data || this.bibliographyEntries.data.length === 0 || uploadedFiles.length === 0) {
         // If no bibliography entries, all files are unmatched
         this.data.matchedFiles = [];
         this.data.unmatchedFiles = uploadedFiles;
@@ -297,8 +297,6 @@ export default {
         this.hasError = false;
         this.errorMessage = "";
         this.processing = false;
-        // Don't emit update when initializing with existing data to prevent loops
-        // The parent component already has this data
       }
     },
 
diff --git a/extralit-frontend/components/features/import/file-upload/TableUpload.vue b/extralit-frontend/components/features/import/file-upload/TableUpload.vue
index 92a4e9965..f495f8c58 100644
--- a/extralit-frontend/components/features/import/file-upload/TableUpload.vue
+++ b/extralit-frontend/components/features/import/file-upload/TableUpload.vue
@@ -30,7 +30,7 @@
     <div v-if="uploaded && !hasError" class="table-upload__upload-success">
       <BaseIcon icon-name="check" class="table-upload__upload-success-icon" />
       <span class="table-upload__upload-success-text">
-        Successfully uploaded {{ data.fileName }} ({{ data.parsedEntries.length }} entries found)
+        Successfully uploaded {{ data.fileName }} ({{ data.dataframeData ? data.dataframeData.data.length : 0 }} entries found)
       </span>
     </div>
 
@@ -57,17 +57,17 @@
 
 <script lang="ts">
 import { useResolve } from "ts-injecty";
-import type { CSVConfig } from "~/v1/domain/services/IFileService";
-import { FileService } from "~/v1/domain/services/FileService";
+import type { CSVConfig } from "~/v1/domain/services/IFileParsingService";
+import { FileParsingService } from "~/v1/domain/services/FileParsingService";
 import CsvColumnSelection from "./CsvColumnSelection.vue";
 import "assets/icons/check";
 import "assets/icons/danger";
 import "assets/icons/document";
+import { TableData } from "~/v1/domain/entities/table/TableData";
 
 interface BibliographyData {
   fileName: string;
-  parsedEntries: any[];
-  dataframeData: any;
+  dataframeData: TableData | null;
   rawContent: string;
 }
 
@@ -89,7 +89,6 @@ export default {
       type: Object as () => BibliographyData,
       default: () => ({
         fileName: "",
-        parsedEntries: [],
         dataframeData: null,
         rawContent: "",
       }),
@@ -99,7 +98,7 @@ export default {
   emits: ["update"],
 
   setup() {
-    const fileService = useResolve(FileService);
+    const fileService = useResolve(FileParsingService);
     return { fileService };
   },
 
@@ -111,7 +110,6 @@ export default {
       errorMessage: "",
       data: {
         fileName: "",
-        parsedEntries: [],
         dataframeData: null,
         rawContent: "",
       } as BibliographyData,
@@ -151,7 +149,7 @@ export default {
   watch: {
     initialData: {
       handler(newData: BibliographyData) {
-        if (newData && (newData.fileName || newData.parsedEntries.length > 0)) {
+        if (newData && (newData.fileName || newData?.dataframeData?.data?.length > 0)) {
           this.initializeWithExistingData();
         }
       },
@@ -198,7 +196,6 @@ export default {
       this.errorMessage = "";
       this.data = {
         fileName: "",
-        parsedEntries: [],
         dataframeData: null,
         rawContent: "",
       };
@@ -233,11 +230,9 @@ export default {
           await this.parseCsvContent(content);
         } else if (this.isBibTexFile(file)) {
           // Handle BibTeX file
-          const result = await this.fileService.parseBibTeX(content);
-          this.data.parsedEntries = result.entries;
-          this.data.dataframeData = result.dataframeData;
+          this.data.dataframeData = await this.fileService.parseBibTeX(content);
 
-          if (this.data.parsedEntries.length > 0) {
+          if (this.data.dataframeData && this.data.dataframeData.data.length > 0) {
             this.uploaded = true;
             this.emitUpdate();
           } else {
@@ -289,10 +284,7 @@ export default {
           return;
         }
 
-        const result = await this.fileService.parseCSVWithConfig(this.csvData.rawData, this.csvConfig);
-
-        this.data.parsedEntries = result.entries;
-        this.data.dataframeData = result.dataframeData;
+        this.data.dataframeData = await this.fileService.parseCSVWithConfig(this.csvData.rawData, this.csvConfig);
 
         // Hide column selection and mark as uploaded
         this.showCsvColumnSelection = false;
@@ -324,7 +316,6 @@ export default {
       // Reset data
       this.data = {
         fileName: "",
-        parsedEntries: [],
         dataframeData: null,
         rawContent: "",
       };
@@ -340,14 +331,13 @@ export default {
     },
 
     initializeWithExistingData(): void {
-      if (this.initialData && (this.initialData.fileName || this.initialData.parsedEntries.length > 0)) {
+      if (this.initialData && (this.initialData.fileName || (this.initialData.dataframeData && this.initialData.dataframeData.data.length > 0))) {
         this.data = {
           fileName: this.initialData.fileName || "",
-          parsedEntries: this.initialData.parsedEntries || [],
           dataframeData: this.initialData.dataframeData || null,
           rawContent: this.initialData.rawContent || "",
         };
-        this.uploaded = this.data.parsedEntries.length > 0;
+        this.uploaded = this.data.dataframeData && this.data.dataframeData.data.length > 0;
         this.hasError = false;
         this.errorMessage = "";
         this.showCsvColumnSelection = false;
@@ -358,9 +348,8 @@ export default {
 
     emitUpdate(): void {
       this.$emit("update", {
-        isValid: this.uploaded && !this.hasError && this.data.parsedEntries.length > 0,
+        isValid: this.uploaded && !this.hasError && this.data.dataframeData && this.data.dataframeData.data.length > 0,
         fileName: this.data.fileName,
-        parsedEntries: this.data.parsedEntries,
         dataframeData: this.data.dataframeData,
         rawContent: this.data.rawContent,
       });
@@ -373,7 +362,6 @@ export default {
       this.errorMessage = "";
       this.data = {
         fileName: "",
-        parsedEntries: [],
         dataframeData: null,
         rawContent: "",
       };
diff --git a/extralit-frontend/components/features/import/types.ts b/extralit-frontend/components/features/import/types.ts
index 713a3857f..1c253bb07 100644
--- a/extralit-frontend/components/features/import/types.ts
+++ b/extralit-frontend/components/features/import/types.ts
@@ -6,15 +6,12 @@
 import type {
   ImportStatus,
   DocumentMetadata,
-  DataframeData,
 } from "~/v1/domain/entities/import/ImportAnalysis";
+import { TableData } from "~/v1/domain/entities/table/TableData";
 
 // Re-export commonly used backend types for convenience
 export type {
   FieldType,
-  DataframeField,
-  DataframeSchema,
-  DataframeData,
   ImportStatus,
   DocumentCreate,
   FileInfo,
@@ -70,7 +67,7 @@ export interface ImportConfirmationData {
   confirmedDocuments: Record<string, DocumentMetadata>;
   totalConfirmed: number;
   documentActions: Record<string, ImportStatus>;
-  filteredDataframeData: DataframeData | null;
+  filteredDataframeData: TableData | null;
 }
 
 // Table row data for ImportAnalysisTable
diff --git a/extralit-frontend/v1/di/di.ts b/extralit-frontend/v1/di/di.ts
index b212c0d3d..e7b40a862 100644
--- a/extralit-frontend/v1/di/di.ts
+++ b/extralit-frontend/v1/di/di.ts
@@ -79,8 +79,8 @@ import { CreateDatasetUseCase } from "@/v1/domain/usecases/create-dataset-use-ca
 import { GetFirstRecordFromHub } from "@/v1/domain/usecases/get-first-record-from-hub";
 import { ExportDatasetToHubUseCase } from "@/v1/domain/usecases/export-dataset-to-hub-use-case";
 import { AuthLoginUseCase } from "@/v1/domain/usecases/auth-login-use-case";
-import { FileService } from "@/v1/domain/services/FileService";
-import { PdfMatchingService } from "@/v1/domain/services/PdfMatchingService";
+import { FileParsingService } from "~/v1/domain/services/FileParsingService";
+import { PdfMatchingService } from "@/v1/domain/services/FileMatchingService";
 
 export const loadDependencyContainer = (context: Context) => {
   const useAxios = useAxiosExtension(context);
@@ -211,8 +211,7 @@ export const loadDependencyContainer = (context: Context) => {
 
     register(ExportDatasetToHubUseCase).withDependencies(DatasetRepository, useLocalStorage).build(),
 
-    // File processing services
-    register(FileService).build(),
+    register(FileParsingService).build(),
     register(PdfMatchingService).build(),
   ];
 
diff --git a/extralit-frontend/v1/domain/entities/import/ImportAnalysis.ts b/extralit-frontend/v1/domain/entities/import/ImportAnalysis.ts
index 04288a349..0b036c18f 100644
--- a/extralit-frontend/v1/domain/entities/import/ImportAnalysis.ts
+++ b/extralit-frontend/v1/domain/entities/import/ImportAnalysis.ts
@@ -3,27 +3,11 @@
  * Maps to extralit-server/src/extralit_server/api/schemas/v1/imports.py
  */
 
+import { TableData } from "../table/TableData";
+
 // Basic field types supported in dataframes
 export type FieldType = "string" | "integer" | "float" | "boolean";
 
-// Dataframe field definition
-export interface DataframeField {
-  name: string;
-  type: FieldType;
-}
-
-// Dataframe schema definition
-export interface DataframeSchema {
-  fields: DataframeField[];
-  primaryKey: string[];
-}
-
-// Tabular dataframe representation
-export interface DataframeData {
-  schema: DataframeSchema;
-  data: Record<string, any>[];
-}
-
 // Import analysis status for individual documents (maps to ImportStatus enum in backend)
 export type ImportStatus = "add" | "update" | "skip" | "ignore" | "failed";
 
@@ -96,7 +80,7 @@ export interface ImportHistoryResponse {
   user_id: string;
   filename: string;
   created_at: string;
-  data?: DataframeData; // Tabular dataframe data (only in detailed view)
+  data?: TableData; // Tabular dataframe data (only in detailed view)
   metadata?: {
     documents: Record<string, DocumentImportAnalysis>; // Reference key to document info mapping
     summary: ImportSummary; // Import analysis summary
diff --git a/extralit-frontend/v1/domain/entities/import/ImportHistoryDetails.ts b/extralit-frontend/v1/domain/entities/import/ImportHistoryDetails.ts
index 53e9585c6..1215d4a12 100644
--- a/extralit-frontend/v1/domain/entities/import/ImportHistoryDetails.ts
+++ b/extralit-frontend/v1/domain/entities/import/ImportHistoryDetails.ts
@@ -3,9 +3,9 @@
  * Provides TypeScript interfaces for ImportHistory data structure
  */
 
+import { TableData } from "../table/TableData";
 import type {
   ImportHistoryResponse,
-  DataframeData,
   ImportStatus,
   DocumentImportAnalysis,
   ImportSummary,
@@ -38,7 +38,7 @@ export interface ImportHistorySummaryStats {
  * Enhanced ImportHistory details with computed properties
  */
 export class ImportHistoryDetails {
-  constructor(private readonly data: ImportHistoryResponse & { data: DataframeData }) {}
+  constructor(private readonly data: ImportHistoryResponse & { data: TableData }) {}
 
   get id(): string {
     return this.data.id;
@@ -161,7 +161,7 @@ export class ImportHistoryDetails {
   /**
    * Get raw data for export or further processing
    */
-  getRawData(): ImportHistoryResponse & { data: DataframeData } {
+  getRawData(): ImportHistoryResponse & { data: TableData } {
     return this.data;
   }
 
diff --git a/extralit-frontend/v1/domain/services/PdfMatchingService.integration.spec.js b/extralit-frontend/v1/domain/services/FileMatchingService.integration.spec.js
similarity index 89%
rename from extralit-frontend/v1/domain/services/PdfMatchingService.integration.spec.js
rename to extralit-frontend/v1/domain/services/FileMatchingService.integration.spec.js
index 45cfda595..733053f44 100644
--- a/extralit-frontend/v1/domain/services/PdfMatchingService.integration.spec.js
+++ b/extralit-frontend/v1/domain/services/FileMatchingService.integration.spec.js
@@ -1,4 +1,6 @@
-import { PdfMatchingService } from "./PdfMatchingService";
+import { PdfMatchingService } from "./FileMatchingService";
+import { TableData } from "../entities/table/TableData";
+import { DataFrameSchema } from "../entities/table/Schema";
 
 describe("PdfMatchingService Integration", () => {
   let service;
@@ -27,6 +29,8 @@ describe("PdfMatchingService Integration", () => {
         },
       ];
 
+      const tableData = new TableData(entries, new DataFrameSchema());
+
       const files = [
         {
           name: "Linder et al. - 2025 - Predicting RNA-seq coverage from DNA sequence as a unifying model of gene regulation.pdf",
@@ -45,7 +49,7 @@ describe("PdfMatchingService Integration", () => {
         },
       ];
 
-      const result = service.matchFiles(files, entries);
+      const result = service.matchFiles(files, tableData);
 
       expect(result.matchedFiles).toHaveLength(3);
       expect(result.unmatchedFiles).toHaveLength(0);
@@ -79,6 +83,8 @@ describe("PdfMatchingService Integration", () => {
         },
       ];
 
+      const tableData = new TableData(entries, new DataFrameSchema());
+
       const files = [
         {
           name: "Hawley2003a_malaria_bed_nets.pdf",
@@ -90,7 +96,7 @@ describe("PdfMatchingService Integration", () => {
         },
       ];
 
-      const result = service.matchFiles(files, entries);
+      const result = service.matchFiles(files, tableData);
 
       expect(result.matchedFiles).toHaveLength(2);
       expect(result.unmatchedFiles).toHaveLength(0);
@@ -120,6 +126,8 @@ describe("PdfMatchingService Integration", () => {
         },
       ];
 
+      const tableData = new TableData(entries, new DataFrameSchema());
+
       const files = [
         {
           name: "Smith2023_ML_Healthcare.pdf",
@@ -131,7 +139,7 @@ describe("PdfMatchingService Integration", () => {
         },
       ];
 
-      const result = service.matchFiles(files, entries);
+      const result = service.matchFiles(files, tableData);
 
       expect(result.matchedFiles).toHaveLength(2); // Both files match Smith2023 reference
       expect(result.unmatchedFiles).toHaveLength(0);
@@ -162,6 +170,8 @@ describe("PdfMatchingService Integration", () => {
         },
       ];
 
+      const tableData = new TableData(entries, new DataFrameSchema());
+
       const files = [
         {
           name: "Johnson2022_part1.pdf",
@@ -181,7 +191,7 @@ describe("PdfMatchingService Integration", () => {
         },
       ];
 
-      const result = service.matchFiles(files, entries);
+      const result = service.matchFiles(files, tableData);
 
       expect(result.matchedFiles).toHaveLength(3);
       expect(result.unmatchedFiles).toHaveLength(1);
@@ -209,6 +219,8 @@ describe("PdfMatchingService Integration", () => {
         },
       ];
 
+      const tableData = new TableData(entries, new DataFrameSchema());
+
       const files = [
         {
           name: "Mixed2023.pdf",
@@ -216,7 +228,7 @@ describe("PdfMatchingService Integration", () => {
         },
       ];
 
-      const result = service.matchFiles(files, entries);
+      const result = service.matchFiles(files, tableData);
 
       expect(result.matchedFiles).toHaveLength(1);
       expect(result.matchedFiles[0].bibEntry.reference).toBe("Mixed2023");
@@ -234,6 +246,8 @@ describe("PdfMatchingService Integration", () => {
         },
       ];
 
+      const tableData = new TableData(entries, new DataFrameSchema());
+
       const files = [
         {
           name: "LongPath2023.pdf",
@@ -241,7 +255,7 @@ describe("PdfMatchingService Integration", () => {
         },
       ];
 
-      const result = service.matchFiles(files, entries);
+      const result = service.matchFiles(files, tableData);
 
       expect(result.matchedFiles).toHaveLength(1);
       expect(result.matchedFiles[0].confidence).toBeGreaterThan(0.7);
@@ -256,6 +270,8 @@ describe("PdfMatchingService Integration", () => {
         },
       ];
 
+      const tableData = new TableData(entries, new DataFrameSchema());
+
       const files = [
         {
           name: "Special (2023) - Title with [brackets] & symbols.pdf",
@@ -263,7 +279,7 @@ describe("PdfMatchingService Integration", () => {
         },
       ];
 
-      const result = service.matchFiles(files, entries);
+      const result = service.matchFiles(files, tableData);
 
       expect(result.matchedFiles).toHaveLength(1);
       expect(result.matchedFiles[0].confidence).toBeGreaterThan(0.8);
diff --git a/extralit-frontend/v1/domain/services/PdfMatchingService.spec.js b/extralit-frontend/v1/domain/services/FileMatchingService.spec.js
similarity index 88%
rename from extralit-frontend/v1/domain/services/PdfMatchingService.spec.js
rename to extralit-frontend/v1/domain/services/FileMatchingService.spec.js
index d0cca4036..efe44ae19 100644
--- a/extralit-frontend/v1/domain/services/PdfMatchingService.spec.js
+++ b/extralit-frontend/v1/domain/services/FileMatchingService.spec.js
@@ -1,8 +1,11 @@
-import { PdfMatchingService } from "./PdfMatchingService";
+import { PdfMatchingService } from "./FileMatchingService";
+import { TableData } from "../entities/table/TableData";
+import { DataFrameSchema } from "../entities/table/Schema";
 
 describe("PdfMatchingService", () => {
   let service;
   let mockEntries;
+  let mockTableData;
   let mockFiles;
 
   beforeEach(() => {
@@ -27,6 +30,8 @@ describe("PdfMatchingService", () => {
       },
     ];
 
+    mockTableData = new TableData(mockEntries, new DataFrameSchema());
+
     // Mock file objects with webkitRelativePath
     mockFiles = [
       {
@@ -56,13 +61,14 @@ describe("PdfMatchingService", () => {
     });
 
     it("should return all files as unmatched when no entries provided", () => {
-      const result = service.matchFiles(mockFiles, []);
+      const emptyTableData = new TableData([], new DataFrameSchema());
+      const result = service.matchFiles(mockFiles, emptyTableData);
       expect(result.matchedFiles).toEqual([]);
       expect(result.unmatchedFiles).toEqual(mockFiles);
     });
 
     it("should match files using maximum prefix path matching", () => {
-      const result = service.matchFiles(mockFiles, mockEntries);
+      const result = service.matchFiles(mockFiles, mockTableData);
 
       expect(result.matchedFiles).toHaveLength(3);
       expect(result.unmatchedFiles).toHaveLength(1);
@@ -82,7 +88,7 @@ describe("PdfMatchingService", () => {
     });
 
     it("should handle multiple files per reference correctly", () => {
-      const result = service.matchFiles(mockFiles, mockEntries);
+      const result = service.matchFiles(mockFiles, mockTableData);
 
       // Count files per reference
       const referenceCount = {};
@@ -96,7 +102,7 @@ describe("PdfMatchingService", () => {
     });
 
     it("should sort results by confidence and then by reference", () => {
-      const result = service.matchFiles(mockFiles, mockEntries);
+      const result = service.matchFiles(mockFiles, mockTableData);
 
       // Check that results are sorted by confidence (descending)
       for (let i = 1; i < result.matchedFiles.length; i++) {
@@ -199,7 +205,7 @@ describe("PdfMatchingService", () => {
     it("should handle files without webkitRelativePath", () => {
       const filesWithoutWebkit = [{ name: "Smith2023_ML_Healthcare.pdf" }, { name: "Johnson2022_part1.pdf" }];
 
-      const result = service.matchFiles(filesWithoutWebkit, mockEntries);
+      const result = service.matchFiles(filesWithoutWebkit, mockTableData);
 
       // Should still attempt matching using filename
       expect(result.matchedFiles.length).toBeGreaterThan(0);
@@ -214,7 +220,8 @@ describe("PdfMatchingService", () => {
         },
       ];
 
-      const result = service.matchFiles(mockFiles, entriesWithoutPaths);
+      const tableDataWithoutPaths = new TableData(entriesWithoutPaths, new DataFrameSchema());
+      const result = service.matchFiles(mockFiles, tableDataWithoutPaths);
 
       expect(result.matchedFiles).toHaveLength(0);
       expect(result.unmatchedFiles).toEqual(mockFiles);
@@ -229,8 +236,9 @@ describe("PdfMatchingService", () => {
         },
       ];
 
+      const tableDataWithNullPaths = new TableData(entriesWithNullPaths, new DataFrameSchema());
       expect(() => {
-        service.matchFiles(mockFiles, entriesWithNullPaths);
+        service.matchFiles(mockFiles, tableDataWithNullPaths);
       }).not.toThrow();
     });
   });
diff --git a/extralit-frontend/v1/domain/services/PdfMatchingService.ts b/extralit-frontend/v1/domain/services/FileMatchingService.ts
similarity index 97%
rename from extralit-frontend/v1/domain/services/PdfMatchingService.ts
rename to extralit-frontend/v1/domain/services/FileMatchingService.ts
index 991b60cd4..0932c1b29 100644
--- a/extralit-frontend/v1/domain/services/PdfMatchingService.ts
+++ b/extralit-frontend/v1/domain/services/FileMatchingService.ts
@@ -1,5 +1,5 @@
-import type { IPdfMatchingService, PdfMatchResult, PdfMatchingResult } from "./IPdfMatchingService";
-import type { ParsedEntry } from "./IFileService";
+import type { IFileMatchingService, FileMatchResult, FileMatchingResult } from "./IFileMatchingService";
+import type { ParsedEntry } from "./IFileParsingService";
 
 interface MatchCandidate {
   entry: ParsedEntry;
@@ -13,8 +13,10 @@ interface PrefixMatchResult {
   type: string;
 }
 
-export class PdfMatchingService implements IPdfMatchingService {
-  matchFiles(files: File[], entries: ParsedEntry[]): PdfMatchingResult {
+export class PdfMatchingService implements IFileMatchingService {
+  matchFiles(files: File[], dataframeData): FileMatchingResult {
+    const entries: ParsedEntry[] = dataframeData?.data || [];
+
     if (!entries || entries.length === 0 || files.length === 0) {
       return {
         matchedFiles: [],
@@ -22,7 +24,7 @@ export class PdfMatchingService implements IPdfMatchingService {
       };
     }
 
-    const matchedFiles: PdfMatchResult[] = [];
+    const matchedFiles: FileMatchResult[] = [];
     const unmatchedFiles: File[] = [];
 
     // Track which references have been matched to support multiple files per reference
diff --git a/extralit-frontend/v1/domain/services/FileService.spec.js b/extralit-frontend/v1/domain/services/FileParsingService.spec.js
similarity index 94%
rename from extralit-frontend/v1/domain/services/FileService.spec.js
rename to extralit-frontend/v1/domain/services/FileParsingService.spec.js
index 8a1a506d4..d06c24191 100644
--- a/extralit-frontend/v1/domain/services/FileService.spec.js
+++ b/extralit-frontend/v1/domain/services/FileParsingService.spec.js
@@ -1,10 +1,10 @@
-import { FileService, BibTeXParser, CSVParser, DataframeBuilder } from "./FileService";
+import { FileParsingService, BibTeXParser, CSVParser, DataframeBuilder } from "./FileParsingService";
 
 describe("FileService", () => {
   let fileService;
 
   beforeEach(() => {
-    fileService = new FileService();
+    fileService = new FileParsingService();
   });
 
   describe("BibTeXParser", () => {
@@ -103,7 +103,9 @@ describe("FileService", () => {
       const rawData = [{ title: "Test" }];
       const config = { referenceColumn: "ref" };
 
-      expect(() => parser.processWithConfig(rawData, config)).toThrow("No data found in the selected reference column \"ref\".");
+      expect(() => parser.processWithConfig(rawData, config)).toThrow(
+        'No data found in the selected reference column "ref".'
+      );
     });
   });
 
diff --git a/extralit-frontend/v1/domain/services/FileService.ts b/extralit-frontend/v1/domain/services/FileParsingService.ts
similarity index 91%
rename from extralit-frontend/v1/domain/services/FileService.ts
rename to extralit-frontend/v1/domain/services/FileParsingService.ts
index 564193845..45ef6c57f 100644
--- a/extralit-frontend/v1/domain/services/FileService.ts
+++ b/extralit-frontend/v1/domain/services/FileParsingService.ts
@@ -1,7 +1,9 @@
 import bibtexParse from "@orcid/bibtex-parse-js";
 import Papa from "papaparse";
-import type { IFileService, ParsedEntry, ParseResult, CSVConfig, CSVPreviewData } from "./IFileService";
-import type { DataframeData, FieldType } from "~/v1/domain/entities/import/ImportAnalysis";
+import { TableData } from "../entities/table/TableData";
+import { DataFrameSchema } from "../entities/table/Schema";
+import type { IFileParsingService, ParsedEntry, CSVConfig, CSVPreviewData } from "./IFileParsingService";
+import type { FieldType } from "~/v1/domain/entities/import/ImportAnalysis";
 
 export class BibTeXParser {
   parse(content: string): ParsedEntry[] {
@@ -242,12 +244,9 @@ export class CSVParser {
 }
 
 export class DataframeBuilder {
-  static build(entries: ParsedEntry[]): DataframeData {
+  static build(entries: ParsedEntry[]): TableData {
     if (entries.length === 0) {
-      return {
-        schema: { fields: [], primaryKey: ["reference"] },
-        data: [],
-      };
+      return new TableData([], new DataFrameSchema([], ["reference"]));
     }
 
     const allFields = new Set<string>();
@@ -260,13 +259,7 @@ export class DataframeBuilder {
       type: this.inferFieldType(entries, fieldName),
     }));
 
-    return {
-      schema: {
-        fields,
-        primaryKey: ["reference"],
-      },
-      data: entries,
-    };
+    return new TableData(entries, new DataFrameSchema(fields, ["reference"]));
   }
 
   private static inferFieldType(entries: ParsedEntry[], fieldName: string): FieldType {
@@ -282,18 +275,15 @@ export class DataframeBuilder {
   }
 }
 
-export class FileService implements IFileService {
+export class FileParsingService implements IFileParsingService {
   private bibTexParser = new BibTeXParser();
   private csvParser = new CSVParser();
 
-  async parseBibTeX(content: string): Promise<ParseResult> {
+  async parseBibTeX(content: string): Promise<TableData> {
+
     const entries = this.bibTexParser.parse(content);
-    const dataframeData = DataframeBuilder.build(entries);
 
-    return {
-      entries,
-      dataframeData,
-    };
+    return DataframeBuilder.build(entries);
   }
 
   async parseCSVForPreview(content: string): Promise<CSVPreviewData> {
@@ -306,14 +296,11 @@ export class FileService implements IFileService {
     };
   }
 
-  async parseCSVWithConfig(rawData: Record<string, any>[], config: CSVConfig): Promise<ParseResult> {
+  async parseCSVWithConfig(rawData: Record<string, any>[], config: CSVConfig): Promise<TableData> {
     const entries = this.csvParser.processWithConfig(rawData, config);
     const dataframeData = DataframeBuilder.build(entries);
 
-    return {
-      entries,
-      dataframeData,
-    };
+    return dataframeData;
   }
 
   async readFileContent(file: File): Promise<string> {
diff --git a/extralit-frontend/v1/domain/services/IFileMatchingService.ts b/extralit-frontend/v1/domain/services/IFileMatchingService.ts
new file mode 100644
index 000000000..0f7295eec
--- /dev/null
+++ b/extralit-frontend/v1/domain/services/IFileMatchingService.ts
@@ -0,0 +1,18 @@
+import type { ParsedEntry } from "./IFileParsingService";
+import { TableData } from "../entities/table/TableData";
+
+export interface FileMatchResult {
+  file: File;
+  bibEntry: ParsedEntry;
+  matchType: string;
+  confidence: number;
+}
+
+export interface FileMatchingResult {
+  matchedFiles: FileMatchResult[];
+  unmatchedFiles: File[];
+}
+
+export interface IFileMatchingService {
+  matchFiles(files: File[], dataframeData: TableData | null): FileMatchingResult;
+}
diff --git a/extralit-frontend/v1/domain/services/IFileService.ts b/extralit-frontend/v1/domain/services/IFileParsingService.ts
similarity index 66%
rename from extralit-frontend/v1/domain/services/IFileService.ts
rename to extralit-frontend/v1/domain/services/IFileParsingService.ts
index 3116d22c6..8f169fb10 100644
--- a/extralit-frontend/v1/domain/services/IFileService.ts
+++ b/extralit-frontend/v1/domain/services/IFileParsingService.ts
@@ -1,4 +1,4 @@
-import type { DataframeData } from "~/v1/domain/entities/import/ImportAnalysis";
+import { TableData } from "../entities/table/TableData";
 
 export interface ParsedEntry {
   reference: string;
@@ -7,11 +7,6 @@ export interface ParsedEntry {
   [key: string]: any;
 }
 
-export interface ParseResult {
-  entries: ParsedEntry[];
-  dataframeData: DataframeData;
-}
-
 export interface CSVConfig {
   referenceColumn: string;
   filesColumn?: string;
@@ -23,10 +18,10 @@ export interface CSVPreviewData {
   rawData: Record<string, any>[];
 }
 
-export interface IFileService {
-  parseBibTeX(content: string): Promise<ParseResult>;
+export interface IFileParsingService {
+  parseBibTeX(content: string): Promise<TableData>;
   parseCSVForPreview(content: string): Promise<CSVPreviewData>;
-  parseCSVWithConfig(rawData: Record<string, any>[], config: CSVConfig): Promise<ParseResult>;
+  parseCSVWithConfig(rawData: Record<string, any>[], config: CSVConfig): Promise<TableData>;
   readFileContent(file: File): Promise<string>;
   isValidFileType(file: File, validExtensions: string[]): boolean;
 }
diff --git a/extralit-frontend/v1/domain/services/IPdfMatchingService.ts b/extralit-frontend/v1/domain/services/IPdfMatchingService.ts
deleted file mode 100644
index bdfb4c3e2..000000000
--- a/extralit-frontend/v1/domain/services/IPdfMatchingService.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { ParsedEntry } from "./IFileService";
-
-export interface PdfMatchResult {
-  file: File;
-  bibEntry: ParsedEntry;
-  matchType: string;
-  confidence: number;
-}
-
-export interface PdfMatchingResult {
-  matchedFiles: PdfMatchResult[];
-  unmatchedFiles: File[];
-}
-
-export interface IPdfMatchingService {
-  matchFiles(files: File[], entries: ParsedEntry[]): PdfMatchingResult;
-}
diff --git a/extralit-frontend/v1/domain/usecases/get-import-analysis-use-case.ts b/extralit-frontend/v1/domain/usecases/get-import-analysis-use-case.ts
index de6b0a7fa..f0bfa7a13 100644
--- a/extralit-frontend/v1/domain/usecases/get-import-analysis-use-case.ts
+++ b/extralit-frontend/v1/domain/usecases/get-import-analysis-use-case.ts
@@ -5,8 +5,8 @@ import {
   ImportAnalysisResponse,
   DocumentMetadata,
   FileInfo,
-  DataframeData,
 } from "~/v1/domain/entities/import/ImportAnalysis";
+import { TableData } from "@/v1/domain/entities/table/TableData";
 
 const IMPORT_ANALYSIS_API_ERRORS = {
   ERROR_FETCHING_IMPORT_ANALYSIS: "ERROR_FETCHING_IMPORT_ANALYSIS",
@@ -17,7 +17,7 @@ export class GetImportAnalysisUseCase {
 
   async analyzeImport(
     workspaceId: string,
-    dataframeData: DataframeData,
+    dataframeData: TableData,
     matchedFiles: any[]
   ): Promise<ImportAnalysisResponse> {
     try {
@@ -46,7 +46,7 @@ export class GetImportAnalysisUseCase {
 
   private createAnalysisRequest(
     workspaceId: string,
-    dataframeData: DataframeData,
+    dataframeData: TableData,
     matchedFiles: any[]
   ): ImportAnalysisRequest {
     const documents: Record<string, DocumentMetadata> = {};
@@ -121,33 +121,4 @@ export class GetImportAnalysisUseCase {
       documents,
     };
   }
-
-  private extractMetadata(row: Record<string, any>): Record<string, any> | undefined {
-    // Extract additional metadata fields not covered by DocumentCreate
-    const excludedFields = [
-      "reference",
-      "title",
-      "authors",
-      "year",
-      "journal",
-      "volume",
-      "pages",
-      "doi",
-      "url",
-      "abstract",
-      "keywords",
-      "pmid",
-      "filePaths",
-      "type",
-    ];
-
-    const metadata: Record<string, any> = {};
-    Object.keys(row).forEach((key) => {
-      if (!excludedFields.includes(key) && row[key] !== undefined && row[key] !== null && row[key] !== "") {
-        metadata[key] = row[key];
-      }
-    });
-
-    return Object.keys(metadata).length > 0 ? metadata : undefined;
-  }
 }
diff --git a/extralit-frontend/v1/domain/usecases/get-import-history-details-use-case.ts b/extralit-frontend/v1/domain/usecases/get-import-history-details-use-case.ts
index 4ac2a3748..b3cda08e0 100644
--- a/extralit-frontend/v1/domain/usecases/get-import-history-details-use-case.ts
+++ b/extralit-frontend/v1/domain/usecases/get-import-history-details-use-case.ts
@@ -3,9 +3,9 @@
  */
 
 import { type NuxtAxiosInstance } from "@nuxtjs/axios";
+import { TableData } from "../entities/table/TableData";
 import type {
   ImportHistoryResponse,
-  DataframeData,
   DocumentImportAnalysis,
   ImportStatus,
   ImportSummary,
@@ -22,7 +22,7 @@ export interface ImportHistoryDetailItem {
 }
 
 export interface ImportHistoryDetailsResponse extends ImportHistoryResponse {
-  data: DataframeData; // Always present in detailed view
+  data: TableData;
   metadata: {
     documents: Record<string, DocumentImportAnalysis>; // Reference key to document info mapping
     summary: ImportSummary; // Import analysis summary
@@ -73,7 +73,7 @@ export class GetImportHistoryDetailsUseCase {
   /**
    * Calculate summary from data and metadata
    */
-  calculateSummary(data: DataframeData, metadata?: ImportHistoryResponse["metadata"]): ImportSummary {
+  calculateSummary(data: TableData, metadata?: ImportHistoryResponse["metadata"]): ImportSummary {
     // If metadata already contains a summary, use it
     if (metadata?.summary) {
       return metadata.summary;