From dcbcdffe2de0f1e7ed915648b1e4a0c6c0512c3d Mon Sep 17 00:00:00 2001
From: dcruvolo <davidruvolo51@gmail.com>
Date: Thu, 12 Mar 2026 12:17:52 +0100
Subject: [PATCH 1/3] chore: add  mg_tableclass interface and extended all
 tables by default; updated tests

---
 .../org/molgenis/emx2/typescript/Generator.java    | 12 +++++++++++-
 .../src/test/resources/expected-types.ts           | 14 +++++++++-----
 .../src/test/resources/expected-typetest-types.ts  | 12 ++++++++----
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/backend/molgenis-emx2-typescript/src/main/java/org/molgenis/emx2/typescript/Generator.java b/backend/molgenis-emx2-typescript/src/main/java/org/molgenis/emx2/typescript/Generator.java
index d860af5c33a..6c3e7492d1f 100644
--- a/backend/molgenis-emx2-typescript/src/main/java/org/molgenis/emx2/typescript/Generator.java
+++ b/backend/molgenis-emx2-typescript/src/main/java/org/molgenis/emx2/typescript/Generator.java
@@ -13,6 +13,13 @@
 
 public class Generator {
 
+  private static final String MG_TABLECLASS_INTERFACE =
+      """
+                    export interface IMgTableClass {
+                        mg_tableclass: string;
+                    }
+                    """;
+
   private static final String FILE_TS_INTERFACE =
       """
                     export interface IFile {
@@ -62,6 +69,9 @@ public void generate(Schema schema, PrintWriter writer, boolean includeHeader) {
       writer.println("");
     }
 
+    writer.write(MG_TABLECLASS_INTERFACE);
+    writer.println("");
+
     writer.write(FILE_TS_INTERFACE);
     writer.println("");
 
@@ -80,7 +90,7 @@ public void generate(Schema schema, PrintWriter writer, boolean includeHeader) {
               schema.getName().equals(table.getSchemaName())
                   ? table.getTableName()
                   : table.getSchemaName() + '_' + table.getTableName());
-      writer.println(String.format("export interface I%s {", tableName));
+      writer.println(String.format("export interface I%s extends IMgTableClass {", tableName));
 
       for (Column column : table.getColumns()) {
         if (column.getColumnType().isHeading()) {
diff --git a/backend/molgenis-emx2-typescript/src/test/resources/expected-types.ts b/backend/molgenis-emx2-typescript/src/test/resources/expected-types.ts
index bab5a14fd3d..9da99c9b977 100644
--- a/backend/molgenis-emx2-typescript/src/test/resources/expected-types.ts
+++ b/backend/molgenis-emx2-typescript/src/test/resources/expected-types.ts
@@ -1,3 +1,7 @@
+export interface IMgTableClass {
+    mg_tableclass: string;
+}
+
 export interface IFile {
     id?: string;
     size?: number;
@@ -20,7 +24,7 @@ export interface IOntologyNode extends ITreeNode {
     order?: number;
 }
 
-export interface ICategory {
+export interface ICategory extends IMgTableClass {
     name: string;
 }
 
@@ -28,7 +32,7 @@ export interface ICategory_agg {
     count: number
 }
 
-export interface IOrder {
+export interface IOrder extends IMgTableClass {
     orderId: string;
     pet?: any;
     quantity?: string;
@@ -41,7 +45,7 @@ export interface IOrder_agg {
     count: number
 }
 
-export interface IPet {
+export interface IPet extends IMgTableClass {
     name: string;
     category: any;
     photoUrls?: string[];
@@ -55,7 +59,7 @@ export interface IPet_agg {
     count: number
 }
 
-export interface ITag {
+export interface ITag extends IMgTableClass {
     order?: number;
     name: string;
     label?: string;
@@ -72,7 +76,7 @@ export interface ITag_agg {
     count: number
 }
 
-export interface IUser {
+export interface IUser extends IMgTableClass {
     username: string;
     firstName?: string;
     lastName?: string;
diff --git a/backend/molgenis-emx2-typescript/src/test/resources/expected-typetest-types.ts b/backend/molgenis-emx2-typescript/src/test/resources/expected-typetest-types.ts
index 1f128b52da2..1f200ce133a 100644
--- a/backend/molgenis-emx2-typescript/src/test/resources/expected-typetest-types.ts
+++ b/backend/molgenis-emx2-typescript/src/test/resources/expected-typetest-types.ts
@@ -1,3 +1,7 @@
+export interface IMgTableClass {
+    mg_tableclass: string;
+}
+
 export interface IFile {
     id?: string;
     size?: number;
@@ -20,7 +24,7 @@ export interface IOntologyNode extends ITreeNode {
     order?: number;
 }
 
-export interface IComponent {
+export interface IComponent extends IMgTableClass {
     name: string;
     parts?: IPart[];
 }
@@ -29,7 +33,7 @@ export interface IComponent_agg {
     count: number
 }
 
-export interface IPart {
+export interface IPart extends IMgTableClass {
     name: string;
     weight?: number;
 }
@@ -38,7 +42,7 @@ export interface IPart_agg {
     count: number
 }
 
-export interface IProduct {
+export interface IProduct extends IMgTableClass {
     name: string;
     components?: IComponent[];
 }
@@ -47,7 +51,7 @@ export interface IProduct_agg {
     count: number
 }
 
-export interface ITypeTest {
+export interface ITypeTest extends IMgTableClass {
     id: string;
     testUuid: string;
     testUuidNillable?: string;

From 3c5af68766b971b6138d444c8063184736dbe340 Mon Sep 17 00:00:00 2001
From: dcruvolo <davidruvolo51@gmail.com>
Date: Thu, 12 Mar 2026 13:24:41 +0100
Subject: [PATCH 2/3] cranio-provider: regenerated types and fixed typescript
 errors

---
 .../cranio-provider/src/types/ErnDashboard.ts | 172 ++++++++++++++++++
 apps/cranio-provider/src/types/app.ts         |  15 +-
 apps/cranio-provider/src/types/schema.ts      |  68 +++----
 .../src/utils/csSurgicalUtils.ts              |   5 +-
 .../src/utils/getDashboardData.ts             |   8 +-
 .../src/utils/getOrganisation.ts              |   3 +-
 6 files changed, 218 insertions(+), 53 deletions(-)
 create mode 100644 apps/cranio-provider/src/types/ErnDashboard.ts

diff --git a/apps/cranio-provider/src/types/ErnDashboard.ts b/apps/cranio-provider/src/types/ErnDashboard.ts
new file mode 100644
index 00000000000..10c2d6bd1b3
--- /dev/null
+++ b/apps/cranio-provider/src/types/ErnDashboard.ts
@@ -0,0 +1,172 @@
+// Generated (on: 2026-03-12T13:19:30.267073) from Generator.java for schema: ErnDashboard
+
+export interface IMgTableClass {
+  mg_tableclass: string;
+}
+
+export interface IFile {
+  id?: string;
+  size?: number;
+  extension?: string;
+  url?: string;
+}
+
+export interface ITreeNode {
+  name: string;
+  children?: ITreeNode[];
+  parent?: {
+    name: string;
+  };
+}
+
+export interface IOntologyNode extends ITreeNode {
+  code?: string;
+  definition?: string;
+  ontologyTermURI?: string;
+  order?: number;
+}
+
+export interface IComponents extends IMgTableClass {
+  order?: number;
+  name: string;
+  label?: string;
+  tags?: string[];
+  parent?: IComponents;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IComponents[];
+  statistics?: IStatistics[];
+}
+
+export interface IComponents_agg {
+  count: number;
+}
+
+export interface IDataproviders extends IMgTableClass {
+  providerIdentifier: string;
+  organisation?: IOrganisations;
+  hasSubmittedData?: boolean;
+}
+
+export interface IDataproviders_agg {
+  count: number;
+}
+
+export interface IFiles extends IMgTableClass {
+  order?: number;
+  name: string;
+  label?: string;
+  tags?: string[];
+  parent?: IFiles;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IFiles[];
+  file?: IFile;
+}
+
+export interface IFiles_agg {
+  count: number;
+}
+
+export interface IInclusionCriteria extends IMgTableClass {
+  id: string;
+  name?: string;
+  type?: string;
+  value?: string;
+  label?: string;
+}
+
+export interface IInclusionCriteria_agg {
+  count: number;
+}
+
+export interface IOrganisations extends IMgTableClass {
+  order?: number;
+  name: string;
+  label?: string;
+  tags?: string[];
+  parent?: IOrganisations;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IOrganisations[];
+  city?: string;
+  country?: string;
+  latitude?: number;
+  longitude?: number;
+  organisationType?: string;
+  providerInformation?: IDataproviders[];
+  image?: IFile;
+  hasSchema?: boolean;
+  schemaName?: string;
+}
+
+export interface IOrganisations_agg {
+  count: number;
+}
+
+export interface IPublications extends IMgTableClass {
+  title: string;
+  doi: string;
+}
+
+export interface IPublications_agg {
+  count: number;
+}
+
+export interface IStatistics extends IMgTableClass {
+  id: string;
+  label?: string;
+  value?: number;
+  valueOrder?: number;
+  component?: IComponents;
+  description?: string;
+}
+
+export interface IStatistics_agg {
+  count: number;
+}
+
+export interface IStudies extends IMgTableClass {
+  acronym: string;
+  title: string;
+  condition: string;
+  coordinator: string;
+  objective: string;
+  patients: string;
+  dataUsed: string;
+  dataErras: string;
+  patientData: string;
+  dataOther: string;
+  registrationNr: string;
+  status: string;
+  dateStart: string;
+  dateEnd: string;
+}
+
+export interface IStudies_agg {
+  count: number;
+}
+
+export interface IUsers extends IMgTableClass {
+  order?: number;
+  name: string;
+  label?: string;
+  tags?: string[];
+  parent?: IUsers;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: IUsers[];
+  organisation?: IOrganisations;
+}
+
+export interface IUsers_agg {
+  count: number;
+}
diff --git a/apps/cranio-provider/src/types/app.ts b/apps/cranio-provider/src/types/app.ts
index 7eb4d9f62c0..c15588d15d8 100644
--- a/apps/cranio-provider/src/types/app.ts
+++ b/apps/cranio-provider/src/types/app.ts
@@ -1,5 +1,6 @@
 import type { ICranioSchemas } from ".";
-import type { IOrganisations } from "./schema";
+import type { IDashboardPages, ICharts } from "./schema";
+import type { IOrganisations } from "./ErnDashboard";
 
 export interface IAppPage {
   organisation: IOrganisations;
@@ -12,3 +13,15 @@ export interface IAppPage {
     };
   };
 }
+
+export interface IOrganisationsResponse {
+  Organisations: IOrganisations[];
+}
+
+export interface IDashboardPagesResponse {
+  DashboardPages: IDashboardPages[];
+}
+
+export interface IChartsResponse {
+  Charts: ICharts[];
+}
diff --git a/apps/cranio-provider/src/types/schema.ts b/apps/cranio-provider/src/types/schema.ts
index 42763973cdd..bcb83aa8061 100644
--- a/apps/cranio-provider/src/types/schema.ts
+++ b/apps/cranio-provider/src/types/schema.ts
@@ -1,4 +1,8 @@
-// Generated (on: 2024-11-19T14:49:53.211482) from Generator.java for schema: dashboard
+// Generated (on: 2026-03-12T13:14:59.424968) from Generator.java for schema: Dashboard
+
+export interface IMgTableClass {
+  mg_tableclass: string;
+}
 
 export interface IFile {
   id?: string;
@@ -22,7 +26,7 @@ export interface IOntologyNode extends ITreeNode {
   order?: number;
 }
 
-export interface IChartData {
+export interface IChartData extends IMgTableClass {
   dataPointId: string;
   dataPointName?: string;
   dataPointValue?: number;
@@ -32,7 +36,7 @@ export interface IChartData {
   dataPointSecondaryCategory?: string;
   dataPointPrimaryCategoryLabel?: string;
   dataPointSecondaryCategoryLabel?: string;
-  dataPointTime?: string | number;
+  dataPointTime?: string;
   dataPointTimeUnit?: string;
   dataPointColor?: string;
   dataPointDescription?: string;
@@ -40,7 +44,11 @@ export interface IChartData {
   includedInChart?: ICharts;
 }
 
-export interface IChartTypes {
+export interface IChartData_agg {
+  count: number;
+}
+
+export interface IChartTypes extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -53,7 +61,11 @@ export interface IChartTypes {
   children?: IChartTypes[];
 }
 
-export interface ICharts {
+export interface IChartTypes_agg {
+  count: number;
+}
+
+export interface ICharts extends IMgTableClass {
   chartId: string;
   chartType?: IOntologyNode;
   chartTitle?: string;
@@ -75,48 +87,16 @@ export interface ICharts {
   dashboardPage?: IDashboardPages;
 }
 
-export interface IDashboardPages {
-  name: string;
-  description?: string;
-  charts?: ICharts[];
+export interface ICharts_agg {
+  count: number;
 }
 
-export interface IDataproviders {
-  providerIdentifier: string;
-  organisation?: IOrganisations;
-  hasSubmittedData?: boolean;
-}
-
-export interface IOrganisations {
-  order?: number;
+export interface IDashboardPages extends IMgTableClass {
   name: string;
-  label?: string;
-  tags?: string[];
-  parent?: IOrganisations;
-  codesystem?: string;
-  code?: string;
-  ontologyTermURI?: string;
-  definition?: string;
-  children?: IOrganisations[];
-  city?: string;
-  country?: string;
-  latitude?: number;
-  longitude?: number;
-  organisationType?: string;
-  providerInformation: IDataproviders[];
-  image?: IFile;
-  hasSchema?: boolean;
-  schemaName?: string;
-}
-
-export interface IOrganisationsResponse {
-  Organisations: IOrganisations[];
-}
-
-export interface IDashboardPagesResponse {
-  DashboardPages: IDashboardPages[];
+  description?: string;
+  charts?: ICharts[];
 }
 
-export interface IChartsResponse {
-  Charts: ICharts[];
+export interface IDashboardPages_agg {
+  count: number;
 }
diff --git a/apps/cranio-provider/src/utils/csSurgicalUtils.ts b/apps/cranio-provider/src/utils/csSurgicalUtils.ts
index 0bd4e35f038..d512ae55b10 100644
--- a/apps/cranio-provider/src/utils/csSurgicalUtils.ts
+++ b/apps/cranio-provider/src/utils/csSurgicalUtils.ts
@@ -14,7 +14,10 @@ export function filterAgeAtSurgeryData(data: IChartData[], diagnosis: string) {
       return row.dataPointPrimaryCategory === diagnosis;
     })
     .sort((a: IChartData, b: IChartData) => {
-      return (a.dataPointTime as number) - (b.dataPointTime as number);
+      return (
+        (a.dataPointTime as unknown as number) -
+        (b.dataPointTime as unknown as number)
+      );
     });
 }
 
diff --git a/apps/cranio-provider/src/utils/getDashboardData.ts b/apps/cranio-provider/src/utils/getDashboardData.ts
index 52b0e828c96..400402f16ab 100644
--- a/apps/cranio-provider/src/utils/getDashboardData.ts
+++ b/apps/cranio-provider/src/utils/getDashboardData.ts
@@ -1,10 +1,6 @@
 import { request, gql } from "graphql-request";
-import type {
-  IDashboardPagesResponse,
-  IChartsResponse,
-  ICharts,
-  IDashboardPages,
-} from "../types/schema";
+import type { ICharts, IDashboardPages } from "../types/schema";
+import type { IDashboardPagesResponse, IChartsResponse } from "../types/app";
 
 export async function getDashboardPage(
   url: string,
diff --git a/apps/cranio-provider/src/utils/getOrganisation.ts b/apps/cranio-provider/src/utils/getOrganisation.ts
index 9311490f9f7..b84e66c1cd7 100644
--- a/apps/cranio-provider/src/utils/getOrganisation.ts
+++ b/apps/cranio-provider/src/utils/getOrganisation.ts
@@ -1,5 +1,6 @@
 import { request, gql } from "graphql-request";
-import type { IOrganisations, IOrganisationsResponse } from "../types/schema";
+import type { IOrganisations } from "../types/ErnDashboard";
+import type { IOrganisationsResponse } from "../types/app";
 
 export async function getOrganisation(
   url: string,

From a0ea46a4384643486731d77aa8d47c84775c2861 Mon Sep 17 00:00:00 2001
From: dcruvolo <davidruvolo51@gmail.com>
Date: Thu, 12 Mar 2026 13:46:31 +0100
Subject: [PATCH 3/3] regenerated types with mg_tableclass

---
 apps/catalogue/interfaces/catalogue.ts | 217 +++++++++++++------------
 1 file changed, 115 insertions(+), 102 deletions(-)

diff --git a/apps/catalogue/interfaces/catalogue.ts b/apps/catalogue/interfaces/catalogue.ts
index 025e941ce64..3b6ece4309a 100644
--- a/apps/catalogue/interfaces/catalogue.ts
+++ b/apps/catalogue/interfaces/catalogue.ts
@@ -1,4 +1,8 @@
-// Generated (on: 2026-01-14T00:37:29.969663) from Generator.java for schema: catalogue-demo
+// Generated (on: 2026-03-12T13:42:09.364359) from Generator.java for schema: catalogue-demo
+
+export interface IMgTableClass {
+  mg_tableclass: string;
+}
 
 export interface IFile {
   id?: string;
@@ -22,7 +26,7 @@ export interface IOntologyNode extends ITreeNode {
   order?: number;
 }
 
-export interface ICatalogueOntologies_AccessRights {
+export interface ICatalogueOntologies_AccessRights extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -39,7 +43,7 @@ export interface ICatalogueOntologies_AccessRights_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_AgeGroups {
+export interface ICatalogueOntologies_AgeGroups extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -56,7 +60,7 @@ export interface ICatalogueOntologies_AgeGroups_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_AgentTypes {
+export interface ICatalogueOntologies_AgentTypes extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -73,7 +77,7 @@ export interface ICatalogueOntologies_AgentTypes_agg {
   count: number;
 }
 
-export interface IAgents {
+export interface IAgents extends IMgTableClass {
   resource: IResources;
   id: string;
   type: IOntologyNode;
@@ -94,7 +98,8 @@ export interface IAgents_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_AreasOfInformationCohorts {
+export interface ICatalogueOntologies_AreasOfInformationCohorts
+  extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -111,7 +116,8 @@ export interface ICatalogueOntologies_AreasOfInformationCohorts_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_AreasOfInformationDs {
+export interface ICatalogueOntologies_AreasOfInformationDs
+  extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -128,7 +134,7 @@ export interface ICatalogueOntologies_AreasOfInformationDs_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_Biospecimens {
+export interface ICatalogueOntologies_Biospecimens extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -145,7 +151,7 @@ export interface ICatalogueOntologies_Biospecimens_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_CatalogueTypes {
+export interface ICatalogueOntologies_CatalogueTypes extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -162,7 +168,7 @@ export interface ICatalogueOntologies_CatalogueTypes_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_ClinicalStudyTypes {
+export interface ICatalogueOntologies_ClinicalStudyTypes extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -179,7 +185,8 @@ export interface ICatalogueOntologies_ClinicalStudyTypes_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_CohortCollectionTypes {
+export interface ICatalogueOntologies_CohortCollectionTypes
+  extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -196,7 +203,7 @@ export interface ICatalogueOntologies_CohortCollectionTypes_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_CohortDesigns {
+export interface ICatalogueOntologies_CohortDesigns extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -213,7 +220,7 @@ export interface ICatalogueOntologies_CohortDesigns_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_CohortStudyTypes {
+export interface ICatalogueOntologies_CohortStudyTypes extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -230,7 +237,7 @@ export interface ICatalogueOntologies_CohortStudyTypes_agg {
   count: number;
 }
 
-export interface ICollectionEvents {
+export interface ICollectionEvents extends IMgTableClass {
   resource: IResources;
   name: string;
   pid?: string;
@@ -262,7 +269,7 @@ export interface ICollectionEvents_agg {
   count: number;
 }
 
-export interface IContacts {
+export interface IContacts extends IMgTableClass {
   resource: IResources;
   role?: IOntologyNode[];
   roleDescription?: string;
@@ -284,7 +291,24 @@ export interface IContacts_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_ContributionTypes {
+export interface ICatalogueOntologies_Continents extends IMgTableClass {
+  order?: number;
+  name: string;
+  label?: string;
+  tags?: string[];
+  parent?: ICatalogueOntologies_Continents;
+  codesystem?: string;
+  code?: string;
+  ontologyTermURI?: string;
+  definition?: string;
+  children?: ICatalogueOntologies_Continents[];
+}
+
+export interface ICatalogueOntologies_Continents_agg {
+  count: number;
+}
+
+export interface ICatalogueOntologies_ContributionTypes extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -301,7 +325,7 @@ export interface ICatalogueOntologies_ContributionTypes_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_Countries {
+export interface ICatalogueOntologies_Countries extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -318,7 +342,8 @@ export interface ICatalogueOntologies_Countries_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_DataAccessConditions {
+export interface ICatalogueOntologies_DataAccessConditions
+  extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -335,7 +360,7 @@ export interface ICatalogueOntologies_DataAccessConditions_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_DataCategories {
+export interface ICatalogueOntologies_DataCategories extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -352,7 +377,7 @@ export interface ICatalogueOntologies_DataCategories_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_DataUseConditions {
+export interface ICatalogueOntologies_DataUseConditions extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -369,7 +394,7 @@ export interface ICatalogueOntologies_DataUseConditions_agg {
   count: number;
 }
 
-export interface IDatasetMappings {
+export interface IDatasetMappings extends IMgTableClass {
   source: IResources;
   sourceDataset: IDatasets;
   target: IResources;
@@ -383,7 +408,7 @@ export interface IDatasetMappings_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_DatasetTypes {
+export interface ICatalogueOntologies_DatasetTypes extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -400,7 +425,7 @@ export interface ICatalogueOntologies_DatasetTypes_agg {
   count: number;
 }
 
-export interface IDatasets {
+export interface IDatasets extends IMgTableClass {
   resource: IResources;
   name: string;
   label?: string;
@@ -419,7 +444,7 @@ export interface IDatasets_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_DatasourceTypes {
+export interface ICatalogueOntologies_DatasourceTypes extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -436,7 +461,7 @@ export interface ICatalogueOntologies_DatasourceTypes_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_Diseases {
+export interface ICatalogueOntologies_Diseases extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -453,7 +478,7 @@ export interface ICatalogueOntologies_Diseases_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_DocumentTypes {
+export interface ICatalogueOntologies_DocumentTypes extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -470,7 +495,7 @@ export interface ICatalogueOntologies_DocumentTypes_agg {
   count: number;
 }
 
-export interface IDocumentation {
+export interface IDocumentation extends IMgTableClass {
   resource: IResources;
   name: string;
   type?: IOntologyNode;
@@ -483,7 +508,7 @@ export interface IDocumentation_agg {
   count: number;
 }
 
-export interface IEndpoint {
+export interface IEndpoint extends IMgTableClass {
   id: string;
   type: string[];
   name: string[];
@@ -511,7 +536,8 @@ export interface IEndpoint_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_ExternalIdentifierTypes {
+export interface ICatalogueOntologies_ExternalIdentifierTypes
+  extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -528,7 +554,7 @@ export interface ICatalogueOntologies_ExternalIdentifierTypes_agg {
   count: number;
 }
 
-export interface IExternalIdentifiers {
+export interface IExternalIdentifiers extends IMgTableClass {
   resource: IResources;
   identifier: string;
   externalIdentifierType?: IOntologyNode;
@@ -539,7 +565,7 @@ export interface IExternalIdentifiers_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_Formats {
+export interface ICatalogueOntologies_Formats extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -556,7 +582,7 @@ export interface ICatalogueOntologies_Formats_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_FundingTypes {
+export interface ICatalogueOntologies_FundingTypes extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -573,7 +599,7 @@ export interface ICatalogueOntologies_FundingTypes_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_ICDOMorphologies {
+export interface ICatalogueOntologies_ICDOMorphologies extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -590,7 +616,7 @@ export interface ICatalogueOntologies_ICDOMorphologies_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_ICDOTopologies {
+export interface ICatalogueOntologies_ICDOTopologies extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -607,7 +633,8 @@ export interface ICatalogueOntologies_ICDOTopologies_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_InclusionExclusionCriteria {
+export interface ICatalogueOntologies_InclusionExclusionCriteria
+  extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -624,7 +651,8 @@ export interface ICatalogueOntologies_InclusionExclusionCriteria_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_InformedConsentRequired {
+export interface ICatalogueOntologies_InformedConsentRequired
+  extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -641,7 +669,8 @@ export interface ICatalogueOntologies_InformedConsentRequired_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_InformedConsentTypes {
+export interface ICatalogueOntologies_InformedConsentTypes
+  extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -658,7 +687,8 @@ export interface ICatalogueOntologies_InformedConsentTypes_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_InternalIdentifierTypes {
+export interface ICatalogueOntologies_InternalIdentifierTypes
+  extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -675,7 +705,7 @@ export interface ICatalogueOntologies_InternalIdentifierTypes_agg {
   count: number;
 }
 
-export interface IInternalIdentifiers {
+export interface IInternalIdentifiers extends IMgTableClass {
   resource: IResources;
   identifier: string;
   internalIdentifierType?: IOntologyNode;
@@ -686,7 +716,7 @@ export interface IInternalIdentifiers_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_Keywords {
+export interface ICatalogueOntologies_Keywords extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -703,7 +733,7 @@ export interface ICatalogueOntologies_Keywords_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_Languages {
+export interface ICatalogueOntologies_Languages extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -720,7 +750,7 @@ export interface ICatalogueOntologies_Languages_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_Legislations {
+export interface ICatalogueOntologies_Legislations extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -737,7 +767,7 @@ export interface ICatalogueOntologies_Legislations_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_LinkageStrategies {
+export interface ICatalogueOntologies_LinkageStrategies extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -754,7 +784,7 @@ export interface ICatalogueOntologies_LinkageStrategies_agg {
   count: number;
 }
 
-export interface ILinkages {
+export interface ILinkages extends IMgTableClass {
   resource: IResources;
   linkedResource: IResources;
   linkageStrategy?: IOntologyNode;
@@ -768,7 +798,7 @@ export interface ILinkages_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_MappingStatus {
+export interface ICatalogueOntologies_MappingStatus extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -785,24 +815,7 @@ export interface ICatalogueOntologies_MappingStatus_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_MedDRA {
-  order?: number;
-  name: string;
-  label?: string;
-  tags?: string[];
-  parent?: ICatalogueOntologies_MedDRA;
-  codesystem?: string;
-  code?: string;
-  ontologyTermURI?: string;
-  definition?: string;
-  children?: ICatalogueOntologies_MedDRA[];
-}
-
-export interface ICatalogueOntologies_MedDRA_agg {
-  count: number;
-}
-
-export interface ICatalogueOntologies_NetworkTypes {
+export interface ICatalogueOntologies_NetworkTypes extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -819,7 +832,7 @@ export interface ICatalogueOntologies_NetworkTypes_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_ObservationTargets {
+export interface ICatalogueOntologies_ObservationTargets extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -836,7 +849,7 @@ export interface ICatalogueOntologies_ObservationTargets_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_OrganisationRoles {
+export interface ICatalogueOntologies_OrganisationRoles extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -853,7 +866,7 @@ export interface ICatalogueOntologies_OrganisationRoles_agg {
   count: number;
 }
 
-export interface IOrganisations {
+export interface IOrganisations extends IMgTableClass {
   resource: IResources;
   id: string;
   type: IOntologyNode;
@@ -875,7 +888,7 @@ export interface IOrganisations_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_Organisations {
+export interface ICatalogueOntologies_Organisations extends IMgTableClass {
   name: string;
   label?: string;
   acronym?: string;
@@ -899,7 +912,7 @@ export interface ICatalogueOntologies_Organisations_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_PopulationEntry {
+export interface ICatalogueOntologies_PopulationEntry extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -916,7 +929,7 @@ export interface ICatalogueOntologies_PopulationEntry_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_PopulationExit {
+export interface ICatalogueOntologies_PopulationExit extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -933,7 +946,8 @@ export interface ICatalogueOntologies_PopulationExit_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_PopulationOfInterest {
+export interface ICatalogueOntologies_PopulationOfInterest
+  extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -950,7 +964,7 @@ export interface ICatalogueOntologies_PopulationOfInterest_agg {
   count: number;
 }
 
-export interface IProfiles {
+export interface IProfiles extends IMgTableClass {
   dataCatalogueFlat?: string;
 }
 
@@ -958,7 +972,7 @@ export interface IProfiles_agg {
   count: number;
 }
 
-export interface IPublications {
+export interface IPublications extends IMgTableClass {
   resource: IResources;
   doi: string;
   title: string;
@@ -970,7 +984,7 @@ export interface IPublications_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_RefreshPeriods {
+export interface ICatalogueOntologies_RefreshPeriods extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -987,7 +1001,7 @@ export interface ICatalogueOntologies_RefreshPeriods_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_Regions {
+export interface ICatalogueOntologies_Regions extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -1004,7 +1018,7 @@ export interface ICatalogueOntologies_Regions_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_ReleaseTypes {
+export interface ICatalogueOntologies_ReleaseTypes extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -1021,7 +1035,7 @@ export interface ICatalogueOntologies_ReleaseTypes_agg {
   count: number;
 }
 
-export interface IResourceCounts {
+export interface IResourceCounts extends IMgTableClass {
   resource: IResources;
   ageGroup: IOntologyNode;
   populationSize?: number;
@@ -1037,7 +1051,7 @@ export interface IResourceCounts_agg {
   count: number;
 }
 
-export interface IResourceMappings {
+export interface IResourceMappings extends IMgTableClass {
   source: IResources;
   sourceVersion?: string;
   target: IResources;
@@ -1053,7 +1067,7 @@ export interface IResourceMappings_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_ResourceTypes {
+export interface ICatalogueOntologies_ResourceTypes extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -1070,7 +1084,7 @@ export interface ICatalogueOntologies_ResourceTypes_agg {
   count: number;
 }
 
-export interface IResources {
+export interface IResources extends IMgTableClass {
   rdfType?: string;
   fdpEndpoint?: IEndpoint;
   ldpMembershipRelation?: string;
@@ -1081,7 +1095,6 @@ export interface IResources {
   localName?: string;
   acronym?: string;
   type: IOntologyNode[];
-  typeOther?: string;
   catalogueType?: IOntologyNode;
   mainCatalogue?: boolean;
   cohortType?: IOntologyNode[];
@@ -1120,8 +1133,8 @@ export interface IResources {
   underlyingPopulation?: string;
   populationOfInterest?: IOntologyNode[];
   populationOfInterestOther?: string;
-  continents?: IOntologyNode[];
   countries?: IOntologyNode[];
+  continents?: IOntologyNode[];
   regions?: IOntologyNode[];
   populationAgeGroups?: IOntologyNode[];
   ageMin?: number;
@@ -1163,7 +1176,6 @@ export interface IResources {
   biomarkerDataVocabularyOther?: string;
   diagnosisMedicalEventVocabularyOther?: string;
   dataDictionaryAvailable?: boolean;
-  diseaseDetails?: IOntologyNode[];
   biospecimenCollected?: IOntologyNode[];
   languages?: IOntologyNode[];
   multipleEntries?: boolean;
@@ -1237,7 +1249,6 @@ export interface IResources {
   analysisStartPlanned?: string;
   analysisStartActual?: string;
   dataSources?: IResources[];
-  medicalConditionsStudied?: IOntologyNode[];
   dataExtractionDate?: string;
   analysisPlan?: string;
   objectives?: string;
@@ -1248,7 +1259,7 @@ export interface IResources_agg {
   count: number;
 }
 
-export interface IReusedVariables {
+export interface IReusedVariables extends IMgTableClass {
   resource: IResources;
   variable: IVariables;
 }
@@ -1257,7 +1268,7 @@ export interface IReusedVariables_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_SampleCategories {
+export interface ICatalogueOntologies_SampleCategories extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -1274,7 +1285,7 @@ export interface ICatalogueOntologies_SampleCategories_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_SampleTypes {
+export interface ICatalogueOntologies_SampleTypes extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -1291,7 +1302,7 @@ export interface ICatalogueOntologies_SampleTypes_agg {
   count: number;
 }
 
-export interface ISamplesets {
+export interface ISamplesets extends IMgTableClass {
   resource: IResources;
   name: string;
   sampleTypes?: IOntologyNode[];
@@ -1301,7 +1312,7 @@ export interface ISamplesets_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_StandardizedTools {
+export interface ICatalogueOntologies_StandardizedTools extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -1318,7 +1329,7 @@ export interface ICatalogueOntologies_StandardizedTools_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_StatusDetails {
+export interface ICatalogueOntologies_StatusDetails extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -1335,7 +1346,7 @@ export interface ICatalogueOntologies_StatusDetails_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_StudyFunding {
+export interface ICatalogueOntologies_StudyFunding extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -1352,7 +1363,7 @@ export interface ICatalogueOntologies_StudyFunding_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_StudyStatus {
+export interface ICatalogueOntologies_StudyStatus extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -1369,7 +1380,7 @@ export interface ICatalogueOntologies_StudyStatus_agg {
   count: number;
 }
 
-export interface ISubpopulationCounts {
+export interface ISubpopulationCounts extends IMgTableClass {
   resource: IResources;
   subpopulation: ISubpopulations;
   ageGroup: IOntologyNode;
@@ -1382,7 +1393,7 @@ export interface ISubpopulationCounts_agg {
   count: number;
 }
 
-export interface ISubpopulations {
+export interface ISubpopulations extends IMgTableClass {
   resource: IResources;
   name: string;
   pid?: string;
@@ -1418,7 +1429,7 @@ export interface ISubpopulations_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_Themes {
+export interface ICatalogueOntologies_Themes extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -1435,7 +1446,7 @@ export interface ICatalogueOntologies_Themes_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_Titles {
+export interface ICatalogueOntologies_Titles extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -1452,7 +1463,7 @@ export interface ICatalogueOntologies_Titles_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_Units {
+export interface ICatalogueOntologies_Units extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -1469,7 +1480,7 @@ export interface ICatalogueOntologies_Units_agg {
   count: number;
 }
 
-export interface IVariableMappings {
+export interface IVariableMappings extends IMgTableClass {
   source: IResources;
   sourceDataset: IDatasets;
   sourceVariables?: IVariables[];
@@ -1488,7 +1499,8 @@ export interface IVariableMappings_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_VariableRepeatUnits {
+export interface ICatalogueOntologies_VariableRepeatUnits
+  extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;
@@ -1505,7 +1517,7 @@ export interface ICatalogueOntologies_VariableRepeatUnits_agg {
   count: number;
 }
 
-export interface IVariableValues {
+export interface IVariableValues extends IMgTableClass {
   resource: IResources;
   dataset: IDatasets;
   variable: IVariables;
@@ -1522,7 +1534,7 @@ export interface IVariableValues_agg {
   count: number;
 }
 
-export interface IVariables {
+export interface IVariables extends IMgTableClass {
   resource: IResources;
   dataset: IDatasets;
   name: string;
@@ -1541,6 +1553,7 @@ export interface IVariables {
   exampleValues?: string[];
   permittedValues?: IVariableValues[];
   keywords?: IOntologyNode[];
+  generated_keywords?: IOntologyNode[];
   vocabularies?: IOntologyNode[];
   notes?: string;
   mappings?: IVariableMappings[];
@@ -1550,13 +1563,13 @@ export interface IVariables_agg {
   count: number;
 }
 
-export interface IVersion {}
+export interface IVersion extends IMgTableClass {}
 
 export interface IVersion_agg {
   count: number;
 }
 
-export interface ICatalogueOntologies_Vocabularies {
+export interface ICatalogueOntologies_Vocabularies extends IMgTableClass {
   order?: number;
   name: string;
   label?: string;