diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java
index a8675dcf6f4771391a20bb92be84459f0ba22f04..9c6223e41fc1577fee582841f6b9828fdcd1ae05 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java
@@ -26,9 +26,8 @@ import java.util.UUID;
 public class Container {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(nullable = false)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
index e291f3977921a020f858c5bcf3229207ed4d8dcf..ca3f4b44dd4440a95db9954b3382b04fe3dd8071 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
@@ -30,9 +30,8 @@ import static jakarta.persistence.GenerationType.IDENTITY;
 public class ContainerImage {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(nullable = false)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/DataType.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/DataType.java
index 2c5243752ef2dccdb9efa6b626c07566a789039b..d201fd887ecef6bf8382e99f768bf0846b49bb0a 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/DataType.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/DataType.java
@@ -21,9 +21,8 @@ import static jakarta.persistence.GenerationType.IDENTITY;
 public class DataType {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(name = "display_name", nullable = false)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/Operator.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/Operator.java
index 3dbeca6ae79ac4e79aafd5069ebc030ecf4d232c..1fd23da83d8796354673d1cadf175d1efe24b3ae 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/Operator.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/Operator.java
@@ -19,9 +19,8 @@ import java.util.UUID;
 public class Operator {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(name = "display_name", nullable = false)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java
index 2f358c5cb36165fd163a5c8a6ddfb41747179aac..e640ecc90dad5f91155d5660dc17b9cc076e89e1 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java
@@ -42,9 +42,8 @@ import static jakarta.persistence.GenerationType.IDENTITY;
 public class Database implements Serializable {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @JdbcTypeCode(java.sql.Types.VARCHAR)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/View.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/View.java
index 917f28506111ebde8a0d56360efff0a78222104a..6903bc5565666bcbb6ca95c5c40d8a45d68bc2d1 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/View.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/View.java
@@ -35,14 +35,10 @@ import java.util.UUID;
 public class View {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
-    private UUID vdbid;
-
     @ToString.Exclude
     @JdbcTypeCode(java.sql.Types.VARCHAR)
     @Column(name = "owned_by", columnDefinition = "VARCHAR(36)")
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/ViewColumn.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/ViewColumn.java
index 990e6dc804ba89e996da7f2e120e5bf27d83142f..0ae40ec2b829ae6694028a13f78500455faaae3f 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/ViewColumn.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/ViewColumn.java
@@ -24,9 +24,8 @@ import static jakarta.persistence.GenerationType.IDENTITY;
 public class ViewColumn implements Comparable<ViewColumn> {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @ToString.Exclude
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java
index 9cf54a15d880b300b199d663feddc50b84bc54a9..f3508f71170a835b399338cd938e599e35e884ba 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java
@@ -38,9 +38,8 @@ import static jakarta.persistence.GenerationType.IDENTITY;
 public class Table {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(updatable = false, nullable = false)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
index 81b3046d0b7ae49dbb14156071313bd3367570b6..bbbf2943ee7c84aa2bcc67c97ec729c5e90a797c 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
@@ -33,9 +33,8 @@ import static jakarta.persistence.GenerationType.IDENTITY;
 public class TableColumn implements Comparable<TableColumn> {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @ToString.Exclude
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java
index 8744385be57e80c8940feaf9a427a580b0136008..63eb5c67683281eed7238aa6de5c63b55896fdf1 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java
@@ -31,9 +31,8 @@ import static jakarta.persistence.GenerationType.IDENTITY;
 public class TableColumnConcept {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(updatable = false, nullable = false, columnDefinition = "TEXT")
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java
index 087ce4df9ace28576d77a45efa31f6fe076ef7b0..02649c1760a223b65473aafef2483a268219132e 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java
@@ -31,9 +31,8 @@ import static jakarta.persistence.GenerationType.IDENTITY;
 public class TableColumnUnit {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(updatable = false, nullable = false, columnDefinition = "TEXT")
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKey.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKey.java
index a1a9aec1ac94b34bc1c6462ed4374b550bd1adb3..955a7d5b76048c72dc2cd90d8eba2b6127b7206b 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKey.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKey.java
@@ -21,7 +21,6 @@ import java.util.UUID;
 public class ForeignKey {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
     @Column(name = "fkid", nullable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKeyReference.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKeyReference.java
index bb7be45c4150628e7b8dbe07be4ddcd3c91dcefd..6b0d271498f9b1f46062adb0a53eab0112e0b494 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKeyReference.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKeyReference.java
@@ -24,9 +24,8 @@ import static jakarta.persistence.GenerationType.IDENTITY;
 public class ForeignKeyReference {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @ToString.Exclude
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/primaryKey/PrimaryKey.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/primaryKey/PrimaryKey.java
index 37dcceaec7280df9bc309601f7299edd5d8f93e1..9a613ffac6dc849dc579c6779131780f553fd9a4 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/primaryKey/PrimaryKey.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/primaryKey/PrimaryKey.java
@@ -21,7 +21,6 @@ import java.util.UUID;
 public class PrimaryKey {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
     @Column(name = "pkid", nullable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/unique/Unique.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/unique/Unique.java
index 4f6a371f8ee12b555dc3bcb8c447300b895d50d1..7d7b7fdde5063c3436926217626e5f5cefcd1598 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/unique/Unique.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/unique/Unique.java
@@ -22,7 +22,6 @@ import java.util.UUID;
 public class Unique {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
     @Column(name = "uid", nullable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Creator.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Creator.java
index bf749fd51b0e2ff2648dd969b01fedaca9f895bf..2f7381fdde808db3386731aa7075a494f3c8e4ba 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Creator.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Creator.java
@@ -21,9 +21,8 @@ import static jakarta.persistence.GenerationType.IDENTITY;
 public class Creator {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(name = "given_names")
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java
index d71897893171da81b5dd23f1937f622f0a475704..96cd0ea46612c39042e3e28aa004b7d1790900d5 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java
@@ -39,9 +39,8 @@ import static jakarta.persistence.GenerationType.IDENTITY;
 public class Identifier implements Serializable {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(name = "qid", columnDefinition = "VARCHAR(36)")
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierDescription.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierDescription.java
index e8628ce07e5352fcfa10ba4ceb2dd9918e5fdcdf..af97bc150162df2983b64dab7b0c8222c5c215c3 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierDescription.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierDescription.java
@@ -23,9 +23,8 @@ import static jakarta.persistence.GenerationType.IDENTITY;
 public class IdentifierDescription implements Serializable {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(nullable = false, columnDefinition = "TEXT")
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierFunder.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierFunder.java
index 93ef2536cea2a129dcf46ad244735ec6beb0fef6..3227ab08560455dfbf8fcd669ae5f2b9ec4c8887 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierFunder.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierFunder.java
@@ -22,9 +22,8 @@ import static jakarta.persistence.GenerationType.IDENTITY;
 public class IdentifierFunder implements Serializable {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(nullable = false)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierTitle.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierTitle.java
index 2f8e94d61a4f7ec4be4bc97247effe0485e43f3b..10aff720cb30809e763423d279447909deec4830 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierTitle.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierTitle.java
@@ -23,9 +23,8 @@ import static jakarta.persistence.GenerationType.IDENTITY;
 public class IdentifierTitle implements Serializable {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(nullable = false, columnDefinition = "TEXT")
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java
index 8b8bc9108426a5fe1a666ec78c0b6348e2a94a13..5e79df9629353095d8b1a8e14c99bc004fdd8434 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java
@@ -21,9 +21,8 @@ import java.util.UUID;
 public class RelatedIdentifier {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(nullable = false)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/maintenance/BannerMessage.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/maintenance/BannerMessage.java
index a447668a082561f9c18cd5eabcbbaefd79066b1f..e827133e63749b0894ef4ba35e1ed4f3a58bc497 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/maintenance/BannerMessage.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/maintenance/BannerMessage.java
@@ -25,9 +25,8 @@ import static jakarta.persistence.GenerationType.IDENTITY;
 public class BannerMessage {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(nullable = false, columnDefinition = "ENUM('ERROR','WARNING','INFO')")
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/semantics/Ontology.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/semantics/Ontology.java
index da73616077b4a68a125eceb40ccb2177dd3d2ecf..de257e0579ed2861b31060ca1c0f0ec53b3e44de 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/semantics/Ontology.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/semantics/Ontology.java
@@ -29,9 +29,8 @@ import static jakarta.persistence.GenerationType.IDENTITY;
 public class Ontology {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
     @JdbcTypeCode(java.sql.Types.VARCHAR)
-    @Column(nullable = false, updatable = false, columnDefinition = "VARCHAR(36)")
+    @Column(updatable = false, columnDefinition = "VARCHAR(36)")
     private UUID id;
 
     @Column(nullable = false, unique = true)
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
index cff05b8d6f1d670398703c12f79d86aefe8be1be..4049835bb7e2fc6b7bcc4f0d6dc643f1676ad968 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
@@ -827,7 +827,7 @@ public interface MetadataMapper {
     ViewDto viewToViewDto(View data);
 
     @Mappings({
-            @Mapping(target = "databaseId", source = "view.vdbid"),
+            @Mapping(target = "databaseId", source = "view.database.id"),
     })
     ViewColumnDto viewColumnToViewColumnDto(ViewColumn data);
 
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/MetadataEndpointMvcTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/MetadataEndpointMvcTest.java
index 96af6cfa8d14e4974a4afb8e410d9cc9a29bbbeb..7f9ba9743d24f1d888f2a488bd8330755478d1e9 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/MetadataEndpointMvcTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/MetadataEndpointMvcTest.java
@@ -122,7 +122,7 @@ public class MetadataEndpointMvcTest extends AbstractUnitTest {
                 .thenReturn(Optional.of(IDENTIFIER_1));
 
         /* test */
-        this.mockMvc.perform(get("/api/oai?verb=GetRecord&identifier=oai:1"))
+        this.mockMvc.perform(get("/api/oai?verb=GetRecord&identifier=oai:" + IDENTIFIER_1_ID))
                 .andDo(print())
                 .andExpect(content().contentType("text/xml;charset=UTF-8"))
                 .andExpect(xpath("//request[@verb='GetRecord']").exists())
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java
index 9f49e283442047e6cbeb652ddfb1c76294be038b..1014475ef9eb044531e635049a246e218222ad6c 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java
@@ -93,7 +93,6 @@ public class ViewServiceImpl implements ViewService {
             SearchServiceConnectionException {
         /* create in metadata database */
         final View view = View.builder()
-                .vdbid(database.getId())
                 .database(database)
                 .name(data.getName())
                 .internalName(metadataMapper.nameToInternalName(data.getName()))
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
index f49f51bb1809bca48a4f7cbfd50720a7276a70b5..659efd090e4e51e9ac231317b69b42d516183b6b 100644
--- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
+++ b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
@@ -121,7 +121,7 @@ import static java.time.temporal.ChronoUnit.MINUTES;
  * <li>Identifier 6 (Title=en, Description=en, Query=3)</li>
  * </ul>
  * <p>
- * Database 4 (Public Data, Public Schema, User 4) -> Container 2
+ * Database 4 (Public Data, Public Schema, User 4) -> Container 4
  * <li>Table 9</li>
  * <li>Identifier 7</li>
  * <li>Query 7</li>
@@ -996,6 +996,7 @@ public abstract class BaseTest {
             .uiAdditionalFlags(CONTAINER_1_UI_ADDITIONAL_FLAGS)
             .privilegedUsername(CONTAINER_1_PRIVILEGED_USERNAME)
             .privilegedPassword(CONTAINER_1_PRIVILEGED_PASSWORD)
+            .databases(null) /* DATABASE_1, DATABASE_2, DATABASE_3 */
             .build();
 
     public static final ContainerDto CONTAINER_1_DTO = ContainerDto.builder()
@@ -1133,6 +1134,7 @@ public abstract class BaseTest {
             .quota(CONTAINER_4_QUOTA)
             .privilegedUsername(CONTAINER_4_PRIVILEGED_USERNAME)
             .privilegedPassword(CONTAINER_4_PRIVILEGED_PASSWORD)
+            .databases(null) /* DATABASE_4 */
             .build();
 
     public static final String EXCHANGE_DBREPO_NAME = "dbrepo";
@@ -4969,9 +4971,15 @@ public abstract class BaseTest {
     public static final String VIEW_1_QUERY = "select `location`, `lat`, `lng` from `weather_location`";
     public static final String VIEW_1_QUERY_HASH = "dc81a6877c7c51a6a6f406e1fc2a255e44a0d49a20548596e0d583c3eb849c23";
 
+    public static final UUID VIEW_COLUMN_1_1_ID = UUID.fromString("ebf2c5ce-4deb-4cc6-b6f6-61f5d3f6fc98");
+
+    public static final UUID VIEW_COLUMN_1_2_ID = UUID.fromString("d6ba3475-cefa-4771-aaa1-9274f16335ee");
+
+    public static final UUID VIEW_COLUMN_1_3_ID = UUID.fromString("4f189a5f-c9ca-4518-9758-1a0730f6276b");
+
     public static final List<ViewColumnDto> VIEW_1_COLUMNS_DTO = List.of(
             ViewColumnDto.builder()
-                    .id(COLUMN_2_1_ID)
+                    .id(VIEW_COLUMN_1_1_ID)
                     .ordinalPosition(0)
                     .databaseId(DATABASE_1_ID)
                     .name("location")
@@ -4981,7 +4989,7 @@ public abstract class BaseTest {
                     .isNullAllowed(false)
                     .build(),
             ViewColumnDto.builder()
-                    .id(COLUMN_2_2_ID)
+                    .id(VIEW_COLUMN_1_2_ID)
                     .ordinalPosition(1)
                     .databaseId(DATABASE_1_ID)
                     .name("lat")
@@ -4992,7 +5000,7 @@ public abstract class BaseTest {
                     .isNullAllowed(true)
                     .build(),
             ViewColumnDto.builder()
-                    .id(COLUMN_2_3_ID)
+                    .id(VIEW_COLUMN_1_3_ID)
                     .ordinalPosition(2)
                     .databaseId(DATABASE_1_ID)
                     .name("lng")
@@ -5009,7 +5017,6 @@ public abstract class BaseTest {
             .isInitialView(VIEW_1_INITIAL_VIEW)
             .name(VIEW_1_NAME)
             .internalName(VIEW_1_INTERNAL_NAME)
-            .vdbid(DATABASE_1_ID)
             .isPublic(VIEW_1_PUBLIC)
             .isSchemaPublic(VIEW_1_SCHEMA_PUBLIC)
             .query(VIEW_1_QUERY)
@@ -5132,9 +5139,17 @@ public abstract class BaseTest {
     public static final String VIEW_2_QUERY = "select `date`, `location` as loc, `mintemp`, `rainfall` from `weather_aus` where `location` = 'Albury'";
     public static final String VIEW_2_QUERY_HASH = "987fc946772ffb6d85060262dcb5df419692a1f6772ea995e3dedb53c191e984";
 
+    public static final UUID VIEW_COLUMN_2_1_ID = UUID.fromString("8fb30bce-04a8-4e9a-9c6b-0776eda3aab8");
+
+    public static final UUID VIEW_COLUMN_2_2_ID = UUID.fromString("d43f9940-ae27-4d81-b17b-ccbaf578186c");
+
+    public static final UUID VIEW_COLUMN_2_3_ID = UUID.fromString("b47733bb-aeea-414d-811e-405c64463730");
+
+    public static final UUID VIEW_COLUMN_2_4_ID = UUID.fromString("2b467e3a-acef-4944-be19-b4b0680874c2");
+
     public static final List<ViewColumnDto> VIEW_2_COLUMNS_DTO = List.of(
             ViewColumnDto.builder()
-                    .id(COLUMN_1_2_ID)
+                    .id(VIEW_COLUMN_2_1_ID)
                     .databaseId(DATABASE_1_ID)
                     .ordinalPosition(0)
                     .name("Date")
@@ -5143,7 +5158,7 @@ public abstract class BaseTest {
                     .isNullAllowed(true)
                     .build(),
             ViewColumnDto.builder()
-                    .id(COLUMN_1_3_ID)
+                    .id(VIEW_COLUMN_2_2_ID)
                     .databaseId(DATABASE_1_ID)
                     .ordinalPosition(1)
                     .name("loc")
@@ -5153,7 +5168,7 @@ public abstract class BaseTest {
                     .isNullAllowed(true)
                     .build(),
             ViewColumnDto.builder()
-                    .id(COLUMN_1_5_ID)
+                    .id(VIEW_COLUMN_2_3_ID)
                     .databaseId(DATABASE_1_ID)
                     .ordinalPosition(2)
                     .name("Rainfall")
@@ -5164,7 +5179,7 @@ public abstract class BaseTest {
                     .isNullAllowed(true)
                     .build(),
             ViewColumnDto.builder()
-                    .id(COLUMN_1_4_ID)
+                    .id(VIEW_COLUMN_2_4_ID)
                     .databaseId(DATABASE_1_ID)
                     .ordinalPosition(3)
                     .name("MinTemp")
@@ -5181,7 +5196,6 @@ public abstract class BaseTest {
             .isInitialView(VIEW_2_INITIAL_VIEW)
             .name(VIEW_2_NAME)
             .internalName(VIEW_2_INTERNAL_NAME)
-            .vdbid(DATABASE_1_ID)
             .isPublic(VIEW_2_PUBLIC)
             .isSchemaPublic(VIEW_2_SCHEMA_PUBLIC)
             .columns(null)  /* VIEW_2_COLUMNS */
@@ -5289,9 +5303,17 @@ public abstract class BaseTest {
 
     public static final Long VIEW_3_DATA_COUNT = 3L;
 
+    public static final UUID VIEW_COLUMN_3_1_ID = UUID.fromString("129839cb-dbd7-492d-8fd0-ee44a8f51c4d");
+
+    public static final UUID VIEW_COLUMN_3_2_ID = UUID.fromString("e229d80a-c25c-4fbe-8f31-bbb2e1dff3d5");
+
+    public static final UUID VIEW_COLUMN_3_3_ID = UUID.fromString("12083a5d-fdd3-41db-9f92-d1298558e477");
+
+    public static final UUID VIEW_COLUMN_3_4_ID = UUID.fromString("668f8a87-1fa6-4be7-9761-1844aa8315a4");
+
     public static final List<ViewColumnDto> VIEW_3_COLUMNS_DTO = List.of(
             ViewColumnDto.builder()
-                    .id(COLUMN_1_4_ID)
+                    .id(VIEW_COLUMN_3_1_ID)
                     .databaseId(DATABASE_1_ID)
                     .ordinalPosition(0)
                     .name("MinTemp")
@@ -5302,7 +5324,7 @@ public abstract class BaseTest {
                     .isNullAllowed(true)
                     .build(),
             ViewColumnDto.builder()
-                    .id(COLUMN_1_5_ID)
+                    .id(VIEW_COLUMN_3_2_ID)
                     .databaseId(DATABASE_1_ID)
                     .ordinalPosition(1)
                     .name("Rainfall")
@@ -5313,7 +5335,7 @@ public abstract class BaseTest {
                     .isNullAllowed(true)
                     .build(),
             ViewColumnDto.builder()
-                    .id(COLUMN_1_3_ID)
+                    .id(VIEW_COLUMN_3_3_ID)
                     .databaseId(DATABASE_1_ID)
                     .ordinalPosition(2)
                     .name("Location")
@@ -5323,7 +5345,7 @@ public abstract class BaseTest {
                     .isNullAllowed(true)
                     .build(),
             ViewColumnDto.builder()
-                    .id(COLUMN_1_2_ID)
+                    .id(VIEW_COLUMN_3_4_ID)
                     .databaseId(DATABASE_1_ID)
                     .ordinalPosition(3)
                     .name("Date")
@@ -5338,7 +5360,6 @@ public abstract class BaseTest {
             .isInitialView(VIEW_3_INITIAL_VIEW)
             .name(VIEW_3_NAME)
             .internalName(VIEW_3_INTERNAL_NAME)
-            .vdbid(DATABASE_1_ID)
             .isPublic(VIEW_3_PUBLIC)
             .isSchemaPublic(VIEW_3_SCHEMA_PUBLIC)
             .columns(null)  /* VIEW_3_COLUMNS */
@@ -5366,7 +5387,7 @@ public abstract class BaseTest {
 
     public static final List<ViewColumn> VIEW_3_COLUMNS = List.of(
             ViewColumn.builder()
-                    .id(COLUMN_1_4_ID)
+                    .id(VIEW_COLUMN_3_1_ID)
                     .ordinalPosition(0)
                     .name("MinTemp")
                     .internalName("mintemp")
@@ -5377,7 +5398,7 @@ public abstract class BaseTest {
                     .view(VIEW_3)
                     .build(),
             ViewColumn.builder()
-                    .id(COLUMN_1_5_ID)
+                    .id(VIEW_COLUMN_3_2_ID)
                     .ordinalPosition(1)
                     .name("Rainfall")
                     .internalName("rainfall")
@@ -5388,7 +5409,7 @@ public abstract class BaseTest {
                     .view(VIEW_3)
                     .build(),
             ViewColumn.builder()
-                    .id(COLUMN_1_3_ID)
+                    .id(VIEW_COLUMN_3_3_ID)
                     .ordinalPosition(2)
                     .name("Location")
                     .internalName("location")
@@ -5398,7 +5419,7 @@ public abstract class BaseTest {
                     .view(VIEW_3)
                     .build(),
             ViewColumn.builder()
-                    .id(COLUMN_1_2_ID)
+                    .id(VIEW_COLUMN_3_4_ID)
                     .ordinalPosition(3)
                     .name("Date")
                     .internalName("date")
@@ -5605,7 +5626,6 @@ public abstract class BaseTest {
             .isInitialView(VIEW_4_INITIAL_VIEW)
             .name(VIEW_4_NAME)
             .internalName(VIEW_4_INTERNAL_NAME)
-            .vdbid(DATABASE_2_ID)
             .isPublic(VIEW_4_PUBLIC)
             .isSchemaPublic(VIEW_4_SCHEMA_PUBLIC)
             .query(VIEW_4_QUERY)
@@ -5811,7 +5831,6 @@ public abstract class BaseTest {
             .isInitialView(VIEW_5_INITIAL_VIEW)
             .name(VIEW_5_NAME)
             .internalName(VIEW_5_INTERNAL_NAME)
-            .vdbid(DATABASE_3_ID)
             .isPublic(VIEW_5_PUBLIC)
             .isSchemaPublic(VIEW_5_SCHEMA_PUBLIC)
             .query(VIEW_5_QUERY)
diff --git a/helm/dbrepo/files/01-setup-schema.sql b/helm/dbrepo/files/01-setup-schema.sql
index e2bde25ed6d64f69c4f8d6e897a49a672e3f9a71..b9055cf884bdb3d310310c52a17471504cdc6fac 100644
--- a/helm/dbrepo/files/01-setup-schema.sql
+++ b/helm/dbrepo/files/01-setup-schema.sql
@@ -2,390 +2,341 @@ BEGIN;
 
 CREATE TABLE IF NOT EXISTS `mdb_users`
 (
-    id               character varying(36)  NOT NULL,
-    keycloak_id      character varying(36)  NOT NULL,
-    username         character varying(255) NOT NULL,
-    firstname        character varying(255),
-    lastname         character varying(255),
-    orcid            character varying(255),
-    affiliation      character varying(255),
-    is_internal      BOOLEAN                NOT NULL DEFAULT FALSE,
-    mariadb_password character varying(255) NOT NULL,
-    theme            character varying(255) NOT NULL default ('light'),
-    language         character varying(3)   NOT NULL default ('en'),
-    PRIMARY KEY (id),
-    UNIQUE (keycloak_id),
-    UNIQUE (username)
+    id               VARCHAR(36)  NOT NULL DEFAULT UUID(),
+    keycloak_id      VARCHAR(36)  NOT NULL,
+    username         VARCHAR(255) NOT NULL,
+    firstname        VARCHAR(255),
+    lastname         VARCHAR(255),
+    orcid            VARCHAR(255),
+    affiliation      VARCHAR(255),
+    is_internal      BOOLEAN      NOT NULL DEFAULT FALSE,
+    mariadb_password VARCHAR(255) NOT NULL,
+    theme            VARCHAR(255) NOT NULL DEFAULT ('light'),
+    language         VARCHAR(3)   NOT NULL DEFAULT ('en'),
+    PRIMARY KEY (`id`),
+    UNIQUE (`keycloak_id`),
+    UNIQUE (`username`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_images`
 (
-    id            SERIAL,
-    registry      character varying(255) NOT NULL DEFAULT 'docker.io',
-    name          character varying(255) NOT NULL,
-    version       character varying(255) NOT NULL,
-    default_port  integer                NOT NULL,
-    dialect       character varying(255) NOT NULL,
-    driver_class  character varying(255) NOT NULL,
-    jdbc_method   character varying(255) NOT NULL,
-    is_default    BOOLEAN                NOT NULL DEFAULT FALSE,
-    created       timestamp              NOT NULL DEFAULT NOW(),
-    last_modified timestamp,
-    PRIMARY KEY (id),
-    UNIQUE (name, version),
-    UNIQUE (is_default)
+    id            VARCHAR(36)  NOT NULL DEFAULT UUID(),
+    registry      VARCHAR(255) NOT NULL DEFAULT 'docker.io',
+    name          VARCHAR(255) NOT NULL,
+    version       VARCHAR(255) NOT NULL,
+    DEFAULT_port  INT          NOT NULL,
+    dialect       VARCHAR(255) NOT NULL,
+    driver_class  VARCHAR(255) NOT NULL,
+    jdbc_method   VARCHAR(255) NOT NULL,
+    is_DEFAULT    BOOLEAN      NOT NULL DEFAULT FALSE,
+    created       TIMESTAMP    NOT NULL DEFAULT NOW(),
+    last_modified TIMESTAMP,
+    PRIMARY KEY (`id`),
+    UNIQUE (`name`, `version`),
+    UNIQUE (`is_DEFAULT`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_containers`
 (
-    id                  SERIAL,
-    internal_name       character varying(255) NOT NULL,
-    name                character varying(255) NOT NULL,
-    host                character varying(255) NOT NULL,
-    port                integer                NOT NULL default 3306,
-    ui_host             character varying(255) NOT NULL default host,
-    ui_port             integer                NOT NULL default port,
-    ui_additional_flags text,
-    sidecar_host        character varying(255),
-    sidecar_port        integer,
-    image_id            bigint                 NOT NULL,
-    created             timestamp              NOT NULL DEFAULT NOW(),
-    last_modified       timestamp,
-    privileged_username character varying(255) NOT NULL,
-    privileged_password character varying(255) NOT NULL,
-    quota               integer                NOT NULL DEFAULT 50,
-    PRIMARY KEY (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_data`
-(
-    ID           SERIAL,
-    PROVENANCE   text,
-    FileEncoding text,
-    FileType     character varying(100),
-    Version      text,
-    Seperator    text,
-    PRIMARY KEY (ID)
+    id                  VARCHAR(36)  NOT NULL DEFAULT UUID(),
+    internal_name       VARCHAR(255) NOT NULL,
+    name                VARCHAR(255) NOT NULL,
+    host                VARCHAR(255) NOT NULL,
+    port                INT          NOT NULL DEFAULT 3306,
+    ui_host             VARCHAR(255) NOT NULL DEFAULT host,
+    ui_port             INT          NOT NULL DEFAULT port,
+    ui_additional_flags TEXT,
+    image_id            VARCHAR(36)  NOT NULL,
+    created             TIMESTAMP    NOT NULL DEFAULT NOW(),
+    last_modified       TIMESTAMP,
+    privileged_username VARCHAR(255) NOT NULL,
+    privileged_password VARCHAR(255) NOT NULL,
+    quota               INT,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`image_id`) REFERENCES mdb_images (`id`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_licenses`
 (
-    identifier  character varying(255) NOT NULL,
-    uri         text                   NOT NULL,
-    description text                   NOT NULL,
-    PRIMARY KEY (identifier),
+    identifier  VARCHAR(255) NOT NULL,
+    uri         TEXT         NOT NULL,
+    description TEXT         NOT NULL,
+    PRIMARY KEY (`identifier`),
     UNIQUE (uri(200))
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_databases`
 (
-    id               SERIAL,
-    cid              BIGINT UNSIGNED        NOT NULL,
-    name             character varying(255) NOT NULL,
-    internal_name    character varying(255) NOT NULL,
-    exchange_name    character varying(255) NOT NULL,
-    description      text,
-    engine           character varying(20),
-    is_public        boolean                NOT NULL DEFAULT TRUE,
-    is_schema_public boolean                NOT NULL DEFAULT TRUE,
-    image            longblob,
-    owned_by         character varying(36),
-    contact_person   character varying(36),
-    created          timestamp              NOT NULL DEFAULT NOW(),
-    last_modified    timestamp,
-    PRIMARY KEY (id),
-    FOREIGN KEY (cid) REFERENCES mdb_containers (id),
-    FOREIGN KEY (owned_by) REFERENCES mdb_users (id),
-    FOREIGN KEY (contact_person) REFERENCES mdb_users (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_databases_subjects`
-(
-    dbid     BIGINT                 NOT NULL,
-    subjects character varying(255) NOT NULL,
-    PRIMARY KEY (dbid, subjects)
+    id               VARCHAR(36)  NOT NULL DEFAULT UUID(),
+    cid              VARCHAR(36)  NOT NULL,
+    name             VARCHAR(255) NOT NULL,
+    internal_name    VARCHAR(255) NOT NULL,
+    exchange_name    VARCHAR(255) NOT NULL,
+    description      TEXT,
+    engine           VARCHAR(20),
+    is_public        BOOLEAN      NOT NULL DEFAULT TRUE,
+    is_schema_public BOOLEAN      NOT NULL DEFAULT TRUE,
+    image            LONGBLOB,
+    owned_by         VARCHAR(36)  NOT NULL,
+    contact_person   VARCHAR(36)  NOT NULL,
+    created          TIMESTAMP    NOT NULL DEFAULT NOW(),
+    last_modified    TIMESTAMP,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`cid`) REFERENCES mdb_containers (`id`),
+    FOREIGN KEY (`owned_by`) REFERENCES mdb_users (`id`),
+    FOREIGN KEY (`contact_person`) REFERENCES mdb_users (`id`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_tables`
 (
-    ID               SERIAL,
-    tDBID            BIGINT UNSIGNED       NOT NULL,
-    tName            VARCHAR(64)           NOT NULL,
-    internal_name    VARCHAR(64)           NOT NULL,
-    queue_name       VARCHAR(255)          NOT NULL,
+    id               VARCHAR(36)  NOT NULL DEFAULT UUID(),
+    tDBID            VARCHAR(36)  NOT NULL,
+    tName            VARCHAR(64)  NOT NULL,
+    internal_name    VARCHAR(64)  NOT NULL,
+    queue_name       VARCHAR(255) NOT NULL,
     routing_key      VARCHAR(255),
     tDescription     VARCHAR(2048),
     num_rows         BIGINT,
     data_length      BIGINT,
     max_data_length  BIGINT,
     avg_row_length   BIGINT,
-    `separator`      CHAR(1),
-    quote            CHAR(1),
-    element_null     VARCHAR(50),
-    skip_lines       BIGINT,
-    element_true     VARCHAR(50),
-    element_false    VARCHAR(50),
-    Version          TEXT,
-    created          timestamp             NOT NULL DEFAULT NOW(),
-    versioned        boolean               not null default true,
-    is_public        boolean               not null default true,
-    is_schema_public boolean               not null default true,
-    owned_by         character varying(36) NOT NULL,
-    last_modified    timestamp,
-    PRIMARY KEY (ID),
-    UNIQUE (tDBID, internal_name),
-    FOREIGN KEY (tDBID) REFERENCES mdb_databases (id),
-    FOREIGN KEY (owned_by) REFERENCES mdb_users (id)
+    created          TIMESTAMP    NOT NULL DEFAULT NOW(),
+    versioned        BOOLEAN      NOT NULL DEFAULT TRUE,
+    is_public        BOOLEAN      NOT NULL DEFAULT TRUE,
+    is_schema_public BOOLEAN      NOT NULL DEFAULT TRUE,
+    owned_by         VARCHAR(36)  NOT NULL DEFAULT UUID(),
+    last_modified    TIMESTAMP,
+    PRIMARY KEY (`ID`),
+    UNIQUE (`tDBID`, `internal_name`),
+    FOREIGN KEY (`tDBID`) REFERENCES mdb_databases (`id`),
+    FOREIGN KEY (`owned_by`) REFERENCES mdb_users (`id`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_columns`
 (
-    ID               SERIAL,
-    tID              BIGINT UNSIGNED NOT NULL,
+    id               VARCHAR(36)     NOT NULL DEFAULT UUID(),
+    tID              VARCHAR(36)     NOT NULL,
     cName            VARCHAR(64),
     internal_name    VARCHAR(64)     NOT NULL,
     Datatype         ENUM ('CHAR','VARCHAR','BINARY','VARBINARY','TINYBLOB','TINYTEXT','TEXT','BLOB','MEDIUMTEXT','MEDIUMBLOB','LONGTEXT','LONGBLOB','ENUM','SET','SERIAL','BIT','TINYINT','BOOL','SMALLINT','MEDIUMINT','INT','BIGINT','FLOAT','DOUBLE','DECIMAL','DATE','DATETIME','TIMESTAMP','TIME','YEAR'),
     length           BIGINT UNSIGNED NULL,
-    ordinal_position INTEGER         NOT NULL,
+    ordinal_position INT             NOT NULL,
     index_length     BIGINT UNSIGNED NULL,
     description      VARCHAR(2048),
     size             BIGINT UNSIGNED,
     d                BIGINT UNSIGNED,
-    is_null_allowed  BOOLEAN         NOT NULL DEFAULT true,
+    is_null_allowed  BOOLEAN         NOT NULL DEFAULT TRUE,
     val_min          NUMERIC         NULL,
     val_max          NUMERIC         NULL,
     mean             NUMERIC         NULL,
     median           NUMERIC         NULL,
     std_dev          Numeric         NULL,
-    created          timestamp       NOT NULL DEFAULT NOW(),
-    last_modified    timestamp,
-    FOREIGN KEY (tID) REFERENCES mdb_tables (ID) ON DELETE CASCADE,
-    PRIMARY KEY (ID),
-    UNIQUE (tID, internal_name)
+    created          TIMESTAMP       NOT NULL DEFAULT NOW(),
+    last_modified    TIMESTAMP,
+    FOREIGN KEY (`tID`) REFERENCES mdb_tables (`ID`) ON DELETE CASCADE,
+    PRIMARY KEY (`ID`),
+    UNIQUE (`tID`, `internal_name`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_columns_enums`
 (
-    id        SERIAL,
-    column_id BIGINT UNSIGNED        NOT NULL,
-    value     CHARACTER VARYING(255) NOT NULL,
-    FOREIGN KEY (column_id) REFERENCES mdb_columns (ID) ON DELETE CASCADE,
-    PRIMARY KEY (id)
+    id        VARCHAR(36)  NOT NULL DEFAULT UUID(),
+    column_id VARCHAR(36)  NOT NULL,
+    value     VARCHAR(255) NOT NULL,
+    FOREIGN KEY (`column_id`) REFERENCES mdb_columns (`ID`) ON DELETE CASCADE,
+    PRIMARY KEY (`id`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_columns_sets`
 (
-    id        SERIAL,
-    column_id BIGINT UNSIGNED        NOT NULL,
-    value     CHARACTER VARYING(255) NOT NULL,
-    FOREIGN KEY (column_id) REFERENCES mdb_columns (ID) ON DELETE CASCADE,
-    PRIMARY KEY (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_columns_nom`
-(
-    cID           BIGINT UNSIGNED,
-    tID           BIGINT UNSIGNED,
-    maxlength     INTEGER,
-    last_modified timestamp,
-    created       timestamp NOT NULL DEFAULT NOW(),
-    PRIMARY KEY (cID),
-    FOREIGN KEY (cID) REFERENCES mdb_columns (ID)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_columns_cat`
-(
-    cID           BIGINT UNSIGNED,
-    tID           BIGINT UNSIGNED,
-    num_cat       INTEGER,
-    --    cat_array     TEXT[],
-    last_modified timestamp,
-    created       timestamp NOT NULL DEFAULT NOW(),
-    PRIMARY KEY (cID),
-    FOREIGN KEY (cID) REFERENCES mdb_columns (ID)
+    id        VARCHAR(36)  NOT NULL DEFAULT UUID(),
+    column_id VARCHAR(36)  NOT NULL,
+    value     VARCHAR(255) NOT NULL,
+    FOREIGN KEY (`column_id`) REFERENCES mdb_columns (`ID`) ON DELETE CASCADE,
+    PRIMARY KEY (`id`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_constraints_foreign_key`
 (
-    fkid      SERIAL,
-    tid       BIGINT UNSIGNED NOT NULL,
-    rtid      BIGINT UNSIGNED NOT NULL,
-    name      VARCHAR(255)    NOT NULL,
-    on_update VARCHAR(50)     NULL,
-    on_delete VARCHAR(50)     NULL,
-    position  INT             NULL,
-    PRIMARY KEY (fkid),
-    FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE,
-    FOREIGN KEY (rtid) REFERENCES mdb_tables (id)
+    fkid      VARCHAR(36)  NOT NULL DEFAULT UUID(),
+    tid       VARCHAR(36)  NOT NULL,
+    rtid      VARCHAR(36)  NOT NULL,
+    name      VARCHAR(255) NOT NULL,
+    on_update VARCHAR(50)  NULL,
+    on_delete VARCHAR(50)  NULL,
+    position  INT          NULL,
+    PRIMARY KEY (`fkid`),
+    FOREIGN KEY (`tid`) REFERENCES mdb_tables (`id`) ON DELETE CASCADE,
+    FOREIGN KEY (`rtid`) REFERENCES mdb_tables (`id`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_constraints_primary_key`
 (
-    pkid SERIAL,
-    tID  BIGINT UNSIGNED NOT NULL,
-    cid  BIGINT UNSIGNED NOT NULL,
-    PRIMARY KEY (pkid),
-    FOREIGN KEY (tID) REFERENCES mdb_tables (id) ON DELETE CASCADE,
-    FOREIGN KEY (cid) REFERENCES mdb_columns (id) ON DELETE CASCADE
+    pkid VARCHAR(36) NOT NULL DEFAULT UUID(),
+    tID  VARCHAR(36) NOT NULL,
+    cid  VARCHAR(36) NOT NULL,
+    PRIMARY KEY (`pkid`),
+    FOREIGN KEY (`tID`) REFERENCES mdb_tables (`id`) ON DELETE CASCADE,
+    FOREIGN KEY (`cid`) REFERENCES mdb_columns (`id`) ON DELETE CASCADE
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_constraints_foreign_key_reference`
 (
-    id   SERIAL,
-    fkid BIGINT UNSIGNED NOT NULL,
-    cid  BIGINT UNSIGNED NOT NULL,
-    rcid BIGINT UNSIGNED NOT NULL,
-    PRIMARY KEY (id),
+    id   VARCHAR(36) NOT NULL DEFAULT UUID(),
+    fkid VARCHAR(36) NOT NULL,
+    cid  VARCHAR(36) NOT NULL,
+    rcid VARCHAR(36) NOT NULL,
+    PRIMARY KEY (`id`),
     UNIQUE (fkid, cid, rcid),
-    FOREIGN KEY (fkid) REFERENCES mdb_constraints_foreign_key (fkid) ON UPDATE CASCADE,
-    FOREIGN KEY (cid) REFERENCES mdb_columns (id),
-    FOREIGN KEY (rcid) REFERENCES mdb_columns (id)
+    FOREIGN KEY (`fkid`) REFERENCES mdb_constraints_foreign_key (`fkid`) ON UPDATE CASCADE,
+    FOREIGN KEY (`cid`) REFERENCES mdb_columns (`id`),
+    FOREIGN KEY (`rcid`) REFERENCES mdb_columns (`id`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_constraints_unique`
 (
-    uid      SERIAL,
-    name     VARCHAR(255)    NOT NULL,
-    tid      BIGINT UNSIGNED NOT NULL,
-    position INT             NULL,
-    PRIMARY KEY (uid),
-    FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE
+    uid      VARCHAR(36)  NOT NULL DEFAULT UUID(),
+    name     VARCHAR(255) NOT NULL,
+    tid      VARCHAR(36)  NOT NULL,
+    position INT          NULL,
+    PRIMARY KEY (`uid`),
+    FOREIGN KEY (`tid`) REFERENCES mdb_tables (`id`) ON DELETE CASCADE
 );
 
 CREATE TABLE IF NOT EXISTS `mdb_constraints_unique_columns`
 (
-    id  SERIAL,
-    uid BIGINT UNSIGNED NOT NULL,
-    cid BIGINT UNSIGNED NOT NULL,
-    PRIMARY KEY (id),
-    FOREIGN KEY (uid) REFERENCES mdb_constraints_unique (uid),
-    FOREIGN KEY (cid) REFERENCES mdb_columns (id) ON DELETE CASCADE
+    id  VARCHAR(36) NOT NULL DEFAULT UUID(),
+    uid VARCHAR(36) NOT NULL,
+    cid VARCHAR(36) NOT NULL,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`uid`) REFERENCES mdb_constraints_unique (`uid`),
+    FOREIGN KEY (`cid`) REFERENCES mdb_columns (`id`) ON DELETE CASCADE
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_constraints_checks`
 (
-    id     SERIAL,
-    tid    BIGINT UNSIGNED NOT NULL,
-    checks VARCHAR(255)    NOT NULL,
-    PRIMARY KEY (id),
-    FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE
+    id     VARCHAR(36)  NOT NULL DEFAULT UUID(),
+    tid    VARCHAR(36)  NOT NULL,
+    checks VARCHAR(255) NOT NULL,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`tid`) REFERENCES mdb_tables (`id`) ON DELETE CASCADE
 ) WITH SYSTEM VERSIONING;
 
 
 CREATE TABLE IF NOT EXISTS `mdb_concepts`
 (
-    id          SERIAL,
-    uri         text         not null,
+    id          VARCHAR(36)  NOT NULL DEFAULT UUID(),
+    uri         TEXT         NOT NULL,
     name        VARCHAR(255) null,
     description TEXT         null,
-    created     timestamp    NOT NULL DEFAULT NOW(),
-    PRIMARY KEY (id),
+    created     TIMESTAMP    NOT NULL DEFAULT NOW(),
+    PRIMARY KEY (`id`),
     UNIQUE (uri(200))
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_units`
 (
-    id          SERIAL,
-    uri         text         not null,
+    id          VARCHAR(36)  NOT NULL DEFAULT UUID(),
+    uri         TEXT         NOT NULL,
     name        VARCHAR(255) null,
     description TEXT         null,
-    created     timestamp    NOT NULL DEFAULT NOW(),
-    PRIMARY KEY (id),
+    created     TIMESTAMP    NOT NULL DEFAULT NOW(),
+    PRIMARY KEY (`id`),
     UNIQUE (uri(200))
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_columns_concepts`
 (
-    id      BIGINT UNSIGNED NOT NULL,
-    cID     BIGINT UNSIGNED NOT NULL,
-    created timestamp       NOT NULL DEFAULT NOW(),
+    id      VARCHAR(36) NOT NULL DEFAULT UUID(),
+    cID     VARCHAR(36) NOT NULL,
+    created TIMESTAMP   NOT NULL DEFAULT NOW(),
     PRIMARY KEY (id, cid),
-    FOREIGN KEY (cID) REFERENCES mdb_columns (ID)
+    FOREIGN KEY (`cID`) REFERENCES mdb_columns (`ID`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_columns_units`
 (
-    id      BIGINT UNSIGNED NOT NULL,
-    cID     BIGINT UNSIGNED NOT NULL,
-    created timestamp       NOT NULL DEFAULT NOW(),
+    id      VARCHAR(36) NOT NULL DEFAULT UUID(),
+    cID     VARCHAR(36) NOT NULL,
+    created TIMESTAMP   NOT NULL DEFAULT NOW(),
     PRIMARY KEY (id, cID),
-    FOREIGN KEY (cID) REFERENCES mdb_columns (ID)
+    FOREIGN KEY (`cID`) REFERENCES mdb_columns (`ID`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_view`
 (
-    id               SERIAL,
-    vdbid            BIGINT UNSIGNED       NOT NULL,
-    vName            VARCHAR(64)           NOT NULL,
-    internal_name    VARCHAR(64)           NOT NULL,
-    Query            TEXT                  NOT NULL,
-    query_hash       VARCHAR(255)          NOT NULL,
-    Public           BOOLEAN               NOT NULL DEFAULT TRUE,
-    is_schema_public boolean               NOT NULL DEFAULT TRUE,
-    InitialView      BOOLEAN               NOT NULL,
-    created          timestamp             NOT NULL DEFAULT NOW(),
-    last_modified    timestamp,
-    owned_by         character varying(36) NOT NULL,
-    PRIMARY KEY (id),
-    FOREIGN KEY (vdbid) REFERENCES mdb_databases (id),
-    FOREIGN KEY (owned_by) REFERENCES mdb_users (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_banner_messages`
-(
-    id            SERIAL,
-    type          ENUM ('ERROR', 'WARNING', 'INFO') NOT NULL default 'INFO',
+    id               VARCHAR(36)  NOT NULL DEFAULT UUID(),
+    vdbid            VARCHAR(36)  NOT NULL,
+    vName            VARCHAR(64)  NOT NULL,
+    internal_name    VARCHAR(64)  NOT NULL,
+    Query            TEXT         NOT NULL,
+    query_hash       VARCHAR(255) NOT NULL,
+    Public           BOOLEAN      NOT NULL DEFAULT TRUE,
+    is_schema_public BOOLEAN      NOT NULL DEFAULT TRUE,
+    InitialView      BOOLEAN      NOT NULL,
+    created          TIMESTAMP    NOT NULL DEFAULT NOW(),
+    last_modified    TIMESTAMP,
+    owned_by         VARCHAR(36)  NOT NULL,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`vdbid`) REFERENCES mdb_databases (`id`),
+    FOREIGN KEY (`owned_by`) REFERENCES mdb_users (`id`)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_messages`
+(
+    id            VARCHAR(36)                       NOT NULL DEFAULT UUID(),
+    type          ENUM ('ERROR', 'WARNING', 'INFO') NOT NULL DEFAULT 'INFO',
     message       TEXT                              NOT NULL,
     link          TEXT                              NULL,
-    link_text     VARCHAR(255)                      NULL,
-    display_start timestamp                         NULL,
-    display_end   timestamp                         NULL,
-    PRIMARY KEY (id)
+    link_TEXT     VARCHAR(255)                      NULL,
+    display_start TIMESTAMP                         NULL,
+    display_end   TIMESTAMP                         NULL,
+    PRIMARY KEY (`id`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_ontologies`
 (
-    id              SERIAL,
-    prefix          VARCHAR(8) NOT NULL,
-    uri             TEXT       NOT NULL,
+    id              VARCHAR(36) NOT NULL DEFAULT UUID(),
+    prefix          VARCHAR(8)  NOT NULL,
+    uri             TEXT        NOT NULL,
     uri_pattern     TEXT,
-    sparql_endpoint TEXT       NULL,
-    rdf_path        TEXT       NULL,
-    last_modified   timestamp,
-    created         timestamp  NOT NULL DEFAULT NOW(),
-    UNIQUE (prefix),
+    sparql_endpoint TEXT        NULL,
+    rdf_path        TEXT        NULL,
+    last_modified   TIMESTAMP,
+    created         TIMESTAMP   NOT NULL DEFAULT NOW(),
+    UNIQUE (`prefix`),
     UNIQUE (uri(200)),
-    PRIMARY KEY (id)
+    PRIMARY KEY (`id`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_view_columns`
 (
-    id               SERIAL,
-    view_id          BIGINT UNSIGNED NOT NULL,
+    id               VARCHAR(36) NOT NULL DEFAULT UUID(),
+    view_id          VARCHAR(36) NOT NULL,
     name             VARCHAR(64),
-    internal_name    VARCHAR(64)     NOT NULL,
+    internal_name    VARCHAR(64) NOT NULL,
     column_type      ENUM ('CHAR','VARCHAR','BINARY','VARBINARY','TINYBLOB','TINYTEXT','TEXT','BLOB','MEDIUMTEXT','MEDIUMBLOB','LONGTEXT','LONGBLOB','ENUM','SET','BIT','TINYINT','BOOL','SMALLINT','MEDIUMINT','INT','BIGINT','FLOAT','DOUBLE','DECIMAL','DATE','DATETIME','TIMESTAMP','TIME','YEAR'),
-    ordinal_position INTEGER         NOT NULL,
+    ordinal_position INT         NOT NULL,
     size             BIGINT UNSIGNED,
     d                BIGINT UNSIGNED,
-    is_null_allowed  BOOLEAN         NOT NULL DEFAULT true,
-    PRIMARY KEY (id),
-    FOREIGN KEY (view_id) REFERENCES mdb_view (id) ON DELETE CASCADE,
+    is_null_allowed  BOOLEAN     NOT NULL DEFAULT TRUE,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`view_id`) REFERENCES mdb_view (`id`) ON DELETE CASCADE,
     UNIQUE (view_id, internal_name)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_identifiers`
 (
-    id                SERIAL,
-    dbid              BIGINT UNSIGNED                              NOT NULL,
-    qid               BIGINT UNSIGNED,
-    vid               BIGINT UNSIGNED,
-    tid               BIGINT UNSIGNED,
+    id                VARCHAR(36)                                  NOT NULL DEFAULT UUID(),
+    dbid              VARCHAR(36)                                  NOT NULL,
+    qid               VARCHAR(36)                                  NOT NULL,
+    vid               VARCHAR(36)                                  NOT NULL,
+    tid               VARCHAR(36)                                  NOT NULL,
     publisher         VARCHAR(255)                                 NOT NULL,
     language          VARCHAR(2),
-    publication_year  INTEGER                                      NOT NULL,
-    publication_month INTEGER,
-    publication_day   INTEGER,
+    publication_year  INT                                          NOT NULL,
+    publication_month INT,
+    publication_day   INT,
     identifier_type   ENUM ('DATABASE', 'SUBSET', 'VIEW', 'TABLE') NOT NULL,
     status            ENUM ('DRAFT', 'PUBLISHED')                  NOT NULL DEFAULT ('PUBLISHED'),
     query             TEXT,
@@ -398,154 +349,147 @@ CREATE TABLE IF NOT EXISTS `mdb_identifiers`
     created           TIMESTAMP                                    NOT NULL DEFAULT NOW(),
     owned_by          VARCHAR(36)                                  NOT NULL,
     last_modified     TIMESTAMP,
-    PRIMARY KEY (id), /* must be a single id from persistent identifier concept */
-    FOREIGN KEY (dbid) REFERENCES mdb_databases (id),
-    FOREIGN KEY (owned_by) REFERENCES mdb_users (id)
+    PRIMARY KEY (`id`), /* must be a single id from persistent identifier concept */
+    FOREIGN KEY (`dbid`) REFERENCES mdb_databases (`id`),
+    FOREIGN KEY (`owned_by`) REFERENCES mdb_users (`id`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_identifier_licenses`
 (
-    pid        BIGINT UNSIGNED NOT NULL,
-    license_id VARCHAR(255)    NOT NULL,
+    pid        VARCHAR(36)  NOT NULL DEFAULT UUID(),
+    license_id VARCHAR(255) NOT NULL,
     PRIMARY KEY (pid, license_id),
-    FOREIGN KEY (pid) REFERENCES mdb_identifiers (id),
-    FOREIGN KEY (license_id) REFERENCES mdb_licenses (identifier)
+    FOREIGN KEY (`pid`) REFERENCES mdb_identifiers (`id`),
+    FOREIGN KEY (`license_id`) REFERENCES mdb_licenses (`identifier`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_identifier_titles`
 (
-    id         SERIAL,
-    pid        BIGINT UNSIGNED NOT NULL,
-    title      text            NOT NULL,
+    id         VARCHAR(36) NOT NULL DEFAULT UUID(),
+    pid        VARCHAR(36) NOT NULL,
+    title      TEXT        NOT NULL,
     title_type ENUM ('ALTERNATIVE_TITLE', 'SUBTITLE', 'TRANSLATED_TITLE', 'OTHER'),
     language   VARCHAR(2),
-    PRIMARY KEY (id),
-    FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`pid`) REFERENCES mdb_identifiers (`id`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_identifier_funders`
 (
-    id                     SERIAL,
-    pid                    BIGINT UNSIGNED NOT NULL,
-    funder_name            VARCHAR(255)    NOT NULL,
+    id                     VARCHAR(36)  NOT NULL DEFAULT UUID(),
+    pid                    VARCHAR(36)  NOT NULL,
+    funder_name            VARCHAR(255) NOT NULL,
     funder_identifier      TEXT,
     funder_identifier_type ENUM ('CROSSREF_FUNDER_ID', 'GRID', 'ISNI', 'ROR', 'OTHER'),
-    scheme_uri             text,
+    scheme_uri             TEXT,
     award_number           VARCHAR(255),
-    award_title            text,
+    award_title            TEXT,
     language               VARCHAR(255),
-    PRIMARY KEY (id),
-    FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`pid`) REFERENCES mdb_identifiers (`id`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_identifier_descriptions`
 (
-    id               SERIAL,
-    pid              BIGINT UNSIGNED NOT NULL,
-    description      text            NOT NULL,
+    id               VARCHAR(36) NOT NULL DEFAULT UUID(),
+    pid              VARCHAR(36) NOT NULL,
+    description      TEXT        NOT NULL,
     description_type ENUM ('ABSTRACT', 'METHODS', 'SERIES_INFORMATION', 'TABLE_OF_CONTENTS', 'TECHNICAL_INFO', 'OTHER'),
     language         VARCHAR(2),
-    PRIMARY KEY (id),
-    FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`pid`) REFERENCES mdb_identifiers (`id`)
 ) WITH SYSTEM VERSIONING;
 
-CREATE TABLE IF NOT EXISTS `mdb_related_identifiers`
+CREATE TABLE IF NOT EXISTS `mdb_identifier_related`
 (
-    id       SERIAL,
-    pid      BIGINT UNSIGNED                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      NOT NULL,
-    value    varchar(255)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         NOT NULL,
+    id       VARCHAR(36)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          NOT NULL DEFAULT UUID(),
+    pid      VARCHAR(36)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          NOT NULL DEFAULT UUID(),
+    value    VARCHAR(255)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         NOT NULL,
     type     ENUM ('DOI','URL','URN','ARK','ARXIV','BIBCODE','EAN13','EISSN','HANDLE','IGSN','ISBN','ISTC','LISSN','LSID','PMID','PURL','UPC','W3ID')                                                                                                                                                                                                                                                                                                                                                                                                                             NOT NULL,
     relation ENUM ('IS_CITED_BY','CITES','IS_SUPPLEMENT_TO','IS_SUPPLEMENTED_BY','IS_CONTINUED_BY','CONTINUES','IS_DESCRIBED_BY','DESCRIBES','HAS_METADATA','IS_METADATA_FOR','HAS_VERSION','IS_VERSION_OF','IS_NEW_VERSION_OF','IS_PREVIOUS_VERSION_OF','IS_PART_OF','HAS_PART','IS_PUBLISHED_IN','IS_REFERENCED_BY','REFERENCES','IS_DOCUMENTED_BY','DOCUMENTS','IS_COMPILED_BY','COMPILES','IS_VARIANT_FORM_OF','IS_ORIGINAL_FORM_OF','IS_IDENTICAL_TO','IS_REVIEWED_BY','REVIEWS','IS_DERIVED_FROM','IS_SOURCE_OF','IS_REQUIRED_BY','REQUIRES','IS_OBSOLETED_BY','OBSOLETES') NOT NULL,
-    PRIMARY KEY (id), /* must be a single id from persistent identifier concept */
-    FOREIGN KEY (pid) REFERENCES mdb_identifiers (id),
+    PRIMARY KEY (`id`), /* must be a single id from persistent identifier concept */
+    FOREIGN KEY (`pid`) REFERENCES mdb_identifiers (`id`),
     UNIQUE (pid, value)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_identifier_creators`
 (
-    id                                SERIAL,
-    pid                               BIGINT UNSIGNED NOT NULL,
-    given_names                       text,
-    family_name                       text,
-    creator_name                      VARCHAR(255)    NOT NULL,
-    name_type                         ENUM ('PERSONAL', 'ORGANIZATIONAL') default 'PERSONAL',
-    name_identifier                   text,
+    id                                VARCHAR(36)  NOT NULL               DEFAULT UUID(),
+    pid                               VARCHAR(36)  NOT NULL,
+    given_names                       TEXT,
+    family_name                       TEXT,
+    creator_name                      VARCHAR(255) NOT NULL,
+    name_type                         ENUM ('PERSONAL', 'ORGANIZATIONAL') DEFAULT 'PERSONAL',
+    name_identifier                   TEXT,
     name_identifier_scheme            ENUM ('ROR', 'GRID', 'ISNI', 'ORCID'),
-    name_identifier_scheme_uri        text,
+    name_identifier_scheme_uri        TEXT,
     affiliation                       VARCHAR(255),
-    affiliation_identifier            text,
+    affiliation_identifier            TEXT,
     affiliation_identifier_scheme     ENUM ('ROR', 'GRID', 'ISNI'),
-    affiliation_identifier_scheme_uri text,
-    PRIMARY KEY (id),
-    FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_update`
-(
-    uUserID character varying(255) NOT NULL,
-    uDBID   BIGINT UNSIGNED        NOT NULL,
-    created timestamp              NOT NULL DEFAULT NOW(),
-    PRIMARY KEY (uUserID, uDBID),
-    FOREIGN KEY (uDBID) REFERENCES mdb_databases (id)
+    affiliation_identifier_scheme_uri TEXT,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`pid`) REFERENCES mdb_identifiers (`id`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_access`
 (
-    aUserID  character varying(255) NOT NULL,
-    aDBID    BIGINT UNSIGNED REFERENCES mdb_databases (id),
+    aUserID  VARCHAR(255) NOT NULL,
+    aDBID    VARCHAR(36)  NOT NULL,
     attime   TIMESTAMP,
     download BOOLEAN,
-    created  timestamp              NOT NULL DEFAULT NOW(),
-    PRIMARY KEY (aUserID, aDBID)
+    created  TIMESTAMP    NOT NULL DEFAULT NOW(),
+    PRIMARY KEY (aUserID, aDBID),
+    FOREIGN KEY (`aDBID`) REFERENCES mdb_databases (`id`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_have_access`
 (
-    user_id     character varying(36)                   NOT NULL,
-    database_id BIGINT UNSIGNED REFERENCES mdb_databases (id),
+    user_id     VARCHAR(36)                             NOT NULL,
+    database_id VARCHAR(36)                             NOT NULL,
     access_type ENUM ('READ', 'WRITE_OWN', 'WRITE_ALL') NOT NULL,
-    created     timestamp                               NOT NULL DEFAULT NOW(),
+    created     TIMESTAMP                               NOT NULL DEFAULT NOW(),
     PRIMARY KEY (user_id, database_id),
-    FOREIGN KEY (user_id) REFERENCES mdb_users (id)
+    FOREIGN KEY (`database_id`) REFERENCES mdb_databases (`id`),
+    FOREIGN KEY (`user_id`) REFERENCES mdb_users (`id`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_image_types`
 (
-    id            SERIAL,
-    image_id      BIGINT UNSIGNED NOT NULL,
-    display_name  varchar(255)    NOT NULL,
-    value         varchar(255)    NOT NULL,
+    id            VARCHAR(36)  NOT NULL DEFAULT UUID(),
+    image_id      VARCHAR(36)  NOT NULL,
+    display_name  VARCHAR(255) NOT NULL,
+    value         VARCHAR(255) NOT NULL,
     size_min      INT UNSIGNED,
     size_max      INT UNSIGNED,
-    size_default  INT UNSIGNED,
-    size_required BOOLEAN COMMENT 'When setting NULL, the service assumes the data type has no size',
+    size_DEFAULT  INT UNSIGNED,
+    size_required BOOLEAN comment 'When setting NULL, the service assumes the data type has no size',
     size_step     INT UNSIGNED,
     d_min         INT UNSIGNED,
     d_max         INT UNSIGNED,
-    d_default     INT UNSIGNED,
-    d_required    BOOLEAN COMMENT 'When setting NULL, the service assumes the data type has no d',
+    d_DEFAULT     INT UNSIGNED,
+    d_required    BOOLEAN comment 'When setting NULL, the service assumes the data type has no d',
     d_step        INT UNSIGNED,
     type_hint     TEXT,
     data_hint     TEXT,
-    documentation TEXT            NOT NULL,
-    is_generated  BOOLEAN         NOT NULL,
-    is_quoted     BOOLEAN         NOT NULL,
-    is_buildable  BOOLEAN         NOT NULL,
-    PRIMARY KEY (id),
-    FOREIGN KEY (image_id) REFERENCES `mdb_images` (`id`),
-    UNIQUE (value)
+    documentation TEXT         NOT NULL,
+    is_generated  BOOLEAN      NOT NULL,
+    is_quoted     BOOLEAN      NOT NULL,
+    is_buildable  BOOLEAN      NOT NULL,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`image_id`) REFERENCES `mdb_images` (`id`),
+    UNIQUE (`value`)
 ) WITH SYSTEM VERSIONING;
 
 CREATE TABLE IF NOT EXISTS `mdb_image_operators`
 (
-    id            SERIAL,
-    image_id      BIGINT UNSIGNED NOT NULL,
-    display_name  varchar(255)    NOT NULL,
-    value         varchar(255)    NOT NULL,
-    documentation TEXT            NOT NULL,
-    PRIMARY KEY (id),
-    FOREIGN KEY (image_id) REFERENCES `mdb_images` (`id`),
-    UNIQUE (value)
+    id            VARCHAR(36)  NOT NULL DEFAULT UUID(),
+    image_id      VARCHAR(36)  NOT NULL,
+    display_name  VARCHAR(255) NOT NULL,
+    value         VARCHAR(255) NOT NULL,
+    documentation TEXT         NOT NULL,
+    PRIMARY KEY (`id`),
+    FOREIGN KEY (`image_id`) REFERENCES `mdb_images` (`id`),
+    UNIQUE (image_id, value)
 ) WITH SYSTEM VERSIONING;
 
 COMMIT;
@@ -558,110 +502,121 @@ VALUES ('CC0-1.0', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode'
        ('CC-BY-4.0', 'https://creativecommons.org/licenses/by/4.0/legalcode',
         'The Creative Commons Attribution license allows re-distribution and re-use of a licensed work on the condition that the creator is appropriately credited.');
 
-INSERT INTO `mdb_images` (name, registry, version, default_port, dialect, driver_class, jdbc_method)
-VALUES ('mariadb', 'docker.io', '11.1.3', 3306, 'org.hibernate.dialect.MariaDBDialect', 'org.mariadb.jdbc.Driver',
-        'mariadb');
+INSERT INTO `mdb_images` (id, name, registry, version, DEFAULT_port, dialect, driver_class, jdbc_method)
+VALUES ('d79cb089-363c-488b-9717-649e44d8fcc5', 'mariadb', 'docker.io', '11.1.3', 3306,
+        'org.hibernate.dialect.MariaDBDialect', 'org.mariadb.jdbc.Driver', 'mariadb');
 
-INSERT INTO `mdb_image_types` (image_id, display_name, value, size_min, size_max, size_default, size_required,
-                               size_step, d_min, d_max, d_default, d_required, d_step, type_hint, data_hint,
+INSERT INTO `mdb_image_types` (image_id, display_name, value, size_min, size_max, size_DEFAULT, size_required,
+                               size_step, d_min, d_max, d_DEFAULT, d_required, d_step, type_hint, data_hint,
                                documentation, is_quoted, is_buildable, is_generated)
-VALUES (1, 'BIGINT(size)', 'bigint', 0, null, null, false, 1, null, null, null, null, null, null, null,
-        'https://mariadb.com/kb/en/bigint/', false, true, false),
-       (1, 'BINARY(size)', 'binary', 0, 255, 255, true, 1, null, null, null, null, null, 'size in Bytes', null,
-        'https://mariadb.com/kb/en/binary/', false, true, false),
-       (1, 'BIT(size)', 'bit', 0, 64, null, false, 1, null, null, null, null, null, null, null,
-        'https://mariadb.com/kb/en/bit/', false, true, false),
-       (1, 'BLOB(size)', 'blob', 0, 65535, null, false, 1, null, null, null, null, null, 'size in Bytes', null,
-        'https://mariadb.com/kb/en/blob/', false, false, false),
-       (1, 'BOOL', 'bool', null, null, null, null, null, null, null, null, null, null, null, null,
-        'https://mariadb.com/kb/en/bool/', false, true, false),
-       (1, 'CHAR(size)', 'char', 0, 255, 255, false, 1, null, null, null, null, null, null, null,
-        'https://mariadb.com/kb/en/char/', false, true, false),
-       (1, 'DATE', 'date', null, null, null, null, null, null, null, null, null, null,
-        'min. 1000-01-01, max. 9999-12-31', 'e.g. YYYY-MM-DD, YY-MM-DD, YYMMDD, YYYY/MM/DD',
-        'https://mariadb.com/kb/en/date/', true, true, false),
-       (1, 'DATETIME(fsp)', 'datetime', 0, 6, null, null, 1, null, null, null, null, null,
-        'fsp=microsecond precision, min. 1000-01-01 00:00:00.0, max. 9999-12-31 23:59:59.9',
+VALUES ('d79cb089-363c-488b-9717-649e44d8fcc5', 'BIGINT(size)', 'bigint', 0, null, null, FALSE, 1, null, null, null,
+        null, null, null, null, 'https://mariadb.com/kb/en/bigint/', FALSE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'BINARY(size)', 'binary', 0, 255, 255, TRUE, 1, null, null, null, null,
+        null, 'size in Bytes', null, 'https://mariadb.com/kb/en/binary/', FALSE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'BIT(size)', 'bit', 0, 64, null, FALSE, 1, null, null, null, null, null,
+        null, null, 'https://mariadb.com/kb/en/bit/', FALSE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'BLOB(size)', 'blob', 0, 65535, null, FALSE, 1, null, null, null, null,
+        null, 'size in Bytes', null, 'https://mariadb.com/kb/en/blob/', FALSE, FALSE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'BOOL', 'bool', null, null, null, null, null, null, null, null, null,
+        null, null, null, 'https://mariadb.com/kb/en/bool/', FALSE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'CHAR(size)', 'char', 0, 255, 255, FALSE, 1, null, null, null, null,
+        null, null, null, 'https://mariadb.com/kb/en/char/', FALSE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'DATE', 'date', null, null, null, null, null, null, null, null, null,
+        null, 'min. 1000-01-01, max. 9999-12-31', 'e.g. YYYY-MM-DD, YY-MM-DD, YYMMDD, YYYY/MM/DD',
+        'https://mariadb.com/kb/en/date/', TRUE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'DATETIME(fsp)', 'datetime', 0, 6, null, null, 1, null, null, null,
+        null, null, 'fsp=microsecond precision, min. 1000-01-01 00:00:00.0, max. 9999-12-31 23:59:59.9',
         'e.g. YYYY-MM-DD HH:MM:SS, YY-MM-DD HH:MM:SS, YYYYMMDDHHMMSS, YYMMDDHHMMSS, YYYYMMDD, YYMMDD',
-        'https://mariadb.com/kb/en/datetime/', true, true, false),
-       (1, 'DECIMAL(size, d)', 'decimal', 0, 65, null, false, 1, 0, 38, null, false, null, null, null,
-        'https://mariadb.com/kb/en/decimal/', false, true, false),
-       (1, 'DOUBLE(size, d)', 'double', null, null, null, false, null, null, null, null, false, null, null, null,
-        'https://mariadb.com/kb/en/double/', false, true, false),
-       (1, 'ENUM(v1,v2,...)', 'enum', null, null, null, null, null, null, null, null, null, null, null,
-        'e.g. value1, value2, ...', 'https://mariadb.com/kb/en/enum/', true, true, false),
-       (1, 'FLOAT(size)', 'float', null, null, null, false, null, null, null, null, null, null, null, null,
-        'https://mariadb.com/kb/en/float/', false, true, false),
-       (1, 'INT(size)', 'int', null, null, null, false, null, null, null, null, null, null, 'size in Bytes', null,
-        'https://mariadb.com/kb/en/int/', false, true, false),
-       (1, 'LONGBLOB', 'longblob', null, null, null, null, null, null, null, null, null, null, 'max. 3.999 GiB', null,
-        'https://mariadb.com/kb/en/longblob/', false, true, false),
-       (1, 'LONGTEXT', 'longtext', null, null, null, null, null, null, null, null, null, null, 'max. 3.999 GiB', null,
-        'https://mariadb.com/kb/en/longtext/', true, true, false),
-       (1, 'MEDIUMBLOB', 'mediumblob', null, null, null, null, null, null, null, null, null, null, 'max. 15.999 MiB',
-        null, 'https://mariadb.com/kb/en/mediumblob/', false, true, false),
-       (1, 'MEDIUMINT', 'mediumint', null, null, null, null, null, null, null, null, null, null, 'size in Bytes', null,
-        'https://mariadb.com/kb/en/mediumint/', false, true, false),
-       (1, 'MEDIUMTEXT', 'mediumtext', null, null, null, null, null, null, null, null, null, null, 'size in Bytes',
-        null, 'https://mariadb.com/kb/en/mediumtext/', true, true, false),
-       (1, 'SERIAL', 'serial', null, null, null, null, null, null, null, null, null, null, null,
-        null, 'https://mariadb.com/kb/en/bigint/', true, true, true),
-       (1, 'SET(v1,v2,...)', 'set', null, null, null, null, null, null, null, null, null, null, null,
-        'e.g. value1, value2, ...', 'https://mariadb.com/kb/en/set/', true, true, false),
-       (1, 'SMALLINT(size)', 'smallint', 0, null, null, false, null, null, null, null, null, null, 'size in Bytes',
-        null, 'https://mariadb.com/kb/en/smallint/', false, true, false),
-       (1, 'TEXT(size)', 'text', 0, null, null, false, null, null, null, null, null, null, 'size in Bytes', null,
-        'https://mariadb.com/kb/en/text/', true, true, false),
-       (1, 'TIME(fsp)', 'time', 0, 6, 0, false, null, null, null, null, null, null,
+        'https://mariadb.com/kb/en/datetime/', TRUE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'DECIMAL(size, d)', 'decimal', 0, 65, null, FALSE, 1, 0, 38, null,
+        FALSE, null, null, null, 'https://mariadb.com/kb/en/decimal/', FALSE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'DOUBLE(size, d)', 'double', null, null, null, FALSE, null, null, null,
+        null, FALSE, null, null, null, 'https://mariadb.com/kb/en/double/', FALSE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'ENUM(v1,v2,...)', 'ENUM', null, null, null, null, null, null, null,
+        null, null, null, null, 'e.g. value1, value2, ...', 'https://mariadb.com/kb/en/ENUM/', TRUE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'FLOAT(size)', 'float', null, null, null, FALSE, null, null, null, null,
+        null, null, null, null, 'https://mariadb.com/kb/en/float/', FALSE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'INT(size)', 'int', null, null, null, FALSE, null, null, null, null,
+        null, null, 'size in Bytes', null, 'https://mariadb.com/kb/en/int/', FALSE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'LONGBLOB', 'longblob', null, null, null, null, null, null, null, null,
+        null, null, 'max. 3.999 GiB', null, 'https://mariadb.com/kb/en/longblob/', FALSE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'LONGTEXT', 'longTEXT', null, null, null, null, null, null, null, null,
+        null, null, 'max. 3.999 GiB', null, 'https://mariadb.com/kb/en/longTEXT/', TRUE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'MEDIUMBLOB', 'mediumblob', null, null, null, null, null, null, null,
+        null, null, null, 'max. 15.999 MiB', null, 'https://mariadb.com/kb/en/mediumblob/', FALSE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'MEDIUMINT', 'mediumint', null, null, null, null, null, null, null,
+        null, null, null, 'size in Bytes', null, 'https://mariadb.com/kb/en/mediumint/', FALSE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'MEDIUMTEXT', 'mediumTEXT', null, null, null, null, null, null, null,
+        null, null, null, 'size in Bytes', null, 'https://mariadb.com/kb/en/mediumTEXT/', TRUE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'SERIAL', 'serial', null, null, null, null, null, null, null, null,
+        null, null, null, null, 'https://mariadb.com/kb/en/bigint/', TRUE, TRUE, TRUE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'SET(v1,v2,...)', 'set', null, null, null, null, null, null, null, null,
+        null, null, null, 'e.g. value1, value2, ...', 'https://mariadb.com/kb/en/set/', TRUE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'SMALLINT(size)', 'smallint', 0, null, null, FALSE, null, null, null,
+        null, null, null, 'size in Bytes', null, 'https://mariadb.com/kb/en/smallint/', FALSE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'TEXT(size)', 'TEXT', 0, null, null, FALSE, null, null, null, null,
+        null, null, 'size in Bytes', null, 'https://mariadb.com/kb/en/TEXT/', TRUE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'TIME(fsp)', 'time', 0, 6, 0, FALSE, null, null, null, null, null, null,
         'fsp=microsecond precision, min. 0, max. 6', 'e.g. HH:MM:SS, HH:MM, HHMMSS, H:M:S',
-        'https://mariadb.com/kb/en/time/', true, true, false),
-       (1, 'TIMESTAMP(fsp)', 'timestamp', 0, 6, 0, false, null, null, null, null, null, null,
-        'fsp=microsecond precision, min. 0, max. 6',
+        'https://mariadb.com/kb/en/time/', TRUE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'TIMESTAMP(fsp)', 'timestamp', 0, 6, 0, FALSE, null, null, null, null,
+        null, null, 'fsp=microsecond precision, min. 0, max. 6',
         'e.g. YYYY-MM-DD HH:MM:SS, YY-MM-DD HH:MM:SS, YYYYMMDDHHMMSS, YYMMDDHHMMSS, YYYYMMDD, YYMMDD',
-        'https://mariadb.com/kb/en/timestamp/', true, true, false),
-       (1, 'TINYBLOB', 'tinyblob', null, null, null, null, null, null, null, null, null, null, null,
-        'fsp=microsecond precision, min. 0, max. 6', 'https://mariadb.com/kb/en/timestamp/', false, true, false),
-       (1, 'TINYINT(size)', 'tinyint', 0, null, null, false, null, null, null, null, null, null, null,
-        'size in Bytes', 'https://mariadb.com/kb/en/tinyint/', false, true, false),
-       (1, 'TINYTEXT', 'tinytext', null, null, null, null, null, null, null, null, null, null, null,
-        'max. 255 characters', 'https://mariadb.com/kb/en/tinytext/', true, true, false),
-       (1, 'YEAR', 'year', 2, 4, null, false, 2, null, null, null, null, null, 'min. 1901, max. 2155', 'e.g. YYYY, YY',
-        'https://mariadb.com/kb/en/year/', false, true, false),
-       (1, 'VARBINARY(size)', 'varbinary', 0, null, null, true, null, null, null, null, null, null, null,
-        null, 'https://mariadb.com/kb/en/varbinary/', false, true, false),
-       (1, 'VARCHAR(size)', 'varchar', 0, 65532, 255, true, null, null, null, null, null, null, null,
-        null, 'https://mariadb.com/kb/en/varchar/', false, true, false);
+        'https://mariadb.com/kb/en/timestamp/', TRUE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'TINYBLOB', 'tinyblob', null, null, null, null, null, null, null, null,
+        null, null, null, 'fsp=microsecond precision, min. 0, max. 6', 'https://mariadb.com/kb/en/timestamp/', FALSE,
+        TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'TINYINT(size)', 'tinyint', 0, null, null, FALSE, null, null, null,
+        null, null, null, null, 'size in Bytes', 'https://mariadb.com/kb/en/tinyint/', FALSE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'TINYTEXT', 'tinyTEXT', null, null, null, null, null, null, null, null,
+        null, null, null, 'max. 255 characters', 'https://mariadb.com/kb/en/tinyTEXT/', TRUE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'YEAR', 'year', 2, 4, null, FALSE, 2, null, null, null, null, null,
+        'min. 1901, max. 2155', 'e.g. YYYY, YY', 'https://mariadb.com/kb/en/year/', FALSE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'VARBINARY(size)', 'varbinary', 0, null, null, TRUE, null, null, null,
+        null, null, null, null, null, 'https://mariadb.com/kb/en/varbinary/', FALSE, TRUE, FALSE),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'VARCHAR(size)', 'VARCHAR', 0, 65532, 255, TRUE, null, null, null, null,
+        null, null, null, null, 'https://mariadb.com/kb/en/VARCHAR/', FALSE, TRUE, FALSE);
+
 
 INSERT INTO `mdb_image_operators` (image_id, display_name, value, documentation)
-VALUES (1, 'Equal operator', '=', 'https://mariadb.com/kb/en/assignment-operators-assignment-operator/'),
-       (1, 'NULL-safe equal operator', '<=>', 'https://mariadb.com/kb/en/null-safe-equal/'),
-       (1, 'Less-than operator', '<', 'https://mariadb.com/kb/en/less-than/'),
-       (1, 'Less than or equal operator', '<=', 'https://mariadb.com/kb/en/less-than-or-equal/'),
-       (1, 'Greater-than operator', '>', 'https://mariadb.com/kb/en/greater-than/'),
-       (1, 'Greater than or equal operator', '>=', 'https://mariadb.com/kb/en/greater-than-or-equal/'),
-       (1, 'Not equal operator', '!=', 'https://mariadb.com/kb/en/not-equal/'),
-       (1, 'Addition operator', '+', 'https://mariadb.com/kb/en/addition-operator/'),
-       (1, 'Division operator', '/', 'https://mariadb.com/kb/en/division-operator/'),
-       (1, 'Modulo operator', '%', 'https://mariadb.com/kb/en/modulo-operator/'),
-       (1, 'Multiplication operator', '*', 'https://mariadb.com/kb/en/multiplication-operator/'),
-       (1, 'Subtraction operator', '-', 'https://mariadb.com/kb/en/subtraction-operator-/'),
-       (1, 'LIKE', 'LIKE', 'https://mariadb.com/kb/en/like/'),
-       (1, 'NOT LIKE', 'NOT LIKE', 'https://mariadb.com/kb/en/not-like/'),
-       (1, 'IN', 'IN', 'https://mariadb.com/kb/en/in/'),
-       (1, 'NOT IN', 'NOT IN', 'https://mariadb.com/kb/en/not-in/'),
-       (1, 'IS', 'IS', 'https://mariadb.com/kb/en/is/'),
-       (1, 'IS NOT', 'IS NOT', 'https://mariadb.com/kb/en/is-not/'),
-       (1, 'IS NOT NULL', 'IS NOT NULL', 'https://mariadb.com/kb/en/is-not-null/'),
-       (1, 'IS NULL', 'IS NULL', 'https://mariadb.com/kb/en/is-null/'),
-       (1, 'ISNULL', 'ISNULL', 'https://mariadb.com/kb/en/isnull/'),
-       (1, 'REGEXP', 'REGEXP', 'https://mariadb.com/kb/en/regexp/'),
-       (1, 'NOT REGEXP', 'NOT REGEXP', 'https://mariadb.com/kb/en/not-regexp/'),
-       (1, 'Bitwise AND', '&', 'https://mariadb.com/kb/en/bitwise_and/'),
-       (1, 'Bitwise OR', '|', 'https://mariadb.com/kb/en/bitwise-or/'),
-       (1, 'Bitwise XOR', '^', 'https://mariadb.com/kb/en/bitwise-xor/'),
-       (1, 'Bitwise NOT', '~', 'https://mariadb.com/kb/en/bitwise-not/'),
-       (1, 'Left shift', '<<', 'https://mariadb.com/kb/en/shift-left/'),
-       (1, 'Right shift', '>>', 'https://mariadb.com/kb/en/shift-right/');
+VALUES ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Equal operator', '=',
+        'https://mariadb.com/kb/en/assignment-operators-assignment-operator/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'NULL-safe equal operator', '<=>',
+        'https://mariadb.com/kb/en/null-safe-equal/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Less-than operator', '<', 'https://mariadb.com/kb/en/less-than/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Less than or equal operator', '<=',
+        'https://mariadb.com/kb/en/less-than-or-equal/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Greater-than operator', '>',
+        'https://mariadb.com/kb/en/greater-than/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Greater than or equal operator', '>=',
+        'https://mariadb.com/kb/en/greater-than-or-equal/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Not equal operator', '!=', 'https://mariadb.com/kb/en/not-equal/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Addition operator', '+',
+        'https://mariadb.com/kb/en/addition-operator/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Division operator', '/',
+        'https://mariadb.com/kb/en/division-operator/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Modulo operator', '%', 'https://mariadb.com/kb/en/modulo-operator/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Multiplication operator', '*',
+        'https://mariadb.com/kb/en/multiplication-operator/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Subtraction operator', '-',
+        'https://mariadb.com/kb/en/subtraction-operator-/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'LIKE', 'LIKE', 'https://mariadb.com/kb/en/like/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'NOT LIKE', 'NOT LIKE', 'https://mariadb.com/kb/en/not-like/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'IN', 'IN', 'https://mariadb.com/kb/en/in/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'NOT IN', 'NOT IN', 'https://mariadb.com/kb/en/not-in/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'IS', 'IS', 'https://mariadb.com/kb/en/is/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'IS NOT', 'IS NOT', 'https://mariadb.com/kb/en/is-not/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'IS NOT NULL', 'IS NOT NULL', 'https://mariadb.com/kb/en/is-not-null/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'IS NULL', 'IS NULL', 'https://mariadb.com/kb/en/is-null/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'ISNULL', 'ISNULL', 'https://mariadb.com/kb/en/isnull/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'REGEXP', 'REGEXP', 'https://mariadb.com/kb/en/regexp/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'NOT REGEXP', 'NOT REGEXP', 'https://mariadb.com/kb/en/not-regexp/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Bitwise AND', '&', 'https://mariadb.com/kb/en/bitwise_and/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Bitwise OR', '|', 'https://mariadb.com/kb/en/bitwise-or/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Bitwise XOR', '^', 'https://mariadb.com/kb/en/bitwise-xor/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Bitwise NOT', '~', 'https://mariadb.com/kb/en/bitwise-not/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Left shift', '<<', 'https://mariadb.com/kb/en/shift-left/'),
+       ('d79cb089-363c-488b-9717-649e44d8fcc5', 'Right shift', '>>', 'https://mariadb.com/kb/en/shift-right/');
 
 INSERT
 INTO `mdb_ontologies` (prefix, uri, uri_pattern, sparql_endpoint, rdf_path)