diff --git a/matrix_builder.py b/matrix_builder.py
index 07ff541..5c33722 100644
--- a/matrix_builder.py
+++ b/matrix_builder.py
@@ -4,31 +4,32 @@ class MatrixBuilder:
     def __init__(self, data_processor, tables_data, verbose=False):
         self.data_processor = data_processor
         self.tables_data = tables_data
+        self.lazy_loaded_tables_data = {}  # Neue Arbeitsvariable
         self.verbose = verbose
+        self.matrix = {}  # Klassenvariable
 
     def build_multitable_matrix(self):
-        matrix = {}
         for table_name, table_rows in self.tables_data.items():
             self.print_verbose_message(f"Building matrix for table: {table_name}")
-            matrix[table_name] = self._build_matrix_for_table(table_name, table_rows.copy())
-        return matrix
+            self.matrix[table_name] = self._build_matrix_for_table(table_name, table_rows.copy())
+        return self.matrix
 
     def _build_matrix_for_table(self, table_name, table_rows, reference_map={}):
         self.print_verbose_message(f"Starting matrix build for table: {table_name}")
-        matrix = {table_name: table_rows}
+        self.matrix[table_name] = table_rows
         reference_map = reference_map.copy()
         self._process_link_fields(table_name, reference_map)
-        self._populate_matrix_with_related_content(matrix, table_name, table_rows, reference_map)
-        return matrix[table_name]
+        self._populate_matrix_with_related_content(table_name, table_rows, reference_map)
+        return self.matrix[table_name]
 
-    def _populate_matrix_with_related_content(self, matrix, table_name, table_rows, reference_map):
+    def _populate_matrix_with_related_content(self, table_name, table_rows, reference_map):
         for table_row in table_rows:
             for column_name, cell_content in table_row.items():
                 if column_name in reference_map:
                     self.print_verbose_message(f"Handling linked content for column: {column_name}")
-                    self._handle_linked_content(matrix, table_row, column_name, cell_content, reference_map)
+                    self._handle_linked_content(table_row, column_name, cell_content, reference_map)
 
-    def _handle_linked_content(self, matrix, table_row, column_name, cell_content, reference_map):
+    def _handle_linked_content(self, table_row, column_name, cell_content, reference_map):
         link_table_id = reference_map[column_name]["link_row_table_id"]
         link_field_id = reference_map[column_name]["link_row_related_field_id"]
 
@@ -36,17 +37,17 @@ class MatrixBuilder:
             raise Exception("link_row_related_field_id has to be a positive number")
 
         self.print_verbose_message(f"Fetching related content for table ID: {link_table_id} and field ID: {link_field_id}")
-        new_content = self._fetch_related_content(matrix, cell_content, link_table_id, link_field_id, reference_map)
+        new_content = self._fetch_related_content(cell_content, link_table_id, link_field_id, reference_map)
         table_row[column_name] = new_content
 
-    def _fetch_related_content(self, matrix, cell_content, link_table_id, link_field_id, reference_map):
+    def _fetch_related_content(self, cell_content, link_table_id, link_field_id, reference_map):
         new_content = []
         for entry in cell_content:
             related_cell_id = self._generate_related_cell_identifier(link_table_id, link_field_id, entry["id"])
             self.print_verbose_message(f"Generated related cell identifier: {related_cell_id}")
             if related_cell_id not in reference_map.get("embeded", []):
                 reference_map.setdefault("embeded", []).append(related_cell_id)
-                matrix[link_table_id] = self._build_matrix_for_table(link_table_id, self.tables_data[link_table_id].copy(), reference_map)
+                self.matrix[link_table_id] = self._build_matrix_for_table(link_table_id, self.lazy_loaded_tables_data.get(link_table_id, []).copy(), reference_map)
                 new_content.append(entry)
         return new_content
 
@@ -62,9 +63,9 @@ class MatrixBuilder:
 
     def _load_table_data_if_missing(self, link_field):
         link_table_id = link_field["link_row_table_id"]
-        if link_table_id not in self.tables_data:
+        if link_table_id not in self.lazy_loaded_tables_data:
             self.print_verbose_message(f"Loading data for missing table ID: {link_table_id}")
-            self.tables_data[link_table_id] = self.data_processor.get_all_rows_from_table(link_table_id)
+            self.lazy_loaded_tables_data[link_table_id] = self.data_processor.get_all_rows_from_table(link_table_id)
 
     def _update_reference_map(self, link_field, reference_map):
         field_name = f"field_{link_field['id']}"