diff --git a/.jupyter/api_authentication/models/column_dto.py b/.jupyter/api_authentication/models/column_dto.py
deleted file mode 100644
index 04d7b1abfcfd9e184e3f24cc68e72b0d725e0beb..0000000000000000000000000000000000000000
--- a/.jupyter/api_authentication/models/column_dto.py
+++ /dev/null
@@ -1,514 +0,0 @@
-# coding: utf-8
-
-"""
-    Database Repository Authentication Service API
-
-    Service that manages the authentication  # noqa: E501
-
-    OpenAPI spec version: 1.1.0-alpha
-    Contact: andreas.rauber@tuwien.ac.at
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-class ColumnDto(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'id': 'int',
-        'name': 'str',
-        'unique': 'bool',
-        'references': 'str',
-        'internal_name': 'str',
-        'date_format': 'ImageDateDto',
-        'auto_generated': 'bool',
-        'is_primary_key': 'bool',
-        'column_type': 'str',
-        'column_concept': 'ConceptDto',
-        'decimal_digits_before': 'int',
-        'decimal_digits_after': 'int',
-        'is_null_allowed': 'bool',
-        'check_expression': 'str',
-        'foreign_key': 'str',
-        'enum_values': 'list[str]'
-    }
-
-    attribute_map = {
-        'id': 'id',
-        'name': 'name',
-        'unique': 'unique',
-        'references': 'references',
-        'internal_name': 'internal_name',
-        'date_format': 'date_format',
-        'auto_generated': 'auto_generated',
-        'is_primary_key': 'is_primary_key',
-        'column_type': 'column_type',
-        'column_concept': 'column_concept',
-        'decimal_digits_before': 'decimal_digits_before',
-        'decimal_digits_after': 'decimal_digits_after',
-        'is_null_allowed': 'is_null_allowed',
-        'check_expression': 'check_expression',
-        'foreign_key': 'foreign_key',
-        'enum_values': 'enum_values'
-    }
-
-    def __init__(self, id=None, name=None, unique=None, references=None, internal_name=None, date_format=None, auto_generated=None, is_primary_key=None, column_type=None, column_concept=None, decimal_digits_before=None, decimal_digits_after=None, is_null_allowed=None, check_expression=None, foreign_key=None, enum_values=None):  # noqa: E501
-        """ColumnDto - a model defined in Swagger"""  # noqa: E501
-        self._id = None
-        self._name = None
-        self._unique = None
-        self._references = None
-        self._internal_name = None
-        self._date_format = None
-        self._auto_generated = None
-        self._is_primary_key = None
-        self._column_type = None
-        self._column_concept = None
-        self._decimal_digits_before = None
-        self._decimal_digits_after = None
-        self._is_null_allowed = None
-        self._check_expression = None
-        self._foreign_key = None
-        self._enum_values = None
-        self.discriminator = None
-        self.id = id
-        self.name = name
-        self.unique = unique
-        if references is not None:
-            self.references = references
-        self.internal_name = internal_name
-        if date_format is not None:
-            self.date_format = date_format
-        self.auto_generated = auto_generated
-        self.is_primary_key = is_primary_key
-        self.column_type = column_type
-        if column_concept is not None:
-            self.column_concept = column_concept
-        if decimal_digits_before is not None:
-            self.decimal_digits_before = decimal_digits_before
-        if decimal_digits_after is not None:
-            self.decimal_digits_after = decimal_digits_after
-        self.is_null_allowed = is_null_allowed
-        if check_expression is not None:
-            self.check_expression = check_expression
-        if foreign_key is not None:
-            self.foreign_key = foreign_key
-        if enum_values is not None:
-            self.enum_values = enum_values
-
-    @property
-    def id(self):
-        """Gets the id of this ColumnDto.  # noqa: E501
-
-
-        :return: The id of this ColumnDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this ColumnDto.
-
-
-        :param id: The id of this ColumnDto.  # noqa: E501
-        :type: int
-        """
-        if id is None:
-            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
-
-        self._id = id
-
-    @property
-    def name(self):
-        """Gets the name of this ColumnDto.  # noqa: E501
-
-
-        :return: The name of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this ColumnDto.
-
-
-        :param name: The name of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def unique(self):
-        """Gets the unique of this ColumnDto.  # noqa: E501
-
-
-        :return: The unique of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._unique
-
-    @unique.setter
-    def unique(self, unique):
-        """Sets the unique of this ColumnDto.
-
-
-        :param unique: The unique of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if unique is None:
-            raise ValueError("Invalid value for `unique`, must not be `None`")  # noqa: E501
-
-        self._unique = unique
-
-    @property
-    def references(self):
-        """Gets the references of this ColumnDto.  # noqa: E501
-
-
-        :return: The references of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._references
-
-    @references.setter
-    def references(self, references):
-        """Sets the references of this ColumnDto.
-
-
-        :param references: The references of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-
-        self._references = references
-
-    @property
-    def internal_name(self):
-        """Gets the internal_name of this ColumnDto.  # noqa: E501
-
-
-        :return: The internal_name of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._internal_name
-
-    @internal_name.setter
-    def internal_name(self, internal_name):
-        """Sets the internal_name of this ColumnDto.
-
-
-        :param internal_name: The internal_name of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-        if internal_name is None:
-            raise ValueError("Invalid value for `internal_name`, must not be `None`")  # noqa: E501
-
-        self._internal_name = internal_name
-
-    @property
-    def date_format(self):
-        """Gets the date_format of this ColumnDto.  # noqa: E501
-
-
-        :return: The date_format of this ColumnDto.  # noqa: E501
-        :rtype: ImageDateDto
-        """
-        return self._date_format
-
-    @date_format.setter
-    def date_format(self, date_format):
-        """Sets the date_format of this ColumnDto.
-
-
-        :param date_format: The date_format of this ColumnDto.  # noqa: E501
-        :type: ImageDateDto
-        """
-
-        self._date_format = date_format
-
-    @property
-    def auto_generated(self):
-        """Gets the auto_generated of this ColumnDto.  # noqa: E501
-
-
-        :return: The auto_generated of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._auto_generated
-
-    @auto_generated.setter
-    def auto_generated(self, auto_generated):
-        """Sets the auto_generated of this ColumnDto.
-
-
-        :param auto_generated: The auto_generated of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if auto_generated is None:
-            raise ValueError("Invalid value for `auto_generated`, must not be `None`")  # noqa: E501
-
-        self._auto_generated = auto_generated
-
-    @property
-    def is_primary_key(self):
-        """Gets the is_primary_key of this ColumnDto.  # noqa: E501
-
-
-        :return: The is_primary_key of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._is_primary_key
-
-    @is_primary_key.setter
-    def is_primary_key(self, is_primary_key):
-        """Sets the is_primary_key of this ColumnDto.
-
-
-        :param is_primary_key: The is_primary_key of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if is_primary_key is None:
-            raise ValueError("Invalid value for `is_primary_key`, must not be `None`")  # noqa: E501
-
-        self._is_primary_key = is_primary_key
-
-    @property
-    def column_type(self):
-        """Gets the column_type of this ColumnDto.  # noqa: E501
-
-
-        :return: The column_type of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._column_type
-
-    @column_type.setter
-    def column_type(self, column_type):
-        """Sets the column_type of this ColumnDto.
-
-
-        :param column_type: The column_type of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-        if column_type is None:
-            raise ValueError("Invalid value for `column_type`, must not be `None`")  # noqa: E501
-        allowed_values = ["enum", "number", "decimal", "string", "text", "boolean", "date", "timestamp", "blob"]  # noqa: E501
-        if column_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `column_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(column_type, allowed_values)
-            )
-
-        self._column_type = column_type
-
-    @property
-    def column_concept(self):
-        """Gets the column_concept of this ColumnDto.  # noqa: E501
-
-
-        :return: The column_concept of this ColumnDto.  # noqa: E501
-        :rtype: ConceptDto
-        """
-        return self._column_concept
-
-    @column_concept.setter
-    def column_concept(self, column_concept):
-        """Sets the column_concept of this ColumnDto.
-
-
-        :param column_concept: The column_concept of this ColumnDto.  # noqa: E501
-        :type: ConceptDto
-        """
-
-        self._column_concept = column_concept
-
-    @property
-    def decimal_digits_before(self):
-        """Gets the decimal_digits_before of this ColumnDto.  # noqa: E501
-
-
-        :return: The decimal_digits_before of this ColumnDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._decimal_digits_before
-
-    @decimal_digits_before.setter
-    def decimal_digits_before(self, decimal_digits_before):
-        """Sets the decimal_digits_before of this ColumnDto.
-
-
-        :param decimal_digits_before: The decimal_digits_before of this ColumnDto.  # noqa: E501
-        :type: int
-        """
-
-        self._decimal_digits_before = decimal_digits_before
-
-    @property
-    def decimal_digits_after(self):
-        """Gets the decimal_digits_after of this ColumnDto.  # noqa: E501
-
-
-        :return: The decimal_digits_after of this ColumnDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._decimal_digits_after
-
-    @decimal_digits_after.setter
-    def decimal_digits_after(self, decimal_digits_after):
-        """Sets the decimal_digits_after of this ColumnDto.
-
-
-        :param decimal_digits_after: The decimal_digits_after of this ColumnDto.  # noqa: E501
-        :type: int
-        """
-
-        self._decimal_digits_after = decimal_digits_after
-
-    @property
-    def is_null_allowed(self):
-        """Gets the is_null_allowed of this ColumnDto.  # noqa: E501
-
-
-        :return: The is_null_allowed of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._is_null_allowed
-
-    @is_null_allowed.setter
-    def is_null_allowed(self, is_null_allowed):
-        """Sets the is_null_allowed of this ColumnDto.
-
-
-        :param is_null_allowed: The is_null_allowed of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if is_null_allowed is None:
-            raise ValueError("Invalid value for `is_null_allowed`, must not be `None`")  # noqa: E501
-
-        self._is_null_allowed = is_null_allowed
-
-    @property
-    def check_expression(self):
-        """Gets the check_expression of this ColumnDto.  # noqa: E501
-
-
-        :return: The check_expression of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._check_expression
-
-    @check_expression.setter
-    def check_expression(self, check_expression):
-        """Sets the check_expression of this ColumnDto.
-
-
-        :param check_expression: The check_expression of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-
-        self._check_expression = check_expression
-
-    @property
-    def foreign_key(self):
-        """Gets the foreign_key of this ColumnDto.  # noqa: E501
-
-
-        :return: The foreign_key of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._foreign_key
-
-    @foreign_key.setter
-    def foreign_key(self, foreign_key):
-        """Sets the foreign_key of this ColumnDto.
-
-
-        :param foreign_key: The foreign_key of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-
-        self._foreign_key = foreign_key
-
-    @property
-    def enum_values(self):
-        """Gets the enum_values of this ColumnDto.  # noqa: E501
-
-
-        :return: The enum_values of this ColumnDto.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._enum_values
-
-    @enum_values.setter
-    def enum_values(self, enum_values):
-        """Sets the enum_values of this ColumnDto.
-
-
-        :param enum_values: The enum_values of this ColumnDto.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._enum_values = enum_values
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ColumnDto, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ColumnDto):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/.jupyter/api_authentication/models/concept_dto.py b/.jupyter/api_authentication/models/concept_dto.py
deleted file mode 100644
index 3bc88694251fce5435205b067e18ce4e26c9b566..0000000000000000000000000000000000000000
--- a/.jupyter/api_authentication/models/concept_dto.py
+++ /dev/null
@@ -1,165 +0,0 @@
-# coding: utf-8
-
-"""
-    Database Repository Authentication Service API
-
-    Service that manages the authentication  # noqa: E501
-
-    OpenAPI spec version: 1.1.0-alpha
-    Contact: andreas.rauber@tuwien.ac.at
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-class ConceptDto(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'uri': 'str',
-        'name': 'str',
-        'created': 'datetime'
-    }
-
-    attribute_map = {
-        'uri': 'uri',
-        'name': 'name',
-        'created': 'created'
-    }
-
-    def __init__(self, uri=None, name=None, created=None):  # noqa: E501
-        """ConceptDto - a model defined in Swagger"""  # noqa: E501
-        self._uri = None
-        self._name = None
-        self._created = None
-        self.discriminator = None
-        self.uri = uri
-        self.name = name
-        self.created = created
-
-    @property
-    def uri(self):
-        """Gets the uri of this ConceptDto.  # noqa: E501
-
-
-        :return: The uri of this ConceptDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._uri
-
-    @uri.setter
-    def uri(self, uri):
-        """Sets the uri of this ConceptDto.
-
-
-        :param uri: The uri of this ConceptDto.  # noqa: E501
-        :type: str
-        """
-        if uri is None:
-            raise ValueError("Invalid value for `uri`, must not be `None`")  # noqa: E501
-
-        self._uri = uri
-
-    @property
-    def name(self):
-        """Gets the name of this ConceptDto.  # noqa: E501
-
-
-        :return: The name of this ConceptDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this ConceptDto.
-
-
-        :param name: The name of this ConceptDto.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def created(self):
-        """Gets the created of this ConceptDto.  # noqa: E501
-
-
-        :return: The created of this ConceptDto.  # noqa: E501
-        :rtype: datetime
-        """
-        return self._created
-
-    @created.setter
-    def created(self, created):
-        """Sets the created of this ConceptDto.
-
-
-        :param created: The created of this ConceptDto.  # noqa: E501
-        :type: datetime
-        """
-        if created is None:
-            raise ValueError("Invalid value for `created`, must not be `None`")  # noqa: E501
-
-        self._created = created
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ConceptDto, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ConceptDto):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/.jupyter/api_authentication/models/database_dto.py b/.jupyter/api_authentication/models/database_dto.py
index 6119a4d801d552d4994ae04eae81b457e5c98622..a8a3fed0801cf9c5b07e2fe15631578e93913f72 100644
--- a/.jupyter/api_authentication/models/database_dto.py
+++ b/.jupyter/api_authentication/models/database_dto.py
@@ -28,334 +28,307 @@ class DatabaseDto(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'database_id': 'int',
-        'database_name': 'str',
-        'database_exchange': 'str',
-        'database_creator': 'UserBriefDto',
-        'database_subjects': 'list[str]',
-        'database_language': 'str',
-        'database_license': 'LicenseDto',
-        'database_description': 'str',
-        'database_publisher': 'str',
-        'database_contact_person': 'UserDto',
+        'id': 'int',
+        'name': 'str',
+        'exchange': 'str',
+        'creator': 'UserBriefDto',
+        'subjects': 'list[str]',
+        'language': 'str',
+        'license': 'LicenseDto',
+        'description': 'str',
+        'publisher': 'str',
         'tables': 'list[TableBriefDto]',
-        'database_container_image': 'ImageDto',
+        'image': 'ImageDto',
         'container': 'ContainerDto',
-        'database_creation_time': 'datetime',
+        'created': 'datetime',
         'deleted': 'datetime',
-        'database_internal_name': 'str',
-        'database_publication_year': 'int',
-        'database_publication_month': 'int',
-        'database_publication_day': 'int',
-        'database_public': 'bool'
+        'internal_name': 'str',
+        'publication_year': 'int',
+        'publication_month': 'int',
+        'publication_day': 'int',
+        'is_public': 'bool'
     }
 
     attribute_map = {
-        'database_id': 'database id',
-        'database_name': 'database name',
-        'database_exchange': 'database exchange',
-        'database_creator': 'database creator',
-        'database_subjects': 'database subjects',
-        'database_language': 'database language',
-        'database_license': 'database license',
-        'database_description': 'database description',
-        'database_publisher': 'database publisher',
-        'database_contact_person': 'database contact person',
+        'id': 'id',
+        'name': 'name',
+        'exchange': 'exchange',
+        'creator': 'creator',
+        'subjects': 'subjects',
+        'language': 'language',
+        'license': 'license',
+        'description': 'description',
+        'publisher': 'publisher',
         'tables': 'tables',
-        'database_container_image': 'database container image',
+        'image': 'image',
         'container': 'container',
-        'database_creation_time': 'database creation time',
+        'created': 'created',
         'deleted': 'deleted',
-        'database_internal_name': 'database internal name',
-        'database_publication_year': 'database publication year',
-        'database_publication_month': 'database publication month',
-        'database_publication_day': 'database publication day',
-        'database_public': 'database public'
+        'internal_name': 'internal_name',
+        'publication_year': 'publication_year',
+        'publication_month': 'publication_month',
+        'publication_day': 'publication_day',
+        'is_public': 'is_public'
     }
 
-    def __init__(self, database_id=None, database_name=None, database_exchange=None, database_creator=None, database_subjects=None, database_language=None, database_license=None, database_description=None, database_publisher=None, database_contact_person=None, tables=None, database_container_image=None, container=None, database_creation_time=None, deleted=None, database_internal_name=None, database_publication_year=None, database_publication_month=None, database_publication_day=None, database_public=None):  # noqa: E501
+    def __init__(self, id=None, name=None, exchange=None, creator=None, subjects=None, language=None, license=None, description=None, publisher=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, publication_year=None, publication_month=None, publication_day=None, is_public=None):  # noqa: E501
         """DatabaseDto - a model defined in Swagger"""  # noqa: E501
-        self._database_id = None
-        self._database_name = None
-        self._database_exchange = None
-        self._database_creator = None
-        self._database_subjects = None
-        self._database_language = None
-        self._database_license = None
-        self._database_description = None
-        self._database_publisher = None
-        self._database_contact_person = None
+        self._id = None
+        self._name = None
+        self._exchange = None
+        self._creator = None
+        self._subjects = None
+        self._language = None
+        self._license = None
+        self._description = None
+        self._publisher = None
         self._tables = None
-        self._database_container_image = None
+        self._image = None
         self._container = None
-        self._database_creation_time = None
+        self._created = None
         self._deleted = None
-        self._database_internal_name = None
-        self._database_publication_year = None
-        self._database_publication_month = None
-        self._database_publication_day = None
-        self._database_public = None
+        self._internal_name = None
+        self._publication_year = None
+        self._publication_month = None
+        self._publication_day = None
+        self._is_public = None
         self.discriminator = None
-        self.database_id = database_id
-        self.database_name = database_name
-        self.database_exchange = database_exchange
-        self.database_creator = database_creator
-        if database_subjects is not None:
-            self.database_subjects = database_subjects
-        if database_language is not None:
-            self.database_language = database_language
-        if database_license is not None:
-            self.database_license = database_license
-        self.database_description = database_description
-        if database_publisher is not None:
-            self.database_publisher = database_publisher
-        if database_contact_person is not None:
-            self.database_contact_person = database_contact_person
+        self.id = id
+        self.name = name
+        self.exchange = exchange
+        self.creator = creator
+        if subjects is not None:
+            self.subjects = subjects
+        if language is not None:
+            self.language = language
+        if license is not None:
+            self.license = license
+        if description is not None:
+            self.description = description
+        if publisher is not None:
+            self.publisher = publisher
         if tables is not None:
             self.tables = tables
-        if database_container_image is not None:
-            self.database_container_image = database_container_image
+        if image is not None:
+            self.image = image
         if container is not None:
             self.container = container
-        if database_creation_time is not None:
-            self.database_creation_time = database_creation_time
+        if created is not None:
+            self.created = created
         if deleted is not None:
             self.deleted = deleted
-        self.database_internal_name = database_internal_name
-        if database_publication_year is not None:
-            self.database_publication_year = database_publication_year
-        if database_publication_month is not None:
-            self.database_publication_month = database_publication_month
-        if database_publication_day is not None:
-            self.database_publication_day = database_publication_day
-        if database_public is not None:
-            self.database_public = database_public
+        self.internal_name = internal_name
+        if publication_year is not None:
+            self.publication_year = publication_year
+        if publication_month is not None:
+            self.publication_month = publication_month
+        if publication_day is not None:
+            self.publication_day = publication_day
+        if is_public is not None:
+            self.is_public = is_public
 
     @property
-    def database_id(self):
-        """Gets the database_id of this DatabaseDto.  # noqa: E501
+    def id(self):
+        """Gets the id of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_id of this DatabaseDto.  # noqa: E501
+        :return: The id of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_id
+        return self._id
 
-    @database_id.setter
-    def database_id(self, database_id):
-        """Sets the database_id of this DatabaseDto.
+    @id.setter
+    def id(self, id):
+        """Sets the id of this DatabaseDto.
 
 
-        :param database_id: The database_id of this DatabaseDto.  # noqa: E501
+        :param id: The id of this DatabaseDto.  # noqa: E501
         :type: int
         """
-        if database_id is None:
-            raise ValueError("Invalid value for `database_id`, must not be `None`")  # noqa: E501
+        if id is None:
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
 
-        self._database_id = database_id
+        self._id = id
 
     @property
-    def database_name(self):
-        """Gets the database_name of this DatabaseDto.  # noqa: E501
+    def name(self):
+        """Gets the name of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_name of this DatabaseDto.  # noqa: E501
+        :return: The name of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_name
+        return self._name
 
-    @database_name.setter
-    def database_name(self, database_name):
-        """Sets the database_name of this DatabaseDto.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this DatabaseDto.
 
 
-        :param database_name: The database_name of this DatabaseDto.  # noqa: E501
+        :param name: The name of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_name is None:
-            raise ValueError("Invalid value for `database_name`, must not be `None`")  # noqa: E501
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._database_name = database_name
+        self._name = name
 
     @property
-    def database_exchange(self):
-        """Gets the database_exchange of this DatabaseDto.  # noqa: E501
+    def exchange(self):
+        """Gets the exchange of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_exchange of this DatabaseDto.  # noqa: E501
+        :return: The exchange of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_exchange
+        return self._exchange
 
-    @database_exchange.setter
-    def database_exchange(self, database_exchange):
-        """Sets the database_exchange of this DatabaseDto.
+    @exchange.setter
+    def exchange(self, exchange):
+        """Sets the exchange of this DatabaseDto.
 
 
-        :param database_exchange: The database_exchange of this DatabaseDto.  # noqa: E501
+        :param exchange: The exchange of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_exchange is None:
-            raise ValueError("Invalid value for `database_exchange`, must not be `None`")  # noqa: E501
+        if exchange is None:
+            raise ValueError("Invalid value for `exchange`, must not be `None`")  # noqa: E501
 
-        self._database_exchange = database_exchange
+        self._exchange = exchange
 
     @property
-    def database_creator(self):
-        """Gets the database_creator of this DatabaseDto.  # noqa: E501
+    def creator(self):
+        """Gets the creator of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_creator of this DatabaseDto.  # noqa: E501
+        :return: The creator of this DatabaseDto.  # noqa: E501
         :rtype: UserBriefDto
         """
-        return self._database_creator
+        return self._creator
 
-    @database_creator.setter
-    def database_creator(self, database_creator):
-        """Sets the database_creator of this DatabaseDto.
+    @creator.setter
+    def creator(self, creator):
+        """Sets the creator of this DatabaseDto.
 
 
-        :param database_creator: The database_creator of this DatabaseDto.  # noqa: E501
+        :param creator: The creator of this DatabaseDto.  # noqa: E501
         :type: UserBriefDto
         """
-        if database_creator is None:
-            raise ValueError("Invalid value for `database_creator`, must not be `None`")  # noqa: E501
+        if creator is None:
+            raise ValueError("Invalid value for `creator`, must not be `None`")  # noqa: E501
 
-        self._database_creator = database_creator
+        self._creator = creator
 
     @property
-    def database_subjects(self):
-        """Gets the database_subjects of this DatabaseDto.  # noqa: E501
+    def subjects(self):
+        """Gets the subjects of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_subjects of this DatabaseDto.  # noqa: E501
+        :return: The subjects of this DatabaseDto.  # noqa: E501
         :rtype: list[str]
         """
-        return self._database_subjects
+        return self._subjects
 
-    @database_subjects.setter
-    def database_subjects(self, database_subjects):
-        """Sets the database_subjects of this DatabaseDto.
+    @subjects.setter
+    def subjects(self, subjects):
+        """Sets the subjects of this DatabaseDto.
 
 
-        :param database_subjects: The database_subjects of this DatabaseDto.  # noqa: E501
+        :param subjects: The subjects of this DatabaseDto.  # noqa: E501
         :type: list[str]
         """
 
-        self._database_subjects = database_subjects
+        self._subjects = subjects
 
     @property
-    def database_language(self):
-        """Gets the database_language of this DatabaseDto.  # noqa: E501
+    def language(self):
+        """Gets the language of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_language of this DatabaseDto.  # noqa: E501
+        :return: The language of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_language
+        return self._language
 
-    @database_language.setter
-    def database_language(self, database_language):
-        """Sets the database_language of this DatabaseDto.
+    @language.setter
+    def language(self, language):
+        """Sets the language of this DatabaseDto.
 
 
-        :param database_language: The database_language of this DatabaseDto.  # noqa: E501
+        :param language: The language of this DatabaseDto.  # noqa: E501
         :type: str
         """
         allowed_values = ["ab", "aa", "af", "ak", "sq", "am", "ar", "an", "hy", "as", "av", "ae", "ay", "az", "bm", "ba", "eu", "be", "bn", "bh", "bi", "bs", "br", "bg", "my", "ca", "km", "ch", "ce", "ny", "zh", "cu", "cv", "kw", "co", "cr", "hr", "cs", "da", "dv", "nl", "dz", "en", "eo", "et", "ee", "fo", "fj", "fi", "fr", "ff", "gd", "gl", "lg", "ka", "de", "ki", "el", "kl", "gn", "gu", "ht", "ha", "he", "hz", "hi", "ho", "hu", "is", "io", "ig", "id", "ia", "ie", "iu", "ik", "ga", "it", "ja", "jv", "kn", "kr", "ks", "kk", "rw", "kv", "kg", "ko", "kj", "ku", "ky", "lo", "la", "lv", "lb", "li", "ln", "lt", "lu", "mk", "mg", "ms", "ml", "mt", "gv", "mi", "mr", "mh", "ro", "mn", "na", "nv", "nd", "ng", "ne", "se", "no", "nb", "nn", "ii", "oc", "oj", "or", "om", "os", "pi", "pa", "ps", "fa", "pl", "pt", "qu", "rm", "rn", "ru", "sm", "sg", "sa", "sc", "sr", "sn", "sd", "si", "sk", "sl", "so", "st", "nr", "es", "su", "sw", "ss", "sv", "tl", "ty", "tg", "ta", "tt", "te", "th", "bo", "ti", "to", "ts", "tn", "tr", "tk", "tw", "ug", "uk", "ur", "uz", "ve", "vi", "vo", "wa", "cy", "fy", "wo", "xh", "yi", "yo", "za", "zu"]  # noqa: E501
-        if database_language not in allowed_values:
+        if language not in allowed_values:
             raise ValueError(
-                "Invalid value for `database_language` ({0}), must be one of {1}"  # noqa: E501
-                .format(database_language, allowed_values)
+                "Invalid value for `language` ({0}), must be one of {1}"  # noqa: E501
+                .format(language, allowed_values)
             )
 
-        self._database_language = database_language
+        self._language = language
 
     @property
-    def database_license(self):
-        """Gets the database_license of this DatabaseDto.  # noqa: E501
+    def license(self):
+        """Gets the license of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_license of this DatabaseDto.  # noqa: E501
+        :return: The license of this DatabaseDto.  # noqa: E501
         :rtype: LicenseDto
         """
-        return self._database_license
+        return self._license
 
-    @database_license.setter
-    def database_license(self, database_license):
-        """Sets the database_license of this DatabaseDto.
+    @license.setter
+    def license(self, license):
+        """Sets the license of this DatabaseDto.
 
 
-        :param database_license: The database_license of this DatabaseDto.  # noqa: E501
+        :param license: The license of this DatabaseDto.  # noqa: E501
         :type: LicenseDto
         """
 
-        self._database_license = database_license
+        self._license = license
 
     @property
-    def database_description(self):
-        """Gets the database_description of this DatabaseDto.  # noqa: E501
+    def description(self):
+        """Gets the description of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_description of this DatabaseDto.  # noqa: E501
+        :return: The description of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_description
+        return self._description
 
-    @database_description.setter
-    def database_description(self, database_description):
-        """Sets the database_description of this DatabaseDto.
+    @description.setter
+    def description(self, description):
+        """Sets the description of this DatabaseDto.
 
 
-        :param database_description: The database_description of this DatabaseDto.  # noqa: E501
+        :param description: The description of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_description is None:
-            raise ValueError("Invalid value for `database_description`, must not be `None`")  # noqa: E501
 
-        self._database_description = database_description
+        self._description = description
 
     @property
-    def database_publisher(self):
-        """Gets the database_publisher of this DatabaseDto.  # noqa: E501
+    def publisher(self):
+        """Gets the publisher of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publisher of this DatabaseDto.  # noqa: E501
+        :return: The publisher of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_publisher
+        return self._publisher
 
-    @database_publisher.setter
-    def database_publisher(self, database_publisher):
-        """Sets the database_publisher of this DatabaseDto.
+    @publisher.setter
+    def publisher(self, publisher):
+        """Sets the publisher of this DatabaseDto.
 
 
-        :param database_publisher: The database_publisher of this DatabaseDto.  # noqa: E501
+        :param publisher: The publisher of this DatabaseDto.  # noqa: E501
         :type: str
         """
 
-        self._database_publisher = database_publisher
-
-    @property
-    def database_contact_person(self):
-        """Gets the database_contact_person of this DatabaseDto.  # noqa: E501
-
-
-        :return: The database_contact_person of this DatabaseDto.  # noqa: E501
-        :rtype: UserDto
-        """
-        return self._database_contact_person
-
-    @database_contact_person.setter
-    def database_contact_person(self, database_contact_person):
-        """Sets the database_contact_person of this DatabaseDto.
-
-
-        :param database_contact_person: The database_contact_person of this DatabaseDto.  # noqa: E501
-        :type: UserDto
-        """
-
-        self._database_contact_person = database_contact_person
+        self._publisher = publisher
 
     @property
     def tables(self):
@@ -379,25 +352,25 @@ class DatabaseDto(object):
         self._tables = tables
 
     @property
-    def database_container_image(self):
-        """Gets the database_container_image of this DatabaseDto.  # noqa: E501
+    def image(self):
+        """Gets the image of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_container_image of this DatabaseDto.  # noqa: E501
+        :return: The image of this DatabaseDto.  # noqa: E501
         :rtype: ImageDto
         """
-        return self._database_container_image
+        return self._image
 
-    @database_container_image.setter
-    def database_container_image(self, database_container_image):
-        """Sets the database_container_image of this DatabaseDto.
+    @image.setter
+    def image(self, image):
+        """Sets the image of this DatabaseDto.
 
 
-        :param database_container_image: The database_container_image of this DatabaseDto.  # noqa: E501
+        :param image: The image of this DatabaseDto.  # noqa: E501
         :type: ImageDto
         """
 
-        self._database_container_image = database_container_image
+        self._image = image
 
     @property
     def container(self):
@@ -421,25 +394,25 @@ class DatabaseDto(object):
         self._container = container
 
     @property
-    def database_creation_time(self):
-        """Gets the database_creation_time of this DatabaseDto.  # noqa: E501
+    def created(self):
+        """Gets the created of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_creation_time of this DatabaseDto.  # noqa: E501
+        :return: The created of this DatabaseDto.  # noqa: E501
         :rtype: datetime
         """
-        return self._database_creation_time
+        return self._created
 
-    @database_creation_time.setter
-    def database_creation_time(self, database_creation_time):
-        """Sets the database_creation_time of this DatabaseDto.
+    @created.setter
+    def created(self, created):
+        """Sets the created of this DatabaseDto.
 
 
-        :param database_creation_time: The database_creation_time of this DatabaseDto.  # noqa: E501
+        :param created: The created of this DatabaseDto.  # noqa: E501
         :type: datetime
         """
 
-        self._database_creation_time = database_creation_time
+        self._created = created
 
     @property
     def deleted(self):
@@ -463,111 +436,111 @@ class DatabaseDto(object):
         self._deleted = deleted
 
     @property
-    def database_internal_name(self):
-        """Gets the database_internal_name of this DatabaseDto.  # noqa: E501
+    def internal_name(self):
+        """Gets the internal_name of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_internal_name of this DatabaseDto.  # noqa: E501
+        :return: The internal_name of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_internal_name
+        return self._internal_name
 
-    @database_internal_name.setter
-    def database_internal_name(self, database_internal_name):
-        """Sets the database_internal_name of this DatabaseDto.
+    @internal_name.setter
+    def internal_name(self, internal_name):
+        """Sets the internal_name of this DatabaseDto.
 
 
-        :param database_internal_name: The database_internal_name of this DatabaseDto.  # noqa: E501
+        :param internal_name: The internal_name of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_internal_name is None:
-            raise ValueError("Invalid value for `database_internal_name`, must not be `None`")  # noqa: E501
+        if internal_name is None:
+            raise ValueError("Invalid value for `internal_name`, must not be `None`")  # noqa: E501
 
-        self._database_internal_name = database_internal_name
+        self._internal_name = internal_name
 
     @property
-    def database_publication_year(self):
-        """Gets the database_publication_year of this DatabaseDto.  # noqa: E501
+    def publication_year(self):
+        """Gets the publication_year of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publication_year of this DatabaseDto.  # noqa: E501
+        :return: The publication_year of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_publication_year
+        return self._publication_year
 
-    @database_publication_year.setter
-    def database_publication_year(self, database_publication_year):
-        """Sets the database_publication_year of this DatabaseDto.
+    @publication_year.setter
+    def publication_year(self, publication_year):
+        """Sets the publication_year of this DatabaseDto.
 
 
-        :param database_publication_year: The database_publication_year of this DatabaseDto.  # noqa: E501
+        :param publication_year: The publication_year of this DatabaseDto.  # noqa: E501
         :type: int
         """
 
-        self._database_publication_year = database_publication_year
+        self._publication_year = publication_year
 
     @property
-    def database_publication_month(self):
-        """Gets the database_publication_month of this DatabaseDto.  # noqa: E501
+    def publication_month(self):
+        """Gets the publication_month of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publication_month of this DatabaseDto.  # noqa: E501
+        :return: The publication_month of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_publication_month
+        return self._publication_month
 
-    @database_publication_month.setter
-    def database_publication_month(self, database_publication_month):
-        """Sets the database_publication_month of this DatabaseDto.
+    @publication_month.setter
+    def publication_month(self, publication_month):
+        """Sets the publication_month of this DatabaseDto.
 
 
-        :param database_publication_month: The database_publication_month of this DatabaseDto.  # noqa: E501
+        :param publication_month: The publication_month of this DatabaseDto.  # noqa: E501
         :type: int
         """
 
-        self._database_publication_month = database_publication_month
+        self._publication_month = publication_month
 
     @property
-    def database_publication_day(self):
-        """Gets the database_publication_day of this DatabaseDto.  # noqa: E501
+    def publication_day(self):
+        """Gets the publication_day of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publication_day of this DatabaseDto.  # noqa: E501
+        :return: The publication_day of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_publication_day
+        return self._publication_day
 
-    @database_publication_day.setter
-    def database_publication_day(self, database_publication_day):
-        """Sets the database_publication_day of this DatabaseDto.
+    @publication_day.setter
+    def publication_day(self, publication_day):
+        """Sets the publication_day of this DatabaseDto.
 
 
-        :param database_publication_day: The database_publication_day of this DatabaseDto.  # noqa: E501
+        :param publication_day: The publication_day of this DatabaseDto.  # noqa: E501
         :type: int
         """
 
-        self._database_publication_day = database_publication_day
+        self._publication_day = publication_day
 
     @property
-    def database_public(self):
-        """Gets the database_public of this DatabaseDto.  # noqa: E501
+    def is_public(self):
+        """Gets the is_public of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_public of this DatabaseDto.  # noqa: E501
+        :return: The is_public of this DatabaseDto.  # noqa: E501
         :rtype: bool
         """
-        return self._database_public
+        return self._is_public
 
-    @database_public.setter
-    def database_public(self, database_public):
-        """Sets the database_public of this DatabaseDto.
+    @is_public.setter
+    def is_public(self, is_public):
+        """Sets the is_public of this DatabaseDto.
 
 
-        :param database_public: The database_public of this DatabaseDto.  # noqa: E501
+        :param is_public: The is_public of this DatabaseDto.  # noqa: E501
         :type: bool
         """
 
-        self._database_public = database_public
+        self._is_public = is_public
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/.jupyter/api_authentication/models/table_dto.py b/.jupyter/api_authentication/models/table_dto.py
deleted file mode 100644
index 9eceddcfc49f5bcd0031bde0c00cf5e2434fa072..0000000000000000000000000000000000000000
--- a/.jupyter/api_authentication/models/table_dto.py
+++ /dev/null
@@ -1,272 +0,0 @@
-# coding: utf-8
-
-"""
-    Database Repository Authentication Service API
-
-    Service that manages the authentication  # noqa: E501
-
-    OpenAPI spec version: 1.1.0-alpha
-    Contact: andreas.rauber@tuwien.ac.at
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-class TableDto(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'id': 'int',
-        'name': 'str',
-        'topic': 'str',
-        'description': 'str',
-        'created': 'datetime',
-        'columns': 'list[ColumnDto]',
-        'internal_name': 'str'
-    }
-
-    attribute_map = {
-        'id': 'id',
-        'name': 'name',
-        'topic': 'topic',
-        'description': 'description',
-        'created': 'created',
-        'columns': 'columns',
-        'internal_name': 'internal_name'
-    }
-
-    def __init__(self, id=None, name=None, topic=None, description=None, created=None, columns=None, internal_name=None):  # noqa: E501
-        """TableDto - a model defined in Swagger"""  # noqa: E501
-        self._id = None
-        self._name = None
-        self._topic = None
-        self._description = None
-        self._created = None
-        self._columns = None
-        self._internal_name = None
-        self.discriminator = None
-        self.id = id
-        self.name = name
-        self.topic = topic
-        self.description = description
-        if created is not None:
-            self.created = created
-        self.columns = columns
-        self.internal_name = internal_name
-
-    @property
-    def id(self):
-        """Gets the id of this TableDto.  # noqa: E501
-
-
-        :return: The id of this TableDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this TableDto.
-
-
-        :param id: The id of this TableDto.  # noqa: E501
-        :type: int
-        """
-        if id is None:
-            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
-
-        self._id = id
-
-    @property
-    def name(self):
-        """Gets the name of this TableDto.  # noqa: E501
-
-
-        :return: The name of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this TableDto.
-
-
-        :param name: The name of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def topic(self):
-        """Gets the topic of this TableDto.  # noqa: E501
-
-
-        :return: The topic of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._topic
-
-    @topic.setter
-    def topic(self, topic):
-        """Sets the topic of this TableDto.
-
-
-        :param topic: The topic of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if topic is None:
-            raise ValueError("Invalid value for `topic`, must not be `None`")  # noqa: E501
-
-        self._topic = topic
-
-    @property
-    def description(self):
-        """Gets the description of this TableDto.  # noqa: E501
-
-
-        :return: The description of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this TableDto.
-
-
-        :param description: The description of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if description is None:
-            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
-
-        self._description = description
-
-    @property
-    def created(self):
-        """Gets the created of this TableDto.  # noqa: E501
-
-
-        :return: The created of this TableDto.  # noqa: E501
-        :rtype: datetime
-        """
-        return self._created
-
-    @created.setter
-    def created(self, created):
-        """Sets the created of this TableDto.
-
-
-        :param created: The created of this TableDto.  # noqa: E501
-        :type: datetime
-        """
-
-        self._created = created
-
-    @property
-    def columns(self):
-        """Gets the columns of this TableDto.  # noqa: E501
-
-
-        :return: The columns of this TableDto.  # noqa: E501
-        :rtype: list[ColumnDto]
-        """
-        return self._columns
-
-    @columns.setter
-    def columns(self, columns):
-        """Sets the columns of this TableDto.
-
-
-        :param columns: The columns of this TableDto.  # noqa: E501
-        :type: list[ColumnDto]
-        """
-        if columns is None:
-            raise ValueError("Invalid value for `columns`, must not be `None`")  # noqa: E501
-
-        self._columns = columns
-
-    @property
-    def internal_name(self):
-        """Gets the internal_name of this TableDto.  # noqa: E501
-
-
-        :return: The internal_name of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._internal_name
-
-    @internal_name.setter
-    def internal_name(self, internal_name):
-        """Sets the internal_name of this TableDto.
-
-
-        :param internal_name: The internal_name of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if internal_name is None:
-            raise ValueError("Invalid value for `internal_name`, must not be `None`")  # noqa: E501
-
-        self._internal_name = internal_name
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(TableDto, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, TableDto):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/.jupyter/api_authentication/models/user_token_modify_dto.py b/.jupyter/api_authentication/models/user_token_modify_dto.py
deleted file mode 100644
index 68148592c9f7bc31726e7b09044c4408cd53b20f..0000000000000000000000000000000000000000
--- a/.jupyter/api_authentication/models/user_token_modify_dto.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# coding: utf-8
-
-"""
-    Database Repository Authentication Service API
-
-    Service that manages the authentication  # noqa: E501
-
-    OpenAPI spec version: 1.1.0-alpha
-    Contact: andreas.rauber@tuwien.ac.at
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-class UserTokenModifyDto(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'invenio_token': 'str'
-    }
-
-    attribute_map = {
-        'invenio_token': 'invenio_token'
-    }
-
-    def __init__(self, invenio_token=None):  # noqa: E501
-        """UserTokenModifyDto - a model defined in Swagger"""  # noqa: E501
-        self._invenio_token = None
-        self.discriminator = None
-        self.invenio_token = invenio_token
-
-    @property
-    def invenio_token(self):
-        """Gets the invenio_token of this UserTokenModifyDto.  # noqa: E501
-
-
-        :return: The invenio_token of this UserTokenModifyDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._invenio_token
-
-    @invenio_token.setter
-    def invenio_token(self, invenio_token):
-        """Sets the invenio_token of this UserTokenModifyDto.
-
-
-        :param invenio_token: The invenio_token of this UserTokenModifyDto.  # noqa: E501
-        :type: str
-        """
-        if invenio_token is None:
-            raise ValueError("Invalid value for `invenio_token`, must not be `None`")  # noqa: E501
-
-        self._invenio_token = invenio_token
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(UserTokenModifyDto, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, UserTokenModifyDto):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/.jupyter/api_container/__init__.py b/.jupyter/api_container/__init__.py
index e8c65699a9aec6d7e0fb978d8754509fb3ea5b55..c37bd1a9543340cd1effa2d5e3de96fdf13f5375 100644
--- a/.jupyter/api_container/__init__.py
+++ b/.jupyter/api_container/__init__.py
@@ -27,7 +27,6 @@ from api_container.models.container_change_dto import ContainerChangeDto
 from api_container.models.container_create_request_dto import ContainerCreateRequestDto
 from api_container.models.container_dto import ContainerDto
 from api_container.models.database_dto import DatabaseDto
-from api_container.models.granted_authority_dto import GrantedAuthorityDto
 from api_container.models.image_brief_dto import ImageBriefDto
 from api_container.models.image_change_dto import ImageChangeDto
 from api_container.models.image_create_dto import ImageCreateDto
@@ -37,4 +36,3 @@ from api_container.models.image_env_item_dto import ImageEnvItemDto
 from api_container.models.license_dto import LicenseDto
 from api_container.models.table_brief_dto import TableBriefDto
 from api_container.models.user_brief_dto import UserBriefDto
-from api_container.models.user_dto import UserDto
diff --git a/.jupyter/api_container/models/__init__.py b/.jupyter/api_container/models/__init__.py
index 563386400df8bac3bf6baa005dffcc98e331ee88..32e6e340214faf439abb16a103fd75f4c0cec578 100644
--- a/.jupyter/api_container/models/__init__.py
+++ b/.jupyter/api_container/models/__init__.py
@@ -20,7 +20,6 @@ from api_container.models.container_change_dto import ContainerChangeDto
 from api_container.models.container_create_request_dto import ContainerCreateRequestDto
 from api_container.models.container_dto import ContainerDto
 from api_container.models.database_dto import DatabaseDto
-from api_container.models.granted_authority_dto import GrantedAuthorityDto
 from api_container.models.image_brief_dto import ImageBriefDto
 from api_container.models.image_change_dto import ImageChangeDto
 from api_container.models.image_create_dto import ImageCreateDto
@@ -30,4 +29,3 @@ from api_container.models.image_env_item_dto import ImageEnvItemDto
 from api_container.models.license_dto import LicenseDto
 from api_container.models.table_brief_dto import TableBriefDto
 from api_container.models.user_brief_dto import UserBriefDto
-from api_container.models.user_dto import UserDto
diff --git a/.jupyter/api_container/models/column_dto.py b/.jupyter/api_container/models/column_dto.py
deleted file mode 100644
index 96e26927200e62d98f54e2ea8f231a0262f6955c..0000000000000000000000000000000000000000
--- a/.jupyter/api_container/models/column_dto.py
+++ /dev/null
@@ -1,514 +0,0 @@
-# coding: utf-8
-
-"""
-    Database Repository Container Service API
-
-    Service that manages the containers  # noqa: E501
-
-    OpenAPI spec version: 1.1.0-alpha
-    Contact: andreas.rauber@tuwien.ac.at
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-class ColumnDto(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'id': 'int',
-        'name': 'str',
-        'unique': 'bool',
-        'references': 'str',
-        'internal_name': 'str',
-        'date_format': 'ImageDateDto',
-        'auto_generated': 'bool',
-        'is_primary_key': 'bool',
-        'column_type': 'str',
-        'column_concept': 'ConceptDto',
-        'decimal_digits_before': 'int',
-        'decimal_digits_after': 'int',
-        'is_null_allowed': 'bool',
-        'check_expression': 'str',
-        'foreign_key': 'str',
-        'enum_values': 'list[str]'
-    }
-
-    attribute_map = {
-        'id': 'id',
-        'name': 'name',
-        'unique': 'unique',
-        'references': 'references',
-        'internal_name': 'internal_name',
-        'date_format': 'date_format',
-        'auto_generated': 'auto_generated',
-        'is_primary_key': 'is_primary_key',
-        'column_type': 'column_type',
-        'column_concept': 'column_concept',
-        'decimal_digits_before': 'decimal_digits_before',
-        'decimal_digits_after': 'decimal_digits_after',
-        'is_null_allowed': 'is_null_allowed',
-        'check_expression': 'check_expression',
-        'foreign_key': 'foreign_key',
-        'enum_values': 'enum_values'
-    }
-
-    def __init__(self, id=None, name=None, unique=None, references=None, internal_name=None, date_format=None, auto_generated=None, is_primary_key=None, column_type=None, column_concept=None, decimal_digits_before=None, decimal_digits_after=None, is_null_allowed=None, check_expression=None, foreign_key=None, enum_values=None):  # noqa: E501
-        """ColumnDto - a model defined in Swagger"""  # noqa: E501
-        self._id = None
-        self._name = None
-        self._unique = None
-        self._references = None
-        self._internal_name = None
-        self._date_format = None
-        self._auto_generated = None
-        self._is_primary_key = None
-        self._column_type = None
-        self._column_concept = None
-        self._decimal_digits_before = None
-        self._decimal_digits_after = None
-        self._is_null_allowed = None
-        self._check_expression = None
-        self._foreign_key = None
-        self._enum_values = None
-        self.discriminator = None
-        self.id = id
-        self.name = name
-        self.unique = unique
-        if references is not None:
-            self.references = references
-        self.internal_name = internal_name
-        if date_format is not None:
-            self.date_format = date_format
-        self.auto_generated = auto_generated
-        self.is_primary_key = is_primary_key
-        self.column_type = column_type
-        if column_concept is not None:
-            self.column_concept = column_concept
-        if decimal_digits_before is not None:
-            self.decimal_digits_before = decimal_digits_before
-        if decimal_digits_after is not None:
-            self.decimal_digits_after = decimal_digits_after
-        self.is_null_allowed = is_null_allowed
-        if check_expression is not None:
-            self.check_expression = check_expression
-        if foreign_key is not None:
-            self.foreign_key = foreign_key
-        if enum_values is not None:
-            self.enum_values = enum_values
-
-    @property
-    def id(self):
-        """Gets the id of this ColumnDto.  # noqa: E501
-
-
-        :return: The id of this ColumnDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this ColumnDto.
-
-
-        :param id: The id of this ColumnDto.  # noqa: E501
-        :type: int
-        """
-        if id is None:
-            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
-
-        self._id = id
-
-    @property
-    def name(self):
-        """Gets the name of this ColumnDto.  # noqa: E501
-
-
-        :return: The name of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this ColumnDto.
-
-
-        :param name: The name of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def unique(self):
-        """Gets the unique of this ColumnDto.  # noqa: E501
-
-
-        :return: The unique of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._unique
-
-    @unique.setter
-    def unique(self, unique):
-        """Sets the unique of this ColumnDto.
-
-
-        :param unique: The unique of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if unique is None:
-            raise ValueError("Invalid value for `unique`, must not be `None`")  # noqa: E501
-
-        self._unique = unique
-
-    @property
-    def references(self):
-        """Gets the references of this ColumnDto.  # noqa: E501
-
-
-        :return: The references of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._references
-
-    @references.setter
-    def references(self, references):
-        """Sets the references of this ColumnDto.
-
-
-        :param references: The references of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-
-        self._references = references
-
-    @property
-    def internal_name(self):
-        """Gets the internal_name of this ColumnDto.  # noqa: E501
-
-
-        :return: The internal_name of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._internal_name
-
-    @internal_name.setter
-    def internal_name(self, internal_name):
-        """Sets the internal_name of this ColumnDto.
-
-
-        :param internal_name: The internal_name of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-        if internal_name is None:
-            raise ValueError("Invalid value for `internal_name`, must not be `None`")  # noqa: E501
-
-        self._internal_name = internal_name
-
-    @property
-    def date_format(self):
-        """Gets the date_format of this ColumnDto.  # noqa: E501
-
-
-        :return: The date_format of this ColumnDto.  # noqa: E501
-        :rtype: ImageDateDto
-        """
-        return self._date_format
-
-    @date_format.setter
-    def date_format(self, date_format):
-        """Sets the date_format of this ColumnDto.
-
-
-        :param date_format: The date_format of this ColumnDto.  # noqa: E501
-        :type: ImageDateDto
-        """
-
-        self._date_format = date_format
-
-    @property
-    def auto_generated(self):
-        """Gets the auto_generated of this ColumnDto.  # noqa: E501
-
-
-        :return: The auto_generated of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._auto_generated
-
-    @auto_generated.setter
-    def auto_generated(self, auto_generated):
-        """Sets the auto_generated of this ColumnDto.
-
-
-        :param auto_generated: The auto_generated of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if auto_generated is None:
-            raise ValueError("Invalid value for `auto_generated`, must not be `None`")  # noqa: E501
-
-        self._auto_generated = auto_generated
-
-    @property
-    def is_primary_key(self):
-        """Gets the is_primary_key of this ColumnDto.  # noqa: E501
-
-
-        :return: The is_primary_key of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._is_primary_key
-
-    @is_primary_key.setter
-    def is_primary_key(self, is_primary_key):
-        """Sets the is_primary_key of this ColumnDto.
-
-
-        :param is_primary_key: The is_primary_key of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if is_primary_key is None:
-            raise ValueError("Invalid value for `is_primary_key`, must not be `None`")  # noqa: E501
-
-        self._is_primary_key = is_primary_key
-
-    @property
-    def column_type(self):
-        """Gets the column_type of this ColumnDto.  # noqa: E501
-
-
-        :return: The column_type of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._column_type
-
-    @column_type.setter
-    def column_type(self, column_type):
-        """Sets the column_type of this ColumnDto.
-
-
-        :param column_type: The column_type of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-        if column_type is None:
-            raise ValueError("Invalid value for `column_type`, must not be `None`")  # noqa: E501
-        allowed_values = ["enum", "number", "decimal", "string", "text", "boolean", "date", "timestamp", "blob"]  # noqa: E501
-        if column_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `column_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(column_type, allowed_values)
-            )
-
-        self._column_type = column_type
-
-    @property
-    def column_concept(self):
-        """Gets the column_concept of this ColumnDto.  # noqa: E501
-
-
-        :return: The column_concept of this ColumnDto.  # noqa: E501
-        :rtype: ConceptDto
-        """
-        return self._column_concept
-
-    @column_concept.setter
-    def column_concept(self, column_concept):
-        """Sets the column_concept of this ColumnDto.
-
-
-        :param column_concept: The column_concept of this ColumnDto.  # noqa: E501
-        :type: ConceptDto
-        """
-
-        self._column_concept = column_concept
-
-    @property
-    def decimal_digits_before(self):
-        """Gets the decimal_digits_before of this ColumnDto.  # noqa: E501
-
-
-        :return: The decimal_digits_before of this ColumnDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._decimal_digits_before
-
-    @decimal_digits_before.setter
-    def decimal_digits_before(self, decimal_digits_before):
-        """Sets the decimal_digits_before of this ColumnDto.
-
-
-        :param decimal_digits_before: The decimal_digits_before of this ColumnDto.  # noqa: E501
-        :type: int
-        """
-
-        self._decimal_digits_before = decimal_digits_before
-
-    @property
-    def decimal_digits_after(self):
-        """Gets the decimal_digits_after of this ColumnDto.  # noqa: E501
-
-
-        :return: The decimal_digits_after of this ColumnDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._decimal_digits_after
-
-    @decimal_digits_after.setter
-    def decimal_digits_after(self, decimal_digits_after):
-        """Sets the decimal_digits_after of this ColumnDto.
-
-
-        :param decimal_digits_after: The decimal_digits_after of this ColumnDto.  # noqa: E501
-        :type: int
-        """
-
-        self._decimal_digits_after = decimal_digits_after
-
-    @property
-    def is_null_allowed(self):
-        """Gets the is_null_allowed of this ColumnDto.  # noqa: E501
-
-
-        :return: The is_null_allowed of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._is_null_allowed
-
-    @is_null_allowed.setter
-    def is_null_allowed(self, is_null_allowed):
-        """Sets the is_null_allowed of this ColumnDto.
-
-
-        :param is_null_allowed: The is_null_allowed of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if is_null_allowed is None:
-            raise ValueError("Invalid value for `is_null_allowed`, must not be `None`")  # noqa: E501
-
-        self._is_null_allowed = is_null_allowed
-
-    @property
-    def check_expression(self):
-        """Gets the check_expression of this ColumnDto.  # noqa: E501
-
-
-        :return: The check_expression of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._check_expression
-
-    @check_expression.setter
-    def check_expression(self, check_expression):
-        """Sets the check_expression of this ColumnDto.
-
-
-        :param check_expression: The check_expression of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-
-        self._check_expression = check_expression
-
-    @property
-    def foreign_key(self):
-        """Gets the foreign_key of this ColumnDto.  # noqa: E501
-
-
-        :return: The foreign_key of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._foreign_key
-
-    @foreign_key.setter
-    def foreign_key(self, foreign_key):
-        """Sets the foreign_key of this ColumnDto.
-
-
-        :param foreign_key: The foreign_key of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-
-        self._foreign_key = foreign_key
-
-    @property
-    def enum_values(self):
-        """Gets the enum_values of this ColumnDto.  # noqa: E501
-
-
-        :return: The enum_values of this ColumnDto.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._enum_values
-
-    @enum_values.setter
-    def enum_values(self, enum_values):
-        """Sets the enum_values of this ColumnDto.
-
-
-        :param enum_values: The enum_values of this ColumnDto.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._enum_values = enum_values
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ColumnDto, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ColumnDto):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/.jupyter/api_container/models/concept_dto.py b/.jupyter/api_container/models/concept_dto.py
deleted file mode 100644
index fb84f8162eefe1e337201edcf46d36fcde988341..0000000000000000000000000000000000000000
--- a/.jupyter/api_container/models/concept_dto.py
+++ /dev/null
@@ -1,165 +0,0 @@
-# coding: utf-8
-
-"""
-    Database Repository Container Service API
-
-    Service that manages the containers  # noqa: E501
-
-    OpenAPI spec version: 1.1.0-alpha
-    Contact: andreas.rauber@tuwien.ac.at
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-class ConceptDto(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'uri': 'str',
-        'name': 'str',
-        'created': 'datetime'
-    }
-
-    attribute_map = {
-        'uri': 'uri',
-        'name': 'name',
-        'created': 'created'
-    }
-
-    def __init__(self, uri=None, name=None, created=None):  # noqa: E501
-        """ConceptDto - a model defined in Swagger"""  # noqa: E501
-        self._uri = None
-        self._name = None
-        self._created = None
-        self.discriminator = None
-        self.uri = uri
-        self.name = name
-        self.created = created
-
-    @property
-    def uri(self):
-        """Gets the uri of this ConceptDto.  # noqa: E501
-
-
-        :return: The uri of this ConceptDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._uri
-
-    @uri.setter
-    def uri(self, uri):
-        """Sets the uri of this ConceptDto.
-
-
-        :param uri: The uri of this ConceptDto.  # noqa: E501
-        :type: str
-        """
-        if uri is None:
-            raise ValueError("Invalid value for `uri`, must not be `None`")  # noqa: E501
-
-        self._uri = uri
-
-    @property
-    def name(self):
-        """Gets the name of this ConceptDto.  # noqa: E501
-
-
-        :return: The name of this ConceptDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this ConceptDto.
-
-
-        :param name: The name of this ConceptDto.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def created(self):
-        """Gets the created of this ConceptDto.  # noqa: E501
-
-
-        :return: The created of this ConceptDto.  # noqa: E501
-        :rtype: datetime
-        """
-        return self._created
-
-    @created.setter
-    def created(self, created):
-        """Sets the created of this ConceptDto.
-
-
-        :param created: The created of this ConceptDto.  # noqa: E501
-        :type: datetime
-        """
-        if created is None:
-            raise ValueError("Invalid value for `created`, must not be `None`")  # noqa: E501
-
-        self._created = created
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ConceptDto, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ConceptDto):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/.jupyter/api_container/models/database_dto.py b/.jupyter/api_container/models/database_dto.py
index 95e967060fc4db7b769e9d3d3ebf7b6d63e22997..4c1e4837496cdf9051cf1ee03fcb8e4882734298 100644
--- a/.jupyter/api_container/models/database_dto.py
+++ b/.jupyter/api_container/models/database_dto.py
@@ -28,334 +28,307 @@ class DatabaseDto(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'database_id': 'int',
-        'database_name': 'str',
-        'database_exchange': 'str',
-        'database_creator': 'UserBriefDto',
-        'database_subjects': 'list[str]',
-        'database_language': 'str',
-        'database_license': 'LicenseDto',
-        'database_description': 'str',
-        'database_publisher': 'str',
-        'database_contact_person': 'UserDto',
+        'id': 'int',
+        'name': 'str',
+        'exchange': 'str',
+        'creator': 'UserBriefDto',
+        'subjects': 'list[str]',
+        'language': 'str',
+        'license': 'LicenseDto',
+        'description': 'str',
+        'publisher': 'str',
         'tables': 'list[TableBriefDto]',
-        'database_container_image': 'ImageDto',
+        'image': 'ImageDto',
         'container': 'ContainerDto',
-        'database_creation_time': 'datetime',
+        'created': 'datetime',
         'deleted': 'datetime',
-        'database_internal_name': 'str',
-        'database_publication_year': 'int',
-        'database_publication_month': 'int',
-        'database_publication_day': 'int',
-        'database_public': 'bool'
+        'internal_name': 'str',
+        'publication_year': 'int',
+        'publication_month': 'int',
+        'publication_day': 'int',
+        'is_public': 'bool'
     }
 
     attribute_map = {
-        'database_id': 'database id',
-        'database_name': 'database name',
-        'database_exchange': 'database exchange',
-        'database_creator': 'database creator',
-        'database_subjects': 'database subjects',
-        'database_language': 'database language',
-        'database_license': 'database license',
-        'database_description': 'database description',
-        'database_publisher': 'database publisher',
-        'database_contact_person': 'database contact person',
+        'id': 'id',
+        'name': 'name',
+        'exchange': 'exchange',
+        'creator': 'creator',
+        'subjects': 'subjects',
+        'language': 'language',
+        'license': 'license',
+        'description': 'description',
+        'publisher': 'publisher',
         'tables': 'tables',
-        'database_container_image': 'database container image',
+        'image': 'image',
         'container': 'container',
-        'database_creation_time': 'database creation time',
+        'created': 'created',
         'deleted': 'deleted',
-        'database_internal_name': 'database internal name',
-        'database_publication_year': 'database publication year',
-        'database_publication_month': 'database publication month',
-        'database_publication_day': 'database publication day',
-        'database_public': 'database public'
+        'internal_name': 'internal_name',
+        'publication_year': 'publication_year',
+        'publication_month': 'publication_month',
+        'publication_day': 'publication_day',
+        'is_public': 'is_public'
     }
 
-    def __init__(self, database_id=None, database_name=None, database_exchange=None, database_creator=None, database_subjects=None, database_language=None, database_license=None, database_description=None, database_publisher=None, database_contact_person=None, tables=None, database_container_image=None, container=None, database_creation_time=None, deleted=None, database_internal_name=None, database_publication_year=None, database_publication_month=None, database_publication_day=None, database_public=None):  # noqa: E501
+    def __init__(self, id=None, name=None, exchange=None, creator=None, subjects=None, language=None, license=None, description=None, publisher=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, publication_year=None, publication_month=None, publication_day=None, is_public=None):  # noqa: E501
         """DatabaseDto - a model defined in Swagger"""  # noqa: E501
-        self._database_id = None
-        self._database_name = None
-        self._database_exchange = None
-        self._database_creator = None
-        self._database_subjects = None
-        self._database_language = None
-        self._database_license = None
-        self._database_description = None
-        self._database_publisher = None
-        self._database_contact_person = None
+        self._id = None
+        self._name = None
+        self._exchange = None
+        self._creator = None
+        self._subjects = None
+        self._language = None
+        self._license = None
+        self._description = None
+        self._publisher = None
         self._tables = None
-        self._database_container_image = None
+        self._image = None
         self._container = None
-        self._database_creation_time = None
+        self._created = None
         self._deleted = None
-        self._database_internal_name = None
-        self._database_publication_year = None
-        self._database_publication_month = None
-        self._database_publication_day = None
-        self._database_public = None
+        self._internal_name = None
+        self._publication_year = None
+        self._publication_month = None
+        self._publication_day = None
+        self._is_public = None
         self.discriminator = None
-        self.database_id = database_id
-        self.database_name = database_name
-        self.database_exchange = database_exchange
-        self.database_creator = database_creator
-        if database_subjects is not None:
-            self.database_subjects = database_subjects
-        if database_language is not None:
-            self.database_language = database_language
-        if database_license is not None:
-            self.database_license = database_license
-        self.database_description = database_description
-        if database_publisher is not None:
-            self.database_publisher = database_publisher
-        if database_contact_person is not None:
-            self.database_contact_person = database_contact_person
+        self.id = id
+        self.name = name
+        self.exchange = exchange
+        self.creator = creator
+        if subjects is not None:
+            self.subjects = subjects
+        if language is not None:
+            self.language = language
+        if license is not None:
+            self.license = license
+        if description is not None:
+            self.description = description
+        if publisher is not None:
+            self.publisher = publisher
         if tables is not None:
             self.tables = tables
-        if database_container_image is not None:
-            self.database_container_image = database_container_image
+        if image is not None:
+            self.image = image
         if container is not None:
             self.container = container
-        if database_creation_time is not None:
-            self.database_creation_time = database_creation_time
+        if created is not None:
+            self.created = created
         if deleted is not None:
             self.deleted = deleted
-        self.database_internal_name = database_internal_name
-        if database_publication_year is not None:
-            self.database_publication_year = database_publication_year
-        if database_publication_month is not None:
-            self.database_publication_month = database_publication_month
-        if database_publication_day is not None:
-            self.database_publication_day = database_publication_day
-        if database_public is not None:
-            self.database_public = database_public
+        self.internal_name = internal_name
+        if publication_year is not None:
+            self.publication_year = publication_year
+        if publication_month is not None:
+            self.publication_month = publication_month
+        if publication_day is not None:
+            self.publication_day = publication_day
+        if is_public is not None:
+            self.is_public = is_public
 
     @property
-    def database_id(self):
-        """Gets the database_id of this DatabaseDto.  # noqa: E501
+    def id(self):
+        """Gets the id of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_id of this DatabaseDto.  # noqa: E501
+        :return: The id of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_id
+        return self._id
 
-    @database_id.setter
-    def database_id(self, database_id):
-        """Sets the database_id of this DatabaseDto.
+    @id.setter
+    def id(self, id):
+        """Sets the id of this DatabaseDto.
 
 
-        :param database_id: The database_id of this DatabaseDto.  # noqa: E501
+        :param id: The id of this DatabaseDto.  # noqa: E501
         :type: int
         """
