diff --git a/src/App.tsx b/src/App.tsx
index f5488f9f5dc2d3a47d4d50979ac4586bd1e5fd2d..719242c41c0b48fdf4bcd5f77503cdf6617472dc 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useActiveQuery, useAppDispatch, useAuthCache, useML, useSessionCache } from '@/lib/data-access/store';
 import { addError, setCurrentTheme } from '@/lib/data-access/store/configSlice';
 import { resetGraphQueryResults, queryingBackend } from '@/lib/data-access/store/graphQueryResultSlice';
diff --git a/src/lib/data-access/store/schemaSlice.ts b/src/lib/data-access/store/schemaSlice.ts
index bfdbccffe5bad2f205a12c58953c2e09938c007a..1d194f6d2be765ebedac01cef5fcee4ed7369834 100644
--- a/src/lib/data-access/store/schemaSlice.ts
+++ b/src/lib/data-access/store/schemaSlice.ts
@@ -20,14 +20,8 @@ export type SchemaSliceI = {
 export const initialState: SchemaSliceI = {
   graph: new SchemaGraphology().export(),
   graphStats: {
-    nodes: {
-      count: 0,
-      stats: {},
-    },
-    edges: {
-      count: 0,
-      stats: {},
-    },
+    nodes: { count: 0, stats: {} },
+    edges: { count: 0, stats: {} },
   },
   loading: false,
   error: false,
diff --git a/src/lib/mock-data/schema/big2ndChamberSchemaRaw.ts b/src/lib/mock-data/schema/big2ndChamberSchemaRaw.ts
index 535dd220a771c233d77c59d21cfd5ae7b793ea02..a0d8bf1f477773e514c5d5439030a4ad355ecc29 100644
--- a/src/lib/mock-data/schema/big2ndChamberSchemaRaw.ts
+++ b/src/lib/mock-data/schema/big2ndChamberSchemaRaw.ts
@@ -1,7 +1,7 @@
-import { SchemaUtils } from '@/lib/schema/schema-utils';
-import { SchemaFromBackend } from 'ts-common';
+import { SchemaUtils } from '../../../lib/schema/schema-utils';
+import { SchemaReturnFormat } from 'ts-common';
 
-export const big2ndChamberSchemaRaw: SchemaFromBackend = {
+export const big2ndChamberSchemaRaw: SchemaReturnFormat = {
   nodes: [
     {
       name: 'kamerleden',
@@ -68,6 +68,10 @@ export const big2ndChamberSchemaRaw: SchemaFromBackend = {
       attributes: [],
     },
   ],
+  graphStats: {
+    nodes: { count: 0, stats: {} },
+    edges: { count: 0, stats: {} },
+  },
 };
 
 export const big2ndChamberSchema = SchemaUtils.schemaBackend2Graphology(big2ndChamberSchemaRaw);
diff --git a/src/lib/mock-data/schema/fincenWithAttributes.ts b/src/lib/mock-data/schema/fincenWithAttributes.ts
index 982aaf157aeae7550601de94b30c414130dc5f56..1a78f48184d58840bb99cebee471b57c154b369a 100644
--- a/src/lib/mock-data/schema/fincenWithAttributes.ts
+++ b/src/lib/mock-data/schema/fincenWithAttributes.ts
@@ -1,7 +1,7 @@
-import { SchemaUtils } from '@/lib/schema/schema-utils';
-import { SchemaFromBackend } from 'ts-common';
+import { SchemaUtils } from '../../../lib/schema/schema-utils';
+import { SchemaReturnFormat } from 'ts-common';
 
-export const fincenWithAttributesRaw: SchemaFromBackend = {
+export const fincenWithAttributesRaw: SchemaReturnFormat = {
   nodes: [
     {
       name: 'Entity',
@@ -173,6 +173,10 @@ export const fincenWithAttributesRaw: SchemaFromBackend = {
       attributes: [],
     },
   ],
+  graphStats: {
+    nodes: { count: 0, stats: {} },
+    edges: { count: 0, stats: {} },
+  },
 };
 
 export const fincenWithAttributes = SchemaUtils.schemaBackend2Graphology(fincenWithAttributesRaw);
diff --git a/src/lib/mock-data/schema/marieBoucherSampleSchemaRaw.ts b/src/lib/mock-data/schema/marieBoucherSampleSchemaRaw.ts
index 899d9c54c9231bda5944b7d66d1f25cd20b9fe89..c5f8901c8f629781f8a803420e1716c3cd68dda7 100644
--- a/src/lib/mock-data/schema/marieBoucherSampleSchemaRaw.ts
+++ b/src/lib/mock-data/schema/marieBoucherSampleSchemaRaw.ts
@@ -1,7 +1,7 @@
-import { SchemaFromBackend } from 'ts-common';
+import { SchemaReturnFormat } from 'ts-common';
 import { SchemaUtils } from '../../schema/schema-utils';
 
-export const marieBoucherSampleSchemaRaw: SchemaFromBackend = {
+export const marieBoucherSampleSchemaRaw: SchemaReturnFormat = {
   nodes: [
     {
       name: 'merchant',
@@ -21,6 +21,10 @@ export const marieBoucherSampleSchemaRaw: SchemaFromBackend = {
       attributes: [{ name: 'time', type: 'int' }],
     },
   ],
+  graphStats: {
+    nodes: { count: 0, stats: {} },
+    edges: { count: 0, stats: {} },
+  },
 };
 
 export const marieBoucherSampleSchema = SchemaUtils.schemaBackend2Graphology(marieBoucherSampleSchemaRaw);
diff --git a/src/lib/mock-data/schema/moviesSchemaRaw.ts b/src/lib/mock-data/schema/moviesSchemaRaw.ts
index e99b7f9a2eade43e53829ea43a107ab5fa26eda7..1081a161ba3409a75095cf4df25a90e5ada92f61 100644
--- a/src/lib/mock-data/schema/moviesSchemaRaw.ts
+++ b/src/lib/mock-data/schema/moviesSchemaRaw.ts
@@ -1,7 +1,7 @@
-import { SchemaFromBackend } from 'ts-common';
+import { SchemaReturnFormat } from 'ts-common';
 import { SchemaUtils } from '../../schema/schema-utils/schemaUtils';
 
-export const movieSchemaRaw: SchemaFromBackend = {
+export const movieSchemaRaw: SchemaReturnFormat = {
   nodes: [
     {
       name: 'Movie',
@@ -102,6 +102,10 @@ export const movieSchemaRaw: SchemaFromBackend = {
       attributes: [],
     },
   ],
+  graphStats: {
+    nodes: { count: 0, stats: {} },
+    edges: { count: 0, stats: {} },
+  },
 };
 
 export const movieSchema = SchemaUtils.schemaBackend2Graphology(movieSchemaRaw);
diff --git a/src/lib/mock-data/schema/moviesSchemaWithAttributes.ts b/src/lib/mock-data/schema/moviesSchemaWithAttributes.ts
index d369048f3ca37bf8454d90d8d364ec861c03ff12..78bcd6fd17aac3707701f16f0bd9538818783476 100644
--- a/src/lib/mock-data/schema/moviesSchemaWithAttributes.ts
+++ b/src/lib/mock-data/schema/moviesSchemaWithAttributes.ts
@@ -1,7 +1,7 @@
-import { SchemaUtils } from '@/lib/schema/schema-utils/schemaUtils';
-import { SchemaFromBackend } from 'ts-common';
+import { SchemaUtils } from '../../../lib/schema/schema-utils';
+import { SchemaReturnFormat } from 'ts-common';
 
-export const movieSchemaWithAttributesRaw: SchemaFromBackend = {
+export const movieSchemaWithAttributesRaw: SchemaReturnFormat = {
   nodes: [
     {
       name: 'Movie',
@@ -102,6 +102,10 @@ export const movieSchemaWithAttributesRaw: SchemaFromBackend = {
       attributes: [],
     },
   ],
+  graphStats: {
+    nodes: { count: 0, stats: {} },
+    edges: { count: 0, stats: {} },
+  },
 };
 
 export const movieSchemaWithAttributes = SchemaUtils.schemaBackend2Graphology(movieSchemaWithAttributesRaw);
diff --git a/src/lib/mock-data/schema/northwindSchemaRaw.ts b/src/lib/mock-data/schema/northwindSchemaRaw.ts
index e6abb6d048639291b4c09556ca9dc87f01ea181c..eb3aad664873bb168e7cad14f6dcff6c51fea63e 100644
--- a/src/lib/mock-data/schema/northwindSchemaRaw.ts
+++ b/src/lib/mock-data/schema/northwindSchemaRaw.ts
@@ -1,7 +1,7 @@
-import { SchemaFromBackend } from 'ts-common';
+import { SchemaReturnFormat } from 'ts-common';
 import { SchemaUtils } from '../../schema/schema-utils/schemaUtils';
 
-export const northwindSchemaRaw: SchemaFromBackend = {
+export const northwindSchemaRaw: SchemaReturnFormat = {
   nodes: [
     {
       name: 'Order',
@@ -288,6 +288,10 @@ export const northwindSchemaRaw: SchemaFromBackend = {
       attributes: [],
     },
   ],
+  graphStats: {
+    nodes: { count: 0, stats: {} },
+    edges: { count: 0, stats: {} },
+  },
 };
 
 export const northWindSchema = SchemaUtils.schemaBackend2Graphology(northwindSchemaRaw);
diff --git a/src/lib/mock-data/schema/northwindWithAttributes.ts b/src/lib/mock-data/schema/northwindWithAttributes.ts
index 5bbeb25518862ec8aa8721f25ea6502e0edde43a..5a9ac1d7726fac15b52fc0c767b7e32c725ec6d8 100644
--- a/src/lib/mock-data/schema/northwindWithAttributes.ts
+++ b/src/lib/mock-data/schema/northwindWithAttributes.ts
@@ -1,7 +1,7 @@
-import { SchemaUtils } from '@/lib/schema/schema-utils';
-import { SchemaFromBackend } from 'ts-common';
+import { SchemaUtils } from '../../../lib/schema/schema-utils';
+import { SchemaReturnFormat } from 'ts-common';
 
-export const northWindWithAttributesRaw: SchemaFromBackend = {
+export const northWindWithAttributesRaw: SchemaReturnFormat = {
   nodes: [
     {
       name: 'Order',
@@ -288,6 +288,10 @@ export const northWindWithAttributesRaw: SchemaFromBackend = {
       attributes: [],
     },
   ],
+  graphStats: {
+    nodes: { count: 0, stats: {} },
+    edges: { count: 0, stats: {} },
+  },
 };
 
 export const northWindWithAttributes = SchemaUtils.schemaBackend2Graphology(northWindWithAttributesRaw);
diff --git a/src/lib/mock-data/schema/recommendationsWithAttributes.ts b/src/lib/mock-data/schema/recommendationsWithAttributes.ts
index 6e33a0e91ca1fe94e5bb3fca5dc7889bba08936f..b3755ceb8280150b0f07bc66f298a6656312fc96 100644
--- a/src/lib/mock-data/schema/recommendationsWithAttributes.ts
+++ b/src/lib/mock-data/schema/recommendationsWithAttributes.ts
@@ -1,7 +1,7 @@
-import { SchemaUtils } from '@/lib/schema/schema-utils';
-import { SchemaFromBackend } from 'ts-common';
+import { SchemaUtils } from '../../../lib/schema/schema-utils';
+import { SchemaReturnFormat } from 'ts-common';
 
-export const recommendationsWithAttributesRaw: SchemaFromBackend = {
+export const recommendationsWithAttributesRaw: SchemaReturnFormat = {
   nodes: [
     {
       name: 'Movie',
@@ -467,6 +467,10 @@ export const recommendationsWithAttributesRaw: SchemaFromBackend = {
       ],
     },
   ],
+  graphStats: {
+    nodes: { count: 0, stats: {} },
+    edges: { count: 0, stats: {} },
+  },
 };
 
 export const recommendationsSchemaWithAttributes = SchemaUtils.schemaBackend2Graphology(recommendationsWithAttributesRaw);
diff --git a/src/lib/mock-data/schema/simpleAirportRaw.ts b/src/lib/mock-data/schema/simpleAirportRaw.ts
index c77808b0afee62963834656590f2e416f51d34d0..1c3286e86150fd6ce974f0122d46a600da3068a3 100644
--- a/src/lib/mock-data/schema/simpleAirportRaw.ts
+++ b/src/lib/mock-data/schema/simpleAirportRaw.ts
@@ -1,7 +1,7 @@
-import { SchemaFromBackend } from 'ts-common';
+import { SchemaReturnFormat } from 'ts-common';
 import { SchemaUtils } from '../../schema/schema-utils';
 
-export const simpleSchemaAirportRaw: SchemaFromBackend = {
+export const simpleSchemaAirportRaw: SchemaReturnFormat = {
   nodes: [
     {
       name: 'airports',
@@ -39,6 +39,10 @@ export const simpleSchemaAirportRaw: SchemaFromBackend = {
       ],
     },
   ],
+  graphStats: {
+    nodes: { count: 0, stats: {} },
+    edges: { count: 0, stats: {} },
+  },
 };
 
 export const simpleSchemaAirport = SchemaUtils.schemaBackend2Graphology(simpleSchemaAirportRaw);
diff --git a/src/lib/mock-data/schema/simpleRaw.ts b/src/lib/mock-data/schema/simpleRaw.ts
index 86948c0ed0b19f2993f4c8f03260aeaf9f5a0ad0..551b512cc72ce232ee92d38ebae3faa4e1bfde72 100644
--- a/src/lib/mock-data/schema/simpleRaw.ts
+++ b/src/lib/mock-data/schema/simpleRaw.ts
@@ -1,7 +1,7 @@
-import { SchemaFromBackend } from 'ts-common';
+import { SchemaReturnFormat } from 'ts-common';
 import { SchemaUtils } from '../../schema/schema-utils/schemaUtils';
 
-export const simpleSchemaRaw: SchemaFromBackend = {
+export const simpleSchemaRaw: SchemaReturnFormat = {
   nodes: [
     {
       name: 'Thijs',
@@ -109,6 +109,10 @@ export const simpleSchemaRaw: SchemaFromBackend = {
       attributes: [{ name: 'test', type: 'string' }],
     },
   ],
+  graphStats: {
+    nodes: { count: 0, stats: {} },
+    edges: { count: 0, stats: {} },
+  },
 };
 
 export const simpleSchema = SchemaUtils.schemaBackend2Graphology(simpleSchemaRaw);
diff --git a/src/lib/mock-data/schema/slackWithAttributes.ts b/src/lib/mock-data/schema/slackWithAttributes.ts
index 6dd9da42592cf13590e42904ab3717fbac810f45..65285703f8debeaaf063491070745ced0bd252c6 100644
--- a/src/lib/mock-data/schema/slackWithAttributes.ts
+++ b/src/lib/mock-data/schema/slackWithAttributes.ts
@@ -1,7 +1,7 @@
-import { SchemaUtils } from '@/lib/schema/schema-utils';
-import { SchemaFromBackend } from 'ts-common';
+import { SchemaUtils } from '../../../lib/schema/schema-utils';
+import { SchemaReturnFormat } from 'ts-common';
 
-export const slackWithAttributesRaw: SchemaFromBackend = {
+export const slackWithAttributesRaw: SchemaReturnFormat = {
   nodes: [
     {
       name: 'Owner',
@@ -2774,6 +2774,10 @@ export const slackWithAttributesRaw: SchemaFromBackend = {
       attributes: [],
     },
   ],
+  graphStats: {
+    nodes: { count: 0, stats: {} },
+    edges: { count: 0, stats: {} },
+  },
 };
 
 export const slackWithAttributes = SchemaUtils.schemaBackend2Graphology(slackWithAttributesRaw);
diff --git a/src/lib/mock-data/schema/twitterSchemaRaw.ts b/src/lib/mock-data/schema/twitterSchemaRaw.ts
index 06026e614b0912230615785f1d1a5349f2b2b7fb..a0062c3b329ae7245b742d37aa60f50d712c23d4 100644
--- a/src/lib/mock-data/schema/twitterSchemaRaw.ts
+++ b/src/lib/mock-data/schema/twitterSchemaRaw.ts
@@ -1,7 +1,7 @@
-import { SchemaFromBackend } from 'ts-common';
+import { SchemaReturnFormat } from 'ts-common';
 import { SchemaUtils } from '../../schema/schema-utils/schemaUtils';
 
-export const twitterSchemaRaw: SchemaFromBackend = {
+export const twitterSchemaRaw: SchemaReturnFormat = {
   nodes: [
     {
       name: 'Me',
@@ -334,6 +334,10 @@ export const twitterSchemaRaw: SchemaFromBackend = {
       attributes: [],
     },
   ],
+  graphStats: {
+    nodes: { count: 0, stats: {} },
+    edges: { count: 0, stats: {} },
+  },
 };
 
 export const twitterSchema = SchemaUtils.schemaBackend2Graphology(twitterSchemaRaw);
diff --git a/src/lib/mock-data/schema/typesMockSchemaRaw.ts b/src/lib/mock-data/schema/typesMockSchemaRaw.ts
index fbce7c3b8330cbb9431227a6c4f8f329b9ebf05c..8aa3ba3055a1f416c794b41bae6e6e569c18853a 100644
--- a/src/lib/mock-data/schema/typesMockSchemaRaw.ts
+++ b/src/lib/mock-data/schema/typesMockSchemaRaw.ts
@@ -1,7 +1,7 @@
-import { SchemaUtils } from '@/lib/schema/schema-utils';
-import { SchemaFromBackend } from 'ts-common';
+import { SchemaUtils } from '../../../lib/schema/schema-utils';
+import { SchemaReturnFormat } from 'ts-common';
 
-export const typesMockSchemaRaw: SchemaFromBackend = {
+export const typesMockSchemaRaw: SchemaReturnFormat = {
   nodes: [
     {
       name: 'worker',
@@ -51,6 +51,10 @@ export const typesMockSchemaRaw: SchemaFromBackend = {
       attributes: [],
     },
   ],
+  graphStats: {
+    nodes: { count: 0, stats: {} },
+    edges: { count: 0, stats: {} },
+  },
 };
 
 export const typesMockSchema = SchemaUtils.schemaBackend2Graphology(typesMockSchemaRaw);
diff --git a/src/lib/querybuilder/panel/schemaquerybuilder.stories.tsx b/src/lib/querybuilder/panel/schemaquerybuilder.stories.tsx
index d68798c0c79a19300acf7cdddf9c4c606594dbed..96a023d2894e6692eff9265a222ec868034faf03 100644
--- a/src/lib/querybuilder/panel/schemaquerybuilder.stories.tsx
+++ b/src/lib/querybuilder/panel/schemaquerybuilder.stories.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
 import { Meta } from '@storybook/react';
 import { Provider } from 'react-redux';
-import { setQuerybuilderGraph, setSchema, store } from '@/lib/data-access/store';
-import { SchemaUtils } from '@/lib/schema/schema-utils';
+import { setSchema, store } from '@/lib/data-access/store';
+import { setQuerybuilderGraph } from '@/lib/data-access/store/sessionSlice';
+import { SchemaUtils } from '../../../lib/schema/schema-utils';
 import { Schema } from '@/lib/schema/panel';
 import { movieSchemaRaw } from '@/lib/mock-data';
 import { QueryBuilder } from '@/lib/querybuilder';
diff --git a/src/lib/querybuilder/panel/stories/querybuilder-simple.stories.tsx b/src/lib/querybuilder/panel/stories/querybuilder-simple.stories.tsx
index 42bd1e8f9187fca5b5c2dcb03db043c0a49753b6..1a1b040d29ce3796b92b825b0cc54c49755564ad 100644
--- a/src/lib/querybuilder/panel/stories/querybuilder-simple.stories.tsx
+++ b/src/lib/querybuilder/panel/stories/querybuilder-simple.stories.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { setQuerybuilderGraph, setSchema, store } from '@/lib/data-access/store';
+import { setSchema, store } from '@/lib/data-access/store';
+import { setQuerybuilderGraph } from '@/lib/data-access/store/sessionSlice';
 import { Meta } from '@storybook/react';
 import { Provider } from 'react-redux';
 import QueryBuilder from '../QueryBuilder';
@@ -55,6 +55,10 @@ export const Simple = {
           ],
         },
       ],
+      graphStats: {
+        nodes: { count: 0, stats: {} },
+        edges: { count: 0, stats: {} },
+      },
     });
 
     store.dispatch(setSchema(schema.export()));
diff --git a/src/lib/querybuilder/panel/stories/querybuilder-single-entity.stories.tsx b/src/lib/querybuilder/panel/stories/querybuilder-single-entity.stories.tsx
index 13240541000797ab0affef8b1eb63d83c9b88cb2..3b382ac7b5dac5eab4950103d9ee0be0f3a42c5f 100644
--- a/src/lib/querybuilder/panel/stories/querybuilder-single-entity.stories.tsx
+++ b/src/lib/querybuilder/panel/stories/querybuilder-single-entity.stories.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { setQuerybuilderGraph, store } from '@/lib/data-access/store';
+import { store } from '@/lib/data-access/store';
+import { setQuerybuilderGraph } from '@/lib/data-access/store/sessionSlice';
 import { Meta } from '@storybook/react';
 import { Provider } from 'react-redux';
 import QueryBuilder from '../QueryBuilder';
diff --git a/src/lib/querybuilder/panel/stories/querybuilder-single-relationship.stories.tsx b/src/lib/querybuilder/panel/stories/querybuilder-single-relationship.stories.tsx
index 4907c643fbaa13f61721f287eff7038ed7791408..a24430b3a9f11dfe50698d16dc3f1c75de41ca61 100644
--- a/src/lib/querybuilder/panel/stories/querybuilder-single-relationship.stories.tsx
+++ b/src/lib/querybuilder/panel/stories/querybuilder-single-relationship.stories.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
-import { setQuerybuilderGraph, store } from '@/lib/data-access/store';
+import { store } from '@/lib/data-access/store';
+import { setQuerybuilderGraph } from '@/lib/data-access/store/sessionSlice';
 import { Meta } from '@storybook/react';
 import { Provider } from 'react-redux';
 import QueryBuilder from '../QueryBuilder';
diff --git a/src/lib/schema/panel/schema.spec.ts b/src/lib/schema/panel/schema.spec.ts
index 548ec907ba774dc7f94dd6c1ea0ef5361029e41b..3760edfaf1c4fdd74ca4364c8a10a01f2802b44c 100644
--- a/src/lib/schema/panel/schema.spec.ts
+++ b/src/lib/schema/panel/schema.spec.ts
@@ -1,9 +1,9 @@
-import { assert, describe, expect, it } from 'vitest';
+import { describe, it } from 'vitest';
 
 // import { SchemaUtils } from '@graphpolaris/schema-utils';
-// import { SchemaFromBackend } from '@graphpolaris/models';
+// import { SchemaReturnFormat } from '@graphpolaris/models';
 
-// const twitterSchemaRaw: SchemaFromBackend = {
+// const twitterSchemaRaw: SchemaReturnFormat = {
 //   nodes: [
 //     {
 //       name: 'Me',
@@ -313,8 +313,12 @@ import { assert, describe, expect, it } from 'vitest';
 //       from: 'Me',
 //       to: 'Tweet',
 //       attributes: [],
-//     },
-//   ],
+//     //},
+//   //],
+//    graphStats: {
+//      nodes: { count: 0, stats: {} },
+//      edges: { count: 0, stats: {} },
+//    },
 // };
 
 // const twitterSchema = SchemaUtils.ParseSchemaFromBackend(twitterSchemaRaw);
diff --git a/src/lib/schema/panel/schema.stories.tsx b/src/lib/schema/panel/schema.stories.tsx
index ac7dae2b05abe3f81d78411f346879c04921299e..d0ef51cd74bb3b70d69e686dfe3de4bda2f49dfe 100644
--- a/src/lib/schema/panel/schema.stories.tsx
+++ b/src/lib/schema/panel/schema.stories.tsx
@@ -1,6 +1,6 @@
 import { schemaSlice, setSchema } from '@/lib/data-access/store';
 import { movieSchemaRaw, northwindSchemaRaw, twitterSchemaRaw } from '@/lib/mock-data';
-import { SchemaUtils } from '@/lib/schema/schema-utils';
+import { SchemaUtils } from '../../../lib/schema/schema-utils';
 import { configureStore } from '@reduxjs/toolkit';
 import { Meta } from '@storybook/react';
 import { Provider } from 'react-redux';
@@ -72,6 +72,10 @@ export const TestSimple = {
           ],
         },
       ],
+      graphStats: {
+        nodes: { count: 0, stats: {} },
+        edges: { count: 0, stats: {} },
+      },
     });
 
     dispatch(setSchema(schema.export()));
@@ -93,6 +97,10 @@ export const TestTooltip = {
         },
       ],
       edges: [],
+      graphStats: {
+        nodes: { count: 0, stats: {} },
+        edges: { count: 0, stats: {} },
+      },
     });
 
     dispatch(setSchema(schema.export()));
diff --git a/src/lib/schema/schema-utils/schemaUsecases.spec.ts b/src/lib/schema/schema-utils/schemaUsecases.spec.ts
index 37dc7c7264eb8c5caad7935e97fe1530ded9bca4..2e49571415eed0548818a13582b5e6f82460fbd6 100644
--- a/src/lib/schema/schema-utils/schemaUsecases.spec.ts
+++ b/src/lib/schema/schema-utils/schemaUsecases.spec.ts
@@ -2,19 +2,19 @@ import { describe, expect, it, test } from 'vitest';
 import { movieSchemaRaw, northwindSchemaRaw, simpleSchemaRaw, twitterSchemaRaw } from '../../mock-data/schema';
 import { SchemaGraphology } from '../model';
 import { SchemaUtils } from './schemaUtils';
-import { SchemaFromBackend } from 'ts-common';
+import { SchemaReturnFormat } from 'ts-common';
 
 describe('SchemaUsecases', () => {
   test.each([{ data: simpleSchemaRaw }, { data: movieSchemaRaw }, { data: northwindSchemaRaw }, { data: twitterSchemaRaw }])(
     'parseSchemaFromBackend parsing should work',
     ({ data }: any) => {
-      const parsed = SchemaUtils.schemaBackend2Graphology(data as SchemaFromBackend);
+      const parsed = SchemaUtils.schemaBackend2Graphology(data as SchemaReturnFormat);
       expect(parsed).toBeDefined();
     },
   );
 
   it('should export and reimport', () => {
-    const parsed = SchemaUtils.schemaBackend2Graphology(simpleSchemaRaw as SchemaFromBackend);
+    const parsed = SchemaGraphology.from(SchemaUtils.schemaBackend2Graphology(simpleSchemaRaw as SchemaReturnFormat));
     const reload = SchemaGraphology.from(parsed.export());
 
     expect(parsed).toEqual(reload);