diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
index 54df39999b57ed5d5f2ef3d95de387fa732c8420..eea4d65320ed1002ebcff6c6120e3c372a2e0027 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
@@ -3,6 +3,7 @@ package at.tuwien.service;
 import at.tuwien.api.database.ViewColumnDto;
 import at.tuwien.api.database.ViewDto;
 import at.tuwien.api.database.query.QueryResultDto;
+import at.tuwien.api.database.table.columns.ColumnDto;
 import at.tuwien.config.MariaDbConfig;
 import at.tuwien.config.MariaDbContainerConfig;
 import at.tuwien.exception.*;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java
index 28204fbe2fa97f8f72e15ed9becc41b6424730f7..610b452d348bc3278565c46d6d8bd4eb48eb640c 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java
@@ -362,6 +362,12 @@ public interface MariaDbMapper {
                                 .append(ck)
                                 .append(")"));
             }
+            if (!data.getDescription().isBlank()) {
+                /* create table comments */
+                stringBuilder.append(" COMMENT \"")
+                        .append(data.getDescription())
+                        .append("\"");
+            }
         }
         stringBuilder.append(") WITH SYSTEM VERSIONING");
         if (data.getDescription() != null && !data.getDescription().isBlank()) {
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceMariaDbImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceMariaDbImpl.java
index 2d91dcb8f4612e6cca1ba77f1a73aa4670c5ecbe..4ee483ad5e11b4bbc3499e0d98f255e666bec1ea 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceMariaDbImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceMariaDbImpl.java
@@ -1,20 +1,26 @@
 package at.tuwien.service.impl;
 
 import at.tuwien.api.container.internal.PrivilegedContainerDto;
+import at.tuwien.api.database.DatabaseDto;
+import at.tuwien.api.database.ViewDto;
 import at.tuwien.api.database.internal.CreateDatabaseDto;
 import at.tuwien.api.database.internal.PrivilegedDatabaseDto;
+import at.tuwien.api.database.table.TableDto;
 import at.tuwien.api.user.UserDto;
 import at.tuwien.api.user.internal.UpdateUserPasswordDto;
 import at.tuwien.config.RabbitConfig;
 import at.tuwien.exception.*;
 import at.tuwien.mapper.MariaDbMapper;
 import at.tuwien.service.DatabaseService;
+import at.tuwien.service.SchemaService;
 import com.mchange.v2.c3p0.ComboPooledDataSource;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 
 @Log4j2
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/DatabaseMapper.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/DatabaseMapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/dbrepo-ui/locales/de-AT.json b/dbrepo-ui/locales/de-AT.json
index bf84b689328bfc34624217596e6e269db1c2eb3a..263dbe62fc5ccdbd36d70a549bd8a433122c78ec 100644
--- a/dbrepo-ui/locales/de-AT.json
+++ b/dbrepo-ui/locales/de-AT.json
@@ -1213,6 +1213,10 @@
       "tables": "Die Metadaten der Datenbanktabellen wurden erfolgreich aktualisiert",
       "views": "Metadaten der Datenbankansichten wurden erfolgreich aktualisiert"
     },
+    "schema": {
+      "tables": "Die Metadaten der Datenbanktabellen wurden erfolgreich aktualisiert.",
+      "views": "Metadaten der Datenbankansichten wurden erfolgreich aktualisiert."
+    },
     "database": {
       "upload": "Datenbankbild erfolgreich hochgeladen",
       "transfer": "Der Datenbankeigentümer wurde erfolgreich übertragen",
diff --git a/dbrepo-ui/locales/en-US.json b/dbrepo-ui/locales/en-US.json
index 54d7a64a7adf6c8db89b95b7ee9e4e54a7691940..a14d7292831b1f2e81009be3d39f9051b99c6b8d 100644
--- a/dbrepo-ui/locales/en-US.json
+++ b/dbrepo-ui/locales/en-US.json
@@ -1213,6 +1213,10 @@
       "tables": "Successfully refreshed database tables metadata",
       "views": "Successfully refreshed database views metadata"
     },
+    "schema": {
+      "tables": "Successfully refreshed database tables metadata.",
+      "views": "Successfully refreshed database views metadata."
+    },
     "database": {
       "upload": "Successfully uploaded database image",
       "transfer": "Successfully transferred the database owner",
diff --git a/mkdocs.yml b/mkdocs.yml
index b554e282e2d9a6aa694de49f4a346a9134975d47..1455b24f4e3fd6bfb20e5f0f855ce7cdb1d9e82f 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,4 +1,5 @@
 site_name: Database Repository
+site_url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/
 repo_url: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services
 repo_name: fda-services
 site_author: Research Unit Data Science, Technische Universität Wien