-        if database_id is None:
-            raise ValueError("Invalid value for `database_id`, must not be `None`")  # noqa: E501
+        if id is None:
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
 
-        self._database_id = database_id
+        self._id = id
 
     @property
-    def database_name(self):
-        """Gets the database_name of this DatabaseDto.  # noqa: E501
+    def name(self):
+        """Gets the name of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_name of this DatabaseDto.  # noqa: E501
+        :return: The name of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_name
+        return self._name
 
-    @database_name.setter
-    def database_name(self, database_name):
-        """Sets the database_name of this DatabaseDto.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this DatabaseDto.
 
 
-        :param database_name: The database_name of this DatabaseDto.  # noqa: E501
+        :param name: The name of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_name is None:
-            raise ValueError("Invalid value for `database_name`, must not be `None`")  # noqa: E501
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._database_name = database_name
+        self._name = name
 
     @property
-    def database_exchange(self):
-        """Gets the database_exchange of this DatabaseDto.  # noqa: E501
+    def exchange(self):
+        """Gets the exchange of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_exchange of this DatabaseDto.  # noqa: E501
+        :return: The exchange of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_exchange
+        return self._exchange
 
-    @database_exchange.setter
-    def database_exchange(self, database_exchange):
-        """Sets the database_exchange of this DatabaseDto.
+    @exchange.setter
+    def exchange(self, exchange):
+        """Sets the exchange of this DatabaseDto.
 
 
-        :param database_exchange: The database_exchange of this DatabaseDto.  # noqa: E501
+        :param exchange: The exchange of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_exchange is None:
-            raise ValueError("Invalid value for `database_exchange`, must not be `None`")  # noqa: E501
+        if exchange is None:
+            raise ValueError("Invalid value for `exchange`, must not be `None`")  # noqa: E501
 
-        self._database_exchange = database_exchange
+        self._exchange = exchange
 
     @property
-    def database_creator(self):
-        """Gets the database_creator of this DatabaseDto.  # noqa: E501
+    def creator(self):
+        """Gets the creator of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_creator of this DatabaseDto.  # noqa: E501
+        :return: The creator of this DatabaseDto.  # noqa: E501
         :rtype: UserBriefDto
         """
-        return self._database_creator
+        return self._creator
 
-    @database_creator.setter
-    def database_creator(self, database_creator):
-        """Sets the database_creator of this DatabaseDto.
+    @creator.setter
+    def creator(self, creator):
+        """Sets the creator of this DatabaseDto.
 
 
-        :param database_creator: The database_creator of this DatabaseDto.  # noqa: E501
+        :param creator: The creator of this DatabaseDto.  # noqa: E501
         :type: UserBriefDto
         """
-        if database_creator is None:
-            raise ValueError("Invalid value for `database_creator`, must not be `None`")  # noqa: E501
+        if creator is None:
+            raise ValueError("Invalid value for `creator`, must not be `None`")  # noqa: E501
 
-        self._database_creator = database_creator
+        self._creator = creator
 
     @property
-    def database_subjects(self):
-        """Gets the database_subjects of this DatabaseDto.  # noqa: E501
+    def subjects(self):
+        """Gets the subjects of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_subjects of this DatabaseDto.  # noqa: E501
+        :return: The subjects of this DatabaseDto.  # noqa: E501
         :rtype: list[str]
         """
-        return self._database_subjects
+        return self._subjects
 
-    @database_subjects.setter
-    def database_subjects(self, database_subjects):
-        """Sets the database_subjects of this DatabaseDto.
+    @subjects.setter
+    def subjects(self, subjects):
+        """Sets the subjects of this DatabaseDto.
 
 
-        :param database_subjects: The database_subjects of this DatabaseDto.  # noqa: E501
+        :param subjects: The subjects of this DatabaseDto.  # noqa: E501
         :type: list[str]
         """
 
-        self._database_subjects = database_subjects
+        self._subjects = subjects
 
     @property
-    def database_language(self):
-        """Gets the database_language of this DatabaseDto.  # noqa: E501
+    def language(self):
+        """Gets the language of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_language of this DatabaseDto.  # noqa: E501
+        :return: The language of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_language
+        return self._language
 
-    @database_language.setter
-    def database_language(self, database_language):
-        """Sets the database_language of this DatabaseDto.
+    @language.setter
+    def language(self, language):
+        """Sets the language of this DatabaseDto.
 
 
-        :param database_language: The database_language of this DatabaseDto.  # noqa: E501
+        :param language: The language of this DatabaseDto.  # noqa: E501
         :type: str
         """
         allowed_values = ["ab", "aa", "af", "ak", "sq", "am", "ar", "an", "hy", "as", "av", "ae", "ay", "az", "bm", "ba", "eu", "be", "bn", "bh", "bi", "bs", "br", "bg", "my", "ca", "km", "ch", "ce", "ny", "zh", "cu", "cv", "kw", "co", "cr", "hr", "cs", "da", "dv", "nl", "dz", "en", "eo", "et", "ee", "fo", "fj", "fi", "fr", "ff", "gd", "gl", "lg", "ka", "de", "ki", "el", "kl", "gn", "gu", "ht", "ha", "he", "hz", "hi", "ho", "hu", "is", "io", "ig", "id", "ia", "ie", "iu", "ik", "ga", "it", "ja", "jv", "kn", "kr", "ks", "kk", "rw", "kv", "kg", "ko", "kj", "ku", "ky", "lo", "la", "lv", "lb", "li", "ln", "lt", "lu", "mk", "mg", "ms", "ml", "mt", "gv", "mi", "mr", "mh", "ro", "mn", "na", "nv", "nd", "ng", "ne", "se", "no", "nb", "nn", "ii", "oc", "oj", "or", "om", "os", "pi", "pa", "ps", "fa", "pl", "pt", "qu", "rm", "rn", "ru", "sm", "sg", "sa", "sc", "sr", "sn", "sd", "si", "sk", "sl", "so", "st", "nr", "es", "su", "sw", "ss", "sv", "tl", "ty", "tg", "ta", "tt", "te", "th", "bo", "ti", "to", "ts", "tn", "tr", "tk", "tw", "ug", "uk", "ur", "uz", "ve", "vi", "vo", "wa", "cy", "fy", "wo", "xh", "yi", "yo", "za", "zu"]  # noqa: E501
-        if database_language not in allowed_values:
+        if language not in allowed_values:
             raise ValueError(
-                "Invalid value for `database_language` ({0}), must be one of {1}"  # noqa: E501
-                .format(database_language, allowed_values)
+                "Invalid value for `language` ({0}), must be one of {1}"  # noqa: E501
+                .format(language, allowed_values)
             )
 
-        self._database_language = database_language
+        self._language = language
 
     @property
-    def database_license(self):
-        """Gets the database_license of this DatabaseDto.  # noqa: E501
+    def license(self):
+        """Gets the license of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_license of this DatabaseDto.  # noqa: E501
+        :return: The license of this DatabaseDto.  # noqa: E501
         :rtype: LicenseDto
         """
-        return self._database_license
+        return self._license
 
-    @database_license.setter
-    def database_license(self, database_license):
-        """Sets the database_license of this DatabaseDto.
+    @license.setter
+    def license(self, license):
+        """Sets the license of this DatabaseDto.
 
 
-        :param database_license: The database_license of this DatabaseDto.  # noqa: E501
+        :param license: The license of this DatabaseDto.  # noqa: E501
         :type: LicenseDto
         """
 
-        self._database_license = database_license
+        self._license = license
 
     @property
-    def database_description(self):
-        """Gets the database_description of this DatabaseDto.  # noqa: E501
+    def description(self):
+        """Gets the description of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_description of this DatabaseDto.  # noqa: E501
+        :return: The description of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_description
+        return self._description
 
-    @database_description.setter
-    def database_description(self, database_description):
-        """Sets the database_description of this DatabaseDto.
+    @description.setter
+    def description(self, description):
+        """Sets the description of this DatabaseDto.
 
 
-        :param database_description: The database_description of this DatabaseDto.  # noqa: E501
+        :param description: The description of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_description is None:
-            raise ValueError("Invalid value for `database_description`, must not be `None`")  # noqa: E501
 
-        self._database_description = database_description
+        self._description = description
 
     @property
-    def database_publisher(self):
-        """Gets the database_publisher of this DatabaseDto.  # noqa: E501
+    def publisher(self):
+        """Gets the publisher of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publisher of this DatabaseDto.  # noqa: E501
+        :return: The publisher of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_publisher
+        return self._publisher
 
-    @database_publisher.setter
-    def database_publisher(self, database_publisher):
-        """Sets the database_publisher of this DatabaseDto.
+    @publisher.setter
+    def publisher(self, publisher):
+        """Sets the publisher of this DatabaseDto.
 
 
-        :param database_publisher: The database_publisher of this DatabaseDto.  # noqa: E501
+        :param publisher: The publisher of this DatabaseDto.  # noqa: E501
         :type: str
         """
 
-        self._database_publisher = database_publisher
-
-    @property
-    def database_contact_person(self):
-        """Gets the database_contact_person of this DatabaseDto.  # noqa: E501
-
-
-        :return: The database_contact_person of this DatabaseDto.  # noqa: E501
-        :rtype: UserDto
-        """
-        return self._database_contact_person
-
-    @database_contact_person.setter
-    def database_contact_person(self, database_contact_person):
-        """Sets the database_contact_person of this DatabaseDto.
-
-
-        :param database_contact_person: The database_contact_person of this DatabaseDto.  # noqa: E501
-        :type: UserDto
-        """
-
-        self._database_contact_person = database_contact_person
+        self._publisher = publisher
 
     @property
     def tables(self):
@@ -379,25 +352,25 @@ class DatabaseDto(object):
         self._tables = tables
 
     @property
-    def database_container_image(self):
-        """Gets the database_container_image of this DatabaseDto.  # noqa: E501
+    def image(self):
+        """Gets the image of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_container_image of this DatabaseDto.  # noqa: E501
+        :return: The image of this DatabaseDto.  # noqa: E501
         :rtype: ImageDto
         """
-        return self._database_container_image
+        return self._image
 
-    @database_container_image.setter
-    def database_container_image(self, database_container_image):
-        """Sets the database_container_image of this DatabaseDto.
+    @image.setter
+    def image(self, image):
+        """Sets the image of this DatabaseDto.
 
 
-        :param database_container_image: The database_container_image of this DatabaseDto.  # noqa: E501
+        :param image: The image of this DatabaseDto.  # noqa: E501
         :type: ImageDto
         """
 
-        self._database_container_image = database_container_image
+        self._image = image
 
     @property
     def container(self):
@@ -421,25 +394,25 @@ class DatabaseDto(object):
         self._container = container
 
     @property
-    def database_creation_time(self):
-        """Gets the database_creation_time of this DatabaseDto.  # noqa: E501
+    def created(self):
+        """Gets the created of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_creation_time of this DatabaseDto.  # noqa: E501
+        :return: The created of this DatabaseDto.  # noqa: E501
         :rtype: datetime
         """
-        return self._database_creation_time
+        return self._created
 
-    @database_creation_time.setter
-    def database_creation_time(self, database_creation_time):
-        """Sets the database_creation_time of this DatabaseDto.
+    @created.setter
+    def created(self, created):
+        """Sets the created of this DatabaseDto.
 
 
-        :param database_creation_time: The database_creation_time of this DatabaseDto.  # noqa: E501
+        :param created: The created of this DatabaseDto.  # noqa: E501
         :type: datetime
         """
 
-        self._database_creation_time = database_creation_time
+        self._created = created
 
     @property
     def deleted(self):
@@ -463,111 +436,111 @@ class DatabaseDto(object):
         self._deleted = deleted
 
     @property
-    def database_internal_name(self):
-        """Gets the database_internal_name of this DatabaseDto.  # noqa: E501
+    def internal_name(self):
+        """Gets the internal_name of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_internal_name of this DatabaseDto.  # noqa: E501
+        :return: The internal_name of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_internal_name
+        return self._internal_name
 
-    @database_internal_name.setter
-    def database_internal_name(self, database_internal_name):
-        """Sets the database_internal_name of this DatabaseDto.
+    @internal_name.setter
+    def internal_name(self, internal_name):
+        """Sets the internal_name of this DatabaseDto.
 
 
-        :param database_internal_name: The database_internal_name of this DatabaseDto.  # noqa: E501
+        :param internal_name: The internal_name of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_internal_name is None:
-            raise ValueError("Invalid value for `database_internal_name`, must not be `None`")  # noqa: E501
+        if internal_name is None:
+            raise ValueError("Invalid value for `internal_name`, must not be `None`")  # noqa: E501
 
-        self._database_internal_name = database_internal_name
+        self._internal_name = internal_name
 
     @property
-    def database_publication_year(self):
-        """Gets the database_publication_year of this DatabaseDto.  # noqa: E501
+    def publication_year(self):
+        """Gets the publication_year of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publication_year of this DatabaseDto.  # noqa: E501
+        :return: The publication_year of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_publication_year
+        return self._publication_year
 
-    @database_publication_year.setter
-    def database_publication_year(self, database_publication_year):
-        """Sets the database_publication_year of this DatabaseDto.
+    @publication_year.setter
+    def publication_year(self, publication_year):
+        """Sets the publication_year of this DatabaseDto.
 
 
-        :param database_publication_year: The database_publication_year of this DatabaseDto.  # noqa: E501
+        :param publication_year: The publication_year of this DatabaseDto.  # noqa: E501
         :type: int
         """
 
-        self._database_publication_year = database_publication_year
+        self._publication_year = publication_year
 
     @property
-    def database_publication_month(self):
-        """Gets the database_publication_month of this DatabaseDto.  # noqa: E501
+    def publication_month(self):
+        """Gets the publication_month of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publication_month of this DatabaseDto.  # noqa: E501
+        :return: The publication_month of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_publication_month
+        return self._publication_month
 
-    @database_publication_month.setter
-    def database_publication_month(self, database_publication_month):
-        """Sets the database_publication_month of this DatabaseDto.
+    @publication_month.setter
+    def publication_month(self, publication_month):
+        """Sets the publication_month of this DatabaseDto.
 
 
-        :param database_publication_month: The database_publication_month of this DatabaseDto.  # noqa: E501
+        :param publication_month: The publication_month of this DatabaseDto.  # noqa: E501
         :type: int
         """
 
-        self._database_publication_month = database_publication_month
+        self._publication_month = publication_month
 
     @property
-    def database_publication_day(self):
-        """Gets the database_publication_day of this DatabaseDto.  # noqa: E501
+    def publication_day(self):
+        """Gets the publication_day of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publication_day of this DatabaseDto.  # noqa: E501
+        :return: The publication_day of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_publication_day
+        return self._publication_day
 
-    @database_publication_day.setter
-    def database_publication_day(self, database_publication_day):
-        """Sets the database_publication_day of this DatabaseDto.
+    @publication_day.setter
+    def publication_day(self, publication_day):
+        """Sets the publication_day of this DatabaseDto.
 
 
-        :param database_publication_day: The database_publication_day of this DatabaseDto.  # noqa: E501
+        :param publication_day: The publication_day of this DatabaseDto.  # noqa: E501
         :type: int
         """
 
-        self._database_publication_day = database_publication_day
+        self._publication_day = publication_day
 
     @property
-    def database_public(self):
-        """Gets the database_public of this DatabaseDto.  # noqa: E501
+    def is_public(self):
+        """Gets the is_public of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_public of this DatabaseDto.  # noqa: E501
+        :return: The is_public of this DatabaseDto.  # noqa: E501
         :rtype: bool
         """
-        return self._database_public
+        return self._is_public
 
-    @database_public.setter
-    def database_public(self, database_public):
-        """Sets the database_public of this DatabaseDto.
+    @is_public.setter
+    def is_public(self, is_public):
+        """Sets the is_public of this DatabaseDto.
 
 
-        :param database_public: The database_public of this DatabaseDto.  # noqa: E501
+        :param is_public: The is_public of this DatabaseDto.  # noqa: E501
         :type: bool
         """
 
-        self._database_public = database_public
+        self._is_public = is_public
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/.jupyter/api_container/models/table_dto.py b/.jupyter/api_container/models/table_dto.py
deleted file mode 100644
index 30b4e2932fc5deee389da6e604dc41bffbb656aa..0000000000000000000000000000000000000000
--- a/.jupyter/api_container/models/table_dto.py
+++ /dev/null
@@ -1,272 +0,0 @@
-# coding: utf-8
-
-"""
-    Database Repository Container Service API
-
-    Service that manages the containers  # noqa: E501
-
-    OpenAPI spec version: 1.1.0-alpha
-    Contact: andreas.rauber@tuwien.ac.at
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-class TableDto(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'id': 'int',
-        'name': 'str',
-        'topic': 'str',
-        'description': 'str',
-        'created': 'datetime',
-        'columns': 'list[ColumnDto]',
-        'internal_name': 'str'
-    }
-
-    attribute_map = {
-        'id': 'id',
-        'name': 'name',
-        'topic': 'topic',
-        'description': 'description',
-        'created': 'created',
-        'columns': 'columns',
-        'internal_name': 'internal_name'
-    }
-
-    def __init__(self, id=None, name=None, topic=None, description=None, created=None, columns=None, internal_name=None):  # noqa: E501
-        """TableDto - a model defined in Swagger"""  # noqa: E501
-        self._id = None
-        self._name = None
-        self._topic = None
-        self._description = None
-        self._created = None
-        self._columns = None
-        self._internal_name = None
-        self.discriminator = None
-        self.id = id
-        self.name = name
-        self.topic = topic
-        self.description = description
-        if created is not None:
-            self.created = created
-        self.columns = columns
-        self.internal_name = internal_name
-
-    @property
-    def id(self):
-        """Gets the id of this TableDto.  # noqa: E501
-
-
-        :return: The id of this TableDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this TableDto.
-
-
-        :param id: The id of this TableDto.  # noqa: E501
-        :type: int
-        """
-        if id is None:
-            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
-
-        self._id = id
-
-    @property
-    def name(self):
-        """Gets the name of this TableDto.  # noqa: E501
-
-
-        :return: The name of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this TableDto.
-
-
-        :param name: The name of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def topic(self):
-        """Gets the topic of this TableDto.  # noqa: E501
-
-
-        :return: The topic of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._topic
-
-    @topic.setter
-    def topic(self, topic):
-        """Sets the topic of this TableDto.
-
-
-        :param topic: The topic of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if topic is None:
-            raise ValueError("Invalid value for `topic`, must not be `None`")  # noqa: E501
-
-        self._topic = topic
-
-    @property
-    def description(self):
-        """Gets the description of this TableDto.  # noqa: E501
-
-
-        :return: The description of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this TableDto.
-
-
-        :param description: The description of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if description is None:
-            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
-
-        self._description = description
-
-    @property
-    def created(self):
-        """Gets the created of this TableDto.  # noqa: E501
-
-
-        :return: The created of this TableDto.  # noqa: E501
-        :rtype: datetime
-        """
-        return self._created
-
-    @created.setter
-    def created(self, created):
-        """Sets the created of this TableDto.
-
-
-        :param created: The created of this TableDto.  # noqa: E501
-        :type: datetime
-        """
-
-        self._created = created
-
-    @property
-    def columns(self):
-        """Gets the columns of this TableDto.  # noqa: E501
-
-
-        :return: The columns of this TableDto.  # noqa: E501
-        :rtype: list[ColumnDto]
-        """
-        return self._columns
-
-    @columns.setter
-    def columns(self, columns):
-        """Sets the columns of this TableDto.
-
-
-        :param columns: The columns of this TableDto.  # noqa: E501
-        :type: list[ColumnDto]
-        """
-        if columns is None:
-            raise ValueError("Invalid value for `columns`, must not be `None`")  # noqa: E501
-
-        self._columns = columns
-
-    @property
-    def internal_name(self):
-        """Gets the internal_name of this TableDto.  # noqa: E501
-
-
-        :return: The internal_name of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._internal_name
-
-    @internal_name.setter
-    def internal_name(self, internal_name):
-        """Sets the internal_name of this TableDto.
-
-
-        :param internal_name: The internal_name of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if internal_name is None:
-            raise ValueError("Invalid value for `internal_name`, must not be `None`")  # noqa: E501
-
-        self._internal_name = internal_name
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(TableDto, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, TableDto):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/.jupyter/api_database/__init__.py b/.jupyter/api_database/__init__.py
index 9a42f3144f688a0c9784305f49f763d26606d2b9..f76d3d9068b7e4a0eaf718eadbca509c3d5e4f0c 100644
--- a/.jupyter/api_database/__init__.py
+++ b/.jupyter/api_database/__init__.py
@@ -29,7 +29,6 @@ from api_database.models.database_create_dto import DatabaseCreateDto
 from api_database.models.database_dto import DatabaseDto
 from api_database.models.database_modify_dto import DatabaseModifyDto
 from api_database.models.database_transfer_dto import DatabaseTransferDto
-from api_database.models.granted_authority_dto import GrantedAuthorityDto
 from api_database.models.image_brief_dto import ImageBriefDto
 from api_database.models.image_date_dto import ImageDateDto
 from api_database.models.image_dto import ImageDto
@@ -37,4 +36,3 @@ from api_database.models.image_env_item_dto import ImageEnvItemDto
 from api_database.models.license_dto import LicenseDto
 from api_database.models.table_brief_dto import TableBriefDto
 from api_database.models.user_brief_dto import UserBriefDto
-from api_database.models.user_dto import UserDto
diff --git a/.jupyter/api_database/models/__init__.py b/.jupyter/api_database/models/__init__.py
index caa6d6454ea0d69452d82095c5636da19c8ca164..75d043704bb0625459042595af1e81904221060c 100644
--- a/.jupyter/api_database/models/__init__.py
+++ b/.jupyter/api_database/models/__init__.py
@@ -22,7 +22,6 @@ from api_database.models.database_create_dto import DatabaseCreateDto
 from api_database.models.database_dto import DatabaseDto
 from api_database.models.database_modify_dto import DatabaseModifyDto
 from api_database.models.database_transfer_dto import DatabaseTransferDto
-from api_database.models.granted_authority_dto import GrantedAuthorityDto
 from api_database.models.image_brief_dto import ImageBriefDto
 from api_database.models.image_date_dto import ImageDateDto
 from api_database.models.image_dto import ImageDto
@@ -30,4 +29,3 @@ from api_database.models.image_env_item_dto import ImageEnvItemDto
 from api_database.models.license_dto import LicenseDto
 from api_database.models.table_brief_dto import TableBriefDto
 from api_database.models.user_brief_dto import UserBriefDto
-from api_database.models.user_dto import UserDto
diff --git a/.jupyter/api_database/models/column_dto.py b/.jupyter/api_database/models/column_dto.py
deleted file mode 100644
index e4e7f842ad2e7e5730320c4eabed83aa17a09250..0000000000000000000000000000000000000000
--- a/.jupyter/api_database/models/column_dto.py
+++ /dev/null
@@ -1,514 +0,0 @@
-# coding: utf-8
-
-"""
-    Database Repository Database Service API
-
-    Service that manages the databases  # noqa: E501
-
-    OpenAPI spec version: 1.1.0-alpha
-    Contact: andreas.rauber@tuwien.ac.at
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-class ColumnDto(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'id': 'int',
-        'name': 'str',
-        'unique': 'bool',
-        'references': 'str',
-        'internal_name': 'str',
-        'date_format': 'ImageDateDto',
-        'auto_generated': 'bool',
-        'is_primary_key': 'bool',
-        'column_type': 'str',
-        'column_concept': 'ConceptDto',
-        'decimal_digits_before': 'int',
-        'decimal_digits_after': 'int',
-        'is_null_allowed': 'bool',
-        'check_expression': 'str',
-        'foreign_key': 'str',
-        'enum_values': 'list[str]'
-    }
-
-    attribute_map = {
-        'id': 'id',
-        'name': 'name',
-        'unique': 'unique',
-        'references': 'references',
-        'internal_name': 'internal_name',
-        'date_format': 'date_format',
-        'auto_generated': 'auto_generated',
-        'is_primary_key': 'is_primary_key',
-        'column_type': 'column_type',
-        'column_concept': 'column_concept',
-        'decimal_digits_before': 'decimal_digits_before',
-        'decimal_digits_after': 'decimal_digits_after',
-        'is_null_allowed': 'is_null_allowed',
-        'check_expression': 'check_expression',
-        'foreign_key': 'foreign_key',
-        'enum_values': 'enum_values'
-    }
-
-    def __init__(self, id=None, name=None, unique=None, references=None, internal_name=None, date_format=None, auto_generated=None, is_primary_key=None, column_type=None, column_concept=None, decimal_digits_before=None, decimal_digits_after=None, is_null_allowed=None, check_expression=None, foreign_key=None, enum_values=None):  # noqa: E501
-        """ColumnDto - a model defined in Swagger"""  # noqa: E501
-        self._id = None
-        self._name = None
-        self._unique = None
-        self._references = None
-        self._internal_name = None
-        self._date_format = None
-        self._auto_generated = None
-        self._is_primary_key = None
-        self._column_type = None
-        self._column_concept = None
-        self._decimal_digits_before = None
-        self._decimal_digits_after = None
-        self._is_null_allowed = None
-        self._check_expression = None
-        self._foreign_key = None
-        self._enum_values = None
-        self.discriminator = None
-        self.id = id
-        self.name = name
-        self.unique = unique
-        if references is not None:
-            self.references = references
-        self.internal_name = internal_name
-        if date_format is not None:
-            self.date_format = date_format
-        self.auto_generated = auto_generated
-        self.is_primary_key = is_primary_key
-        self.column_type = column_type
-        if column_concept is not None:
-            self.column_concept = column_concept
-        if decimal_digits_before is not None:
-            self.decimal_digits_before = decimal_digits_before
-        if decimal_digits_after is not None:
-            self.decimal_digits_after = decimal_digits_after
-        self.is_null_allowed = is_null_allowed
-        if check_expression is not None:
-            self.check_expression = check_expression
-        if foreign_key is not None:
-            self.foreign_key = foreign_key
-        if enum_values is not None:
-            self.enum_values = enum_values
-
-    @property
-    def id(self):
-        """Gets the id of this ColumnDto.  # noqa: E501
-
-
-        :return: The id of this ColumnDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this ColumnDto.
-
-
-        :param id: The id of this ColumnDto.  # noqa: E501
-        :type: int
-        """
-        if id is None:
-            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
-
-        self._id = id
-
-    @property
-    def name(self):
-        """Gets the name of this ColumnDto.  # noqa: E501
-
-
-        :return: The name of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this ColumnDto.
-
-
-        :param name: The name of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def unique(self):
-        """Gets the unique of this ColumnDto.  # noqa: E501
-
-
-        :return: The unique of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._unique
-
-    @unique.setter
-    def unique(self, unique):
-        """Sets the unique of this ColumnDto.
-
-
-        :param unique: The unique of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if unique is None:
-            raise ValueError("Invalid value for `unique`, must not be `None`")  # noqa: E501
-
-        self._unique = unique
-
-    @property
-    def references(self):
-        """Gets the references of this ColumnDto.  # noqa: E501
-
-
-        :return: The references of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._references
-
-    @references.setter
-    def references(self, references):
-        """Sets the references of this ColumnDto.
-
-
-        :param references: The references of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-
-        self._references = references
-
-    @property
-    def internal_name(self):
-        """Gets the internal_name of this ColumnDto.  # noqa: E501
-
-
-        :return: The internal_name of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._internal_name
-
-    @internal_name.setter
-    def internal_name(self, internal_name):
-        """Sets the internal_name of this ColumnDto.
-
-
-        :param internal_name: The internal_name of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-        if internal_name is None:
-            raise ValueError("Invalid value for `internal_name`, must not be `None`")  # noqa: E501
-
-        self._internal_name = internal_name
-
-    @property
-    def date_format(self):
-        """Gets the date_format of this ColumnDto.  # noqa: E501
-
-
-        :return: The date_format of this ColumnDto.  # noqa: E501
-        :rtype: ImageDateDto
-        """
-        return self._date_format
-
-    @date_format.setter
-    def date_format(self, date_format):
-        """Sets the date_format of this ColumnDto.
-
-
-        :param date_format: The date_format of this ColumnDto.  # noqa: E501
-        :type: ImageDateDto
-        """
-
-        self._date_format = date_format
-
-    @property
-    def auto_generated(self):
-        """Gets the auto_generated of this ColumnDto.  # noqa: E501
-
-
-        :return: The auto_generated of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._auto_generated
-
-    @auto_generated.setter
-    def auto_generated(self, auto_generated):
-        """Sets the auto_generated of this ColumnDto.
-
-
-        :param auto_generated: The auto_generated of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if auto_generated is None:
-            raise ValueError("Invalid value for `auto_generated`, must not be `None`")  # noqa: E501
-
-        self._auto_generated = auto_generated
-
-    @property
-    def is_primary_key(self):
-        """Gets the is_primary_key of this ColumnDto.  # noqa: E501
-
-
-        :return: The is_primary_key of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._is_primary_key
-
-    @is_primary_key.setter
-    def is_primary_key(self, is_primary_key):
-        """Sets the is_primary_key of this ColumnDto.
-
-
-        :param is_primary_key: The is_primary_key of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if is_primary_key is None:
-            raise ValueError("Invalid value for `is_primary_key`, must not be `None`")  # noqa: E501
-
-        self._is_primary_key = is_primary_key
-
-    @property
-    def column_type(self):
-        """Gets the column_type of this ColumnDto.  # noqa: E501
-
-
-        :return: The column_type of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._column_type
-
-    @column_type.setter
-    def column_type(self, column_type):
-        """Sets the column_type of this ColumnDto.
-
-
-        :param column_type: The column_type of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-        if column_type is None:
-            raise ValueError("Invalid value for `column_type`, must not be `None`")  # noqa: E501
-        allowed_values = ["enum", "number", "decimal", "string", "text", "boolean", "date", "timestamp", "blob"]  # noqa: E501
-        if column_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `column_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(column_type, allowed_values)
-            )
-
-        self._column_type = column_type
-
-    @property
-    def column_concept(self):
-        """Gets the column_concept of this ColumnDto.  # noqa: E501
-
-
-        :return: The column_concept of this ColumnDto.  # noqa: E501
-        :rtype: ConceptDto
-        """
-        return self._column_concept
-
-    @column_concept.setter
-    def column_concept(self, column_concept):
-        """Sets the column_concept of this ColumnDto.
-
-
-        :param column_concept: The column_concept of this ColumnDto.  # noqa: E501
-        :type: ConceptDto
-        """
-
-        self._column_concept = column_concept
-
-    @property
-    def decimal_digits_before(self):
-        """Gets the decimal_digits_before of this ColumnDto.  # noqa: E501
-
-
-        :return: The decimal_digits_before of this ColumnDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._decimal_digits_before
-
-    @decimal_digits_before.setter
-    def decimal_digits_before(self, decimal_digits_before):
-        """Sets the decimal_digits_before of this ColumnDto.
-
-
-        :param decimal_digits_before: The decimal_digits_before of this ColumnDto.  # noqa: E501
-        :type: int
-        """
-
-        self._decimal_digits_before = decimal_digits_before
-
-    @property
-    def decimal_digits_after(self):
-        """Gets the decimal_digits_after of this ColumnDto.  # noqa: E501
-
-
-        :return: The decimal_digits_after of this ColumnDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._decimal_digits_after
-
-    @decimal_digits_after.setter
-    def decimal_digits_after(self, decimal_digits_after):
-        """Sets the decimal_digits_after of this ColumnDto.
-
-
-        :param decimal_digits_after: The decimal_digits_after of this ColumnDto.  # noqa: E501
-        :type: int
-        """
-
-        self._decimal_digits_after = decimal_digits_after
-
-    @property
-    def is_null_allowed(self):
-        """Gets the is_null_allowed of this ColumnDto.  # noqa: E501
-
-
-        :return: The is_null_allowed of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._is_null_allowed
-
-    @is_null_allowed.setter
-    def is_null_allowed(self, is_null_allowed):
-        """Sets the is_null_allowed of this ColumnDto.
-
-
-        :param is_null_allowed: The is_null_allowed of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if is_null_allowed is None:
-            raise ValueError("Invalid value for `is_null_allowed`, must not be `None`")  # noqa: E501
-
-        self._is_null_allowed = is_null_allowed
-
-    @property
-    def check_expression(self):
-        """Gets the check_expression of this ColumnDto.  # noqa: E501
-
-
-        :return: The check_expression of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._check_expression
-
-    @check_expression.setter
-    def check_expression(self, check_expression):
-        """Sets the check_expression of this ColumnDto.
-
-
-        :param check_expression: The check_expression of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-
-        self._check_expression = check_expression
-
-    @property
-    def foreign_key(self):
-        """Gets the foreign_key of this ColumnDto.  # noqa: E501
-
-
-        :return: The foreign_key of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._foreign_key
-
-    @foreign_key.setter
-    def foreign_key(self, foreign_key):
-        """Sets the foreign_key of this ColumnDto.
-
-
-        :param foreign_key: The foreign_key of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-
-        self._foreign_key = foreign_key
-
-    @property
-    def enum_values(self):
-        """Gets the enum_values of this ColumnDto.  # noqa: E501
-
-
-        :return: The enum_values of this ColumnDto.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._enum_values
-
-    @enum_values.setter
-    def enum_values(self, enum_values):
-        """Sets the enum_values of this ColumnDto.
-
-
-        :param enum_values: The enum_values of this ColumnDto.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._enum_values = enum_values
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ColumnDto, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ColumnDto):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/.jupyter/api_database/models/concept_dto.py b/.jupyter/api_database/models/concept_dto.py
deleted file mode 100644
index a2d5b742904608ce6b17b290a9e0b38bb4164ae7..0000000000000000000000000000000000000000
--- a/.jupyter/api_database/models/concept_dto.py
+++ /dev/null
@@ -1,165 +0,0 @@
-# coding: utf-8
-
-"""
-    Database Repository Database Service API
-
-    Service that manages the databases  # noqa: E501
-
-    OpenAPI spec version: 1.1.0-alpha
-    Contact: andreas.rauber@tuwien.ac.at
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-class ConceptDto(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'uri': 'str',
-        'name': 'str',
-        'created': 'datetime'
-    }
-
-    attribute_map = {
-        'uri': 'uri',
-        'name': 'name',
-        'created': 'created'
-    }
-
-    def __init__(self, uri=None, name=None, created=None):  # noqa: E501
-        """ConceptDto - a model defined in Swagger"""  # noqa: E501
-        self._uri = None
-        self._name = None
-        self._created = None
-        self.discriminator = None
-        self.uri = uri
-        self.name = name
-        self.created = created
-
-    @property
-    def uri(self):
-        """Gets the uri of this ConceptDto.  # noqa: E501
-
-
-        :return: The uri of this ConceptDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._uri
-
-    @uri.setter
-    def uri(self, uri):
-        """Sets the uri of this ConceptDto.
-
-
-        :param uri: The uri of this ConceptDto.  # noqa: E501
-        :type: str
-        """
-        if uri is None:
-            raise ValueError("Invalid value for `uri`, must not be `None`")  # noqa: E501
-
-        self._uri = uri
-
-    @property
-    def name(self):
-        """Gets the name of this ConceptDto.  # noqa: E501
-
-
-        :return: The name of this ConceptDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this ConceptDto.
-
-
-        :param name: The name of this ConceptDto.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def created(self):
-        """Gets the created of this ConceptDto.  # noqa: E501
-
-
-        :return: The created of this ConceptDto.  # noqa: E501
-        :rtype: datetime
-        """
-        return self._created
-
-    @created.setter
-    def created(self, created):
-        """Sets the created of this ConceptDto.
-
-
-        :param created: The created of this ConceptDto.  # noqa: E501
-        :type: datetime
-        """
-        if created is None:
-            raise ValueError("Invalid value for `created`, must not be `None`")  # noqa: E501
-
-        self._created = created
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ConceptDto, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ConceptDto):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/.jupyter/api_database/models/database_dto.py b/.jupyter/api_database/models/database_dto.py
index 56899bd1051f4bf6440c22f309aae45d1d9c4e3f..2ac4839ac7fed4b29f04560ca8a73ae3e7795e70 100644
--- a/.jupyter/api_database/models/database_dto.py
+++ b/.jupyter/api_database/models/database_dto.py
@@ -28,334 +28,307 @@ class DatabaseDto(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'database_id': 'int',
-        'database_name': 'str',
-        'database_exchange': 'str',
-        'database_creator': 'UserBriefDto',
-        'database_subjects': 'list[str]',
-        'database_language': 'str',
-        'database_license': 'LicenseDto',
-        'database_description': 'str',
-        'database_publisher': 'str',
-        'database_contact_person': 'UserDto',
+        'id': 'int',
+        'name': 'str',
+        'exchange': 'str',
+        'creator': 'UserBriefDto',
+        'subjects': 'list[str]',
+        'language': 'str',
+        'license': 'LicenseDto',
+        'description': 'str',
+        'publisher': 'str',
         'tables': 'list[TableBriefDto]',
-        'database_container_image': 'ImageDto',
+        'image': 'ImageDto',
         'container': 'ContainerDto',
-        'database_creation_time': 'datetime',
+        'created': 'datetime',
         'deleted': 'datetime',
-        'database_internal_name': 'str',
-        'database_publication_year': 'int',
-        'database_publication_month': 'int',
-        'database_publication_day': 'int',
-        'database_public': 'bool'
+        'internal_name': 'str',
+        'publication_year': 'int',
+        'publication_month': 'int',
+        'publication_day': 'int',
+        'is_public': 'bool'
     }
 
     attribute_map = {
-        'database_id': 'database id',
-        'database_name': 'database name',
-        'database_exchange': 'database exchange',
-        'database_creator': 'database creator',
-        'database_subjects': 'database subjects',
-        'database_language': 'database language',
-        'database_license': 'database license',
-        'database_description': 'database description',
-        'database_publisher': 'database publisher',
-        'database_contact_person': 'database contact person',
+        'id': 'id',
+        'name': 'name',
+        'exchange': 'exchange',
+        'creator': 'creator',
+        'subjects': 'subjects',
+        'language': 'language',
+        'license': 'license',
+        'description': 'description',
+        'publisher': 'publisher',
         'tables': 'tables',
-        'database_container_image': 'database container image',
+        'image': 'image',
         'container': 'container',
-        'database_creation_time': 'database creation time',
+        'created': 'created',
         'deleted': 'deleted',
-        'database_internal_name': 'database internal name',
-        'database_publication_year': 'database publication year',
-        'database_publication_month': 'database publication month',
-        'database_publication_day': 'database publication day',
-        'database_public': 'database public'
+        'internal_name': 'internal_name',
+        'publication_year': 'publication_year',
+        'publication_month': 'publication_month',
+        'publication_day': 'publication_day',
+        'is_public': 'is_public'
     }
 
-    def __init__(self, database_id=None, database_name=None, database_exchange=None, database_creator=None, database_subjects=None, database_language=None, database_license=None, database_description=None, database_publisher=None, database_contact_person=None, tables=None, database_container_image=None, container=None, database_creation_time=None, deleted=None, database_internal_name=None, database_publication_year=None, database_publication_month=None, database_publication_day=None, database_public=None):  # noqa: E501
+    def __init__(self, id=None, name=None, exchange=None, creator=None, subjects=None, language=None, license=None, description=None, publisher=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, publication_year=None, publication_month=None, publication_day=None, is_public=None):  # noqa: E501
         """DatabaseDto - a model defined in Swagger"""  # noqa: E501
-        self._database_id = None
-        self._database_name = None
-        self._database_exchange = None
-        self._database_creator = None
-        self._database_subjects = None
-        self._database_language = None
-        self._database_license = None
-        self._database_description = None
-        self._database_publisher = None
-        self._database_contact_person = None
+        self._id = None
+        self._name = None
+        self._exchange = None
+        self._creator = None
+        self._subjects = None
+        self._language = None
+        self._license = None
+        self._description = None
+        self._publisher = None
         self._tables = None
-        self._database_container_image = None
+        self._image = None
         self._container = None
-        self._database_creation_time = None
+        self._created = None
         self._deleted = None
-        self._database_internal_name = None
-        self._database_publication_year = None
-        self._database_publication_month = None
-        self._database_publication_day = None
-        self._database_public = None
+        self._internal_name = None
+        self._publication_year = None
+        self._publication_month = None
+        self._publication_day = None
+        self._is_public = None
         self.discriminator = None
-        self.database_id = database_id
-        self.database_name = database_name
-        self.database_exchange = database_exchange
-        self.database_creator = database_creator
-        if database_subjects is not None:
-            self.database_subjects = database_subjects
-        if database_language is not None:
-            self.database_language = database_language
-        if database_license is not None:
-            self.database_license = database_license
-        self.database_description = database_description
-        if database_publisher is not None:
-            self.database_publisher = database_publisher
-        if database_contact_person is not None:
-            self.database_contact_person = database_contact_person
+        self.id = id
+        self.name = name
+        self.exchange = exchange
+        self.creator = creator
+        if subjects is not None:
+            self.subjects = subjects
+        if language is not None:
+            self.language = language
+        if license is not None:
+            self.license = license
+        if description is not None:
+            self.description = description
+        if publisher is not None:
+            self.publisher = publisher
         if tables is not None:
             self.tables = tables
-        if database_container_image is not None:
-            self.database_container_image = database_container_image
+        if image is not None:
+            self.image = image
         if container is not None:
             self.container = container
-        if database_creation_time is not None:
-            self.database_creation_time = database_creation_time
+        if created is not None:
+            self.created = created
         if deleted is not None:
             self.deleted = deleted
-        self.database_internal_name = database_internal_name
-        if database_publication_year is not None:
-            self.database_publication_year = database_publication_year
-        if database_publication_month is not None:
-            self.database_publication_month = database_publication_month
-        if database_publication_day is not None:
-            self.database_publication_day = database_publication_day
-        if database_public is not None:
-            self.database_public = database_public
+        self.internal_name = internal_name
+        if publication_year is not None:
+            self.publication_year = publication_year
+        if publication_month is not None:
+            self.publication_month = publication_month
+        if publication_day is not None:
+            self.publication_day = publication_day
+        if is_public is not None:
+            self.is_public = is_public
 
     @property
-    def database_id(self):
-        """Gets the database_id of this DatabaseDto.  # noqa: E501
+    def id(self):
+        """Gets the id of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_id of this DatabaseDto.  # noqa: E501
+        :return: The id of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_id
+        return self._id
 
-    @database_id.setter
-    def database_id(self, database_id):
-        """Sets the database_id of this DatabaseDto.
+    @id.setter
+    def id(self, id):
+        """Sets the id of this DatabaseDto.
 
 
-        :param database_id: The database_id of this DatabaseDto.  # noqa: E501
+        :param id: The id of this DatabaseDto.  # noqa: E501
         :type: int
         """
-        if database_id is None:
-            raise ValueError("Invalid value for `database_id`, must not be `None`")  # noqa: E501
+        if id is None:
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
 
-        self._database_id = database_id
+        self._id = id
 
     @property
-    def database_name(self):
-        """Gets the database_name of this DatabaseDto.  # noqa: E501
+    def name(self):
+        """Gets the name of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_name of this DatabaseDto.  # noqa: E501
+        :return: The name of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_name
+        return self._name
 
-    @database_name.setter
-    def database_name(self, database_name):
-        """Sets the database_name of this DatabaseDto.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this DatabaseDto.
 
 
-        :param database_name: The database_name of this DatabaseDto.  # noqa: E501
+        :param name: The name of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_name is None:
-            raise ValueError("Invalid value for `database_name`, must not be `None`")  # noqa: E501
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._database_name = database_name
+        self._name = name
 
     @property
-    def database_exchange(self):
-        """Gets the database_exchange of this DatabaseDto.  # noqa: E501
+    def exchange(self):
+        """Gets the exchange of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_exchange of this DatabaseDto.  # noqa: E501
+        :return: The exchange of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_exchange
+        return self._exchange
 
-    @database_exchange.setter
-    def database_exchange(self, database_exchange):
-        """Sets the database_exchange of this DatabaseDto.
+    @exchange.setter
+    def exchange(self, exchange):
+        """Sets the exchange of this DatabaseDto.
 
 
-        :param database_exchange: The database_exchange of this DatabaseDto.  # noqa: E501
+        :param exchange: The exchange of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_exchange is None:
-            raise ValueError("Invalid value for `database_exchange`, must not be `None`")  # noqa: E501
+        if exchange is None:
+            raise ValueError("Invalid value for `exchange`, must not be `None`")  # noqa: E501
 
-        self._database_exchange = database_exchange
+        self._exchange = exchange
 
     @property
-    def database_creator(self):
-        """Gets the database_creator of this DatabaseDto.  # noqa: E501
+    def creator(self):
+        """Gets the creator of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_creator of this DatabaseDto.  # noqa: E501
+        :return: The creator of this DatabaseDto.  # noqa: E501
         :rtype: UserBriefDto
         """
-        return self._database_creator
+        return self._creator
 
-    @database_creator.setter
-    def database_creator(self, database_creator):
-        """Sets the database_creator of this DatabaseDto.
+    @creator.setter
+    def creator(self, creator):
+        """Sets the creator of this DatabaseDto.
 
 
-        :param database_creator: The database_creator of this DatabaseDto.  # noqa: E501
+        :param creator: The creator of this DatabaseDto.  # noqa: E501
         :type: UserBriefDto
         """
-        if database_creator is None:
-            raise ValueError("Invalid value for `database_creator`, must not be `None`")  # noqa: E501
+        if creator is None:
+            raise ValueError("Invalid value for `creator`, must not be `None`")  # noqa: E501
 
-        self._database_creator = database_creator
+        self._creator = creator
 
     @property
-    def database_subjects(self):
-        """Gets the database_subjects of this DatabaseDto.  # noqa: E501
+    def subjects(self):
+        """Gets the subjects of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_subjects of this DatabaseDto.  # noqa: E501
+        :return: The subjects of this DatabaseDto.  # noqa: E501
         :rtype: list[str]
         """
-        return self._database_subjects
+        return self._subjects
 
-    @database_subjects.setter
-    def database_subjects(self, database_subjects):
-        """Sets the database_subjects of this DatabaseDto.
+    @subjects.setter
+    def subjects(self, subjects):
+        """Sets the subjects of this DatabaseDto.
 
 
-        :param database_subjects: The database_subjects of this DatabaseDto.  # noqa: E501
+        :param subjects: The subjects of this DatabaseDto.  # noqa: E501
         :type: list[str]
         """
 
-        self._database_subjects = database_subjects
+        self._subjects = subjects
 
     @property
-    def database_language(self):
-        """Gets the database_language of this DatabaseDto.  # noqa: E501
+    def language(self):
+        """Gets the language of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_language of this DatabaseDto.  # noqa: E501
+        :return: The language of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_language
+        return self._language
 
-    @database_language.setter
-    def database_language(self, database_language):
-        """Sets the database_language of this DatabaseDto.
+    @language.setter
+    def language(self, language):
+        """Sets the language of this DatabaseDto.
 
 
-        :param database_language: The database_language of this DatabaseDto.  # noqa: E501
+        :param language: The language of this DatabaseDto.  # noqa: E501
         :type: str
         """
         allowed_values = ["ab", "aa", "af", "ak", "sq", "am", "ar", "an", "hy", "as", "av", "ae", "ay", "az", "bm", "ba", "eu", "be", "bn", "bh", "bi", "bs", "br", "bg", "my", "ca", "km", "ch", "ce", "ny", "zh", "cu", "cv", "kw", "co", "cr", "hr", "cs", "da", "dv", "nl", "dz", "en", "eo", "et", "ee", "fo", "fj", "fi", "fr", "ff", "gd", "gl", "lg", "ka", "de", "ki", "el", "kl", "gn", "gu", "ht", "ha", "he", "hz", "hi", "ho", "hu", "is", "io", "ig", "id", "ia", "ie", "iu", "ik", "ga", "it", "ja", "jv", "kn", "kr", "ks", "kk", "rw", "kv", "kg", "ko", "kj", "ku", "ky", "lo", "la", "lv", "lb", "li", "ln", "lt", "lu", "mk", "mg", "ms", "ml", "mt", "gv", "mi", "mr", "mh", "ro", "mn", "na", "nv", "nd", "ng", "ne", "se", "no", "nb", "nn", "ii", "oc", "oj", "or", "om", "os", "pi", "pa", "ps", "fa", "pl", "pt", "qu", "rm", "rn", "ru", "sm", "sg", "sa", "sc", "sr", "sn", "sd", "si", "sk", "sl", "so", "st", "nr", "es", "su", "sw", "ss", "sv", "tl", "ty", "tg", "ta", "tt", "te", "th", "bo", "ti", "to", "ts", "tn", "tr", "tk", "tw", "ug", "uk", "ur", "uz", "ve", "vi", "vo", "wa", "cy", "fy", "wo", "xh", "yi", "yo", "za", "zu"]  # noqa: E501
-        if database_language not in allowed_values:
+        if language not in allowed_values:
             raise ValueError(
-                "Invalid value for `database_language` ({0}), must be one of {1}"  # noqa: E501
-                .format(database_language, allowed_values)
+                "Invalid value for `language` ({0}), must be one of {1}"  # noqa: E501
+                .format(language, allowed_values)
             )
 
-        self._database_language = database_language
+        self._language = language
 
     @property
-    def database_license(self):
-        """Gets the database_license of this DatabaseDto.  # noqa: E501
+    def license(self):
+        """Gets the license of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_license of this DatabaseDto.  # noqa: E501
+        :return: The license of this DatabaseDto.  # noqa: E501
         :rtype: LicenseDto
         """
-        return self._database_license
+        return self._license
 
-    @database_license.setter
-    def database_license(self, database_license):
-        """Sets the database_license of this DatabaseDto.
+    @license.setter
+    def license(self, license):
+        """Sets the license of this DatabaseDto.
 
 
-        :param database_license: The database_license of this DatabaseDto.  # noqa: E501
+        :param license: The license of this DatabaseDto.  # noqa: E501
         :type: LicenseDto
         """
 
-        self._database_license = database_license
+        self._license = license
 
     @property
-    def database_description(self):
-        """Gets the database_description of this DatabaseDto.  # noqa: E501
+    def description(self):
+        """Gets the description of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_description of this DatabaseDto.  # noqa: E501
+        :return: The description of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_description
+        return self._description
 
-    @database_description.setter
-    def database_description(self, database_description):
-        """Sets the database_description of this DatabaseDto.
+    @description.setter
+    def description(self, description):
+        """Sets the description of this DatabaseDto.
 
 
-        :param database_description: The database_description of this DatabaseDto.  # noqa: E501
+        :param description: The description of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_description is None:
-            raise ValueError("Invalid value for `database_description`, must not be `None`")  # noqa: E501
 
-        self._database_description = database_description
+        self._description = description
 
     @property
-    def database_publisher(self):
-        """Gets the database_publisher of this DatabaseDto.  # noqa: E501
+    def publisher(self):
+        """Gets the publisher of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publisher of this DatabaseDto.  # noqa: E501
+        :return: The publisher of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_publisher
+        return self._publisher
 
-    @database_publisher.setter
-    def database_publisher(self, database_publisher):
-        """Sets the database_publisher of this DatabaseDto.
+    @publisher.setter
+    def publisher(self, publisher):
+        """Sets the publisher of this DatabaseDto.
 
 
-        :param database_publisher: The database_publisher of this DatabaseDto.  # noqa: E501
+        :param publisher: The publisher of this DatabaseDto.  # noqa: E501
         :type: str
         """
 
-        self._database_publisher = database_publisher
-
-    @property
-    def database_contact_person(self):
-        """Gets the database_contact_person of this DatabaseDto.  # noqa: E501
-
-
-        :return: The database_contact_person of this DatabaseDto.  # noqa: E501
-        :rtype: UserDto
-        """
-        return self._database_contact_person
-
-    @database_contact_person.setter
-    def database_contact_person(self, database_contact_person):
-        """Sets the database_contact_person of this DatabaseDto.
-
-
-        :param database_contact_person: The database_contact_person of this DatabaseDto.  # noqa: E501
-        :type: UserDto
-        """
-
-        self._database_contact_person = database_contact_person
+        self._publisher = publisher
 
     @property
     def tables(self):
@@ -379,25 +352,25 @@ class DatabaseDto(object):
         self._tables = tables
 
     @property
-    def database_container_image(self):
-        """Gets the database_container_image of this DatabaseDto.  # noqa: E501
+    def image(self):
+        """Gets the image of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_container_image of this DatabaseDto.  # noqa: E501
+        :return: The image of this DatabaseDto.  # noqa: E501
         :rtype: ImageDto
         """
-        return self._database_container_image
+        return self._image
 
-    @database_container_image.setter
-    def database_container_image(self, database_container_image):
-        """Sets the database_container_image of this DatabaseDto.
+    @image.setter
+    def image(self, image):
+        """Sets the image of this DatabaseDto.
 
 
-        :param database_container_image: The database_container_image of this DatabaseDto.  # noqa: E501
+        :param image: The image of this DatabaseDto.  # noqa: E501
         :type: ImageDto
         """
 
-        self._database_container_image = database_container_image
+        self._image = image
 
     @property
     def container(self):
@@ -421,25 +394,25 @@ class DatabaseDto(object):
         self._container = container
 
     @property
-    def database_creation_time(self):
-        """Gets the database_creation_time of this DatabaseDto.  # noqa: E501
+    def created(self):
+        """Gets the created of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_creation_time of this DatabaseDto.  # noqa: E501
+        :return: The created of this DatabaseDto.  # noqa: E501
         :rtype: datetime
         """
-        return self._database_creation_time
+        return self._created
 
-    @database_creation_time.setter
-    def database_creation_time(self, database_creation_time):
-        """Sets the database_creation_time of this DatabaseDto.
+    @created.setter
+    def created(self, created):
+        """Sets the created of this DatabaseDto.
 
 
-        :param database_creation_time: The database_creation_time of this DatabaseDto.  # noqa: E501
+        :param created: The created of this DatabaseDto.  # noqa: E501
         :type: datetime
         """
 
-        self._database_creation_time = database_creation_time
+        self._created = created
 
     @property
     def deleted(self):
@@ -463,111 +436,111 @@ class DatabaseDto(object):
         self._deleted = deleted
 
     @property
-    def database_internal_name(self):
-        """Gets the database_internal_name of this DatabaseDto.  # noqa: E501
+    def internal_name(self):
+        """Gets the internal_name of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_internal_name of this DatabaseDto.  # noqa: E501
+        :return: The internal_name of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_internal_name
+        return self._internal_name
 
-    @database_internal_name.setter
-    def database_internal_name(self, database_internal_name):
-        """Sets the database_internal_name of this DatabaseDto.
+    @internal_name.setter
+    def internal_name(self, internal_name):
+        """Sets the internal_name of this DatabaseDto.
 
 
-        :param database_internal_name: The database_internal_name of this DatabaseDto.  # noqa: E501
+        :param internal_name: The internal_name of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_internal_name is None:
-            raise ValueError("Invalid value for `database_internal_name`, must not be `None`")  # noqa: E501
+        if internal_name is None:
+            raise ValueError("Invalid value for `internal_name`, must not be `None`")  # noqa: E501
 
-        self._database_internal_name = database_internal_name
+        self._internal_name = internal_name
 
     @property
-    def database_publication_year(self):
-        """Gets the database_publication_year of this DatabaseDto.  # noqa: E501
+    def publication_year(self):
+        """Gets the publication_year of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publication_year of this DatabaseDto.  # noqa: E501
+        :return: The publication_year of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_publication_year
+        return self._publication_year
 
-    @database_publication_year.setter
-    def database_publication_year(self, database_publication_year):
-        """Sets the database_publication_year of this DatabaseDto.
+    @publication_year.setter
+    def publication_year(self, publication_year):
+        """Sets the publication_year of this DatabaseDto.
 
 
-        :param database_publication_year: The database_publication_year of this DatabaseDto.  # noqa: E501
+        :param publication_year: The publication_year of this DatabaseDto.  # noqa: E501
         :type: int
         """
 
-        self._database_publication_year = database_publication_year
+        self._publication_year = publication_year
 
     @property
-    def database_publication_month(self):
-        """Gets the database_publication_month of this DatabaseDto.  # noqa: E501
+    def publication_month(self):
+        """Gets the publication_month of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publication_month of this DatabaseDto.  # noqa: E501
+        :return: The publication_month of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_publication_month
+        return self._publication_month
 
-    @database_publication_month.setter
-    def database_publication_month(self, database_publication_month):
-        """Sets the database_publication_month of this DatabaseDto.
+    @publication_month.setter
+    def publication_month(self, publication_month):
+        """Sets the publication_month of this DatabaseDto.
 
 
-        :param database_publication_month: The database_publication_month of this DatabaseDto.  # noqa: E501
+        :param publication_month: The publication_month of this DatabaseDto.  # noqa: E501
         :type: int
         """
 
-        self._database_publication_month = database_publication_month
+        self._publication_month = publication_month
 
     @property
-    def database_publication_day(self):
-        """Gets the database_publication_day of this DatabaseDto.  # noqa: E501
+    def publication_day(self):
+        """Gets the publication_day of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publication_day of this DatabaseDto.  # noqa: E501
+        :return: The publication_day of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_publication_day
+        return self._publication_day
 
-    @database_publication_day.setter
-    def database_publication_day(self, database_publication_day):
-        """Sets the database_publication_day of this DatabaseDto.
+    @publication_day.setter
+    def publication_day(self, publication_day):
+        """Sets the publication_day of this DatabaseDto.
 
 
-        :param database_publication_day: The database_publication_day of this DatabaseDto.  # noqa: E501
+        :param publication_day: The publication_day of this DatabaseDto.  # noqa: E501
         :type: int
         """
 
-        self._database_publication_day = database_publication_day
+        self._publication_day = publication_day
 
     @property
-    def database_public(self):
-        """Gets the database_public of this DatabaseDto.  # noqa: E501
+    def is_public(self):
+        """Gets the is_public of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_public of this DatabaseDto.  # noqa: E501
+        :return: The is_public of this DatabaseDto.  # noqa: E501
         :rtype: bool
         """
-        return self._database_public
+        return self._is_public
 
-    @database_public.setter
-    def database_public(self, database_public):
-        """Sets the database_public of this DatabaseDto.
+    @is_public.setter
+    def is_public(self, is_public):
+        """Sets the is_public of this DatabaseDto.
 
 
-        :param database_public: The database_public of this DatabaseDto.  # noqa: E501
+        :param is_public: The is_public of this DatabaseDto.  # noqa: E501
         :type: bool
         """
 
-        self._database_public = database_public
+        self._is_public = is_public
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/.jupyter/api_database/models/database_modify_dto.py b/.jupyter/api_database/models/database_modify_dto.py
index 1e74ccca7b8e024459bd90b76f71f87724fc23c4..7888aadf1e880e70c4e7e6ad39e7a499e91ebbc8 100644
--- a/.jupyter/api_database/models/database_modify_dto.py
+++ b/.jupyter/api_database/models/database_modify_dto.py
@@ -65,9 +65,9 @@ class DatabaseModifyDto(object):
         self.discriminator = None
         if subjects is not None:
             self.subjects = subjects
-        self.description = description
-        if publisher is not None:
-            self.publisher = publisher
+        if description is not None:
+            self.description = description
+        self.publisher = publisher
         if license is not None:
             self.license = license
         if language is not None:
@@ -119,8 +119,6 @@ class DatabaseModifyDto(object):
         :param description: The description of this DatabaseModifyDto.  # noqa: E501
         :type: str
         """
-        if description is None:
-            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
 
         self._description = description
 
@@ -142,6 +140,8 @@ class DatabaseModifyDto(object):
         :param publisher: The publisher of this DatabaseModifyDto.  # noqa: E501
         :type: str
         """
+        if publisher is None:
+            raise ValueError("Invalid value for `publisher`, must not be `None`")  # noqa: E501
 
         self._publisher = publisher
 
diff --git a/.jupyter/api_database/models/table_dto.py b/.jupyter/api_database/models/table_dto.py
deleted file mode 100644
index 4206ee0d4928bb33508b7fa1afb26059dda97e07..0000000000000000000000000000000000000000
--- a/.jupyter/api_database/models/table_dto.py
+++ /dev/null
@@ -1,272 +0,0 @@
-# coding: utf-8
-
-"""
-    Database Repository Database Service API
-
-    Service that manages the databases  # noqa: E501
-
-    OpenAPI spec version: 1.1.0-alpha
-    Contact: andreas.rauber@tuwien.ac.at
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-class TableDto(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'id': 'int',
-        'name': 'str',
-        'topic': 'str',
-        'description': 'str',
-        'created': 'datetime',
-        'columns': 'list[ColumnDto]',
-        'internal_name': 'str'
-    }
-
-    attribute_map = {
-        'id': 'id',
-        'name': 'name',
-        'topic': 'topic',
-        'description': 'description',
-        'created': 'created',
-        'columns': 'columns',
-        'internal_name': 'internal_name'
-    }
-
-    def __init__(self, id=None, name=None, topic=None, description=None, created=None, columns=None, internal_name=None):  # noqa: E501
-        """TableDto - a model defined in Swagger"""  # noqa: E501
-        self._id = None
-        self._name = None
-        self._topic = None
-        self._description = None
-        self._created = None
-        self._columns = None
-        self._internal_name = None
-        self.discriminator = None
-        self.id = id
-        self.name = name
-        self.topic = topic
-        self.description = description
-        if created is not None:
-            self.created = created
-        self.columns = columns
-        self.internal_name = internal_name
-
-    @property
-    def id(self):
-        """Gets the id of this TableDto.  # noqa: E501
-
-
-        :return: The id of this TableDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this TableDto.
-
-
-        :param id: The id of this TableDto.  # noqa: E501
-        :type: int
-        """
-        if id is None:
-            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
-
-        self._id = id
-
-    @property
-    def name(self):
-        """Gets the name of this TableDto.  # noqa: E501
-
-
-        :return: The name of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this TableDto.
-
-
-        :param name: The name of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def topic(self):
-        """Gets the topic of this TableDto.  # noqa: E501
-
-
-        :return: The topic of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._topic
-
-    @topic.setter
-    def topic(self, topic):
-        """Sets the topic of this TableDto.
-
-
-        :param topic: The topic of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if topic is None:
-            raise ValueError("Invalid value for `topic`, must not be `None`")  # noqa: E501
-
-        self._topic = topic
-
-    @property
-    def description(self):
-        """Gets the description of this TableDto.  # noqa: E501
-
-
-        :return: The description of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this TableDto.
-
-
-        :param description: The description of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if description is None:
-            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
-
-        self._description = description
-
-    @property
-    def created(self):
-        """Gets the created of this TableDto.  # noqa: E501
-
-
-        :return: The created of this TableDto.  # noqa: E501
-        :rtype: datetime
-        """
-        return self._created
-
-    @created.setter
-    def created(self, created):
-        """Sets the created of this TableDto.
-
-
-        :param created: The created of this TableDto.  # noqa: E501
-        :type: datetime
-        """
-
-        self._created = created
-
-    @property
-    def columns(self):
-        """Gets the columns of this TableDto.  # noqa: E501
-
-
-        :return: The columns of this TableDto.  # noqa: E501
-        :rtype: list[ColumnDto]
-        """
-        return self._columns
-
-    @columns.setter
-    def columns(self, columns):
-        """Sets the columns of this TableDto.
-
-
-        :param columns: The columns of this TableDto.  # noqa: E501
-        :type: list[ColumnDto]
-        """
-        if columns is None:
-            raise ValueError("Invalid value for `columns`, must not be `None`")  # noqa: E501
-
-        self._columns = columns
-
-    @property
-    def internal_name(self):
-        """Gets the internal_name of this TableDto.  # noqa: E501
-
-
-        :return: The internal_name of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._internal_name
-
-    @internal_name.setter
-    def internal_name(self, internal_name):
-        """Sets the internal_name of this TableDto.
-
-
-        :param internal_name: The internal_name of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if internal_name is None:
-            raise ValueError("Invalid value for `internal_name`, must not be `None`")  # noqa: E501
-
-        self._internal_name = internal_name
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(TableDto, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, TableDto):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/.jupyter/api_identifier/models/column_dto.py b/.jupyter/api_identifier/models/column_dto.py
deleted file mode 100644
index 2f58a328d3bf6346a18693a39ef67c4a4c3330dd..0000000000000000000000000000000000000000
--- a/.jupyter/api_identifier/models/column_dto.py
+++ /dev/null
@@ -1,514 +0,0 @@
-# coding: utf-8
-
-"""
-    Database Repository Identifier Service API
-
-    Service that manages the identifiers  # noqa: E501
-
-    OpenAPI spec version: 1.1.0-alpha
-    Contact: andreas.rauber@tuwien.ac.at
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-class ColumnDto(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'id': 'int',
-        'name': 'str',
-        'unique': 'bool',
-        'references': 'str',
-        'internal_name': 'str',
-        'date_format': 'ImageDateDto',
-        'auto_generated': 'bool',
-        'is_primary_key': 'bool',
-        'column_type': 'str',
-        'column_concept': 'ConceptDto',
-        'decimal_digits_before': 'int',
-        'decimal_digits_after': 'int',
-        'is_null_allowed': 'bool',
-        'check_expression': 'str',
-        'foreign_key': 'str',
-        'enum_values': 'list[str]'
-    }
-
-    attribute_map = {
-        'id': 'id',
-        'name': 'name',
-        'unique': 'unique',
-        'references': 'references',
-        'internal_name': 'internal_name',
-        'date_format': 'date_format',
-        'auto_generated': 'auto_generated',
-        'is_primary_key': 'is_primary_key',
-        'column_type': 'column_type',
-        'column_concept': 'column_concept',
-        'decimal_digits_before': 'decimal_digits_before',
-        'decimal_digits_after': 'decimal_digits_after',
-        'is_null_allowed': 'is_null_allowed',
-        'check_expression': 'check_expression',
-        'foreign_key': 'foreign_key',
-        'enum_values': 'enum_values'
-    }
-
-    def __init__(self, id=None, name=None, unique=None, references=None, internal_name=None, date_format=None, auto_generated=None, is_primary_key=None, column_type=None, column_concept=None, decimal_digits_before=None, decimal_digits_after=None, is_null_allowed=None, check_expression=None, foreign_key=None, enum_values=None):  # noqa: E501
-        """ColumnDto - a model defined in Swagger"""  # noqa: E501
-        self._id = None
-        self._name = None
-        self._unique = None
-        self._references = None
-        self._internal_name = None
-        self._date_format = None
-        self._auto_generated = None
-        self._is_primary_key = None
-        self._column_type = None
-        self._column_concept = None
-        self._decimal_digits_before = None
-        self._decimal_digits_after = None
-        self._is_null_allowed = None
-        self._check_expression = None
-        self._foreign_key = None
-        self._enum_values = None
-        self.discriminator = None
-        self.id = id
-        self.name = name
-        self.unique = unique
-        if references is not None:
-            self.references = references
-        self.internal_name = internal_name
-        if date_format is not None:
-            self.date_format = date_format
-        self.auto_generated = auto_generated
-        self.is_primary_key = is_primary_key
-        self.column_type = column_type
-        if column_concept is not None:
-            self.column_concept = column_concept
-        if decimal_digits_before is not None:
-            self.decimal_digits_before = decimal_digits_before
-        if decimal_digits_after is not None:
-            self.decimal_digits_after = decimal_digits_after
-        self.is_null_allowed = is_null_allowed
-        if check_expression is not None:
-            self.check_expression = check_expression
-        if foreign_key is not None:
-            self.foreign_key = foreign_key
-        if enum_values is not None:
-            self.enum_values = enum_values
-
-    @property
-    def id(self):
-        """Gets the id of this ColumnDto.  # noqa: E501
-
-
-        :return: The id of this ColumnDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this ColumnDto.
-
-
-        :param id: The id of this ColumnDto.  # noqa: E501
-        :type: int
-        """
-        if id is None:
-            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
-
-        self._id = id
-
-    @property
-    def name(self):
-        """Gets the name of this ColumnDto.  # noqa: E501
-
-
-        :return: The name of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this ColumnDto.
-
-
-        :param name: The name of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def unique(self):
-        """Gets the unique of this ColumnDto.  # noqa: E501
-
-
-        :return: The unique of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._unique
-
-    @unique.setter
-    def unique(self, unique):
-        """Sets the unique of this ColumnDto.
-
-
-        :param unique: The unique of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if unique is None:
-            raise ValueError("Invalid value for `unique`, must not be `None`")  # noqa: E501
-
-        self._unique = unique
-
-    @property
-    def references(self):
-        """Gets the references of this ColumnDto.  # noqa: E501
-
-
-        :return: The references of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._references
-
-    @references.setter
-    def references(self, references):
-        """Sets the references of this ColumnDto.
-
-
-        :param references: The references of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-
-        self._references = references
-
-    @property
-    def internal_name(self):
-        """Gets the internal_name of this ColumnDto.  # noqa: E501
-
-
-        :return: The internal_name of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._internal_name
-
-    @internal_name.setter
-    def internal_name(self, internal_name):
-        """Sets the internal_name of this ColumnDto.
-
-
-        :param internal_name: The internal_name of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-        if internal_name is None:
-            raise ValueError("Invalid value for `internal_name`, must not be `None`")  # noqa: E501
-
-        self._internal_name = internal_name
-
-    @property
-    def date_format(self):
-        """Gets the date_format of this ColumnDto.  # noqa: E501
-
-
-        :return: The date_format of this ColumnDto.  # noqa: E501
-        :rtype: ImageDateDto
-        """
-        return self._date_format
-
-    @date_format.setter
-    def date_format(self, date_format):
-        """Sets the date_format of this ColumnDto.
-
-
-        :param date_format: The date_format of this ColumnDto.  # noqa: E501
-        :type: ImageDateDto
-        """
-
-        self._date_format = date_format
-
-    @property
-    def auto_generated(self):
-        """Gets the auto_generated of this ColumnDto.  # noqa: E501
-
-
-        :return: The auto_generated of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._auto_generated
-
-    @auto_generated.setter
-    def auto_generated(self, auto_generated):
-        """Sets the auto_generated of this ColumnDto.
-
-
-        :param auto_generated: The auto_generated of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if auto_generated is None:
-            raise ValueError("Invalid value for `auto_generated`, must not be `None`")  # noqa: E501
-
-        self._auto_generated = auto_generated
-
-    @property
-    def is_primary_key(self):
-        """Gets the is_primary_key of this ColumnDto.  # noqa: E501
-
-
-        :return: The is_primary_key of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._is_primary_key
-
-    @is_primary_key.setter
-    def is_primary_key(self, is_primary_key):
-        """Sets the is_primary_key of this ColumnDto.
-
-
-        :param is_primary_key: The is_primary_key of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if is_primary_key is None:
-            raise ValueError("Invalid value for `is_primary_key`, must not be `None`")  # noqa: E501
-
-        self._is_primary_key = is_primary_key
-
-    @property
-    def column_type(self):
-        """Gets the column_type of this ColumnDto.  # noqa: E501
-
-
-        :return: The column_type of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._column_type
-
-    @column_type.setter
-    def column_type(self, column_type):
-        """Sets the column_type of this ColumnDto.
-
-
-        :param column_type: The column_type of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-        if column_type is None:
-            raise ValueError("Invalid value for `column_type`, must not be `None`")  # noqa: E501
-        allowed_values = ["enum", "number", "decimal", "string", "text", "boolean", "date", "timestamp", "blob"]  # noqa: E501
-        if column_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `column_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(column_type, allowed_values)
-            )
-
-        self._column_type = column_type
-
-    @property
-    def column_concept(self):
-        """Gets the column_concept of this ColumnDto.  # noqa: E501
-
-
-        :return: The column_concept of this ColumnDto.  # noqa: E501
-        :rtype: ConceptDto
-        """
-        return self._column_concept
-
-    @column_concept.setter
-    def column_concept(self, column_concept):
-        """Sets the column_concept of this ColumnDto.
-
-
-        :param column_concept: The column_concept of this ColumnDto.  # noqa: E501
-        :type: ConceptDto
-        """
-
-        self._column_concept = column_concept
-
-    @property
-    def decimal_digits_before(self):
-        """Gets the decimal_digits_before of this ColumnDto.  # noqa: E501
-
-
-        :return: The decimal_digits_before of this ColumnDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._decimal_digits_before
-
-    @decimal_digits_before.setter
-    def decimal_digits_before(self, decimal_digits_before):
-        """Sets the decimal_digits_before of this ColumnDto.
-
-
-        :param decimal_digits_before: The decimal_digits_before of this ColumnDto.  # noqa: E501
-        :type: int
-        """
-
-        self._decimal_digits_before = decimal_digits_before
-
-    @property
-    def decimal_digits_after(self):
-        """Gets the decimal_digits_after of this ColumnDto.  # noqa: E501
-
-
-        :return: The decimal_digits_after of this ColumnDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._decimal_digits_after
-
-    @decimal_digits_after.setter
-    def decimal_digits_after(self, decimal_digits_after):
-        """Sets the decimal_digits_after of this ColumnDto.
-
-
-        :param decimal_digits_after: The decimal_digits_after of this ColumnDto.  # noqa: E501
-        :type: int
-        """
-
-        self._decimal_digits_after = decimal_digits_after
-
-    @property
-    def is_null_allowed(self):
-        """Gets the is_null_allowed of this ColumnDto.  # noqa: E501
-
-
-        :return: The is_null_allowed of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._is_null_allowed
-
-    @is_null_allowed.setter
-    def is_null_allowed(self, is_null_allowed):
-        """Sets the is_null_allowed of this ColumnDto.
-
-
-        :param is_null_allowed: The is_null_allowed of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if is_null_allowed is None:
-            raise ValueError("Invalid value for `is_null_allowed`, must not be `None`")  # noqa: E501
-
-        self._is_null_allowed = is_null_allowed
-
-    @property
-    def check_expression(self):
-        """Gets the check_expression of this ColumnDto.  # noqa: E501
-
-
-        :return: The check_expression of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._check_expression
-
-    @check_expression.setter
-    def check_expression(self, check_expression):
-        """Sets the check_expression of this ColumnDto.
-
-
-        :param check_expression: The check_expression of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-
-        self._check_expression = check_expression
-
-    @property
-    def foreign_key(self):
-        """Gets the foreign_key of this ColumnDto.  # noqa: E501
-
-
-        :return: The foreign_key of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._foreign_key
-
-    @foreign_key.setter
-    def foreign_key(self, foreign_key):
-        """Sets the foreign_key of this ColumnDto.
-
-
-        :param foreign_key: The foreign_key of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-
-        self._foreign_key = foreign_key
-
-    @property
-    def enum_values(self):
-        """Gets the enum_values of this ColumnDto.  # noqa: E501
-
-
-        :return: The enum_values of this ColumnDto.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._enum_values
-
-    @enum_values.setter
-    def enum_values(self, enum_values):
-        """Sets the enum_values of this ColumnDto.
-
-
-        :param enum_values: The enum_values of this ColumnDto.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._enum_values = enum_values
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ColumnDto, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ColumnDto):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/.jupyter/api_identifier/models/concept_dto.py b/.jupyter/api_identifier/models/concept_dto.py
deleted file mode 100644
index 25821a421629da2a0eb8a9acdc9fede61fce32c8..0000000000000000000000000000000000000000
--- a/.jupyter/api_identifier/models/concept_dto.py
+++ /dev/null
@@ -1,165 +0,0 @@
-# coding: utf-8
-
-"""
-    Database Repository Identifier Service API
-
-    Service that manages the identifiers  # noqa: E501
-
-    OpenAPI spec version: 1.1.0-alpha
-    Contact: andreas.rauber@tuwien.ac.at
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-class ConceptDto(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'uri': 'str',
-        'name': 'str',
-        'created': 'datetime'
-    }
-
-    attribute_map = {
-        'uri': 'uri',
-        'name': 'name',
-        'created': 'created'
-    }
-
-    def __init__(self, uri=None, name=None, created=None):  # noqa: E501
-        """ConceptDto - a model defined in Swagger"""  # noqa: E501
-        self._uri = None
-        self._name = None
-        self._created = None
-        self.discriminator = None
-        self.uri = uri
-        self.name = name
-        self.created = created
-
-    @property
-    def uri(self):
-        """Gets the uri of this ConceptDto.  # noqa: E501
-
-
-        :return: The uri of this ConceptDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._uri
-
-    @uri.setter
-    def uri(self, uri):
-        """Sets the uri of this ConceptDto.
-
-
-        :param uri: The uri of this ConceptDto.  # noqa: E501
-        :type: str
-        """
-        if uri is None:
-            raise ValueError("Invalid value for `uri`, must not be `None`")  # noqa: E501
-
-        self._uri = uri
-
-    @property
-    def name(self):
-        """Gets the name of this ConceptDto.  # noqa: E501
-
-
-        :return: The name of this ConceptDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this ConceptDto.
-
-
-        :param name: The name of this ConceptDto.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def created(self):
-        """Gets the created of this ConceptDto.  # noqa: E501
-
-
-        :return: The created of this ConceptDto.  # noqa: E501
-        :rtype: datetime
-        """
-        return self._created
-
-    @created.setter
-    def created(self, created):
-        """Sets the created of this ConceptDto.
-
-
-        :param created: The created of this ConceptDto.  # noqa: E501
-        :type: datetime
-        """
-        if created is None:
-            raise ValueError("Invalid value for `created`, must not be `None`")  # noqa: E501
-
-        self._created = created
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ConceptDto, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ConceptDto):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/.jupyter/api_identifier/models/database_dto.py b/.jupyter/api_identifier/models/database_dto.py
index 871e9b409172c3bef32a4a93367d0df5579f3fed..8e46079b68f82175ab2c44a7932b08fe919322f2 100644
--- a/.jupyter/api_identifier/models/database_dto.py
+++ b/.jupyter/api_identifier/models/database_dto.py
@@ -28,334 +28,307 @@ class DatabaseDto(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'database_id': 'int',
-        'database_name': 'str',
-        'database_exchange': 'str',
-        'database_creator': 'UserBriefDto',
-        'database_subjects': 'list[str]',
-        'database_language': 'str',
-        'database_license': 'LicenseDto',
-        'database_description': 'str',
-        'database_publisher': 'str',
-        'database_contact_person': 'UserDto',
+        'id': 'int',
+        'name': 'str',
+        'exchange': 'str',
+        'creator': 'UserBriefDto',
+        'subjects': 'list[str]',
+        'language': 'str',
+        'license': 'LicenseDto',
+        'description': 'str',
+        'publisher': 'str',
         'tables': 'list[TableBriefDto]',
-        'database_container_image': 'ImageDto',
+        'image': 'ImageDto',
         'container': 'ContainerDto',
-        'database_creation_time': 'datetime',
+        'created': 'datetime',
         'deleted': 'datetime',
-        'database_internal_name': 'str',
-        'database_publication_year': 'int',
-        'database_publication_month': 'int',
-        'database_publication_day': 'int',
-        'database_public': 'bool'
+        'internal_name': 'str',
+        'publication_year': 'int',
+        'publication_month': 'int',
+        'publication_day': 'int',
+        'is_public': 'bool'
     }
 
     attribute_map = {
-        'database_id': 'database id',
-        'database_name': 'database name',
-        'database_exchange': 'database exchange',
-        'database_creator': 'database creator',
-        'database_subjects': 'database subjects',
-        'database_language': 'database language',
-        'database_license': 'database license',
-        'database_description': 'database description',
-        'database_publisher': 'database publisher',
-        'database_contact_person': 'database contact person',
+        'id': 'id',
+        'name': 'name',
+        'exchange': 'exchange',
+        'creator': 'creator',
+        'subjects': 'subjects',
+        'language': 'language',
+        'license': 'license',
+        'description': 'description',
+        'publisher': 'publisher',
         'tables': 'tables',
-        'database_container_image': 'database container image',
+        'image': 'image',
         'container': 'container',
-        'database_creation_time': 'database creation time',
+        'created': 'created',
         'deleted': 'deleted',
-        'database_internal_name': 'database internal name',
-        'database_publication_year': 'database publication year',
-        'database_publication_month': 'database publication month',
-        'database_publication_day': 'database publication day',
-        'database_public': 'database public'
+        'internal_name': 'internal_name',
+        'publication_year': 'publication_year',
+        'publication_month': 'publication_month',
+        'publication_day': 'publication_day',
+        'is_public': 'is_public'
     }
 
-    def __init__(self, database_id=None, database_name=None, database_exchange=None, database_creator=None, database_subjects=None, database_language=None, database_license=None, database_description=None, database_publisher=None, database_contact_person=None, tables=None, database_container_image=None, container=None, database_creation_time=None, deleted=None, database_internal_name=None, database_publication_year=None, database_publication_month=None, database_publication_day=None, database_public=None):  # noqa: E501
+    def __init__(self, id=None, name=None, exchange=None, creator=None, subjects=None, language=None, license=None, description=None, publisher=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, publication_year=None, publication_month=None, publication_day=None, is_public=None):  # noqa: E501
         """DatabaseDto - a model defined in Swagger"""  # noqa: E501
-        self._database_id = None
-        self._database_name = None
-        self._database_exchange = None
-        self._database_creator = None
-        self._database_subjects = None
-        self._database_language = None
-        self._database_license = None
-        self._database_description = None
-        self._database_publisher = None
-        self._database_contact_person = None
+        self._id = None
+        self._name = None
+        self._exchange = None
+        self._creator = None
+        self._subjects = None
+        self._language = None
+        self._license = None
+        self._description = None
+        self._publisher = None
         self._tables = None
-        self._database_container_image = None
+        self._image = None
         self._container = None
-        self._database_creation_time = None
+        self._created = None
         self._deleted = None
-        self._database_internal_name = None
-        self._database_publication_year = None
-        self._database_publication_month = None
-        self._database_publication_day = None
-        self._database_public = None
+        self._internal_name = None
+        self._publication_year = None
+        self._publication_month = None
+        self._publication_day = None
+        self._is_public = None
         self.discriminator = None
-        self.database_id = database_id
-        self.database_name = database_name
-        self.database_exchange = database_exchange
-        self.database_creator = database_creator
-        if database_subjects is not None:
-            self.database_subjects = database_subjects
-        if database_language is not None:
-            self.database_language = database_language
-        if database_license is not None:
-            self.database_license = database_license
-        self.database_description = database_description
-        if database_publisher is not None:
-            self.database_publisher = database_publisher
-        if database_contact_person is not None:
-            self.database_contact_person = database_contact_person
+        self.id = id
+        self.name = name
+        self.exchange = exchange
+        self.creator = creator
+        if subjects is not None:
+            self.subjects = subjects
+        if language is not None:
+            self.language = language
+        if license is not None:
+            self.license = license
+        if description is not None:
+            self.description = description
+        if publisher is not None:
+            self.publisher = publisher
         if tables is not None:
             self.tables = tables
-        if database_container_image is not None:
-            self.database_container_image = database_container_image
+        if image is not None:
+            self.image = image
         if container is not None:
             self.container = container
-        if database_creation_time is not None:
-            self.database_creation_time = database_creation_time
+        if created is not None:
+            self.created = created
         if deleted is not None:
             self.deleted = deleted
-        self.database_internal_name = database_internal_name
-        if database_publication_year is not None:
-            self.database_publication_year = database_publication_year
-        if database_publication_month is not None:
-            self.database_publication_month = database_publication_month
-        if database_publication_day is not None:
-            self.database_publication_day = database_publication_day
-        if database_public is not None:
-            self.database_public = database_public
+        self.internal_name = internal_name
+        if publication_year is not None:
+            self.publication_year = publication_year
+        if publication_month is not None:
+            self.publication_month = publication_month
+        if publication_day is not None:
+            self.publication_day = publication_day
+        if is_public is not None:
+            self.is_public = is_public
 
     @property
-    def database_id(self):
-        """Gets the database_id of this DatabaseDto.  # noqa: E501
+    def id(self):
+        """Gets the id of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_id of this DatabaseDto.  # noqa: E501
+        :return: The id of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_id
+        return self._id
 
-    @database_id.setter
-    def database_id(self, database_id):
-        """Sets the database_id of this DatabaseDto.
+    @id.setter
+    def id(self, id):
+        """Sets the id of this DatabaseDto.
 
 
-        :param database_id: The database_id of this DatabaseDto.  # noqa: E501
+        :param id: The id of this DatabaseDto.  # noqa: E501
         :type: int
         """
-        if database_id is None:
-            raise ValueError("Invalid value for `database_id`, must not be `None`")  # noqa: E501
+        if id is None:
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
 
-        self._database_id = database_id
+        self._id = id
 
     @property
-    def database_name(self):
-        """Gets the database_name of this DatabaseDto.  # noqa: E501
+    def name(self):
+        """Gets the name of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_name of this DatabaseDto.  # noqa: E501
+        :return: The name of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_name
+        return self._name
 
-    @database_name.setter
-    def database_name(self, database_name):
-        """Sets the database_name of this DatabaseDto.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this DatabaseDto.
 
 
-        :param database_name: The database_name of this DatabaseDto.  # noqa: E501
+        :param name: The name of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_name is None:
-            raise ValueError("Invalid value for `database_name`, must not be `None`")  # noqa: E501
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._database_name = database_name
+        self._name = name
 
     @property
-    def database_exchange(self):
-        """Gets the database_exchange of this DatabaseDto.  # noqa: E501
+    def exchange(self):
+        """Gets the exchange of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_exchange of this DatabaseDto.  # noqa: E501
+        :return: The exchange of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_exchange
+        return self._exchange
 
-    @database_exchange.setter
-    def database_exchange(self, database_exchange):
-        """Sets the database_exchange of this DatabaseDto.
+    @exchange.setter
+    def exchange(self, exchange):
+        """Sets the exchange of this DatabaseDto.
 
 
-        :param database_exchange: The database_exchange of this DatabaseDto.  # noqa: E501
+        :param exchange: The exchange of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_exchange is None:
-            raise ValueError("Invalid value for `database_exchange`, must not be `None`")  # noqa: E501
+        if exchange is None:
+            raise ValueError("Invalid value for `exchange`, must not be `None`")  # noqa: E501
 
-        self._database_exchange = database_exchange
+        self._exchange = exchange
 
     @property
-    def database_creator(self):
-        """Gets the database_creator of this DatabaseDto.  # noqa: E501
+    def creator(self):
+        """Gets the creator of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_creator of this DatabaseDto.  # noqa: E501
+        :return: The creator of this DatabaseDto.  # noqa: E501
         :rtype: UserBriefDto
         """
-        return self._database_creator
+        return self._creator
 
-    @database_creator.setter
-    def database_creator(self, database_creator):
-        """Sets the database_creator of this DatabaseDto.
+    @creator.setter
+    def creator(self, creator):
+        """Sets the creator of this DatabaseDto.
 
 
-        :param database_creator: The database_creator of this DatabaseDto.  # noqa: E501
+        :param creator: The creator of this DatabaseDto.  # noqa: E501
         :type: UserBriefDto
         """
-        if database_creator is None:
-            raise ValueError("Invalid value for `database_creator`, must not be `None`")  # noqa: E501
+        if creator is None:
+            raise ValueError("Invalid value for `creator`, must not be `None`")  # noqa: E501
 
-        self._database_creator = database_creator
+        self._creator = creator
 
     @property
-    def database_subjects(self):
-        """Gets the database_subjects of this DatabaseDto.  # noqa: E501
+    def subjects(self):
+        """Gets the subjects of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_subjects of this DatabaseDto.  # noqa: E501
+        :return: The subjects of this DatabaseDto.  # noqa: E501
         :rtype: list[str]
         """
-        return self._database_subjects
+        return self._subjects
 
-    @database_subjects.setter
-    def database_subjects(self, database_subjects):
-        """Sets the database_subjects of this DatabaseDto.
+    @subjects.setter
+    def subjects(self, subjects):
+        """Sets the subjects of this DatabaseDto.
 
 
-        :param database_subjects: The database_subjects of this DatabaseDto.  # noqa: E501
+        :param subjects: The subjects of this DatabaseDto.  # noqa: E501
         :type: list[str]
         """
 
-        self._database_subjects = database_subjects
+        self._subjects = subjects
 
     @property
-    def database_language(self):
-        """Gets the database_language of this DatabaseDto.  # noqa: E501
+    def language(self):
+        """Gets the language of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_language of this DatabaseDto.  # noqa: E501
+        :return: The language of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_language
+        return self._language
 
-    @database_language.setter
-    def database_language(self, database_language):
-        """Sets the database_language of this DatabaseDto.
+    @language.setter
+    def language(self, language):
+        """Sets the language of this DatabaseDto.
 
 
-        :param database_language: The database_language of this DatabaseDto.  # noqa: E501
+        :param language: The language of this DatabaseDto.  # noqa: E501
         :type: str
         """
         allowed_values = ["ab", "aa", "af", "ak", "sq", "am", "ar", "an", "hy", "as", "av", "ae", "ay", "az", "bm", "ba", "eu", "be", "bn", "bh", "bi", "bs", "br", "bg", "my", "ca", "km", "ch", "ce", "ny", "zh", "cu", "cv", "kw", "co", "cr", "hr", "cs", "da", "dv", "nl", "dz", "en", "eo", "et", "ee", "fo", "fj", "fi", "fr", "ff", "gd", "gl", "lg", "ka", "de", "ki", "el", "kl", "gn", "gu", "ht", "ha", "he", "hz", "hi", "ho", "hu", "is", "io", "ig", "id", "ia", "ie", "iu", "ik", "ga", "it", "ja", "jv", "kn", "kr", "ks", "kk", "rw", "kv", "kg", "ko", "kj", "ku", "ky", "lo", "la", "lv", "lb", "li", "ln", "lt", "lu", "mk", "mg", "ms", "ml", "mt", "gv", "mi", "mr", "mh", "ro", "mn", "na", "nv", "nd", "ng", "ne", "se", "no", "nb", "nn", "ii", "oc", "oj", "or", "om", "os", "pi", "pa", "ps", "fa", "pl", "pt", "qu", "rm", "rn", "ru", "sm", "sg", "sa", "sc", "sr", "sn", "sd", "si", "sk", "sl", "so", "st", "nr", "es", "su", "sw", "ss", "sv", "tl", "ty", "tg", "ta", "tt", "te", "th", "bo", "ti", "to", "ts", "tn", "tr", "tk", "tw", "ug", "uk", "ur", "uz", "ve", "vi", "vo", "wa", "cy", "fy", "wo", "xh", "yi", "yo", "za", "zu"]  # noqa: E501
-        if database_language not in allowed_values:
+        if language not in allowed_values:
             raise ValueError(
-                "Invalid value for `database_language` ({0}), must be one of {1}"  # noqa: E501
-                .format(database_language, allowed_values)
+                "Invalid value for `language` ({0}), must be one of {1}"  # noqa: E501
+                .format(language, allowed_values)
             )
 
-        self._database_language = database_language
+        self._language = language
 
     @property
-    def database_license(self):
-        """Gets the database_license of this DatabaseDto.  # noqa: E501
+    def license(self):
+        """Gets the license of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_license of this DatabaseDto.  # noqa: E501
+        :return: The license of this DatabaseDto.  # noqa: E501
         :rtype: LicenseDto
         """
-        return self._database_license
+        return self._license
 
-    @database_license.setter
-    def database_license(self, database_license):
-        """Sets the database_license of this DatabaseDto.
+    @license.setter
+    def license(self, license):
+        """Sets the license of this DatabaseDto.
 
 
-        :param database_license: The database_license of this DatabaseDto.  # noqa: E501
+        :param license: The license of this DatabaseDto.  # noqa: E501
         :type: LicenseDto
         """
 
-        self._database_license = database_license
+        self._license = license
 
     @property
-    def database_description(self):
-        """Gets the database_description of this DatabaseDto.  # noqa: E501
+    def description(self):
+        """Gets the description of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_description of this DatabaseDto.  # noqa: E501
+        :return: The description of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_description
+        return self._description
 
-    @database_description.setter
-    def database_description(self, database_description):
-        """Sets the database_description of this DatabaseDto.
+    @description.setter
+    def description(self, description):
+        """Sets the description of this DatabaseDto.
 
 
-        :param database_description: The database_description of this DatabaseDto.  # noqa: E501
+        :param description: The description of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_description is None:
-            raise ValueError("Invalid value for `database_description`, must not be `None`")  # noqa: E501
 
-        self._database_description = database_description
+        self._description = description
 
     @property
-    def database_publisher(self):
-        """Gets the database_publisher of this DatabaseDto.  # noqa: E501
+    def publisher(self):
+        """Gets the publisher of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publisher of this DatabaseDto.  # noqa: E501
+        :return: The publisher of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_publisher
+        return self._publisher
 
-    @database_publisher.setter
-    def database_publisher(self, database_publisher):
-        """Sets the database_publisher of this DatabaseDto.
+    @publisher.setter
+    def publisher(self, publisher):
+        """Sets the publisher of this DatabaseDto.
 
 
-        :param database_publisher: The database_publisher of this DatabaseDto.  # noqa: E501
+        :param publisher: The publisher of this DatabaseDto.  # noqa: E501
         :type: str
         """
 
-        self._database_publisher = database_publisher
-
-    @property
-    def database_contact_person(self):
-        """Gets the database_contact_person of this DatabaseDto.  # noqa: E501
-
-
-        :return: The database_contact_person of this DatabaseDto.  # noqa: E501
-        :rtype: UserDto
-        """
-        return self._database_contact_person
-
-    @database_contact_person.setter
-    def database_contact_person(self, database_contact_person):
-        """Sets the database_contact_person of this DatabaseDto.
-
-
-        :param database_contact_person: The database_contact_person of this DatabaseDto.  # noqa: E501
-        :type: UserDto
-        """
-
-        self._database_contact_person = database_contact_person
+        self._publisher = publisher
 
     @property
     def tables(self):
@@ -379,25 +352,25 @@ class DatabaseDto(object):
         self._tables = tables
 
     @property
-    def database_container_image(self):
-        """Gets the database_container_image of this DatabaseDto.  # noqa: E501
+    def image(self):
+        """Gets the image of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_container_image of this DatabaseDto.  # noqa: E501
+        :return: The image of this DatabaseDto.  # noqa: E501
         :rtype: ImageDto
         """
-        return self._database_container_image
+        return self._image
 
-    @database_container_image.setter
-    def database_container_image(self, database_container_image):
-        """Sets the database_container_image of this DatabaseDto.
+    @image.setter
+    def image(self, image):
+        """Sets the image of this DatabaseDto.
 
 
-        :param database_container_image: The database_container_image of this DatabaseDto.  # noqa: E501
+        :param image: The image of this DatabaseDto.  # noqa: E501
         :type: ImageDto
         """
 
-        self._database_container_image = database_container_image
+        self._image = image
 
     @property
     def container(self):
@@ -421,25 +394,25 @@ class DatabaseDto(object):
         self._container = container
 
     @property
-    def database_creation_time(self):
-        """Gets the database_creation_time of this DatabaseDto.  # noqa: E501
+    def created(self):
+        """Gets the created of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_creation_time of this DatabaseDto.  # noqa: E501
+        :return: The created of this DatabaseDto.  # noqa: E501
         :rtype: datetime
         """
-        return self._database_creation_time
+        return self._created
 
-    @database_creation_time.setter
-    def database_creation_time(self, database_creation_time):
-        """Sets the database_creation_time of this DatabaseDto.
+    @created.setter
+    def created(self, created):
+        """Sets the created of this DatabaseDto.
 
 
-        :param database_creation_time: The database_creation_time of this DatabaseDto.  # noqa: E501
+        :param created: The created of this DatabaseDto.  # noqa: E501
         :type: datetime
         """
 
-        self._database_creation_time = database_creation_time
+        self._created = created
 
     @property
     def deleted(self):
@@ -463,111 +436,111 @@ class DatabaseDto(object):
         self._deleted = deleted
 
     @property
-    def database_internal_name(self):
-        """Gets the database_internal_name of this DatabaseDto.  # noqa: E501
+    def internal_name(self):
+        """Gets the internal_name of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_internal_name of this DatabaseDto.  # noqa: E501
+        :return: The internal_name of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_internal_name
+        return self._internal_name
 
-    @database_internal_name.setter
-    def database_internal_name(self, database_internal_name):
-        """Sets the database_internal_name of this DatabaseDto.
+    @internal_name.setter
+    def internal_name(self, internal_name):
+        """Sets the internal_name of this DatabaseDto.
 
 
-        :param database_internal_name: The database_internal_name of this DatabaseDto.  # noqa: E501
+        :param internal_name: The internal_name of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_internal_name is None:
-            raise ValueError("Invalid value for `database_internal_name`, must not be `None`")  # noqa: E501
+        if internal_name is None:
+            raise ValueError("Invalid value for `internal_name`, must not be `None`")  # noqa: E501
 
-        self._database_internal_name = database_internal_name
+        self._internal_name = internal_name
 
     @property
-    def database_publication_year(self):
-        """Gets the database_publication_year of this DatabaseDto.  # noqa: E501
+    def publication_year(self):
+        """Gets the publication_year of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publication_year of this DatabaseDto.  # noqa: E501
+        :return: The publication_year of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_publication_year
+        return self._publication_year
 
-    @database_publication_year.setter
-    def database_publication_year(self, database_publication_year):
-        """Sets the database_publication_year of this DatabaseDto.
+    @publication_year.setter
+    def publication_year(self, publication_year):
+        """Sets the publication_year of this DatabaseDto.
 
 
-        :param database_publication_year: The database_publication_year of this DatabaseDto.  # noqa: E501
+        :param publication_year: The publication_year of this DatabaseDto.  # noqa: E501
         :type: int
         """
 
-        self._database_publication_year = database_publication_year
+        self._publication_year = publication_year
 
     @property
-    def database_publication_month(self):
-        """Gets the database_publication_month of this DatabaseDto.  # noqa: E501
+    def publication_month(self):
+        """Gets the publication_month of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publication_month of this DatabaseDto.  # noqa: E501
+        :return: The publication_month of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_publication_month
+        return self._publication_month
 
-    @database_publication_month.setter
-    def database_publication_month(self, database_publication_month):
-        """Sets the database_publication_month of this DatabaseDto.
+    @publication_month.setter
+    def publication_month(self, publication_month):
+        """Sets the publication_month of this DatabaseDto.
 
 
-        :param database_publication_month: The database_publication_month of this DatabaseDto.  # noqa: E501
+        :param publication_month: The publication_month of this DatabaseDto.  # noqa: E501
         :type: int
         """
 
-        self._database_publication_month = database_publication_month
+        self._publication_month = publication_month
 
     @property
-    def database_publication_day(self):
-        """Gets the database_publication_day of this DatabaseDto.  # noqa: E501
+    def publication_day(self):
+        """Gets the publication_day of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publication_day of this DatabaseDto.  # noqa: E501
+        :return: The publication_day of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_publication_day
+        return self._publication_day
 
-    @database_publication_day.setter
-    def database_publication_day(self, database_publication_day):
-        """Sets the database_publication_day of this DatabaseDto.
+    @publication_day.setter
+    def publication_day(self, publication_day):
+        """Sets the publication_day of this DatabaseDto.
 
 
-        :param database_publication_day: The database_publication_day of this DatabaseDto.  # noqa: E501
+        :param publication_day: The publication_day of this DatabaseDto.  # noqa: E501
         :type: int
         """
 
-        self._database_publication_day = database_publication_day
+        self._publication_day = publication_day
 
     @property
-    def database_public(self):
-        """Gets the database_public of this DatabaseDto.  # noqa: E501
+    def is_public(self):
+        """Gets the is_public of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_public of this DatabaseDto.  # noqa: E501
+        :return: The is_public of this DatabaseDto.  # noqa: E501
         :rtype: bool
         """
-        return self._database_public
+        return self._is_public
 
-    @database_public.setter
-    def database_public(self, database_public):
-        """Sets the database_public of this DatabaseDto.
+    @is_public.setter
+    def is_public(self, is_public):
+        """Sets the is_public of this DatabaseDto.
 
 
-        :param database_public: The database_public of this DatabaseDto.  # noqa: E501
+        :param is_public: The is_public of this DatabaseDto.  # noqa: E501
         :type: bool
         """
 
-        self._database_public = database_public
+        self._is_public = is_public
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/.jupyter/api_identifier/models/table_dto.py b/.jupyter/api_identifier/models/table_dto.py
deleted file mode 100644
index 4d34f87b99777e9771d7452fc636d5c67707ca66..0000000000000000000000000000000000000000
--- a/.jupyter/api_identifier/models/table_dto.py
+++ /dev/null
@@ -1,272 +0,0 @@
-# coding: utf-8
-
-"""
-    Database Repository Identifier Service API
-
-    Service that manages the identifiers  # noqa: E501
-
-    OpenAPI spec version: 1.1.0-alpha
-    Contact: andreas.rauber@tuwien.ac.at
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-class TableDto(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'id': 'int',
-        'name': 'str',
-        'topic': 'str',
-        'description': 'str',
-        'created': 'datetime',
-        'columns': 'list[ColumnDto]',
-        'internal_name': 'str'
-    }
-
-    attribute_map = {
-        'id': 'id',
-        'name': 'name',
-        'topic': 'topic',
-        'description': 'description',
-        'created': 'created',
-        'columns': 'columns',
-        'internal_name': 'internal_name'
-    }
-
-    def __init__(self, id=None, name=None, topic=None, description=None, created=None, columns=None, internal_name=None):  # noqa: E501
-        """TableDto - a model defined in Swagger"""  # noqa: E501
-        self._id = None
-        self._name = None
-        self._topic = None
-        self._description = None
-        self._created = None
-        self._columns = None
-        self._internal_name = None
-        self.discriminator = None
-        self.id = id
-        self.name = name
-        self.topic = topic
-        self.description = description
-        if created is not None:
-            self.created = created
-        self.columns = columns
-        self.internal_name = internal_name
-
-    @property
-    def id(self):
-        """Gets the id of this TableDto.  # noqa: E501
-
-
-        :return: The id of this TableDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this TableDto.
-
-
-        :param id: The id of this TableDto.  # noqa: E501
-        :type: int
-        """
-        if id is None:
-            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
-
-        self._id = id
-
-    @property
-    def name(self):
-        """Gets the name of this TableDto.  # noqa: E501
-
-
-        :return: The name of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this TableDto.
-
-
-        :param name: The name of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def topic(self):
-        """Gets the topic of this TableDto.  # noqa: E501
-
-
-        :return: The topic of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._topic
-
-    @topic.setter
-    def topic(self, topic):
-        """Sets the topic of this TableDto.
-
-
-        :param topic: The topic of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if topic is None:
-            raise ValueError("Invalid value for `topic`, must not be `None`")  # noqa: E501
-
-        self._topic = topic
-
-    @property
-    def description(self):
-        """Gets the description of this TableDto.  # noqa: E501
-
-
-        :return: The description of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this TableDto.
-
-
-        :param description: The description of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if description is None:
-            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
-
-        self._description = description
-
-    @property
-    def created(self):
-        """Gets the created of this TableDto.  # noqa: E501
-
-
-        :return: The created of this TableDto.  # noqa: E501
-        :rtype: datetime
-        """
-        return self._created
-
-    @created.setter
-    def created(self, created):
-        """Sets the created of this TableDto.
-
-
-        :param created: The created of this TableDto.  # noqa: E501
-        :type: datetime
-        """
-
-        self._created = created
-
-    @property
-    def columns(self):
-        """Gets the columns of this TableDto.  # noqa: E501
-
-
-        :return: The columns of this TableDto.  # noqa: E501
-        :rtype: list[ColumnDto]
-        """
-        return self._columns
-
-    @columns.setter
-    def columns(self, columns):
-        """Sets the columns of this TableDto.
-
-
-        :param columns: The columns of this TableDto.  # noqa: E501
-        :type: list[ColumnDto]
-        """
-        if columns is None:
-            raise ValueError("Invalid value for `columns`, must not be `None`")  # noqa: E501
-
-        self._columns = columns
-
-    @property
-    def internal_name(self):
-        """Gets the internal_name of this TableDto.  # noqa: E501
-
-
-        :return: The internal_name of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._internal_name
-
-    @internal_name.setter
-    def internal_name(self, internal_name):
-        """Sets the internal_name of this TableDto.
-
-
-        :param internal_name: The internal_name of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if internal_name is None:
-            raise ValueError("Invalid value for `internal_name`, must not be `None`")  # noqa: E501
-
-        self._internal_name = internal_name
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(TableDto, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, TableDto):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/.jupyter/api_query/api/consumer_endpoint_api.py b/.jupyter/api_query/api/consumer_endpoint_api.py
deleted file mode 100644
index 2733010ba96edf699930a04afca6e6b0bbf19dd0..0000000000000000000000000000000000000000
--- a/.jupyter/api_query/api/consumer_endpoint_api.py
+++ /dev/null
@@ -1,142 +0,0 @@
-# coding: utf-8
-
-"""
-    Database Repository Query Service API
-
-    Service that manages the queries  # noqa: E501
-
-    OpenAPI spec version: 1.1.0-alpha
-    Contact: andreas.rauber@tuwien.ac.at
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-from __future__ import absolute_import
-
-import re  # noqa: F401
-
-# python 2 and python 3 compatibility library
-import six
-
-from api_query.api_client import ApiClient
-
-
-class ConsumerEndpointApi(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    Ref: https://github.com/swagger-api/swagger-codegen
-    """
-
-    def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = ApiClient()
-        self.api_client = api_client
-
-    def declare(self, id, database_id, table_id, **kwargs):  # noqa: E501
-        """Declare consumer  # noqa: E501
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.declare(id, database_id, table_id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param int id: (required)
-        :param int database_id: (required)
-        :param int table_id: (required)
-        :return: None
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.declare_with_http_info(id, database_id, table_id, **kwargs)  # noqa: E501
-        else:
-            (data) = self.declare_with_http_info(id, database_id, table_id, **kwargs)  # noqa: E501
-            return data
-
-    def declare_with_http_info(self, id, database_id, table_id, **kwargs):  # noqa: E501
-        """Declare consumer  # noqa: E501
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.declare_with_http_info(id, database_id, table_id, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param int id: (required)
-        :param int database_id: (required)
-        :param int table_id: (required)
-        :return: None
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-
-        all_params = ['id', 'database_id', 'table_id']  # noqa: E501
-        all_params.append('async_req')
-        all_params.append('_return_http_data_only')
-        all_params.append('_preload_content')
-        all_params.append('_request_timeout')
-
-        params = locals()
-        for key, val in six.iteritems(params['kwargs']):
-            if key not in all_params:
-                raise TypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method declare" % key
-                )
-            params[key] = val
-        del params['kwargs']
-        # verify the required parameter 'id' is set
-        if ('id' not in params or
-                params['id'] is None):
-            raise ValueError("Missing the required parameter `id` when calling `declare`")  # noqa: E501
-        # verify the required parameter 'database_id' is set
-        if ('database_id' not in params or
-                params['database_id'] is None):
-            raise ValueError("Missing the required parameter `database_id` when calling `declare`")  # noqa: E501
-        # verify the required parameter 'table_id' is set
-        if ('table_id' not in params or
-                params['table_id'] is None):
-            raise ValueError("Missing the required parameter `table_id` when calling `declare`")  # noqa: E501
-
-        collection_formats = {}
-
-        path_params = {}
-        if 'id' in params:
-            path_params['id'] = params['id']  # noqa: E501
-        if 'database_id' in params:
-            path_params['databaseId'] = params['database_id']  # noqa: E501
-        if 'table_id' in params:
-            path_params['tableId'] = params['table_id']  # noqa: E501
-
-        query_params = []
-
-        header_params = {}
-
-        form_params = []
-        local_var_files = {}
-
-        body_params = None
-        # HTTP header `Accept`
-        header_params['Accept'] = self.api_client.select_header_accept(
-            ['*/*'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['bearerAuth']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/api/container/{id}/database/{databaseId}/table/{tableId}/consumer', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type=None,  # noqa: E501
-            auth_settings=auth_settings,
-            async_req=params.get('async_req'),
-            _return_http_data_only=params.get('_return_http_data_only'),
-            _preload_content=params.get('_preload_content', True),
-            _request_timeout=params.get('_request_timeout'),
-            collection_formats=collection_formats)
diff --git a/.jupyter/api_query/api/table_data_endpoint_api.py b/.jupyter/api_query/api/table_data_endpoint_api.py
index 8f34b37dacac4db3543dd2def4951d0d24501b87..632bf0023c0c979119e43647dec551cf4bc744ad 100644
--- a/.jupyter/api_query/api/table_data_endpoint_api.py
+++ b/.jupyter/api_query/api/table_data_endpoint_api.py
@@ -259,7 +259,7 @@ class TableDataEndpointApi(object):
         auth_settings = ['bearerAuth']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/container/{id}/database/{databaseId}/table/{tableId}/data', 'GET',
+            '/api/container/{id}/database/{databaseId}/table/{tableId}/data', 'HEAD',
             path_params,
             query_params,
             header_params,
@@ -380,7 +380,7 @@ class TableDataEndpointApi(object):
         auth_settings = ['bearerAuth']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/container/{id}/database/{databaseId}/table/{tableId}/data', 'HEAD',
+            '/api/container/{id}/database/{databaseId}/table/{tableId}/data', 'GET',
             path_params,
             query_params,
             header_params,
diff --git a/.jupyter/api_query/api/table_history_endpoint_api.py b/.jupyter/api_query/api/table_history_endpoint_api.py
index 024816773f5d4328cc00116d9c298b48cd860fc9..f013bf0c6aede1359efe4f36e48a29c1d18215c9 100644
--- a/.jupyter/api_query/api/table_history_endpoint_api.py
+++ b/.jupyter/api_query/api/table_history_endpoint_api.py
@@ -126,7 +126,7 @@ class TableHistoryEndpointApi(object):
         auth_settings = ['bearerAuth']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/container/{id}/database/{databaseId}/table/{tableId}/history', 'GET',
+            '/api/container/{id}/database/{databaseId}/table/{tableId}/history', 'HEAD',
             path_params,
             query_params,
             header_params,
@@ -235,7 +235,7 @@ class TableHistoryEndpointApi(object):
         auth_settings = ['bearerAuth']  # noqa: E501
 
         return self.api_client.call_api(
-            '/api/container/{id}/database/{databaseId}/table/{tableId}/history', 'HEAD',
+            '/api/container/{id}/database/{databaseId}/table/{tableId}/history', 'GET',
             path_params,
             query_params,
             header_params,
diff --git a/.jupyter/api_query/models/column_dto.py b/.jupyter/api_query/models/column_dto.py
deleted file mode 100644
index f6997fd2c20d93994ec83b4d03ec0f925ea30d8d..0000000000000000000000000000000000000000
--- a/.jupyter/api_query/models/column_dto.py
+++ /dev/null
@@ -1,514 +0,0 @@
-# coding: utf-8
-
-"""
-    Database Repository Query Service API
-
-    Service that manages the queries  # noqa: E501
-
-    OpenAPI spec version: 1.1.0-alpha
-    Contact: andreas.rauber@tuwien.ac.at
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-class ColumnDto(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'id': 'int',
-        'name': 'str',
-        'unique': 'bool',
-        'references': 'str',
-        'internal_name': 'str',
-        'date_format': 'ImageDateDto',
-        'auto_generated': 'bool',
-        'is_primary_key': 'bool',
-        'column_type': 'str',
-        'column_concept': 'ConceptDto',
-        'decimal_digits_before': 'int',
-        'decimal_digits_after': 'int',
-        'is_null_allowed': 'bool',
-        'check_expression': 'str',
-        'foreign_key': 'str',
-        'enum_values': 'list[str]'
-    }
-
-    attribute_map = {
-        'id': 'id',
-        'name': 'name',
-        'unique': 'unique',
-        'references': 'references',
-        'internal_name': 'internal_name',
-        'date_format': 'date_format',
-        'auto_generated': 'auto_generated',
-        'is_primary_key': 'is_primary_key',
-        'column_type': 'column_type',
-        'column_concept': 'column_concept',
-        'decimal_digits_before': 'decimal_digits_before',
-        'decimal_digits_after': 'decimal_digits_after',
-        'is_null_allowed': 'is_null_allowed',
-        'check_expression': 'check_expression',
-        'foreign_key': 'foreign_key',
-        'enum_values': 'enum_values'
-    }
-
-    def __init__(self, id=None, name=None, unique=None, references=None, internal_name=None, date_format=None, auto_generated=None, is_primary_key=None, column_type=None, column_concept=None, decimal_digits_before=None, decimal_digits_after=None, is_null_allowed=None, check_expression=None, foreign_key=None, enum_values=None):  # noqa: E501
-        """ColumnDto - a model defined in Swagger"""  # noqa: E501
-        self._id = None
-        self._name = None
-        self._unique = None
-        self._references = None
-        self._internal_name = None
-        self._date_format = None
-        self._auto_generated = None
-        self._is_primary_key = None
-        self._column_type = None
-        self._column_concept = None
-        self._decimal_digits_before = None
-        self._decimal_digits_after = None
-        self._is_null_allowed = None
-        self._check_expression = None
-        self._foreign_key = None
-        self._enum_values = None
-        self.discriminator = None
-        self.id = id
-        self.name = name
-        self.unique = unique
-        if references is not None:
-            self.references = references
-        self.internal_name = internal_name
-        if date_format is not None:
-            self.date_format = date_format
-        self.auto_generated = auto_generated
-        self.is_primary_key = is_primary_key
-        self.column_type = column_type
-        if column_concept is not None:
-            self.column_concept = column_concept
-        if decimal_digits_before is not None:
-            self.decimal_digits_before = decimal_digits_before
-        if decimal_digits_after is not None:
-            self.decimal_digits_after = decimal_digits_after
-        self.is_null_allowed = is_null_allowed
-        if check_expression is not None:
-            self.check_expression = check_expression
-        if foreign_key is not None:
-            self.foreign_key = foreign_key
-        if enum_values is not None:
-            self.enum_values = enum_values
-
-    @property
-    def id(self):
-        """Gets the id of this ColumnDto.  # noqa: E501
-
-
-        :return: The id of this ColumnDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this ColumnDto.
-
-
-        :param id: The id of this ColumnDto.  # noqa: E501
-        :type: int
-        """
-        if id is None:
-            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
-
-        self._id = id
-
-    @property
-    def name(self):
-        """Gets the name of this ColumnDto.  # noqa: E501
-
-
-        :return: The name of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this ColumnDto.
-
-
-        :param name: The name of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def unique(self):
-        """Gets the unique of this ColumnDto.  # noqa: E501
-
-
-        :return: The unique of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._unique
-
-    @unique.setter
-    def unique(self, unique):
-        """Sets the unique of this ColumnDto.
-
-
-        :param unique: The unique of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if unique is None:
-            raise ValueError("Invalid value for `unique`, must not be `None`")  # noqa: E501
-
-        self._unique = unique
-
-    @property
-    def references(self):
-        """Gets the references of this ColumnDto.  # noqa: E501
-
-
-        :return: The references of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._references
-
-    @references.setter
-    def references(self, references):
-        """Sets the references of this ColumnDto.
-
-
-        :param references: The references of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-
-        self._references = references
-
-    @property
-    def internal_name(self):
-        """Gets the internal_name of this ColumnDto.  # noqa: E501
-
-
-        :return: The internal_name of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._internal_name
-
-    @internal_name.setter
-    def internal_name(self, internal_name):
-        """Sets the internal_name of this ColumnDto.
-
-
-        :param internal_name: The internal_name of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-        if internal_name is None:
-            raise ValueError("Invalid value for `internal_name`, must not be `None`")  # noqa: E501
-
-        self._internal_name = internal_name
-
-    @property
-    def date_format(self):
-        """Gets the date_format of this ColumnDto.  # noqa: E501
-
-
-        :return: The date_format of this ColumnDto.  # noqa: E501
-        :rtype: ImageDateDto
-        """
-        return self._date_format
-
-    @date_format.setter
-    def date_format(self, date_format):
-        """Sets the date_format of this ColumnDto.
-
-
-        :param date_format: The date_format of this ColumnDto.  # noqa: E501
-        :type: ImageDateDto
-        """
-
-        self._date_format = date_format
-
-    @property
-    def auto_generated(self):
-        """Gets the auto_generated of this ColumnDto.  # noqa: E501
-
-
-        :return: The auto_generated of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._auto_generated
-
-    @auto_generated.setter
-    def auto_generated(self, auto_generated):
-        """Sets the auto_generated of this ColumnDto.
-
-
-        :param auto_generated: The auto_generated of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if auto_generated is None:
-            raise ValueError("Invalid value for `auto_generated`, must not be `None`")  # noqa: E501
-
-        self._auto_generated = auto_generated
-
-    @property
-    def is_primary_key(self):
-        """Gets the is_primary_key of this ColumnDto.  # noqa: E501
-
-
-        :return: The is_primary_key of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._is_primary_key
-
-    @is_primary_key.setter
-    def is_primary_key(self, is_primary_key):
-        """Sets the is_primary_key of this ColumnDto.
-
-
-        :param is_primary_key: The is_primary_key of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if is_primary_key is None:
-            raise ValueError("Invalid value for `is_primary_key`, must not be `None`")  # noqa: E501
-
-        self._is_primary_key = is_primary_key
-
-    @property
-    def column_type(self):
-        """Gets the column_type of this ColumnDto.  # noqa: E501
-
-
-        :return: The column_type of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._column_type
-
-    @column_type.setter
-    def column_type(self, column_type):
-        """Sets the column_type of this ColumnDto.
-
-
-        :param column_type: The column_type of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-        if column_type is None:
-            raise ValueError("Invalid value for `column_type`, must not be `None`")  # noqa: E501
-        allowed_values = ["enum", "number", "decimal", "string", "text", "boolean", "date", "timestamp", "blob"]  # noqa: E501
-        if column_type not in allowed_values:
-            raise ValueError(
-                "Invalid value for `column_type` ({0}), must be one of {1}"  # noqa: E501
-                .format(column_type, allowed_values)
-            )
-
-        self._column_type = column_type
-
-    @property
-    def column_concept(self):
-        """Gets the column_concept of this ColumnDto.  # noqa: E501
-
-
-        :return: The column_concept of this ColumnDto.  # noqa: E501
-        :rtype: ConceptDto
-        """
-        return self._column_concept
-
-    @column_concept.setter
-    def column_concept(self, column_concept):
-        """Sets the column_concept of this ColumnDto.
-
-
-        :param column_concept: The column_concept of this ColumnDto.  # noqa: E501
-        :type: ConceptDto
-        """
-
-        self._column_concept = column_concept
-
-    @property
-    def decimal_digits_before(self):
-        """Gets the decimal_digits_before of this ColumnDto.  # noqa: E501
-
-
-        :return: The decimal_digits_before of this ColumnDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._decimal_digits_before
-
-    @decimal_digits_before.setter
-    def decimal_digits_before(self, decimal_digits_before):
-        """Sets the decimal_digits_before of this ColumnDto.
-
-
-        :param decimal_digits_before: The decimal_digits_before of this ColumnDto.  # noqa: E501
-        :type: int
-        """
-
-        self._decimal_digits_before = decimal_digits_before
-
-    @property
-    def decimal_digits_after(self):
-        """Gets the decimal_digits_after of this ColumnDto.  # noqa: E501
-
-
-        :return: The decimal_digits_after of this ColumnDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._decimal_digits_after
-
-    @decimal_digits_after.setter
-    def decimal_digits_after(self, decimal_digits_after):
-        """Sets the decimal_digits_after of this ColumnDto.
-
-
-        :param decimal_digits_after: The decimal_digits_after of this ColumnDto.  # noqa: E501
-        :type: int
-        """
-
-        self._decimal_digits_after = decimal_digits_after
-
-    @property
-    def is_null_allowed(self):
-        """Gets the is_null_allowed of this ColumnDto.  # noqa: E501
-
-
-        :return: The is_null_allowed of this ColumnDto.  # noqa: E501
-        :rtype: bool
-        """
-        return self._is_null_allowed
-
-    @is_null_allowed.setter
-    def is_null_allowed(self, is_null_allowed):
-        """Sets the is_null_allowed of this ColumnDto.
-
-
-        :param is_null_allowed: The is_null_allowed of this ColumnDto.  # noqa: E501
-        :type: bool
-        """
-        if is_null_allowed is None:
-            raise ValueError("Invalid value for `is_null_allowed`, must not be `None`")  # noqa: E501
-
-        self._is_null_allowed = is_null_allowed
-
-    @property
-    def check_expression(self):
-        """Gets the check_expression of this ColumnDto.  # noqa: E501
-
-
-        :return: The check_expression of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._check_expression
-
-    @check_expression.setter
-    def check_expression(self, check_expression):
-        """Sets the check_expression of this ColumnDto.
-
-
-        :param check_expression: The check_expression of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-
-        self._check_expression = check_expression
-
-    @property
-    def foreign_key(self):
-        """Gets the foreign_key of this ColumnDto.  # noqa: E501
-
-
-        :return: The foreign_key of this ColumnDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._foreign_key
-
-    @foreign_key.setter
-    def foreign_key(self, foreign_key):
-        """Sets the foreign_key of this ColumnDto.
-
-
-        :param foreign_key: The foreign_key of this ColumnDto.  # noqa: E501
-        :type: str
-        """
-
-        self._foreign_key = foreign_key
-
-    @property
-    def enum_values(self):
-        """Gets the enum_values of this ColumnDto.  # noqa: E501
-
-
-        :return: The enum_values of this ColumnDto.  # noqa: E501
-        :rtype: list[str]
-        """
-        return self._enum_values
-
-    @enum_values.setter
-    def enum_values(self, enum_values):
-        """Sets the enum_values of this ColumnDto.
-
-
-        :param enum_values: The enum_values of this ColumnDto.  # noqa: E501
-        :type: list[str]
-        """
-
-        self._enum_values = enum_values
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ColumnDto, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ColumnDto):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/.jupyter/api_query/models/concept_dto.py b/.jupyter/api_query/models/concept_dto.py
deleted file mode 100644
index 02ea52890e81572d29547d4bbfb8f69dd41e95a8..0000000000000000000000000000000000000000
--- a/.jupyter/api_query/models/concept_dto.py
+++ /dev/null
@@ -1,165 +0,0 @@
-# coding: utf-8
-
-"""
-    Database Repository Query Service API
-
-    Service that manages the queries  # noqa: E501
-
-    OpenAPI spec version: 1.1.0-alpha
-    Contact: andreas.rauber@tuwien.ac.at
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-class ConceptDto(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'uri': 'str',
-        'name': 'str',
-        'created': 'datetime'
-    }
-
-    attribute_map = {
-        'uri': 'uri',
-        'name': 'name',
-        'created': 'created'
-    }
-
-    def __init__(self, uri=None, name=None, created=None):  # noqa: E501
-        """ConceptDto - a model defined in Swagger"""  # noqa: E501
-        self._uri = None
-        self._name = None
-        self._created = None
-        self.discriminator = None
-        self.uri = uri
-        self.name = name
-        self.created = created
-
-    @property
-    def uri(self):
-        """Gets the uri of this ConceptDto.  # noqa: E501
-
-
-        :return: The uri of this ConceptDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._uri
-
-    @uri.setter
-    def uri(self, uri):
-        """Sets the uri of this ConceptDto.
-
-
-        :param uri: The uri of this ConceptDto.  # noqa: E501
-        :type: str
-        """
-        if uri is None:
-            raise ValueError("Invalid value for `uri`, must not be `None`")  # noqa: E501
-
-        self._uri = uri
-
-    @property
-    def name(self):
-        """Gets the name of this ConceptDto.  # noqa: E501
-
-
-        :return: The name of this ConceptDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this ConceptDto.
-
-
-        :param name: The name of this ConceptDto.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def created(self):
-        """Gets the created of this ConceptDto.  # noqa: E501
-
-
-        :return: The created of this ConceptDto.  # noqa: E501
-        :rtype: datetime
-        """
-        return self._created
-
-    @created.setter
-    def created(self, created):
-        """Sets the created of this ConceptDto.
-
-
-        :param created: The created of this ConceptDto.  # noqa: E501
-        :type: datetime
-        """
-        if created is None:
-            raise ValueError("Invalid value for `created`, must not be `None`")  # noqa: E501
-
-        self._created = created
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(ConceptDto, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, ConceptDto):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/.jupyter/api_query/models/database_dto.py b/.jupyter/api_query/models/database_dto.py
index fb94bfb4d9045bb7ad5ff5789c279538827cdf25..2a1eca58879ea04405ff2b27dba5d4713893b3ac 100644
--- a/.jupyter/api_query/models/database_dto.py
+++ b/.jupyter/api_query/models/database_dto.py
@@ -28,334 +28,307 @@ class DatabaseDto(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'database_id': 'int',
-        'database_name': 'str',
-        'database_exchange': 'str',
-        'database_creator': 'UserBriefDto',
-        'database_subjects': 'list[str]',
-        'database_language': 'str',
-        'database_license': 'LicenseDto',
-        'database_description': 'str',
-        'database_publisher': 'str',
-        'database_contact_person': 'UserDto',
+        'id': 'int',
+        'name': 'str',
+        'exchange': 'str',
+        'creator': 'UserBriefDto',
+        'subjects': 'list[str]',
+        'language': 'str',
+        'license': 'LicenseDto',
+        'description': 'str',
+        'publisher': 'str',
         'tables': 'list[TableBriefDto]',
-        'database_container_image': 'ImageDto',
+        'image': 'ImageDto',
         'container': 'ContainerDto',
-        'database_creation_time': 'datetime',
+        'created': 'datetime',
         'deleted': 'datetime',
-        'database_internal_name': 'str',
-        'database_publication_year': 'int',
-        'database_publication_month': 'int',
-        'database_publication_day': 'int',
-        'database_public': 'bool'
+        'internal_name': 'str',
+        'publication_year': 'int',
+        'publication_month': 'int',
+        'publication_day': 'int',
+        'is_public': 'bool'
     }
 
     attribute_map = {
-        'database_id': 'database id',
-        'database_name': 'database name',
-        'database_exchange': 'database exchange',
-        'database_creator': 'database creator',
-        'database_subjects': 'database subjects',
-        'database_language': 'database language',
-        'database_license': 'database license',
-        'database_description': 'database description',
-        'database_publisher': 'database publisher',
-        'database_contact_person': 'database contact person',
+        'id': 'id',
+        'name': 'name',
+        'exchange': 'exchange',
+        'creator': 'creator',
+        'subjects': 'subjects',
+        'language': 'language',
+        'license': 'license',
+        'description': 'description',
+        'publisher': 'publisher',
         'tables': 'tables',
-        'database_container_image': 'database container image',
+        'image': 'image',
         'container': 'container',
-        'database_creation_time': 'database creation time',
+        'created': 'created',
         'deleted': 'deleted',
-        'database_internal_name': 'database internal name',
-        'database_publication_year': 'database publication year',
-        'database_publication_month': 'database publication month',
-        'database_publication_day': 'database publication day',
-        'database_public': 'database public'
+        'internal_name': 'internal_name',
+        'publication_year': 'publication_year',
+        'publication_month': 'publication_month',
+        'publication_day': 'publication_day',
+        'is_public': 'is_public'
     }
 
-    def __init__(self, database_id=None, database_name=None, database_exchange=None, database_creator=None, database_subjects=None, database_language=None, database_license=None, database_description=None, database_publisher=None, database_contact_person=None, tables=None, database_container_image=None, container=None, database_creation_time=None, deleted=None, database_internal_name=None, database_publication_year=None, database_publication_month=None, database_publication_day=None, database_public=None):  # noqa: E501
+    def __init__(self, id=None, name=None, exchange=None, creator=None, subjects=None, language=None, license=None, description=None, publisher=None, tables=None, image=None, container=None, created=None, deleted=None, internal_name=None, publication_year=None, publication_month=None, publication_day=None, is_public=None):  # noqa: E501
         """DatabaseDto - a model defined in Swagger"""  # noqa: E501
-        self._database_id = None
-        self._database_name = None
-        self._database_exchange = None
-        self._database_creator = None
-        self._database_subjects = None
-        self._database_language = None
-        self._database_license = None
-        self._database_description = None
-        self._database_publisher = None
-        self._database_contact_person = None
+        self._id = None
+        self._name = None
+        self._exchange = None
+        self._creator = None
+        self._subjects = None
+        self._language = None
+        self._license = None
+        self._description = None
+        self._publisher = None
         self._tables = None
-        self._database_container_image = None
+        self._image = None
         self._container = None
-        self._database_creation_time = None
+        self._created = None
         self._deleted = None
-        self._database_internal_name = None
-        self._database_publication_year = None
-        self._database_publication_month = None
-        self._database_publication_day = None
-        self._database_public = None
+        self._internal_name = None
+        self._publication_year = None
+        self._publication_month = None
+        self._publication_day = None
+        self._is_public = None
         self.discriminator = None
-        self.database_id = database_id
-        self.database_name = database_name
-        self.database_exchange = database_exchange
-        self.database_creator = database_creator
-        if database_subjects is not None:
-            self.database_subjects = database_subjects
-        if database_language is not None:
-            self.database_language = database_language
-        if database_license is not None:
-            self.database_license = database_license
-        self.database_description = database_description
-        if database_publisher is not None:
-            self.database_publisher = database_publisher
-        if database_contact_person is not None:
-            self.database_contact_person = database_contact_person
+        self.id = id
+        self.name = name
+        self.exchange = exchange
+        self.creator = creator
+        if subjects is not None:
+            self.subjects = subjects
+        if language is not None:
+            self.language = language
+        if license is not None:
+            self.license = license
+        if description is not None:
+            self.description = description
+        if publisher is not None:
+            self.publisher = publisher
         if tables is not None:
             self.tables = tables
-        if database_container_image is not None:
-            self.database_container_image = database_container_image
+        if image is not None:
+            self.image = image
         if container is not None:
             self.container = container
-        if database_creation_time is not None:
-            self.database_creation_time = database_creation_time
+        if created is not None:
+            self.created = created
         if deleted is not None:
             self.deleted = deleted
-        self.database_internal_name = database_internal_name
-        if database_publication_year is not None:
-            self.database_publication_year = database_publication_year
-        if database_publication_month is not None:
-            self.database_publication_month = database_publication_month
-        if database_publication_day is not None:
-            self.database_publication_day = database_publication_day
-        if database_public is not None:
-            self.database_public = database_public
+        self.internal_name = internal_name
+        if publication_year is not None:
+            self.publication_year = publication_year
+        if publication_month is not None:
+            self.publication_month = publication_month
+        if publication_day is not None:
+            self.publication_day = publication_day
+        if is_public is not None:
+            self.is_public = is_public
 
     @property
-    def database_id(self):
-        """Gets the database_id of this DatabaseDto.  # noqa: E501
+    def id(self):
+        """Gets the id of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_id of this DatabaseDto.  # noqa: E501
+        :return: The id of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_id
+        return self._id
 
-    @database_id.setter
-    def database_id(self, database_id):
-        """Sets the database_id of this DatabaseDto.
+    @id.setter
+    def id(self, id):
+        """Sets the id of this DatabaseDto.
 
 
-        :param database_id: The database_id of this DatabaseDto.  # noqa: E501
+        :param id: The id of this DatabaseDto.  # noqa: E501
         :type: int
         """
-        if database_id is None:
-            raise ValueError("Invalid value for `database_id`, must not be `None`")  # noqa: E501
+        if id is None:
+            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
 
-        self._database_id = database_id
+        self._id = id
 
     @property
-    def database_name(self):
-        """Gets the database_name of this DatabaseDto.  # noqa: E501
+    def name(self):
+        """Gets the name of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_name of this DatabaseDto.  # noqa: E501
+        :return: The name of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_name
+        return self._name
 
-    @database_name.setter
-    def database_name(self, database_name):
-        """Sets the database_name of this DatabaseDto.
+    @name.setter
+    def name(self, name):
+        """Sets the name of this DatabaseDto.
 
 
-        :param database_name: The database_name of this DatabaseDto.  # noqa: E501
+        :param name: The name of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_name is None:
-            raise ValueError("Invalid value for `database_name`, must not be `None`")  # noqa: E501
+        if name is None:
+            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
 
-        self._database_name = database_name
+        self._name = name
 
     @property
-    def database_exchange(self):
-        """Gets the database_exchange of this DatabaseDto.  # noqa: E501
+    def exchange(self):
+        """Gets the exchange of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_exchange of this DatabaseDto.  # noqa: E501
+        :return: The exchange of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_exchange
+        return self._exchange
 
-    @database_exchange.setter
-    def database_exchange(self, database_exchange):
-        """Sets the database_exchange of this DatabaseDto.
+    @exchange.setter
+    def exchange(self, exchange):
+        """Sets the exchange of this DatabaseDto.
 
 
-        :param database_exchange: The database_exchange of this DatabaseDto.  # noqa: E501
+        :param exchange: The exchange of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_exchange is None:
-            raise ValueError("Invalid value for `database_exchange`, must not be `None`")  # noqa: E501
+        if exchange is None:
+            raise ValueError("Invalid value for `exchange`, must not be `None`")  # noqa: E501
 
-        self._database_exchange = database_exchange
+        self._exchange = exchange
 
     @property
-    def database_creator(self):
-        """Gets the database_creator of this DatabaseDto.  # noqa: E501
+    def creator(self):
+        """Gets the creator of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_creator of this DatabaseDto.  # noqa: E501
+        :return: The creator of this DatabaseDto.  # noqa: E501
         :rtype: UserBriefDto
         """
-        return self._database_creator
+        return self._creator
 
-    @database_creator.setter
-    def database_creator(self, database_creator):
-        """Sets the database_creator of this DatabaseDto.
+    @creator.setter
+    def creator(self, creator):
+        """Sets the creator of this DatabaseDto.
 
 
-        :param database_creator: The database_creator of this DatabaseDto.  # noqa: E501
+        :param creator: The creator of this DatabaseDto.  # noqa: E501
         :type: UserBriefDto
         """
-        if database_creator is None:
-            raise ValueError("Invalid value for `database_creator`, must not be `None`")  # noqa: E501
+        if creator is None:
+            raise ValueError("Invalid value for `creator`, must not be `None`")  # noqa: E501
 
-        self._database_creator = database_creator
+        self._creator = creator
 
     @property
-    def database_subjects(self):
-        """Gets the database_subjects of this DatabaseDto.  # noqa: E501
+    def subjects(self):
+        """Gets the subjects of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_subjects of this DatabaseDto.  # noqa: E501
+        :return: The subjects of this DatabaseDto.  # noqa: E501
         :rtype: list[str]
         """
-        return self._database_subjects
+        return self._subjects
 
-    @database_subjects.setter
-    def database_subjects(self, database_subjects):
-        """Sets the database_subjects of this DatabaseDto.
+    @subjects.setter
+    def subjects(self, subjects):
+        """Sets the subjects of this DatabaseDto.
 
 
-        :param database_subjects: The database_subjects of this DatabaseDto.  # noqa: E501
+        :param subjects: The subjects of this DatabaseDto.  # noqa: E501
         :type: list[str]
         """
 
-        self._database_subjects = database_subjects
+        self._subjects = subjects
 
     @property
-    def database_language(self):
-        """Gets the database_language of this DatabaseDto.  # noqa: E501
+    def language(self):
+        """Gets the language of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_language of this DatabaseDto.  # noqa: E501
+        :return: The language of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_language
+        return self._language
 
-    @database_language.setter
-    def database_language(self, database_language):
-        """Sets the database_language of this DatabaseDto.
+    @language.setter
+    def language(self, language):
+        """Sets the language of this DatabaseDto.
 
 
-        :param database_language: The database_language of this DatabaseDto.  # noqa: E501
+        :param language: The language of this DatabaseDto.  # noqa: E501
         :type: str
         """
         allowed_values = ["ab", "aa", "af", "ak", "sq", "am", "ar", "an", "hy", "as", "av", "ae", "ay", "az", "bm", "ba", "eu", "be", "bn", "bh", "bi", "bs", "br", "bg", "my", "ca", "km", "ch", "ce", "ny", "zh", "cu", "cv", "kw", "co", "cr", "hr", "cs", "da", "dv", "nl", "dz", "en", "eo", "et", "ee", "fo", "fj", "fi", "fr", "ff", "gd", "gl", "lg", "ka", "de", "ki", "el", "kl", "gn", "gu", "ht", "ha", "he", "hz", "hi", "ho", "hu", "is", "io", "ig", "id", "ia", "ie", "iu", "ik", "ga", "it", "ja", "jv", "kn", "kr", "ks", "kk", "rw", "kv", "kg", "ko", "kj", "ku", "ky", "lo", "la", "lv", "lb", "li", "ln", "lt", "lu", "mk", "mg", "ms", "ml", "mt", "gv", "mi", "mr", "mh", "ro", "mn", "na", "nv", "nd", "ng", "ne", "se", "no", "nb", "nn", "ii", "oc", "oj", "or", "om", "os", "pi", "pa", "ps", "fa", "pl", "pt", "qu", "rm", "rn", "ru", "sm", "sg", "sa", "sc", "sr", "sn", "sd", "si", "sk", "sl", "so", "st", "nr", "es", "su", "sw", "ss", "sv", "tl", "ty", "tg", "ta", "tt", "te", "th", "bo", "ti", "to", "ts", "tn", "tr", "tk", "tw", "ug", "uk", "ur", "uz", "ve", "vi", "vo", "wa", "cy", "fy", "wo", "xh", "yi", "yo", "za", "zu"]  # noqa: E501
-        if database_language not in allowed_values:
+        if language not in allowed_values:
             raise ValueError(
-                "Invalid value for `database_language` ({0}), must be one of {1}"  # noqa: E501
-                .format(database_language, allowed_values)
+                "Invalid value for `language` ({0}), must be one of {1}"  # noqa: E501
+                .format(language, allowed_values)
             )
 
-        self._database_language = database_language
+        self._language = language
 
     @property
-    def database_license(self):
-        """Gets the database_license of this DatabaseDto.  # noqa: E501
+    def license(self):
+        """Gets the license of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_license of this DatabaseDto.  # noqa: E501
+        :return: The license of this DatabaseDto.  # noqa: E501
         :rtype: LicenseDto
         """
-        return self._database_license
+        return self._license
 
-    @database_license.setter
-    def database_license(self, database_license):
-        """Sets the database_license of this DatabaseDto.
+    @license.setter
+    def license(self, license):
+        """Sets the license of this DatabaseDto.
 
 
-        :param database_license: The database_license of this DatabaseDto.  # noqa: E501
+        :param license: The license of this DatabaseDto.  # noqa: E501
         :type: LicenseDto
         """
 
-        self._database_license = database_license
+        self._license = license
 
     @property
-    def database_description(self):
-        """Gets the database_description of this DatabaseDto.  # noqa: E501
+    def description(self):
+        """Gets the description of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_description of this DatabaseDto.  # noqa: E501
+        :return: The description of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_description
+        return self._description
 
-    @database_description.setter
-    def database_description(self, database_description):
-        """Sets the database_description of this DatabaseDto.
+    @description.setter
+    def description(self, description):
+        """Sets the description of this DatabaseDto.
 
 
-        :param database_description: The database_description of this DatabaseDto.  # noqa: E501
+        :param description: The description of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_description is None:
-            raise ValueError("Invalid value for `database_description`, must not be `None`")  # noqa: E501
 
-        self._database_description = database_description
+        self._description = description
 
     @property
-    def database_publisher(self):
-        """Gets the database_publisher of this DatabaseDto.  # noqa: E501
+    def publisher(self):
+        """Gets the publisher of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publisher of this DatabaseDto.  # noqa: E501
+        :return: The publisher of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_publisher
+        return self._publisher
 
-    @database_publisher.setter
-    def database_publisher(self, database_publisher):
-        """Sets the database_publisher of this DatabaseDto.
+    @publisher.setter
+    def publisher(self, publisher):
+        """Sets the publisher of this DatabaseDto.
 
 
-        :param database_publisher: The database_publisher of this DatabaseDto.  # noqa: E501
+        :param publisher: The publisher of this DatabaseDto.  # noqa: E501
         :type: str
         """
 
-        self._database_publisher = database_publisher
-
-    @property
-    def database_contact_person(self):
-        """Gets the database_contact_person of this DatabaseDto.  # noqa: E501
-
-
-        :return: The database_contact_person of this DatabaseDto.  # noqa: E501
-        :rtype: UserDto
-        """
-        return self._database_contact_person
-
-    @database_contact_person.setter
-    def database_contact_person(self, database_contact_person):
-        """Sets the database_contact_person of this DatabaseDto.
-
-
-        :param database_contact_person: The database_contact_person of this DatabaseDto.  # noqa: E501
-        :type: UserDto
-        """
-
-        self._database_contact_person = database_contact_person
+        self._publisher = publisher
 
     @property
     def tables(self):
@@ -379,25 +352,25 @@ class DatabaseDto(object):
         self._tables = tables
 
     @property
-    def database_container_image(self):
-        """Gets the database_container_image of this DatabaseDto.  # noqa: E501
+    def image(self):
+        """Gets the image of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_container_image of this DatabaseDto.  # noqa: E501
+        :return: The image of this DatabaseDto.  # noqa: E501
         :rtype: ImageDto
         """
-        return self._database_container_image
+        return self._image
 
-    @database_container_image.setter
-    def database_container_image(self, database_container_image):
-        """Sets the database_container_image of this DatabaseDto.
+    @image.setter
+    def image(self, image):
+        """Sets the image of this DatabaseDto.
 
 
-        :param database_container_image: The database_container_image of this DatabaseDto.  # noqa: E501
+        :param image: The image of this DatabaseDto.  # noqa: E501
         :type: ImageDto
         """
 
-        self._database_container_image = database_container_image
+        self._image = image
 
     @property
     def container(self):
@@ -421,25 +394,25 @@ class DatabaseDto(object):
         self._container = container
 
     @property
-    def database_creation_time(self):
-        """Gets the database_creation_time of this DatabaseDto.  # noqa: E501
+    def created(self):
+        """Gets the created of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_creation_time of this DatabaseDto.  # noqa: E501
+        :return: The created of this DatabaseDto.  # noqa: E501
         :rtype: datetime
         """
-        return self._database_creation_time
+        return self._created
 
-    @database_creation_time.setter
-    def database_creation_time(self, database_creation_time):
-        """Sets the database_creation_time of this DatabaseDto.
+    @created.setter
+    def created(self, created):
+        """Sets the created of this DatabaseDto.
 
 
-        :param database_creation_time: The database_creation_time of this DatabaseDto.  # noqa: E501
+        :param created: The created of this DatabaseDto.  # noqa: E501
         :type: datetime
         """
 
-        self._database_creation_time = database_creation_time
+        self._created = created
 
     @property
     def deleted(self):
@@ -463,111 +436,111 @@ class DatabaseDto(object):
         self._deleted = deleted
 
     @property
-    def database_internal_name(self):
-        """Gets the database_internal_name of this DatabaseDto.  # noqa: E501
+    def internal_name(self):
+        """Gets the internal_name of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_internal_name of this DatabaseDto.  # noqa: E501
+        :return: The internal_name of this DatabaseDto.  # noqa: E501
         :rtype: str
         """
-        return self._database_internal_name
+        return self._internal_name
 
-    @database_internal_name.setter
-    def database_internal_name(self, database_internal_name):
-        """Sets the database_internal_name of this DatabaseDto.
+    @internal_name.setter
+    def internal_name(self, internal_name):
+        """Sets the internal_name of this DatabaseDto.
 
 
-        :param database_internal_name: The database_internal_name of this DatabaseDto.  # noqa: E501
+        :param internal_name: The internal_name of this DatabaseDto.  # noqa: E501
         :type: str
         """
-        if database_internal_name is None:
-            raise ValueError("Invalid value for `database_internal_name`, must not be `None`")  # noqa: E501
+        if internal_name is None:
+            raise ValueError("Invalid value for `internal_name`, must not be `None`")  # noqa: E501
 
-        self._database_internal_name = database_internal_name
+        self._internal_name = internal_name
 
     @property
-    def database_publication_year(self):
-        """Gets the database_publication_year of this DatabaseDto.  # noqa: E501
+    def publication_year(self):
+        """Gets the publication_year of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publication_year of this DatabaseDto.  # noqa: E501
+        :return: The publication_year of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_publication_year
+        return self._publication_year
 
-    @database_publication_year.setter
-    def database_publication_year(self, database_publication_year):
-        """Sets the database_publication_year of this DatabaseDto.
+    @publication_year.setter
+    def publication_year(self, publication_year):
+        """Sets the publication_year of this DatabaseDto.
 
 
-        :param database_publication_year: The database_publication_year of this DatabaseDto.  # noqa: E501
+        :param publication_year: The publication_year of this DatabaseDto.  # noqa: E501
         :type: int
         """
 
-        self._database_publication_year = database_publication_year
+        self._publication_year = publication_year
 
     @property
-    def database_publication_month(self):
-        """Gets the database_publication_month of this DatabaseDto.  # noqa: E501
+    def publication_month(self):
+        """Gets the publication_month of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publication_month of this DatabaseDto.  # noqa: E501
+        :return: The publication_month of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_publication_month
+        return self._publication_month
 
-    @database_publication_month.setter
-    def database_publication_month(self, database_publication_month):
-        """Sets the database_publication_month of this DatabaseDto.
+    @publication_month.setter
+    def publication_month(self, publication_month):
+        """Sets the publication_month of this DatabaseDto.
 
 
-        :param database_publication_month: The database_publication_month of this DatabaseDto.  # noqa: E501
+        :param publication_month: The publication_month of this DatabaseDto.  # noqa: E501
         :type: int
         """
 
-        self._database_publication_month = database_publication_month
+        self._publication_month = publication_month
 
     @property
-    def database_publication_day(self):
-        """Gets the database_publication_day of this DatabaseDto.  # noqa: E501
+    def publication_day(self):
+        """Gets the publication_day of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_publication_day of this DatabaseDto.  # noqa: E501
+        :return: The publication_day of this DatabaseDto.  # noqa: E501
         :rtype: int
         """
-        return self._database_publication_day
+        return self._publication_day
 
-    @database_publication_day.setter
-    def database_publication_day(self, database_publication_day):
-        """Sets the database_publication_day of this DatabaseDto.
+    @publication_day.setter
+    def publication_day(self, publication_day):
+        """Sets the publication_day of this DatabaseDto.
 
 
-        :param database_publication_day: The database_publication_day of this DatabaseDto.  # noqa: E501
+        :param publication_day: The publication_day of this DatabaseDto.  # noqa: E501
         :type: int
         """
 
-        self._database_publication_day = database_publication_day
+        self._publication_day = publication_day
 
     @property
-    def database_public(self):
-        """Gets the database_public of this DatabaseDto.  # noqa: E501
+    def is_public(self):
+        """Gets the is_public of this DatabaseDto.  # noqa: E501
 
 
-        :return: The database_public of this DatabaseDto.  # noqa: E501
+        :return: The is_public of this DatabaseDto.  # noqa: E501
         :rtype: bool
         """
-        return self._database_public
+        return self._is_public
 
-    @database_public.setter
-    def database_public(self, database_public):
-        """Sets the database_public of this DatabaseDto.
+    @is_public.setter
+    def is_public(self, is_public):
+        """Sets the is_public of this DatabaseDto.
 
 
-        :param database_public: The database_public of this DatabaseDto.  # noqa: E501
+        :param is_public: The is_public of this DatabaseDto.  # noqa: E501
         :type: bool
         """
 
-        self._database_public = database_public
+        self._is_public = is_public
 
     def to_dict(self):
         """Returns the model properties as a dict"""
diff --git a/.jupyter/api_query/models/table_dto.py b/.jupyter/api_query/models/table_dto.py
deleted file mode 100644
index b5828f5a522e2cbf96882b4a65ceb6f767b5a837..0000000000000000000000000000000000000000
--- a/.jupyter/api_query/models/table_dto.py
+++ /dev/null
@@ -1,272 +0,0 @@
-# coding: utf-8
-
-"""
-    Database Repository Query Service API
-
-    Service that manages the queries  # noqa: E501
-
-    OpenAPI spec version: 1.1.0-alpha
-    Contact: andreas.rauber@tuwien.ac.at
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-class TableDto(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'id': 'int',
-        'name': 'str',
-        'topic': 'str',
-        'description': 'str',
-        'created': 'datetime',
-        'columns': 'list[ColumnDto]',
-        'internal_name': 'str'
-    }
-
-    attribute_map = {
-        'id': 'id',
-        'name': 'name',
-        'topic': 'topic',
-        'description': 'description',
-        'created': 'created',
-        'columns': 'columns',
-        'internal_name': 'internal_name'
-    }
-
-    def __init__(self, id=None, name=None, topic=None, description=None, created=None, columns=None, internal_name=None):  # noqa: E501
-        """TableDto - a model defined in Swagger"""  # noqa: E501
-        self._id = None
-        self._name = None
-        self._topic = None
-        self._description = None
-        self._created = None
-        self._columns = None
-        self._internal_name = None
-        self.discriminator = None
-        self.id = id
-        self.name = name
-        self.topic = topic
-        self.description = description
-        if created is not None:
-            self.created = created
-        self.columns = columns
-        self.internal_name = internal_name
-
-    @property
-    def id(self):
-        """Gets the id of this TableDto.  # noqa: E501
-
-
-        :return: The id of this TableDto.  # noqa: E501
-        :rtype: int
-        """
-        return self._id
-
-    @id.setter
-    def id(self, id):
-        """Sets the id of this TableDto.
-
-
-        :param id: The id of this TableDto.  # noqa: E501
-        :type: int
-        """
-        if id is None:
-            raise ValueError("Invalid value for `id`, must not be `None`")  # noqa: E501
-
-        self._id = id
-
-    @property
-    def name(self):
-        """Gets the name of this TableDto.  # noqa: E501
-
-
-        :return: The name of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._name
-
-    @name.setter
-    def name(self, name):
-        """Sets the name of this TableDto.
-
-
-        :param name: The name of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if name is None:
-            raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-
-        self._name = name
-
-    @property
-    def topic(self):
-        """Gets the topic of this TableDto.  # noqa: E501
-
-
-        :return: The topic of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._topic
-
-    @topic.setter
-    def topic(self, topic):
-        """Sets the topic of this TableDto.
-
-
-        :param topic: The topic of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if topic is None:
-            raise ValueError("Invalid value for `topic`, must not be `None`")  # noqa: E501
-
-        self._topic = topic
-
-    @property
-    def description(self):
-        """Gets the description of this TableDto.  # noqa: E501
-
-
-        :return: The description of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._description
-
-    @description.setter
-    def description(self, description):
-        """Sets the description of this TableDto.
-
-
-        :param description: The description of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if description is None:
-            raise ValueError("Invalid value for `description`, must not be `None`")  # noqa: E501
-
-        self._description = description
-
-    @property
-    def created(self):
-        """Gets the created of this TableDto.  # noqa: E501
-
-
-        :return: The created of this TableDto.  # noqa: E501
-        :rtype: datetime
-        """
-        return self._created
-
-    @created.setter
-    def created(self, created):
-        """Sets the created of this TableDto.
-
-
-        :param created: The created of this TableDto.  # noqa: E501
-        :type: datetime
-        """
-
-        self._created = created
-
-    @property
-    def columns(self):
-        """Gets the columns of this TableDto.  # noqa: E501
-
-
-        :return: The columns of this TableDto.  # noqa: E501
-        :rtype: list[ColumnDto]
-        """
-        return self._columns
-
-    @columns.setter
-    def columns(self, columns):
-        """Sets the columns of this TableDto.
-
-
-        :param columns: The columns of this TableDto.  # noqa: E501
-        :type: list[ColumnDto]
-        """
-        if columns is None:
-            raise ValueError("Invalid value for `columns`, must not be `None`")  # noqa: E501
-
-        self._columns = columns
-
-    @property
-    def internal_name(self):
-        """Gets the internal_name of this TableDto.  # noqa: E501
-
-
-        :return: The internal_name of this TableDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._internal_name
-
-    @internal_name.setter
-    def internal_name(self, internal_name):
-        """Sets the internal_name of this TableDto.
-
-
-        :param internal_name: The internal_name of this TableDto.  # noqa: E501
-        :type: str
-        """
-        if internal_name is None:
-            raise ValueError("Invalid value for `internal_name`, must not be `None`")  # noqa: E501
-
-        self._internal_name = internal_name
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(TableDto, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, TableDto):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/.jupyter/api_table/models/granted_authority_dto.py b/.jupyter/api_table/models/granted_authority_dto.py
deleted file mode 100644
index c52fdbe55002c9d0c9662eecdb335c20dca41a10..0000000000000000000000000000000000000000
--- a/.jupyter/api_table/models/granted_authority_dto.py
+++ /dev/null
@@ -1,110 +0,0 @@
-# coding: utf-8
-
-"""
-    Database Repository Table Service API
-
-    Service that manages the tables  # noqa: E501
-
-    OpenAPI spec version: 1.1.0-alpha
-    Contact: andreas.rauber@tuwien.ac.at
-    Generated by: https://github.com/swagger-api/swagger-codegen.git
-"""
-
-import pprint
-import re  # noqa: F401
-
-import six
-
-class GrantedAuthorityDto(object):
-    """NOTE: This class is auto generated by the swagger code generator program.
-
-    Do not edit the class manually.
-    """
-    """
-    Attributes:
-      swagger_types (dict): The key is attribute name
-                            and the value is attribute type.
-      attribute_map (dict): The key is attribute name
-                            and the value is json key in definition.
-    """
-    swagger_types = {
-        'authority': 'str'
-    }
-
-    attribute_map = {
-        'authority': 'authority'
-    }
-
-    def __init__(self, authority=None):  # noqa: E501
-        """GrantedAuthorityDto - a model defined in Swagger"""  # noqa: E501
-        self._authority = None
-        self.discriminator = None
-        if authority is not None:
-            self.authority = authority
-
-    @property
-    def authority(self):
-        """Gets the authority of this GrantedAuthorityDto.  # noqa: E501
-
-
-        :return: The authority of this GrantedAuthorityDto.  # noqa: E501
-        :rtype: str
-        """
-        return self._authority
-
-    @authority.setter
-    def authority(self, authority):
-        """Sets the authority of this GrantedAuthorityDto.
-
-
-        :param authority: The authority of this GrantedAuthorityDto.  # noqa: E501
-        :type: str
-        """
-
-        self._authority = authority
-
-    def to_dict(self):
-        """Returns the model properties as a dict"""
-        result = {}
-
-        for attr, _ in six.iteritems(self.swagger_types):
-            value = getattr(self, attr)
-            if isinstance(value, list):
-                result[attr] = list(map(
-                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
-                    value
-                ))
-            elif hasattr(value, "to_dict"):
-                result[attr] = value.to_dict()
-            elif isinstance(value, dict):
-                result[attr] = dict(map(
-                    lambda item: (item[0], item[1].to_dict())
-                    if hasattr(item[1], "to_dict") else item,
-                    value.items()
-                ))
-            else:
-                result[attr] = value
-        if issubclass(GrantedAuthorityDto, dict):
-            for key, value in self.items():
-                result[key] = value
-
-        return result
-
-    def to_str(self):
-        """Returns the string representation of the model"""
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        """For `print` and `pprint`"""
-        return self.to_str()
-
-    def __eq__(self, other):
-        """Returns true if both objects are equal"""
-        if not isinstance(other, GrantedAuthorityDto):
-            return False
-
-        return self.__dict__ == other.__dict__
-
-    def __ne__(self, other):
-        """Returns true if both objects are not equal"""
-        return not self == other
diff --git a/.jupyter/load_test.py b/.jupyter/load_test.py
index dcb161e82d01899b2538cbd0184d1af8f8345003..2c2025bfc74b715ea8c48c1bea363961788d9cb1 100755
--- a/.jupyter/load_test.py
+++ b/.jupyter/load_test.py
@@ -19,6 +19,7 @@ from api_query.api.query_endpoint_api import QueryEndpointApi
 from api_identifier.api.identifier_endpoint_api import IdentifierEndpointApi
 from api_identifier.api.persistence_endpoint_api import PersistenceEndpointApi
 from api_units.api.default_api import DefaultApi
+from api_metadata.api.metadata_endpoint_api import MetadataEndpointApi
 
 authentication = AuthenticationEndpointApi()
 user = UserEndpointApi()
@@ -30,6 +31,7 @@ data = TableDataEndpointApi()
 identifier = IdentifierEndpointApi()
 persistence = PersistenceEndpointApi()
 unit = DefaultApi()
+metadata = MetadataEndpointApi()
 
 token = ""  # keep
 
@@ -309,6 +311,39 @@ def send_tuple(exchange, routing_key, username, password, payload):
     return response
 
 
+def oai_identify():
+    response = rq.get("http://localhost:9095/api/oai?verb=Identify")
+    if "persistent" not in response.text:
+        print("Invalid response %s" % response.text)
+        raise Exception("Invalid response")
+    print("identified repository")
+
+
+def oai_list_identifiers():
+    response = rq.get("http://localhost:9095/api/oai?verb=ListIdentifiers")
+    if "pid/1" not in response.text or "pid/2" not in response.text or "pid/3" not in response.text \
+            or "pid/4" not in response.text or "pid/5" not in response.text:
+        print("Invalid response %s" % response.text)
+        raise Exception("Invalid response")
+    print("listed identifiers")
+
+
+def oai_list_metadata_formats():
+    response = rq.get("http://localhost:9095/api/oai?verb=ListMetadataFormats")
+    if "oai_dc" not in response.text:
+        print("Invalid response %s" % response.text)
+        raise Exception("Invalid response")
+    print("listed metadata formats")
+
+
+def oai_get_record(record_id, expected):
+    response = rq.get("http://localhost:9095/api/oai?verb=GetRecord&metadataPrefix=oai_dc&identifier=" + str(record_id))
+    if expected not in response.text:
+        print("Invalid response %s" % response.text)
+        raise Exception("Invalid response")
+    print("retrieved record with id %d" % record_id)
+
+
 if __name__ == '__main__':
     #
     # create 1 user and 3 containers (public, private, public)
@@ -339,7 +374,7 @@ if __name__ == '__main__':
     cid = create_container().id
     start_container(cid)
     dbid = create_database(cid, False).id
-    update_database(cid, dbid, is_public=False)
+    update_database(cid, dbid)
     tid = create_table(cid, dbid).id
     tname = find_table(cid, dbid, tid).internal_name
     fill_table(cid, dbid, tid)
@@ -419,4 +454,13 @@ if __name__ == '__main__':
     auth_user("test3")
     update_user(uid)
     update_theme(uid)
+    #
+    # OAI-PMH
+    #
+    oai_identify()
+    oai_list_identifiers()
+    oai_list_metadata_formats()
+    oai_get_record(1, "dc:creator>Weise, Martin")
+    oai_get_record(1, "dc:creator>Rauber, Andreas")
+    oai_get_record(6, "code=\"idDoesNotExist\"")
     print("FINISHED")
diff --git a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseDto.java b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseDto.java
index 7bf7d1dfb95a69b97e33ac21ae107987038ed1bf..12f1245c0675cc2c3a13bbbae164323fadaedfc7 100644
--- a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseDto.java
+++ b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseDto.java
@@ -4,7 +4,6 @@ import at.tuwien.api.container.ContainerDto;
 import at.tuwien.api.container.image.ImageDto;
 import at.tuwien.api.database.table.TableBriefDto;
 import at.tuwien.api.user.UserBriefDto;
-import at.tuwien.api.user.UserDto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -25,75 +24,62 @@ import java.util.List;
 public class DatabaseDto {
 
     @NotNull
-    @Schema(name = "database id", example = "1")
+    @Schema(example = "1")
     private Long id;
 
     @NotBlank
-    @Schema(name = "database name", example = "Weather Australia")
+    @Schema(example = "Weather Australia")
     private String name;
 
     @NotBlank
-    @Schema(name = "database exchange")
     private String exchange;
 
     @NotNull
-    @Schema(name = "database creator")
+    @Schema
     private UserBriefDto creator;
 
     @NotBlank
     @JsonProperty("internal_name")
-    @Schema(name = "database internal name", example = "weather_australia")
+    @Schema(example = "weather_australia")
     private String internalName;
 
-    @Schema(name = "database subjects")
     private List<String> subjects;
 
-    @Schema(name = "database language", example = "EN")
+    @Schema(example = "EN")
     private LanguageTypeDto language;
 
-    @Schema(name = "database license", example = "MIT2")
+    @Schema(example = "MIT2")
     private LicenseDto license;
 
-    @NotBlank
-    @Schema(name = "database description", example = "Weather Australia 2009-2021")
+    @Schema(example = "Weather Australia 2009-2021")
     private String description;
 
-    @Schema(name = "database publisher", example = "TU Wien")
+    @Schema(example = "TU Wien")
     private String publisher;
 
-    @Schema(name = "database contact person")
-    private UserDto contact;
-
     @JsonProperty("publication_year")
-    @Schema(name = "database publication year")
     private Integer publicationYear;
 
     @JsonProperty("publication_month")
-    @Schema(name = "database publication month")
     private Integer publicationMonth;
 
     @JsonProperty("publication_day")
-    @Schema(name = "database publication day")
     private Integer publicationDay;
 
-    @Schema(name = "tables")
     private List<TableBriefDto> tables;
 
     @JsonProperty("is_public")
-    @Schema(name = "database public")
     private Boolean isPublic;
 
-    @Schema(name = "database container image")
     private ImageDto image;
 
-    @Schema(name = "container")
     private ContainerDto container;
 
-    @Schema(name = "database creation time", example = "2020-08-04 11:12:00")
+    @Schema(example = "2020-08-04 11:12:00")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC")
     private Instant created;
 
-    @Parameter(name = "database deletion time", example = "2020-08-04 11:13:00")
+    @Parameter(example = "2020-08-04 11:13:00")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC")
     private Instant deleted;
 
diff --git a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseModifyDto.java b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseModifyDto.java
index 9b834f6f3aebd121b649d1b69ed97d5c2517b5b9..726f4cb70df0113ff938926b91476d5d9d8c52bd 100644
--- a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseModifyDto.java
+++ b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/DatabaseModifyDto.java
@@ -23,10 +23,10 @@ public class DatabaseModifyDto {
     @Parameter(name = "database subjects", example = "[\"test\"]")
     private List<String> subjects;
 
-    @NotBlank
     @Parameter(name = "database description", example = "Sample")
     private String description;
 
+    @NotBlank
     @Parameter(name = "database publisher", example = "TU Wien")
     private String publisher;