From 3032720f281e19427e0e2977178f7836825e628e Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Thu, 31 Jan 2019 09:30:18 +0100
Subject: [PATCH] added new table AdditionalAttributes and fix tests

---
 .../ethz/seb/sebserver/gbl/model/Domain.java  |  13 +-
 .../seb/sebserver/gbl/model/EntityType.java   |   5 +-
 .../seb/sebserver/gbl/model/exam/Exam.java    |  14 +-
 ...AdditionalAttributesDynamicSqlSupport.java |  43 ++++
 .../mapper/AdditionalAttributesMapper.java    | 189 ++++++++++++++++++
 ...ientConnectionRecordDynamicSqlSupport.java |  20 +-
 .../mapper/ClientConnectionRecordMapper.java  |  36 ++--
 .../ClientEventRecordDynamicSqlSupport.java   |  18 +-
 .../batis/mapper/ClientEventRecordMapper.java |  36 ++--
 ...ationAttributeRecordDynamicSqlSupport.java |  20 +-
 .../ConfigurationAttributeRecordMapper.java   |  36 ++--
 ...figurationNodeRecordDynamicSqlSupport.java |  20 +-
 .../mapper/ConfigurationNodeRecordMapper.java |  36 ++--
 .../ConfigurationRecordDynamicSqlSupport.java |  14 +-
 .../mapper/ConfigurationRecordMapper.java     |  36 ++--
 ...igurationValueRecordDynamicSqlSupport.java |  16 +-
 .../ConfigurationValueRecordMapper.java       |  36 ++--
 ...nfigurationMapRecordDynamicSqlSupport.java |  12 +-
 .../ExamConfigurationMapRecordMapper.java     |  36 ++--
 .../mapper/ExamRecordDynamicSqlSupport.java   |  27 ++-
 .../batis/mapper/ExamRecordMapper.java        |  50 +++--
 .../IndicatorRecordDynamicSqlSupport.java     |  14 +-
 .../batis/mapper/IndicatorRecordMapper.java   |  36 ++--
 .../InstitutionRecordDynamicSqlSupport.java   |  14 +-
 .../batis/mapper/InstitutionRecordMapper.java |  36 ++--
 .../LmsSetupRecordDynamicSqlSupport.java      |  26 +--
 .../batis/mapper/LmsSetupRecordMapper.java    |  36 ++--
 .../OrientationRecordDynamicSqlSupport.java   |  22 +-
 .../batis/mapper/OrientationRecordMapper.java |  36 ++--
 .../mapper/RoleRecordDynamicSqlSupport.java   |  10 +-
 .../batis/mapper/RoleRecordMapper.java        |  36 ++--
 .../ThresholdRecordDynamicSqlSupport.java     |  12 +-
 .../batis/mapper/ThresholdRecordMapper.java   |  36 ++--
 ...serActivityLogRecordDynamicSqlSupport.java |  18 +-
 .../mapper/UserActivityLogRecordMapper.java   |  36 ++--
 .../mapper/UserRecordDynamicSqlSupport.java   |  24 +--
 .../batis/mapper/UserRecordMapper.java        |  36 ++--
 .../batis/model/AdditionalAttributes.java     | 118 +++++++++++
 .../batis/model/ClientConnectionRecord.java   |  40 ++--
 .../batis/model/ClientEventRecord.java        |  36 ++--
 .../model/ConfigurationAttributeRecord.java   |  40 ++--
 .../batis/model/ConfigurationNodeRecord.java  |  40 ++--
 .../batis/model/ConfigurationRecord.java      |  28 +--
 .../batis/model/ConfigurationValueRecord.java |  32 +--
 .../model/ExamConfigurationMapRecord.java     |  24 +--
 .../datalayer/batis/model/ExamRecord.java     |  58 +++---
 .../batis/model/IndicatorRecord.java          |  28 +--
 .../batis/model/InstitutionRecord.java        |  28 +--
 .../datalayer/batis/model/LmsSetupRecord.java |  52 ++---
 .../batis/model/OrientationRecord.java        |  44 ++--
 .../datalayer/batis/model/RoleRecord.java     |  20 +-
 .../batis/model/ThresholdRecord.java          |  24 +--
 .../batis/model/UserActivityLogRecord.java    |  36 ++--
 .../datalayer/batis/model/UserRecord.java     |  48 ++---
 .../servicelayer/dao/impl/ExamDAOImpl.java    |   5 +-
 src/main/resources/schema-dev.sql             |  25 ++-
 .../api/admin/InstitutionAPITest.java         |  39 ++--
 .../integration/api/admin/UserAPITest.java    | 166 ++++++++-------
 src/test/resources/schema-test.sql            |  18 ++
 59 files changed, 1280 insertions(+), 810 deletions(-)
 create mode 100644 src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesDynamicSqlSupport.java
 create mode 100644 src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesMapper.java
 create mode 100644 src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributes.java

diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java
index f971bb86..949cb7c4 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java
@@ -5,7 +5,7 @@ import javax.annotation.Generated;
 /** Defines the global names of the domain model and domain model fields.
 * This shall be used as a static overall domain model names reference within SEB Server Web-Service as well as within the integrated GUI
 * This file is generated by the org.eth.demo.sebserver.gen.DomainModelNameReferencePlugin and must not be edited manually.**/
-@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-01-24T13:19:09.365+01:00")
+@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-01-31T09:18:13.361+01:00")
 public interface Domain {
     String ATTR_ID = "id";
     String ATTR_INSTITUTION_ID = "institutionId";
@@ -91,6 +91,7 @@ public interface Domain {
         String ATTR_SUPPORTER = "supporter";
         String ATTR_TYPE = "type";
         String ATTR_STATUS = "status";
+        String ATTR_QUIT_PASSWORD = "quitPassword";
         String ATTR_ACTIVE = "active";
     }
 
@@ -198,4 +199,14 @@ public interface Domain {
         String ATTR_ENTITY_ID = "entityId";
         String ATTR_MESSAGE = "message";
     }
+
+    interface ADDITIONAL_ATTRIBUTES {
+        String TYPE_NAME = "AdditionalAttributes";
+        String REFERENCE_NAME = "additionalAttributess";
+        String ATTR_ID = "id";
+        String ATTR_ENTITY_TYPE = "entityType";
+        String ATTR_ENTITY_ID = "entityId";
+        String ATTR_NAME = "name";
+        String ATTR_VALUE = "value";
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/EntityType.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/EntityType.java
index 65440188..7eb118df 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/EntityType.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/EntityType.java
@@ -2,7 +2,7 @@ package ch.ethz.seb.sebserver.gbl.model;
 
 import javax.annotation.Generated;
 
-@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-01-24T13:19:09.428+01:00")
+@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2019-01-31T09:18:13.430+01:00")
 public enum EntityType {
     CONFIGURATION_ATTRIBUTE,
     CONFIGURATION_VALUE,
@@ -19,5 +19,6 @@ public enum EntityType {
     LMS_SETUP,
     USER,
     USER_ROLE,
-    USER_ACTIVITY_LOG;
+    USER_ACTIVITY_LOG,
+    ADDITIONAL_ATTRIBUTES;
 }
\ No newline at end of file
diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Exam.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Exam.java
index b991c735..a6d0d774 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Exam.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/Exam.java
@@ -87,11 +87,14 @@ public final class Exam implements GrantEntity, Activatable {
     @NotNull
     public final ExamType type;
 
-    @JsonProperty(EXAM.ATTR_SUPPORTER)
+    @JsonProperty(EXAM.ATTR_QUIT_PASSWORD)
+    public final String quitPassword;
+
+    @JsonProperty(EXAM.ATTR_OWNER)
     @NotNull
     public final String owner;
 
-    @JsonProperty(EXAM.ATTR_ACTIVE)
+    @JsonProperty(EXAM.ATTR_SUPPORTER)
     public final Collection<String> supporter;
 
     /** Indicates whether this Exam is active or not */
@@ -111,6 +114,7 @@ public final class Exam implements GrantEntity, Activatable {
             @JsonProperty(QuizData.QUIZ_ATTR_END_TIME) final DateTime endTime,
             @JsonProperty(QuizData.QUIZ_ATTR_START_URL) final String startURL,
             @JsonProperty(EXAM.ATTR_TYPE) final ExamType type,
+            @JsonProperty(EXAM.ATTR_QUIT_PASSWORD) final String quitPassword,
             @JsonProperty(EXAM.ATTR_OWNER) final String owner,
             @JsonProperty(EXAM.ATTR_SUPPORTER) final Collection<String> supporter,
             @JsonProperty(EXAM.ATTR_ACTIVE) final Boolean active) {
@@ -126,6 +130,7 @@ public final class Exam implements GrantEntity, Activatable {
         this.endTime = endTime;
         this.startURL = startURL;
         this.type = type;
+        this.quitPassword = quitPassword;
         this.owner = owner;
         this.active = (active != null) ? active : Boolean.FALSE;
 
@@ -147,6 +152,7 @@ public final class Exam implements GrantEntity, Activatable {
         this.endTime = quizData.endTime;
         this.startURL = mapper.getString(EXAM.ATTR_INSTITUTION_ID);
         this.type = mapper.getEnum(EXAM.ATTR_TYPE, ExamType.class);
+        this.quitPassword = mapper.getString(EXAM.ATTR_QUIT_PASSWORD);
         this.owner = mapper.getString(EXAM.ATTR_OWNER);
         this.active = mapper.getBooleanObject(EXAM.ATTR_ACTIVE);
         this.supporter = mapper.getStringSet(EXAM.ATTR_SUPPORTER);
@@ -223,6 +229,10 @@ public final class Exam implements GrantEntity, Activatable {
         return this.startURL;
     }
 
+    public String getQuitPassword() {
+        return this.quitPassword;
+    }
+
     @Override
     public boolean isActive() {
         return this.active;
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesDynamicSqlSupport.java
new file mode 100644
index 00000000..ae59d171
--- /dev/null
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesDynamicSqlSupport.java
@@ -0,0 +1,43 @@
+package ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper;
+
+import java.sql.JDBCType;
+import javax.annotation.Generated;
+import org.mybatis.dynamic.sql.SqlColumn;
+import org.mybatis.dynamic.sql.SqlTable;
+
+public final class AdditionalAttributesDynamicSqlSupport {
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.641+01:00", comments="Source Table: additional_attributes")
+    public static final AdditionalAttributes additionalAttributes = new AdditionalAttributes();
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.642+01:00", comments="Source field: additional_attributes.id")
+    public static final SqlColumn<Long> id = additionalAttributes.id;
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.642+01:00", comments="Source field: additional_attributes.entity_type")
+    public static final SqlColumn<String> entityType = additionalAttributes.entityType;
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.642+01:00", comments="Source field: additional_attributes.entity_id")
+    public static final SqlColumn<Long> entityId = additionalAttributes.entityId;
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.642+01:00", comments="Source field: additional_attributes.name")
+    public static final SqlColumn<String> name = additionalAttributes.name;
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.642+01:00", comments="Source field: additional_attributes.value")
+    public static final SqlColumn<String> value = additionalAttributes.value;
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.641+01:00", comments="Source Table: additional_attributes")
+    public static final class AdditionalAttributes extends SqlTable {
+        public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
+
+        public final SqlColumn<String> entityType = column("entity_type", JDBCType.VARCHAR);
+
+        public final SqlColumn<Long> entityId = column("entity_id", JDBCType.BIGINT);
+
+        public final SqlColumn<String> name = column("name", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> value = column("value", JDBCType.VARCHAR);
+
+        public AdditionalAttributes() {
+            super("additional_attributes");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesMapper.java
new file mode 100644
index 00000000..4a6e2998
--- /dev/null
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributesMapper.java
@@ -0,0 +1,189 @@
+package ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper;
+
+import static ch.ethz.seb.sebserver.webservice.datalayer.batis.mapper.AdditionalAttributesDynamicSqlSupport.*;
+import static org.mybatis.dynamic.sql.SqlBuilder.*;
+
+import ch.ethz.seb.sebserver.webservice.datalayer.batis.model.AdditionalAttributes;
+import java.util.List;
+import javax.annotation.Generated;
+import org.apache.ibatis.annotations.Arg;
+import org.apache.ibatis.annotations.ConstructorArgs;
+import org.apache.ibatis.annotations.DeleteProvider;
+import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.SelectKey;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.UpdateProvider;
+import org.apache.ibatis.type.JdbcType;
+import org.mybatis.dynamic.sql.SqlBuilder;
+import org.mybatis.dynamic.sql.delete.DeleteDSL;
+import org.mybatis.dynamic.sql.delete.MyBatis3DeleteModelAdapter;
+import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
+import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
+import org.mybatis.dynamic.sql.render.RenderingStrategy;
+import org.mybatis.dynamic.sql.select.MyBatis3SelectModelAdapter;
+import org.mybatis.dynamic.sql.select.QueryExpressionDSL;
+import org.mybatis.dynamic.sql.select.SelectDSL;
+import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
+import org.mybatis.dynamic.sql.update.MyBatis3UpdateModelAdapter;
+import org.mybatis.dynamic.sql.update.UpdateDSL;
+import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
+import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
+
+@Mapper
+public interface AdditionalAttributesMapper {
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.642+01:00", comments="Source Table: additional_attributes")
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    long count(SelectStatementProvider selectStatement);
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.642+01:00", comments="Source Table: additional_attributes")
+    @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
+    int delete(DeleteStatementProvider deleteStatement);
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.642+01:00", comments="Source Table: additional_attributes")
+    @InsertProvider(type=SqlProviderAdapter.class, method="insert")
+    @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
+    int insert(InsertStatementProvider<AdditionalAttributes> insertStatement);
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.642+01:00", comments="Source Table: additional_attributes")
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @ConstructorArgs({
+        @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
+        @Arg(column="entity_type", javaType=String.class, jdbcType=JdbcType.VARCHAR),
+        @Arg(column="entity_id", javaType=Long.class, jdbcType=JdbcType.BIGINT),
+        @Arg(column="name", javaType=String.class, jdbcType=JdbcType.VARCHAR),
+        @Arg(column="value", javaType=String.class, jdbcType=JdbcType.VARCHAR)
+    })
+    AdditionalAttributes selectOne(SelectStatementProvider selectStatement);
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.642+01:00", comments="Source Table: additional_attributes")
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @ConstructorArgs({
+        @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
+        @Arg(column="entity_type", javaType=String.class, jdbcType=JdbcType.VARCHAR),
+        @Arg(column="entity_id", javaType=Long.class, jdbcType=JdbcType.BIGINT),
+        @Arg(column="name", javaType=String.class, jdbcType=JdbcType.VARCHAR),
+        @Arg(column="value", javaType=String.class, jdbcType=JdbcType.VARCHAR)
+    })
+    List<AdditionalAttributes> selectMany(SelectStatementProvider selectStatement);
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.642+01:00", comments="Source Table: additional_attributes")
+    @UpdateProvider(type=SqlProviderAdapter.class, method="update")
+    int update(UpdateStatementProvider updateStatement);
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.642+01:00", comments="Source Table: additional_attributes")
+    default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
+        return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
+                .from(additionalAttributes);
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.642+01:00", comments="Source Table: additional_attributes")
+    default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
+        return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributes);
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.642+01:00", comments="Source Table: additional_attributes")
+    default int deleteByPrimaryKey(Long id_) {
+        return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributes)
+                .where(id, isEqualTo(id_))
+                .build()
+                .execute();
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.646+01:00", comments="Source Table: additional_attributes")
+    default int insert(AdditionalAttributes record) {
+        return insert(SqlBuilder.insert(record)
+                .into(additionalAttributes)
+                .map(entityType).toProperty("entityType")
+                .map(entityId).toProperty("entityId")
+                .map(name).toProperty("name")
+                .map(value).toProperty("value")
+                .build()
+                .render(RenderingStrategy.MYBATIS3));
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.646+01:00", comments="Source Table: additional_attributes")
+    default int insertSelective(AdditionalAttributes record) {
+        return insert(SqlBuilder.insert(record)
+                .into(additionalAttributes)
+                .map(entityType).toPropertyWhenPresent("entityType", record::getEntityType)
+                .map(entityId).toPropertyWhenPresent("entityId", record::getEntityId)
+                .map(name).toPropertyWhenPresent("name", record::getName)
+                .map(value).toPropertyWhenPresent("value", record::getValue)
+                .build()
+                .render(RenderingStrategy.MYBATIS3));
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.646+01:00", comments="Source Table: additional_attributes")
+    default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<AdditionalAttributes>>> selectByExample() {
+        return SelectDSL.selectWithMapper(this::selectMany, id, entityType, entityId, name, value)
+                .from(additionalAttributes);
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.646+01:00", comments="Source Table: additional_attributes")
+    default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<AdditionalAttributes>>> selectDistinctByExample() {
+        return SelectDSL.selectDistinctWithMapper(this::selectMany, id, entityType, entityId, name, value)
+                .from(additionalAttributes);
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.646+01:00", comments="Source Table: additional_attributes")
+    default AdditionalAttributes selectByPrimaryKey(Long id_) {
+        return SelectDSL.selectWithMapper(this::selectOne, id, entityType, entityId, name, value)
+                .from(additionalAttributes)
+                .where(id, isEqualTo(id_))
+                .build()
+                .execute();
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.646+01:00", comments="Source Table: additional_attributes")
+    default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(AdditionalAttributes record) {
+        return UpdateDSL.updateWithMapper(this::update, additionalAttributes)
+                .set(entityType).equalTo(record::getEntityType)
+                .set(entityId).equalTo(record::getEntityId)
+                .set(name).equalTo(record::getName)
+                .set(value).equalTo(record::getValue);
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.646+01:00", comments="Source Table: additional_attributes")
+    default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(AdditionalAttributes record) {
+        return UpdateDSL.updateWithMapper(this::update, additionalAttributes)
+                .set(entityType).equalToWhenPresent(record::getEntityType)
+                .set(entityId).equalToWhenPresent(record::getEntityId)
+                .set(name).equalToWhenPresent(record::getName)
+                .set(value).equalToWhenPresent(record::getValue);
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.646+01:00", comments="Source Table: additional_attributes")
+    default int updateByPrimaryKey(AdditionalAttributes record) {
+        return UpdateDSL.updateWithMapper(this::update, additionalAttributes)
+                .set(entityType).equalTo(record::getEntityType)
+                .set(entityId).equalTo(record::getEntityId)
+                .set(name).equalTo(record::getName)
+                .set(value).equalTo(record::getValue)
+                .where(id, isEqualTo(record::getId))
+                .build()
+                .execute();
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.646+01:00", comments="Source Table: additional_attributes")
+    default int updateByPrimaryKeySelective(AdditionalAttributes record) {
+        return UpdateDSL.updateWithMapper(this::update, additionalAttributes)
+                .set(entityType).equalToWhenPresent(record::getEntityType)
+                .set(entityId).equalToWhenPresent(record::getEntityId)
+                .set(name).equalToWhenPresent(record::getName)
+                .set(value).equalToWhenPresent(record::getValue)
+                .where(id, isEqualTo(record::getId))
+                .build()
+                .execute();
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="Source Table: exam")
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @ConstructorArgs({@Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true)})
+    List<Long> selectIds(SelectStatementProvider select);
+
+    default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<Long>>> selectIdsByExample() {
+        return SelectDSL.selectDistinctWithMapper(this::selectIds, id)
+                        .from(additionalAttributes);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java
index 434ed128..4f901050 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java
@@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class ClientConnectionRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.587+01:00", comments="Source Table: client_connection")
     public static final ClientConnectionRecord clientConnectionRecord = new ClientConnectionRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.587+01:00", comments="Source field: client_connection.id")
     public static final SqlColumn<Long> id = clientConnectionRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.587+01:00", comments="Source field: client_connection.exam_id")
     public static final SqlColumn<Long> examId = clientConnectionRecord.examId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.status")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.587+01:00", comments="Source field: client_connection.status")
     public static final SqlColumn<String> status = clientConnectionRecord.status;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.connection_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.588+01:00", comments="Source field: client_connection.connection_token")
     public static final SqlColumn<String> connectionToken = clientConnectionRecord.connectionToken;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.user_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.588+01:00", comments="Source field: client_connection.user_name")
     public static final SqlColumn<String> userName = clientConnectionRecord.userName;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.vdi")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.588+01:00", comments="Source field: client_connection.vdi")
     public static final SqlColumn<Boolean> vdi = clientConnectionRecord.vdi;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.client_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.588+01:00", comments="Source field: client_connection.client_address")
     public static final SqlColumn<String> clientAddress = clientConnectionRecord.clientAddress;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.virtual_client_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.588+01:00", comments="Source field: client_connection.virtual_client_address")
     public static final SqlColumn<String> virtualClientAddress = clientConnectionRecord.virtualClientAddress;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.587+01:00", comments="Source Table: client_connection")
     public static final class ClientConnectionRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java
index 491aa1fc..3a9c40c2 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java
@@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface ClientConnectionRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.589+01:00", comments="Source Table: client_connection")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.589+01:00", comments="Source Table: client_connection")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.589+01:00", comments="Source Table: client_connection")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<ClientConnectionRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.589+01:00", comments="Source Table: client_connection")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -59,7 +59,7 @@ public interface ClientConnectionRecordMapper {
     })
     ClientConnectionRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.589+01:00", comments="Source Table: client_connection")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -73,22 +73,22 @@ public interface ClientConnectionRecordMapper {
     })
     List<ClientConnectionRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.589+01:00", comments="Source Table: client_connection")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.589+01:00", comments="Source Table: client_connection")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(clientConnectionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.589+01:00", comments="Source Table: client_connection")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.589+01:00", comments="Source Table: client_connection")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord)
                 .where(id, isEqualTo(id_))
@@ -96,7 +96,7 @@ public interface ClientConnectionRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.589+01:00", comments="Source Table: client_connection")
     default int insert(ClientConnectionRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(clientConnectionRecord)
@@ -111,7 +111,7 @@ public interface ClientConnectionRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.590+01:00", comments="Source Table: client_connection")
     default int insertSelective(ClientConnectionRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(clientConnectionRecord)
@@ -126,19 +126,19 @@ public interface ClientConnectionRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.590+01:00", comments="Source Table: client_connection")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress)
                 .from(clientConnectionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.590+01:00", comments="Source Table: client_connection")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress)
                 .from(clientConnectionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.590+01:00", comments="Source Table: client_connection")
     default ClientConnectionRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, examId, status, connectionToken, userName, vdi, clientAddress, virtualClientAddress)
                 .from(clientConnectionRecord)
@@ -147,7 +147,7 @@ public interface ClientConnectionRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.590+01:00", comments="Source Table: client_connection")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientConnectionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
                 .set(examId).equalTo(record::getExamId)
@@ -159,7 +159,7 @@ public interface ClientConnectionRecordMapper {
                 .set(virtualClientAddress).equalTo(record::getVirtualClientAddress);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.590+01:00", comments="Source Table: client_connection")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientConnectionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
                 .set(examId).equalToWhenPresent(record::getExamId)
@@ -171,7 +171,7 @@ public interface ClientConnectionRecordMapper {
                 .set(virtualClientAddress).equalToWhenPresent(record::getVirtualClientAddress);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.590+01:00", comments="Source Table: client_connection")
     default int updateByPrimaryKey(ClientConnectionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
                 .set(examId).equalTo(record::getExamId)
@@ -186,7 +186,7 @@ public interface ClientConnectionRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.590+01:00", comments="Source Table: client_connection")
     default int updateByPrimaryKeySelective(ClientConnectionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
                 .set(examId).equalToWhenPresent(record::getExamId)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java
index e7fed67d..13b6d95b 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java
@@ -7,31 +7,31 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class ClientEventRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.593+01:00", comments="Source Table: client_event")
     public static final ClientEventRecord clientEventRecord = new ClientEventRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.594+01:00", comments="Source field: client_event.id")
     public static final SqlColumn<Long> id = clientEventRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.connection_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.594+01:00", comments="Source field: client_event.connection_id")
     public static final SqlColumn<Long> connectionId = clientEventRecord.connectionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.user_identifier")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.594+01:00", comments="Source field: client_event.user_identifier")
     public static final SqlColumn<String> userIdentifier = clientEventRecord.userIdentifier;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.594+01:00", comments="Source field: client_event.type")
     public static final SqlColumn<Integer> type = clientEventRecord.type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.timestamp")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.594+01:00", comments="Source field: client_event.timestamp")
     public static final SqlColumn<Long> timestamp = clientEventRecord.timestamp;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.numeric_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.594+01:00", comments="Source field: client_event.numeric_value")
     public static final SqlColumn<BigDecimal> numericValue = clientEventRecord.numericValue;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.text")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.594+01:00", comments="Source field: client_event.text")
     public static final SqlColumn<String> text = clientEventRecord.text;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.593+01:00", comments="Source Table: client_event")
     public static final class ClientEventRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java
index 62b590ff..aeeeb8d4 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java
@@ -33,20 +33,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface ClientEventRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.595+01:00", comments="Source Table: client_event")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.595+01:00", comments="Source Table: client_event")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.595+01:00", comments="Source Table: client_event")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<ClientEventRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.595+01:00", comments="Source Table: client_event")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -59,7 +59,7 @@ public interface ClientEventRecordMapper {
     })
     ClientEventRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.595+01:00", comments="Source Table: client_event")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -72,22 +72,22 @@ public interface ClientEventRecordMapper {
     })
     List<ClientEventRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.595+01:00", comments="Source Table: client_event")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.595+01:00", comments="Source Table: client_event")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(clientEventRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.595+01:00", comments="Source Table: client_event")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.595+01:00", comments="Source Table: client_event")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord)
                 .where(id, isEqualTo(id_))
@@ -95,7 +95,7 @@ public interface ClientEventRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.596+01:00", comments="Source Table: client_event")
     default int insert(ClientEventRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(clientEventRecord)
@@ -109,7 +109,7 @@ public interface ClientEventRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.596+01:00", comments="Source Table: client_event")
     default int insertSelective(ClientEventRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(clientEventRecord)
@@ -123,19 +123,19 @@ public interface ClientEventRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.596+01:00", comments="Source Table: client_event")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientEventRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, connectionId, userIdentifier, type, timestamp, numericValue, text)
                 .from(clientEventRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.596+01:00", comments="Source Table: client_event")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientEventRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, connectionId, userIdentifier, type, timestamp, numericValue, text)
                 .from(clientEventRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.596+01:00", comments="Source Table: client_event")
     default ClientEventRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, connectionId, userIdentifier, type, timestamp, numericValue, text)
                 .from(clientEventRecord)
@@ -144,7 +144,7 @@ public interface ClientEventRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.596+01:00", comments="Source Table: client_event")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientEventRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
                 .set(connectionId).equalTo(record::getConnectionId)
@@ -155,7 +155,7 @@ public interface ClientEventRecordMapper {
                 .set(text).equalTo(record::getText);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.596+01:00", comments="Source Table: client_event")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientEventRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
                 .set(connectionId).equalToWhenPresent(record::getConnectionId)
@@ -166,7 +166,7 @@ public interface ClientEventRecordMapper {
                 .set(text).equalToWhenPresent(record::getText);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.597+01:00", comments="Source Table: client_event")
     default int updateByPrimaryKey(ClientEventRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
                 .set(connectionId).equalTo(record::getConnectionId)
@@ -180,7 +180,7 @@ public interface ClientEventRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.597+01:00", comments="Source Table: client_event")
     default int updateByPrimaryKeySelective(ClientEventRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
                 .set(connectionId).equalToWhenPresent(record::getConnectionId)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java
index 21a37558..0d322025 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java
@@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class ConfigurationAttributeRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.318+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.313+01:00", comments="Source Table: configuration_attribute")
     public static final ConfigurationAttributeRecord configurationAttributeRecord = new ConfigurationAttributeRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.318+01:00", comments="Source field: configuration_attribute.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.317+01:00", comments="Source field: configuration_attribute.id")
     public static final SqlColumn<Long> id = configurationAttributeRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.318+01:00", comments="Source field: configuration_attribute.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.318+01:00", comments="Source field: configuration_attribute.name")
     public static final SqlColumn<String> name = configurationAttributeRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.318+01:00", comments="Source field: configuration_attribute.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.318+01:00", comments="Source field: configuration_attribute.type")
     public static final SqlColumn<String> type = configurationAttributeRecord.type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.318+01:00", comments="Source field: configuration_attribute.parent_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.319+01:00", comments="Source field: configuration_attribute.parent_id")
     public static final SqlColumn<Long> parentId = configurationAttributeRecord.parentId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.318+01:00", comments="Source field: configuration_attribute.resources")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.319+01:00", comments="Source field: configuration_attribute.resources")
     public static final SqlColumn<String> resources = configurationAttributeRecord.resources;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.318+01:00", comments="Source field: configuration_attribute.validator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.319+01:00", comments="Source field: configuration_attribute.validator")
     public static final SqlColumn<String> validator = configurationAttributeRecord.validator;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.318+01:00", comments="Source field: configuration_attribute.dependencies")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.319+01:00", comments="Source field: configuration_attribute.dependencies")
     public static final SqlColumn<String> dependencies = configurationAttributeRecord.dependencies;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.318+01:00", comments="Source field: configuration_attribute.default_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.319+01:00", comments="Source field: configuration_attribute.default_value")
     public static final SqlColumn<String> defaultValue = configurationAttributeRecord.defaultValue;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.318+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.317+01:00", comments="Source Table: configuration_attribute")
     public static final class ConfigurationAttributeRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java
index 81c866f7..659d9ac6 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java
@@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface ConfigurationAttributeRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.318+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.321+01:00", comments="Source Table: configuration_attribute")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.318+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.323+01:00", comments="Source Table: configuration_attribute")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.318+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.324+01:00", comments="Source Table: configuration_attribute")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<ConfigurationAttributeRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.334+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.327+01:00", comments="Source Table: configuration_attribute")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -59,7 +59,7 @@ public interface ConfigurationAttributeRecordMapper {
     })
     ConfigurationAttributeRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.334+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.328+01:00", comments="Source Table: configuration_attribute")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -73,22 +73,22 @@ public interface ConfigurationAttributeRecordMapper {
     })
     List<ConfigurationAttributeRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.334+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.330+01:00", comments="Source Table: configuration_attribute")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.334+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.331+01:00", comments="Source Table: configuration_attribute")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(configurationAttributeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.334+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.333+01:00", comments="Source Table: configuration_attribute")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.334+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.335+01:00", comments="Source Table: configuration_attribute")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, configurationAttributeRecord)
                 .where(id, isEqualTo(id_))
@@ -96,7 +96,7 @@ public interface ConfigurationAttributeRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.334+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.336+01:00", comments="Source Table: configuration_attribute")
     default int insert(ConfigurationAttributeRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(configurationAttributeRecord)
@@ -111,7 +111,7 @@ public interface ConfigurationAttributeRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.334+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.337+01:00", comments="Source Table: configuration_attribute")
     default int insertSelective(ConfigurationAttributeRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(configurationAttributeRecord)
@@ -126,19 +126,19 @@ public interface ConfigurationAttributeRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.334+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.339+01:00", comments="Source Table: configuration_attribute")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationAttributeRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue)
                 .from(configurationAttributeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.349+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.340+01:00", comments="Source Table: configuration_attribute")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationAttributeRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, type, parentId, resources, validator, dependencies, defaultValue)
                 .from(configurationAttributeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.349+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.341+01:00", comments="Source Table: configuration_attribute")
     default ConfigurationAttributeRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, name, type, parentId, resources, validator, dependencies, defaultValue)
                 .from(configurationAttributeRecord)
@@ -147,7 +147,7 @@ public interface ConfigurationAttributeRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.349+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.341+01:00", comments="Source Table: configuration_attribute")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationAttributeRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord)
                 .set(name).equalTo(record::getName)
@@ -159,7 +159,7 @@ public interface ConfigurationAttributeRecordMapper {
                 .set(defaultValue).equalTo(record::getDefaultValue);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.349+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.342+01:00", comments="Source Table: configuration_attribute")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationAttributeRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord)
                 .set(name).equalToWhenPresent(record::getName)
@@ -171,7 +171,7 @@ public interface ConfigurationAttributeRecordMapper {
                 .set(defaultValue).equalToWhenPresent(record::getDefaultValue);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.349+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.343+01:00", comments="Source Table: configuration_attribute")
     default int updateByPrimaryKey(ConfigurationAttributeRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord)
                 .set(name).equalTo(record::getName)
@@ -186,7 +186,7 @@ public interface ConfigurationAttributeRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.349+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.344+01:00", comments="Source Table: configuration_attribute")
     default int updateByPrimaryKeySelective(ConfigurationAttributeRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationAttributeRecord)
                 .set(name).equalToWhenPresent(record::getName)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java
index a40d924e..8bf7ad52 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java
@@ -6,34 +6,34 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class ConfigurationNodeRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.547+01:00", comments="Source Table: configuration_node")
     public static final ConfigurationNodeRecord configurationNodeRecord = new ConfigurationNodeRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.548+01:00", comments="Source field: configuration_node.id")
     public static final SqlColumn<Long> id = configurationNodeRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.548+01:00", comments="Source field: configuration_node.institution_id")
     public static final SqlColumn<Long> institutionId = configurationNodeRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.owner")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.548+01:00", comments="Source field: configuration_node.owner")
     public static final SqlColumn<String> owner = configurationNodeRecord.owner;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.548+01:00", comments="Source field: configuration_node.name")
     public static final SqlColumn<String> name = configurationNodeRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.description")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.548+01:00", comments="Source field: configuration_node.description")
     public static final SqlColumn<String> description = configurationNodeRecord.description;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.550+01:00", comments="Source field: configuration_node.type")
     public static final SqlColumn<String> type = configurationNodeRecord.type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.template")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.550+01:00", comments="Source field: configuration_node.template")
     public static final SqlColumn<String> template = configurationNodeRecord.template;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.551+01:00", comments="Source field: configuration_node.active")
     public static final SqlColumn<Integer> active = configurationNodeRecord.active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.548+01:00", comments="Source Table: configuration_node")
     public static final class ConfigurationNodeRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java
index bc5c6ecc..8ac18e5f 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java
@@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface ConfigurationNodeRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.551+01:00", comments="Source Table: configuration_node")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.551+01:00", comments="Source Table: configuration_node")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.551+01:00", comments="Source Table: configuration_node")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<ConfigurationNodeRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.551+01:00", comments="Source Table: configuration_node")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -59,7 +59,7 @@ public interface ConfigurationNodeRecordMapper {
     })
     ConfigurationNodeRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.551+01:00", comments="Source Table: configuration_node")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -73,22 +73,22 @@ public interface ConfigurationNodeRecordMapper {
     })
     List<ConfigurationNodeRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.551+01:00", comments="Source Table: configuration_node")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.551+01:00", comments="Source Table: configuration_node")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(configurationNodeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.551+01:00", comments="Source Table: configuration_node")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.551+01:00", comments="Source Table: configuration_node")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, configurationNodeRecord)
                 .where(id, isEqualTo(id_))
@@ -96,7 +96,7 @@ public interface ConfigurationNodeRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.552+01:00", comments="Source Table: configuration_node")
     default int insert(ConfigurationNodeRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(configurationNodeRecord)
@@ -111,7 +111,7 @@ public interface ConfigurationNodeRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.552+01:00", comments="Source Table: configuration_node")
     default int insertSelective(ConfigurationNodeRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(configurationNodeRecord)
@@ -126,19 +126,19 @@ public interface ConfigurationNodeRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.552+01:00", comments="Source Table: configuration_node")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, owner, name, description, type, template, active)
                 .from(configurationNodeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.552+01:00", comments="Source Table: configuration_node")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, owner, name, description, type, template, active)
                 .from(configurationNodeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.552+01:00", comments="Source Table: configuration_node")
     default ConfigurationNodeRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, owner, name, description, type, template, active)
                 .from(configurationNodeRecord)
@@ -147,7 +147,7 @@ public interface ConfigurationNodeRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.552+01:00", comments="Source Table: configuration_node")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationNodeRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -159,7 +159,7 @@ public interface ConfigurationNodeRecordMapper {
                 .set(active).equalTo(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.552+01:00", comments="Source Table: configuration_node")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationNodeRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@@ -171,7 +171,7 @@ public interface ConfigurationNodeRecordMapper {
                 .set(active).equalToWhenPresent(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.552+01:00", comments="Source Table: configuration_node")
     default int updateByPrimaryKey(ConfigurationNodeRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -186,7 +186,7 @@ public interface ConfigurationNodeRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.552+01:00", comments="Source Table: configuration_node")
     default int updateByPrimaryKeySelective(ConfigurationNodeRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationNodeRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java
index 34a8b412..316c7ff4 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java
@@ -7,25 +7,25 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class ConfigurationRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.542+01:00", comments="Source Table: configuration")
     public static final ConfigurationRecord configurationRecord = new ConfigurationRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.542+01:00", comments="Source field: configuration.id")
     public static final SqlColumn<Long> id = configurationRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration.configuration_node_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.543+01:00", comments="Source field: configuration.configuration_node_id")
     public static final SqlColumn<Long> configurationNodeId = configurationRecord.configurationNodeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration.version")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.543+01:00", comments="Source field: configuration.version")
     public static final SqlColumn<String> version = configurationRecord.version;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration.version_date")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.543+01:00", comments="Source field: configuration.version_date")
     public static final SqlColumn<DateTime> versionDate = configurationRecord.versionDate;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration.followup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.543+01:00", comments="Source field: configuration.followup")
     public static final SqlColumn<Integer> followup = configurationRecord.followup;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.542+01:00", comments="Source Table: configuration")
     public static final class ConfigurationRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java
index 6abb4862..213d796f 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java
@@ -34,20 +34,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface ConfigurationRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.543+01:00", comments="Source Table: configuration")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.543+01:00", comments="Source Table: configuration")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.543+01:00", comments="Source Table: configuration")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<ConfigurationRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.544+01:00", comments="Source Table: configuration")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -58,7 +58,7 @@ public interface ConfigurationRecordMapper {
     })
     ConfigurationRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.544+01:00", comments="Source Table: configuration")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -69,22 +69,22 @@ public interface ConfigurationRecordMapper {
     })
     List<ConfigurationRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.544+01:00", comments="Source Table: configuration")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.544+01:00", comments="Source Table: configuration")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(configurationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.544+01:00", comments="Source Table: configuration")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.544+01:00", comments="Source Table: configuration")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord)
                 .where(id, isEqualTo(id_))
@@ -92,7 +92,7 @@ public interface ConfigurationRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.544+01:00", comments="Source Table: configuration")
     default int insert(ConfigurationRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(configurationRecord)
@@ -104,7 +104,7 @@ public interface ConfigurationRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.544+01:00", comments="Source Table: configuration")
     default int insertSelective(ConfigurationRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(configurationRecord)
@@ -116,19 +116,19 @@ public interface ConfigurationRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.545+01:00", comments="Source Table: configuration")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, configurationNodeId, version, versionDate, followup)
                 .from(configurationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.545+01:00", comments="Source Table: configuration")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configurationNodeId, version, versionDate, followup)
                 .from(configurationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.545+01:00", comments="Source Table: configuration")
     default ConfigurationRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, configurationNodeId, version, versionDate, followup)
                 .from(configurationRecord)
@@ -137,7 +137,7 @@ public interface ConfigurationRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.545+01:00", comments="Source Table: configuration")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationRecord)
                 .set(configurationNodeId).equalTo(record::getConfigurationNodeId)
@@ -146,7 +146,7 @@ public interface ConfigurationRecordMapper {
                 .set(followup).equalTo(record::getFollowup);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.545+01:00", comments="Source Table: configuration")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationRecord)
                 .set(configurationNodeId).equalToWhenPresent(record::getConfigurationNodeId)
@@ -155,7 +155,7 @@ public interface ConfigurationRecordMapper {
                 .set(followup).equalToWhenPresent(record::getFollowup);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.545+01:00", comments="Source Table: configuration")
     default int updateByPrimaryKey(ConfigurationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationRecord)
                 .set(configurationNodeId).equalTo(record::getConfigurationNodeId)
@@ -167,7 +167,7 @@ public interface ConfigurationRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.545+01:00", comments="Source Table: configuration")
     default int updateByPrimaryKeySelective(ConfigurationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationRecord)
                 .set(configurationNodeId).equalToWhenPresent(record::getConfigurationNodeId)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java
index bb8a250b..bbf131a2 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java
@@ -6,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class ConfigurationValueRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.524+01:00", comments="Source Table: configuration_value")
     public static final ConfigurationValueRecord configurationValueRecord = new ConfigurationValueRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration_value.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.525+01:00", comments="Source field: configuration_value.id")
     public static final SqlColumn<Long> id = configurationValueRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration_value.configuration_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.525+01:00", comments="Source field: configuration_value.configuration_id")
     public static final SqlColumn<Long> configurationId = configurationValueRecord.configurationId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration_value.configuration_attribute_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.526+01:00", comments="Source field: configuration_value.configuration_attribute_id")
     public static final SqlColumn<Long> configurationAttributeId = configurationValueRecord.configurationAttributeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration_value.list_index")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.526+01:00", comments="Source field: configuration_value.list_index")
     public static final SqlColumn<Integer> listIndex = configurationValueRecord.listIndex;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration_value.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.526+01:00", comments="Source field: configuration_value.value")
     public static final SqlColumn<String> value = configurationValueRecord.value;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration_value.text")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.526+01:00", comments="Source field: configuration_value.text")
     public static final SqlColumn<String> text = configurationValueRecord.text;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.525+01:00", comments="Source Table: configuration_value")
     public static final class ConfigurationValueRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java
index eee2f7a8..9772bc01 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java
@@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface ConfigurationValueRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.527+01:00", comments="Source Table: configuration_value")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.527+01:00", comments="Source Table: configuration_value")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.527+01:00", comments="Source Table: configuration_value")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<ConfigurationValueRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.527+01:00", comments="Source Table: configuration_value")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -57,7 +57,7 @@ public interface ConfigurationValueRecordMapper {
     })
     ConfigurationValueRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.527+01:00", comments="Source Table: configuration_value")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -69,22 +69,22 @@ public interface ConfigurationValueRecordMapper {
     })
     List<ConfigurationValueRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.527+01:00", comments="Source Table: configuration_value")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.528+01:00", comments="Source Table: configuration_value")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(configurationValueRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.528+01:00", comments="Source Table: configuration_value")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.528+01:00", comments="Source Table: configuration_value")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord)
                 .where(id, isEqualTo(id_))
@@ -92,7 +92,7 @@ public interface ConfigurationValueRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.528+01:00", comments="Source Table: configuration_value")
     default int insert(ConfigurationValueRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(configurationValueRecord)
@@ -105,7 +105,7 @@ public interface ConfigurationValueRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.528+01:00", comments="Source Table: configuration_value")
     default int insertSelective(ConfigurationValueRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(configurationValueRecord)
@@ -118,19 +118,19 @@ public interface ConfigurationValueRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.528+01:00", comments="Source Table: configuration_value")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, configurationId, configurationAttributeId, listIndex, value, text)
                 .from(configurationValueRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.528+01:00", comments="Source Table: configuration_value")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configurationId, configurationAttributeId, listIndex, value, text)
                 .from(configurationValueRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.528+01:00", comments="Source Table: configuration_value")
     default ConfigurationValueRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, configurationId, configurationAttributeId, listIndex, value, text)
                 .from(configurationValueRecord)
@@ -139,7 +139,7 @@ public interface ConfigurationValueRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.528+01:00", comments="Source Table: configuration_value")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationValueRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
                 .set(configurationId).equalTo(record::getConfigurationId)
@@ -149,7 +149,7 @@ public interface ConfigurationValueRecordMapper {
                 .set(text).equalTo(record::getText);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.529+01:00", comments="Source Table: configuration_value")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationValueRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
                 .set(configurationId).equalToWhenPresent(record::getConfigurationId)
@@ -159,7 +159,7 @@ public interface ConfigurationValueRecordMapper {
                 .set(text).equalToWhenPresent(record::getText);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.529+01:00", comments="Source Table: configuration_value")
     default int updateByPrimaryKey(ConfigurationValueRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
                 .set(configurationId).equalTo(record::getConfigurationId)
@@ -172,7 +172,7 @@ public interface ConfigurationValueRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.529+01:00", comments="Source Table: configuration_value")
     default int updateByPrimaryKeySelective(ConfigurationValueRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
                 .set(configurationId).equalToWhenPresent(record::getConfigurationId)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java
index c9fa6c5a..b8bc03e7 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java
@@ -6,22 +6,22 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class ExamConfigurationMapRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.555+01:00", comments="Source Table: exam_configuration_map")
     public static final ExamConfigurationMapRecord examConfigurationMapRecord = new ExamConfigurationMapRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam_configuration_map.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.555+01:00", comments="Source field: exam_configuration_map.id")
     public static final SqlColumn<Long> id = examConfigurationMapRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam_configuration_map.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.571+01:00", comments="Source field: exam_configuration_map.exam_id")
     public static final SqlColumn<Long> examId = examConfigurationMapRecord.examId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam_configuration_map.configuration_node_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.571+01:00", comments="Source field: exam_configuration_map.configuration_node_id")
     public static final SqlColumn<Long> configurationNodeId = examConfigurationMapRecord.configurationNodeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam_configuration_map.user_names")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.571+01:00", comments="Source field: exam_configuration_map.user_names")
     public static final SqlColumn<String> userNames = examConfigurationMapRecord.userNames;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.555+01:00", comments="Source Table: exam_configuration_map")
     public static final class ExamConfigurationMapRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java
index a835bed8..7ae94f3d 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java
@@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface ExamConfigurationMapRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.572+01:00", comments="Source Table: exam_configuration_map")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.572+01:00", comments="Source Table: exam_configuration_map")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.572+01:00", comments="Source Table: exam_configuration_map")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<ExamConfigurationMapRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.572+01:00", comments="Source Table: exam_configuration_map")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -55,7 +55,7 @@ public interface ExamConfigurationMapRecordMapper {
     })
     ExamConfigurationMapRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.572+01:00", comments="Source Table: exam_configuration_map")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -65,22 +65,22 @@ public interface ExamConfigurationMapRecordMapper {
     })
     List<ExamConfigurationMapRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.572+01:00", comments="Source Table: exam_configuration_map")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.572+01:00", comments="Source Table: exam_configuration_map")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(examConfigurationMapRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.572+01:00", comments="Source Table: exam_configuration_map")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.572+01:00", comments="Source Table: exam_configuration_map")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord)
                 .where(id, isEqualTo(id_))
@@ -88,7 +88,7 @@ public interface ExamConfigurationMapRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.572+01:00", comments="Source Table: exam_configuration_map")
     default int insert(ExamConfigurationMapRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(examConfigurationMapRecord)
@@ -99,7 +99,7 @@ public interface ExamConfigurationMapRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.573+01:00", comments="Source Table: exam_configuration_map")
     default int insertSelective(ExamConfigurationMapRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(examConfigurationMapRecord)
@@ -110,19 +110,19 @@ public interface ExamConfigurationMapRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.573+01:00", comments="Source Table: exam_configuration_map")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, examId, configurationNodeId, userNames)
                 .from(examConfigurationMapRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.573+01:00", comments="Source Table: exam_configuration_map")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, configurationNodeId, userNames)
                 .from(examConfigurationMapRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.573+01:00", comments="Source Table: exam_configuration_map")
     default ExamConfigurationMapRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, examId, configurationNodeId, userNames)
                 .from(examConfigurationMapRecord)
@@ -131,7 +131,7 @@ public interface ExamConfigurationMapRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.573+01:00", comments="Source Table: exam_configuration_map")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ExamConfigurationMapRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
                 .set(examId).equalTo(record::getExamId)
@@ -139,7 +139,7 @@ public interface ExamConfigurationMapRecordMapper {
                 .set(userNames).equalTo(record::getUserNames);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.573+01:00", comments="Source Table: exam_configuration_map")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ExamConfigurationMapRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
                 .set(examId).equalToWhenPresent(record::getExamId)
@@ -147,7 +147,7 @@ public interface ExamConfigurationMapRecordMapper {
                 .set(userNames).equalToWhenPresent(record::getUserNames);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.573+01:00", comments="Source Table: exam_configuration_map")
     default int updateByPrimaryKey(ExamConfigurationMapRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
                 .set(examId).equalTo(record::getExamId)
@@ -158,7 +158,7 @@ public interface ExamConfigurationMapRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.573+01:00", comments="Source Table: exam_configuration_map")
     default int updateByPrimaryKeySelective(ExamConfigurationMapRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
                 .set(examId).equalToWhenPresent(record::getExamId)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java
index e93b5b4f..cb0ee8c2 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java
@@ -6,37 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class ExamRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.576+01:00", comments="Source Table: exam")
     public static final ExamRecord examRecord = new ExamRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.576+01:00", comments="Source field: exam.id")
     public static final SqlColumn<Long> id = examRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.577+01:00", comments="Source field: exam.institution_id")
     public static final SqlColumn<Long> institutionId = examRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.lms_setup_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.577+01:00", comments="Source field: exam.lms_setup_id")
     public static final SqlColumn<Long> lmsSetupId = examRecord.lmsSetupId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.external_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.577+01:00", comments="Source field: exam.external_id")
     public static final SqlColumn<String> externalId = examRecord.externalId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.owner")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.577+01:00", comments="Source field: exam.owner")
     public static final SqlColumn<String> owner = examRecord.owner;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.supporter")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.577+01:00", comments="Source field: exam.supporter")
     public static final SqlColumn<String> supporter = examRecord.supporter;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.577+01:00", comments="Source field: exam.type")
     public static final SqlColumn<String> type = examRecord.type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.status")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.578+01:00", comments="Source field: exam.status")
     public static final SqlColumn<String> status = examRecord.status;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.578+01:00", comments="Source field: exam.quit_password")
+    public static final SqlColumn<String> quitPassword = examRecord.quitPassword;
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.578+01:00", comments="Source field: exam.active")
     public static final SqlColumn<Integer> active = examRecord.active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.576+01:00", comments="Source Table: exam")
     public static final class ExamRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 
@@ -54,6 +57,8 @@ public final class ExamRecordDynamicSqlSupport {
 
         public final SqlColumn<String> status = column("status", JDBCType.VARCHAR);
 
+        public final SqlColumn<String> quitPassword = column("quit_password", JDBCType.VARCHAR);
+
         public final SqlColumn<Integer> active = column("active", JDBCType.INTEGER);
 
         public ExamRecord() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java
index eed0d0e7..8fd08515 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java
@@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface ExamRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.578+01:00", comments="Source Table: exam")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.578+01:00", comments="Source Table: exam")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.578+01:00", comments="Source Table: exam")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<ExamRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.578+01:00", comments="Source Table: exam")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -56,11 +56,12 @@ public interface ExamRecordMapper {
         @Arg(column="supporter", javaType=String.class, jdbcType=JdbcType.VARCHAR),
         @Arg(column="type", javaType=String.class, jdbcType=JdbcType.VARCHAR),
         @Arg(column="status", javaType=String.class, jdbcType=JdbcType.VARCHAR),
+        @Arg(column="quit_password", javaType=String.class, jdbcType=JdbcType.VARCHAR),
         @Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER)
     })
     ExamRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.578+01:00", comments="Source Table: exam")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -71,26 +72,27 @@ public interface ExamRecordMapper {
         @Arg(column="supporter", javaType=String.class, jdbcType=JdbcType.VARCHAR),
         @Arg(column="type", javaType=String.class, jdbcType=JdbcType.VARCHAR),
         @Arg(column="status", javaType=String.class, jdbcType=JdbcType.VARCHAR),
+        @Arg(column="quit_password", javaType=String.class, jdbcType=JdbcType.VARCHAR),
         @Arg(column="active", javaType=Integer.class, jdbcType=JdbcType.INTEGER)
     })
     List<ExamRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.578+01:00", comments="Source Table: exam")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.578+01:00", comments="Source Table: exam")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(examRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.579+01:00", comments="Source Table: exam")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, examRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.579+01:00", comments="Source Table: exam")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, examRecord)
                 .where(id, isEqualTo(id_))
@@ -98,7 +100,7 @@ public interface ExamRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.579+01:00", comments="Source Table: exam")
     default int insert(ExamRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(examRecord)
@@ -109,12 +111,13 @@ public interface ExamRecordMapper {
                 .map(supporter).toProperty("supporter")
                 .map(type).toProperty("type")
                 .map(status).toProperty("status")
+                .map(quitPassword).toProperty("quitPassword")
                 .map(active).toProperty("active")
                 .build()
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.579+01:00", comments="Source Table: exam")
     default int insertSelective(ExamRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(examRecord)
@@ -125,33 +128,34 @@ public interface ExamRecordMapper {
                 .map(supporter).toPropertyWhenPresent("supporter", record::getSupporter)
                 .map(type).toPropertyWhenPresent("type", record::getType)
                 .map(status).toPropertyWhenPresent("status", record::getStatus)
+                .map(quitPassword).toPropertyWhenPresent("quitPassword", record::getQuitPassword)
                 .map(active).toPropertyWhenPresent("active", record::getActive)
                 .build()
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.579+01:00", comments="Source Table: exam")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamRecord>>> selectByExample() {
-        return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, status, active)
+        return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, status, quitPassword, active)
                 .from(examRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.579+01:00", comments="Source Table: exam")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamRecord>>> selectDistinctByExample() {
-        return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, status, active)
+        return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, status, quitPassword, active)
                 .from(examRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.579+01:00", comments="Source Table: exam")
     default ExamRecord selectByPrimaryKey(Long id_) {
-        return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, lmsSetupId, externalId, owner, supporter, type, status, active)
+        return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, lmsSetupId, externalId, owner, supporter, type, status, quitPassword, active)
                 .from(examRecord)
                 .where(id, isEqualTo(id_))
                 .build()
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.579+01:00", comments="Source Table: exam")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ExamRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -161,10 +165,11 @@ public interface ExamRecordMapper {
                 .set(supporter).equalTo(record::getSupporter)
                 .set(type).equalTo(record::getType)
                 .set(status).equalTo(record::getStatus)
+                .set(quitPassword).equalTo(record::getQuitPassword)
                 .set(active).equalTo(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.579+01:00", comments="Source Table: exam")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ExamRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@@ -174,10 +179,11 @@ public interface ExamRecordMapper {
                 .set(supporter).equalToWhenPresent(record::getSupporter)
                 .set(type).equalToWhenPresent(record::getType)
                 .set(status).equalToWhenPresent(record::getStatus)
+                .set(quitPassword).equalToWhenPresent(record::getQuitPassword)
                 .set(active).equalToWhenPresent(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.579+01:00", comments="Source Table: exam")
     default int updateByPrimaryKey(ExamRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -187,13 +193,14 @@ public interface ExamRecordMapper {
                 .set(supporter).equalTo(record::getSupporter)
                 .set(type).equalTo(record::getType)
                 .set(status).equalTo(record::getStatus)
+                .set(quitPassword).equalTo(record::getQuitPassword)
                 .set(active).equalTo(record::getActive)
                 .where(id, isEqualTo(record::getId))
                 .build()
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.583+01:00", comments="Source Table: exam")
     default int updateByPrimaryKeySelective(ExamRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@@ -203,6 +210,7 @@ public interface ExamRecordMapper {
                 .set(supporter).equalToWhenPresent(record::getSupporter)
                 .set(type).equalToWhenPresent(record::getType)
                 .set(status).equalToWhenPresent(record::getStatus)
+                .set(quitPassword).equalToWhenPresent(record::getQuitPassword)
                 .set(active).equalToWhenPresent(record::getActive)
                 .where(id, isEqualTo(record::getId))
                 .build()
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java
index 070822f1..4dcd369f 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java
@@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class IndicatorRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.601+01:00", comments="Source Table: indicator")
     public static final IndicatorRecord indicatorRecord = new IndicatorRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: indicator.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.601+01:00", comments="Source field: indicator.id")
     public static final SqlColumn<Long> id = indicatorRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: indicator.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.601+01:00", comments="Source field: indicator.exam_id")
     public static final SqlColumn<Long> examId = indicatorRecord.examId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: indicator.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.601+01:00", comments="Source field: indicator.type")
     public static final SqlColumn<String> type = indicatorRecord.type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: indicator.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.601+01:00", comments="Source field: indicator.name")
     public static final SqlColumn<String> name = indicatorRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: indicator.color")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.601+01:00", comments="Source field: indicator.color")
     public static final SqlColumn<String> color = indicatorRecord.color;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.601+01:00", comments="Source Table: indicator")
     public static final class IndicatorRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java
index cbf5c8f0..1fe722cb 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java
@@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface IndicatorRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.601+01:00", comments="Source Table: indicator")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.601+01:00", comments="Source Table: indicator")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.602+01:00", comments="Source Table: indicator")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<IndicatorRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.602+01:00", comments="Source Table: indicator")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -56,7 +56,7 @@ public interface IndicatorRecordMapper {
     })
     IndicatorRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.602+01:00", comments="Source Table: indicator")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -67,22 +67,22 @@ public interface IndicatorRecordMapper {
     })
     List<IndicatorRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.602+01:00", comments="Source Table: indicator")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.602+01:00", comments="Source Table: indicator")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(indicatorRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.602+01:00", comments="Source Table: indicator")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.603+01:00", comments="Source Table: indicator")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, indicatorRecord)
                 .where(id, isEqualTo(id_))
@@ -90,7 +90,7 @@ public interface IndicatorRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.603+01:00", comments="Source Table: indicator")
     default int insert(IndicatorRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(indicatorRecord)
@@ -102,7 +102,7 @@ public interface IndicatorRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.603+01:00", comments="Source Table: indicator")
     default int insertSelective(IndicatorRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(indicatorRecord)
@@ -114,19 +114,19 @@ public interface IndicatorRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.603+01:00", comments="Source Table: indicator")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<IndicatorRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, examId, type, name, color)
                 .from(indicatorRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.603+01:00", comments="Source Table: indicator")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<IndicatorRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, type, name, color)
                 .from(indicatorRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.603+01:00", comments="Source Table: indicator")
     default IndicatorRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, examId, type, name, color)
                 .from(indicatorRecord)
@@ -135,7 +135,7 @@ public interface IndicatorRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.603+01:00", comments="Source Table: indicator")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(IndicatorRecord record) {
         return UpdateDSL.updateWithMapper(this::update, indicatorRecord)
                 .set(examId).equalTo(record::getExamId)
@@ -144,7 +144,7 @@ public interface IndicatorRecordMapper {
                 .set(color).equalTo(record::getColor);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.603+01:00", comments="Source Table: indicator")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(IndicatorRecord record) {
         return UpdateDSL.updateWithMapper(this::update, indicatorRecord)
                 .set(examId).equalToWhenPresent(record::getExamId)
@@ -153,7 +153,7 @@ public interface IndicatorRecordMapper {
                 .set(color).equalToWhenPresent(record::getColor);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.603+01:00", comments="Source Table: indicator")
     default int updateByPrimaryKey(IndicatorRecord record) {
         return UpdateDSL.updateWithMapper(this::update, indicatorRecord)
                 .set(examId).equalTo(record::getExamId)
@@ -165,7 +165,7 @@ public interface IndicatorRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.603+01:00", comments="Source Table: indicator")
     default int updateByPrimaryKeySelective(IndicatorRecord record) {
         return UpdateDSL.updateWithMapper(this::update, indicatorRecord)
                 .set(examId).equalToWhenPresent(record::getExamId)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java
index ff01769c..8e12ee92 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java
@@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class InstitutionRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.608+01:00", comments="Source Table: institution")
     public static final InstitutionRecord institutionRecord = new InstitutionRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: institution.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.608+01:00", comments="Source field: institution.id")
     public static final SqlColumn<Long> id = institutionRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: institution.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.608+01:00", comments="Source field: institution.name")
     public static final SqlColumn<String> name = institutionRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: institution.url_suffix")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.608+01:00", comments="Source field: institution.url_suffix")
     public static final SqlColumn<String> urlSuffix = institutionRecord.urlSuffix;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: institution.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.608+01:00", comments="Source field: institution.active")
     public static final SqlColumn<Integer> active = institutionRecord.active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: institution.logo_image")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.608+01:00", comments="Source field: institution.logo_image")
     public static final SqlColumn<String> logoImage = institutionRecord.logoImage;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.608+01:00", comments="Source Table: institution")
     public static final class InstitutionRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java
index 59547b4e..6d1f676b 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java
@@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface InstitutionRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.608+01:00", comments="Source Table: institution")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.608+01:00", comments="Source Table: institution")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.608+01:00", comments="Source Table: institution")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<InstitutionRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.608+01:00", comments="Source Table: institution")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -56,7 +56,7 @@ public interface InstitutionRecordMapper {
     })
     InstitutionRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.608+01:00", comments="Source Table: institution")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -67,22 +67,22 @@ public interface InstitutionRecordMapper {
     })
     List<InstitutionRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.609+01:00", comments="Source Table: institution")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.609+01:00", comments="Source Table: institution")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(institutionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.609+01:00", comments="Source Table: institution")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.609+01:00", comments="Source Table: institution")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord)
                 .where(id, isEqualTo(id_))
@@ -90,7 +90,7 @@ public interface InstitutionRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.609+01:00", comments="Source Table: institution")
     default int insert(InstitutionRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(institutionRecord)
@@ -102,7 +102,7 @@ public interface InstitutionRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.609+01:00", comments="Source Table: institution")
     default int insertSelective(InstitutionRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(institutionRecord)
@@ -114,19 +114,19 @@ public interface InstitutionRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.609+01:00", comments="Source Table: institution")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, name, urlSuffix, active, logoImage)
                 .from(institutionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.609+01:00", comments="Source Table: institution")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, urlSuffix, active, logoImage)
                 .from(institutionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.609+01:00", comments="Source Table: institution")
     default InstitutionRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, name, urlSuffix, active, logoImage)
                 .from(institutionRecord)
@@ -135,7 +135,7 @@ public interface InstitutionRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.609+01:00", comments="Source Table: institution")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(InstitutionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, institutionRecord)
                 .set(name).equalTo(record::getName)
@@ -144,7 +144,7 @@ public interface InstitutionRecordMapper {
                 .set(logoImage).equalTo(record::getLogoImage);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.609+01:00", comments="Source Table: institution")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(InstitutionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, institutionRecord)
                 .set(name).equalToWhenPresent(record::getName)
@@ -153,7 +153,7 @@ public interface InstitutionRecordMapper {
                 .set(logoImage).equalToWhenPresent(record::getLogoImage);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.609+01:00", comments="Source Table: institution")
     default int updateByPrimaryKey(InstitutionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, institutionRecord)
                 .set(name).equalTo(record::getName)
@@ -165,7 +165,7 @@ public interface InstitutionRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.609+01:00", comments="Source Table: institution")
     default int updateByPrimaryKeySelective(InstitutionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, institutionRecord)
                 .set(name).equalToWhenPresent(record::getName)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java
index 8bce049f..7ae9210d 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java
@@ -6,43 +6,43 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class LmsSetupRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.615+01:00", comments="Source Table: lms_setup")
     public static final LmsSetupRecord lmsSetupRecord = new LmsSetupRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.615+01:00", comments="Source field: lms_setup.id")
     public static final SqlColumn<Long> id = lmsSetupRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.615+01:00", comments="Source field: lms_setup.institution_id")
     public static final SqlColumn<Long> institutionId = lmsSetupRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.616+01:00", comments="Source field: lms_setup.name")
     public static final SqlColumn<String> name = lmsSetupRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.lms_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.616+01:00", comments="Source field: lms_setup.lms_type")
     public static final SqlColumn<String> lmsType = lmsSetupRecord.lmsType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.lms_url")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.616+01:00", comments="Source field: lms_setup.lms_url")
     public static final SqlColumn<String> lmsUrl = lmsSetupRecord.lmsUrl;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.lms_clientname")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.616+01:00", comments="Source field: lms_setup.lms_clientname")
     public static final SqlColumn<String> lmsClientname = lmsSetupRecord.lmsClientname;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.lms_clientsecret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.617+01:00", comments="Source field: lms_setup.lms_clientsecret")
     public static final SqlColumn<String> lmsClientsecret = lmsSetupRecord.lmsClientsecret;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.lms_rest_api_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.617+01:00", comments="Source field: lms_setup.lms_rest_api_token")
     public static final SqlColumn<String> lmsRestApiToken = lmsSetupRecord.lmsRestApiToken;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.seb_clientname")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.617+01:00", comments="Source field: lms_setup.seb_clientname")
     public static final SqlColumn<String> sebClientname = lmsSetupRecord.sebClientname;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.seb_clientsecret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.617+01:00", comments="Source field: lms_setup.seb_clientsecret")
     public static final SqlColumn<String> sebClientsecret = lmsSetupRecord.sebClientsecret;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.617+01:00", comments="Source field: lms_setup.active")
     public static final SqlColumn<Integer> active = lmsSetupRecord.active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.615+01:00", comments="Source Table: lms_setup")
     public static final class LmsSetupRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java
index 0e9ee95a..6c843a45 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java
@@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface LmsSetupRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.617+01:00", comments="Source Table: lms_setup")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.617+01:00", comments="Source Table: lms_setup")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.617+01:00", comments="Source Table: lms_setup")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<LmsSetupRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.617+01:00", comments="Source Table: lms_setup")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -62,7 +62,7 @@ public interface LmsSetupRecordMapper {
     })
     LmsSetupRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.618+01:00", comments="Source Table: lms_setup")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -79,22 +79,22 @@ public interface LmsSetupRecordMapper {
     })
     List<LmsSetupRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.618+01:00", comments="Source Table: lms_setup")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.618+01:00", comments="Source Table: lms_setup")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(lmsSetupRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.618+01:00", comments="Source Table: lms_setup")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.618+01:00", comments="Source Table: lms_setup")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord)
                 .where(id, isEqualTo(id_))
@@ -102,7 +102,7 @@ public interface LmsSetupRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.618+01:00", comments="Source Table: lms_setup")
     default int insert(LmsSetupRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(lmsSetupRecord)
@@ -120,7 +120,7 @@ public interface LmsSetupRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.618+01:00", comments="Source Table: lms_setup")
     default int insertSelective(LmsSetupRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(lmsSetupRecord)
@@ -138,19 +138,19 @@ public interface LmsSetupRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.618+01:00", comments="Source Table: lms_setup")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<LmsSetupRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret, active)
                 .from(lmsSetupRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.618+01:00", comments="Source Table: lms_setup")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<LmsSetupRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret, active)
                 .from(lmsSetupRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.618+01:00", comments="Source Table: lms_setup")
     default LmsSetupRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, lmsType, lmsUrl, lmsClientname, lmsClientsecret, lmsRestApiToken, sebClientname, sebClientsecret, active)
                 .from(lmsSetupRecord)
@@ -159,7 +159,7 @@ public interface LmsSetupRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.618+01:00", comments="Source Table: lms_setup")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(LmsSetupRecord record) {
         return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -174,7 +174,7 @@ public interface LmsSetupRecordMapper {
                 .set(active).equalTo(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.618+01:00", comments="Source Table: lms_setup")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(LmsSetupRecord record) {
         return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@@ -189,7 +189,7 @@ public interface LmsSetupRecordMapper {
                 .set(active).equalToWhenPresent(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.618+01:00", comments="Source Table: lms_setup")
     default int updateByPrimaryKey(LmsSetupRecord record) {
         return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -207,7 +207,7 @@ public interface LmsSetupRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.619+01:00", comments="Source Table: lms_setup")
     default int updateByPrimaryKeySelective(LmsSetupRecord record) {
         return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java
index 1ea8417d..3059f64d 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java
@@ -6,37 +6,37 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class OrientationRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.533+01:00", comments="Source Table: orientation")
     public static final OrientationRecord orientationRecord = new OrientationRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.533+01:00", comments="Source field: orientation.id")
     public static final SqlColumn<Long> id = orientationRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.config_attribute_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.534+01:00", comments="Source field: orientation.config_attribute_id")
     public static final SqlColumn<Long> configAttributeId = orientationRecord.configAttributeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.template")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.534+01:00", comments="Source field: orientation.template")
     public static final SqlColumn<String> template = orientationRecord.template;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.534+01:00", comments="Source field: orientation.view")
     public static final SqlColumn<String> view = orientationRecord.view;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.group")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.534+01:00", comments="Source field: orientation.group")
     public static final SqlColumn<String> group = orientationRecord.group;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.x_position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.534+01:00", comments="Source field: orientation.x_position")
     public static final SqlColumn<Integer> xPosition = orientationRecord.xPosition;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.y_position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.534+01:00", comments="Source field: orientation.y_position")
     public static final SqlColumn<Integer> yPosition = orientationRecord.yPosition;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.width")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.535+01:00", comments="Source field: orientation.width")
     public static final SqlColumn<Integer> width = orientationRecord.width;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.height")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.535+01:00", comments="Source field: orientation.height")
     public static final SqlColumn<Integer> height = orientationRecord.height;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.533+01:00", comments="Source Table: orientation")
     public static final class OrientationRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java
index 5973e336..0498e322 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java
@@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface OrientationRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.535+01:00", comments="Source Table: orientation")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.535+01:00", comments="Source Table: orientation")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.535+01:00", comments="Source Table: orientation")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<OrientationRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.535+01:00", comments="Source Table: orientation")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -60,7 +60,7 @@ public interface OrientationRecordMapper {
     })
     OrientationRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.535+01:00", comments="Source Table: orientation")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -75,22 +75,22 @@ public interface OrientationRecordMapper {
     })
     List<OrientationRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.535+01:00", comments="Source Table: orientation")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.536+01:00", comments="Source Table: orientation")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(orientationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.536+01:00", comments="Source Table: orientation")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.536+01:00", comments="Source Table: orientation")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord)
                 .where(id, isEqualTo(id_))
@@ -98,7 +98,7 @@ public interface OrientationRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.536+01:00", comments="Source Table: orientation")
     default int insert(OrientationRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(orientationRecord)
@@ -114,7 +114,7 @@ public interface OrientationRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.536+01:00", comments="Source Table: orientation")
     default int insertSelective(OrientationRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(orientationRecord)
@@ -130,19 +130,19 @@ public interface OrientationRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.536+01:00", comments="Source Table: orientation")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, configAttributeId, template, view, group, xPosition, yPosition, width, height)
                 .from(orientationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.536+01:00", comments="Source Table: orientation")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configAttributeId, template, view, group, xPosition, yPosition, width, height)
                 .from(orientationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.537+01:00", comments="Source Table: orientation")
     default OrientationRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, configAttributeId, template, view, group, xPosition, yPosition, width, height)
                 .from(orientationRecord)
@@ -151,7 +151,7 @@ public interface OrientationRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.537+01:00", comments="Source Table: orientation")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(OrientationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, orientationRecord)
                 .set(configAttributeId).equalTo(record::getConfigAttributeId)
@@ -164,7 +164,7 @@ public interface OrientationRecordMapper {
                 .set(height).equalTo(record::getHeight);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.537+01:00", comments="Source Table: orientation")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(OrientationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, orientationRecord)
                 .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId)
@@ -177,7 +177,7 @@ public interface OrientationRecordMapper {
                 .set(height).equalToWhenPresent(record::getHeight);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.537+01:00", comments="Source Table: orientation")
     default int updateByPrimaryKey(OrientationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, orientationRecord)
                 .set(configAttributeId).equalTo(record::getConfigAttributeId)
@@ -193,7 +193,7 @@ public interface OrientationRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.537+01:00", comments="Source Table: orientation")
     default int updateByPrimaryKeySelective(OrientationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, orientationRecord)
                 .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java
index 64a66b41..230ea709 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java
@@ -6,19 +6,19 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class RoleRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.626+01:00", comments="Source Table: user_role")
     public static final RoleRecord roleRecord = new RoleRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_role.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.626+01:00", comments="Source field: user_role.id")
     public static final SqlColumn<Long> id = roleRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_role.user_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.626+01:00", comments="Source field: user_role.user_id")
     public static final SqlColumn<Long> userId = roleRecord.userId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_role.role_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.627+01:00", comments="Source field: user_role.role_name")
     public static final SqlColumn<String> roleName = roleRecord.roleName;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.626+01:00", comments="Source Table: user_role")
     public static final class RoleRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java
index 7dfa4702..ffdf6bc0 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java
@@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface RoleRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.627+01:00", comments="Source Table: user_role")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.627+01:00", comments="Source Table: user_role")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.627+01:00", comments="Source Table: user_role")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<RoleRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.627+01:00", comments="Source Table: user_role")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -54,7 +54,7 @@ public interface RoleRecordMapper {
     })
     RoleRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.627+01:00", comments="Source Table: user_role")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -63,22 +63,22 @@ public interface RoleRecordMapper {
     })
     List<RoleRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.627+01:00", comments="Source Table: user_role")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.627+01:00", comments="Source Table: user_role")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(roleRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.628+01:00", comments="Source Table: user_role")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.628+01:00", comments="Source Table: user_role")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, roleRecord)
                 .where(id, isEqualTo(id_))
@@ -86,7 +86,7 @@ public interface RoleRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.628+01:00", comments="Source Table: user_role")
     default int insert(RoleRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(roleRecord)
@@ -96,7 +96,7 @@ public interface RoleRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.628+01:00", comments="Source Table: user_role")
     default int insertSelective(RoleRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(roleRecord)
@@ -106,19 +106,19 @@ public interface RoleRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.628+01:00", comments="Source Table: user_role")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<RoleRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, userId, roleName)
                 .from(roleRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.628+01:00", comments="Source Table: user_role")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<RoleRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, userId, roleName)
                 .from(roleRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.628+01:00", comments="Source Table: user_role")
     default RoleRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, userId, roleName)
                 .from(roleRecord)
@@ -127,21 +127,21 @@ public interface RoleRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.628+01:00", comments="Source Table: user_role")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(RoleRecord record) {
         return UpdateDSL.updateWithMapper(this::update, roleRecord)
                 .set(userId).equalTo(record::getUserId)
                 .set(roleName).equalTo(record::getRoleName);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.628+01:00", comments="Source Table: user_role")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(RoleRecord record) {
         return UpdateDSL.updateWithMapper(this::update, roleRecord)
                 .set(userId).equalToWhenPresent(record::getUserId)
                 .set(roleName).equalToWhenPresent(record::getRoleName);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.628+01:00", comments="Source Table: user_role")
     default int updateByPrimaryKey(RoleRecord record) {
         return UpdateDSL.updateWithMapper(this::update, roleRecord)
                 .set(userId).equalTo(record::getUserId)
@@ -151,7 +151,7 @@ public interface RoleRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.628+01:00", comments="Source Table: user_role")
     default int updateByPrimaryKeySelective(RoleRecord record) {
         return UpdateDSL.updateWithMapper(this::update, roleRecord)
                 .set(userId).equalToWhenPresent(record::getUserId)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java
index 1553e552..e9318752 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java
@@ -7,22 +7,22 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class ThresholdRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.605+01:00", comments="Source Table: threshold")
     public static final ThresholdRecord thresholdRecord = new ThresholdRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: threshold.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.605+01:00", comments="Source field: threshold.id")
     public static final SqlColumn<Long> id = thresholdRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: threshold.indicator_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.605+01:00", comments="Source field: threshold.indicator_id")
     public static final SqlColumn<Long> indicatorId = thresholdRecord.indicatorId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: threshold.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.605+01:00", comments="Source field: threshold.value")
     public static final SqlColumn<BigDecimal> value = thresholdRecord.value;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: threshold.color")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source field: threshold.color")
     public static final SqlColumn<String> color = thresholdRecord.color;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.605+01:00", comments="Source Table: threshold")
     public static final class ThresholdRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java
index 2c162225..0e49d463 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java
@@ -33,20 +33,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface ThresholdRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.553+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source Table: threshold")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.553+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source Table: threshold")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.553+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source Table: threshold")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<ThresholdRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.553+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source Table: threshold")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -56,7 +56,7 @@ public interface ThresholdRecordMapper {
     })
     ThresholdRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.553+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source Table: threshold")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -66,22 +66,22 @@ public interface ThresholdRecordMapper {
     })
     List<ThresholdRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.553+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source Table: threshold")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.553+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source Table: threshold")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(thresholdRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.553+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source Table: threshold")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.553+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source Table: threshold")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, thresholdRecord)
                 .where(id, isEqualTo(id_))
@@ -89,7 +89,7 @@ public interface ThresholdRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.553+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source Table: threshold")
     default int insert(ThresholdRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(thresholdRecord)
@@ -100,7 +100,7 @@ public interface ThresholdRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.553+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source Table: threshold")
     default int insertSelective(ThresholdRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(thresholdRecord)
@@ -111,19 +111,19 @@ public interface ThresholdRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.553+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source Table: threshold")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ThresholdRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, indicatorId, value, color)
                 .from(thresholdRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.553+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source Table: threshold")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ThresholdRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, indicatorId, value, color)
                 .from(thresholdRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.553+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source Table: threshold")
     default ThresholdRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, indicatorId, value, color)
                 .from(thresholdRecord)
@@ -132,7 +132,7 @@ public interface ThresholdRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.553+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source Table: threshold")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ThresholdRecord record) {
         return UpdateDSL.updateWithMapper(this::update, thresholdRecord)
                 .set(indicatorId).equalTo(record::getIndicatorId)
@@ -140,7 +140,7 @@ public interface ThresholdRecordMapper {
                 .set(color).equalTo(record::getColor);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.553+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source Table: threshold")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ThresholdRecord record) {
         return UpdateDSL.updateWithMapper(this::update, thresholdRecord)
                 .set(indicatorId).equalToWhenPresent(record::getIndicatorId)
@@ -148,7 +148,7 @@ public interface ThresholdRecordMapper {
                 .set(color).equalToWhenPresent(record::getColor);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.553+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source Table: threshold")
     default int updateByPrimaryKey(ThresholdRecord record) {
         return UpdateDSL.updateWithMapper(this::update, thresholdRecord)
                 .set(indicatorId).equalTo(record::getIndicatorId)
@@ -159,7 +159,7 @@ public interface ThresholdRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.553+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.606+01:00", comments="Source Table: threshold")
     default int updateByPrimaryKeySelective(ThresholdRecord record) {
         return UpdateDSL.updateWithMapper(this::update, thresholdRecord)
                 .set(indicatorId).equalToWhenPresent(record::getIndicatorId)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java
index c33cd2d6..66c106c5 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java
@@ -6,31 +6,31 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class UserActivityLogRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.631+01:00", comments="Source Table: user_activity_log")
     public static final UserActivityLogRecord userActivityLogRecord = new UserActivityLogRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_activity_log.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.631+01:00", comments="Source field: user_activity_log.id")
     public static final SqlColumn<Long> id = userActivityLogRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_activity_log.user_uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.631+01:00", comments="Source field: user_activity_log.user_uuid")
     public static final SqlColumn<String> userUuid = userActivityLogRecord.userUuid;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_activity_log.timestamp")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.631+01:00", comments="Source field: user_activity_log.timestamp")
     public static final SqlColumn<Long> timestamp = userActivityLogRecord.timestamp;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_activity_log.activity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.631+01:00", comments="Source field: user_activity_log.activity_type")
     public static final SqlColumn<String> activityType = userActivityLogRecord.activityType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source field: user_activity_log.entity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.632+01:00", comments="Source field: user_activity_log.entity_type")
     public static final SqlColumn<String> entityType = userActivityLogRecord.entityType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source field: user_activity_log.entity_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.632+01:00", comments="Source field: user_activity_log.entity_id")
     public static final SqlColumn<String> entityId = userActivityLogRecord.entityId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source field: user_activity_log.message")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.633+01:00", comments="Source field: user_activity_log.message")
     public static final SqlColumn<String> message = userActivityLogRecord.message;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.631+01:00", comments="Source Table: user_activity_log")
     public static final class UserActivityLogRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java
index 79d78f01..69efdc94 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java
@@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface UserActivityLogRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.633+01:00", comments="Source Table: user_activity_log")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.633+01:00", comments="Source Table: user_activity_log")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.634+01:00", comments="Source Table: user_activity_log")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<UserActivityLogRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.634+01:00", comments="Source Table: user_activity_log")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -58,7 +58,7 @@ public interface UserActivityLogRecordMapper {
     })
     UserActivityLogRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.634+01:00", comments="Source Table: user_activity_log")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -71,22 +71,22 @@ public interface UserActivityLogRecordMapper {
     })
     List<UserActivityLogRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.634+01:00", comments="Source Table: user_activity_log")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.634+01:00", comments="Source Table: user_activity_log")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(userActivityLogRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.634+01:00", comments="Source Table: user_activity_log")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, userActivityLogRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.634+01:00", comments="Source Table: user_activity_log")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, userActivityLogRecord)
                 .where(id, isEqualTo(id_))
@@ -94,7 +94,7 @@ public interface UserActivityLogRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.634+01:00", comments="Source Table: user_activity_log")
     default int insert(UserActivityLogRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(userActivityLogRecord)
@@ -108,7 +108,7 @@ public interface UserActivityLogRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.634+01:00", comments="Source Table: user_activity_log")
     default int insertSelective(UserActivityLogRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(userActivityLogRecord)
@@ -122,19 +122,19 @@ public interface UserActivityLogRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.634+01:00", comments="Source Table: user_activity_log")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserActivityLogRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, userUuid, timestamp, activityType, entityType, entityId, message)
                 .from(userActivityLogRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.634+01:00", comments="Source Table: user_activity_log")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserActivityLogRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, userUuid, timestamp, activityType, entityType, entityId, message)
                 .from(userActivityLogRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.634+01:00", comments="Source Table: user_activity_log")
     default UserActivityLogRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, userUuid, timestamp, activityType, entityType, entityId, message)
                 .from(userActivityLogRecord)
@@ -143,7 +143,7 @@ public interface UserActivityLogRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.634+01:00", comments="Source Table: user_activity_log")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(UserActivityLogRecord record) {
         return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord)
                 .set(userUuid).equalTo(record::getUserUuid)
@@ -154,7 +154,7 @@ public interface UserActivityLogRecordMapper {
                 .set(message).equalTo(record::getMessage);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.636+01:00", comments="Source Table: user_activity_log")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(UserActivityLogRecord record) {
         return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord)
                 .set(userUuid).equalToWhenPresent(record::getUserUuid)
@@ -165,7 +165,7 @@ public interface UserActivityLogRecordMapper {
                 .set(message).equalToWhenPresent(record::getMessage);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.637+01:00", comments="Source Table: user_activity_log")
     default int updateByPrimaryKey(UserActivityLogRecord record) {
         return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord)
                 .set(userUuid).equalTo(record::getUserUuid)
@@ -179,7 +179,7 @@ public interface UserActivityLogRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.599+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.637+01:00", comments="Source Table: user_activity_log")
     default int updateByPrimaryKeySelective(UserActivityLogRecord record) {
         return UpdateDSL.updateWithMapper(this::update, userActivityLogRecord)
                 .set(userUuid).equalToWhenPresent(record::getUserUuid)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java
index d8cacabe..ee8a22e2 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java
@@ -6,40 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class UserRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.622+01:00", comments="Source Table: user")
     public static final UserRecord userRecord = new UserRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.622+01:00", comments="Source field: user.id")
     public static final SqlColumn<Long> id = userRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.622+01:00", comments="Source field: user.institution_id")
     public static final SqlColumn<Long> institutionId = userRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.622+01:00", comments="Source field: user.uuid")
     public static final SqlColumn<String> uuid = userRecord.uuid;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.622+01:00", comments="Source field: user.name")
     public static final SqlColumn<String> name = userRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.username")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.622+01:00", comments="Source field: user.username")
     public static final SqlColumn<String> username = userRecord.username;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.password")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.622+01:00", comments="Source field: user.password")
     public static final SqlColumn<String> password = userRecord.password;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.email")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.622+01:00", comments="Source field: user.email")
     public static final SqlColumn<String> email = userRecord.email;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.locale")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.622+01:00", comments="Source field: user.locale")
     public static final SqlColumn<String> locale = userRecord.locale;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.timezone")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.623+01:00", comments="Source field: user.timezone")
     public static final SqlColumn<String> timezone = userRecord.timezone;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.623+01:00", comments="Source field: user.active")
     public static final SqlColumn<Integer> active = userRecord.active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.622+01:00", comments="Source Table: user")
     public static final class UserRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java
index f36a0b5c..e7b3a9fc 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java
@@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface UserRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.623+01:00", comments="Source Table: user")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.623+01:00", comments="Source Table: user")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.623+01:00", comments="Source Table: user")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<UserRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.623+01:00", comments="Source Table: user")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -61,7 +61,7 @@ public interface UserRecordMapper {
     })
     UserRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.623+01:00", comments="Source Table: user")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -77,22 +77,22 @@ public interface UserRecordMapper {
     })
     List<UserRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.623+01:00", comments="Source Table: user")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.623+01:00", comments="Source Table: user")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(userRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.623+01:00", comments="Source Table: user")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, userRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.623+01:00", comments="Source Table: user")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, userRecord)
                 .where(id, isEqualTo(id_))
@@ -100,7 +100,7 @@ public interface UserRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.623+01:00", comments="Source Table: user")
     default int insert(UserRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(userRecord)
@@ -117,7 +117,7 @@ public interface UserRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.623+01:00", comments="Source Table: user")
     default int insertSelective(UserRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(userRecord)
@@ -134,19 +134,19 @@ public interface UserRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.623+01:00", comments="Source Table: user")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, locale, timezone, active)
                 .from(userRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.624+01:00", comments="Source Table: user")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, locale, timezone, active)
                 .from(userRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.624+01:00", comments="Source Table: user")
     default UserRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, uuid, name, username, password, email, locale, timezone, active)
                 .from(userRecord)
@@ -155,7 +155,7 @@ public interface UserRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.624+01:00", comments="Source Table: user")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(UserRecord record) {
         return UpdateDSL.updateWithMapper(this::update, userRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -169,7 +169,7 @@ public interface UserRecordMapper {
                 .set(active).equalTo(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.624+01:00", comments="Source Table: user")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(UserRecord record) {
         return UpdateDSL.updateWithMapper(this::update, userRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@@ -183,7 +183,7 @@ public interface UserRecordMapper {
                 .set(active).equalToWhenPresent(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.624+01:00", comments="Source Table: user")
     default int updateByPrimaryKey(UserRecord record) {
         return UpdateDSL.updateWithMapper(this::update, userRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -200,7 +200,7 @@ public interface UserRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.624+01:00", comments="Source Table: user")
     default int updateByPrimaryKeySelective(UserRecord record) {
         return UpdateDSL.updateWithMapper(this::update, userRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributes.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributes.java
new file mode 100644
index 00000000..816063b5
--- /dev/null
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributes.java
@@ -0,0 +1,118 @@
+package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
+
+import javax.annotation.Generated;
+
+public class AdditionalAttributes {
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.641+01:00", comments="Source field: additional_attributes.id")
+    private Long id;
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.641+01:00", comments="Source field: additional_attributes.entity_type")
+    private String entityType;
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.641+01:00", comments="Source field: additional_attributes.entity_id")
+    private Long entityId;
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.641+01:00", comments="Source field: additional_attributes.name")
+    private String name;
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.641+01:00", comments="Source field: additional_attributes.value")
+    private String value;
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.637+01:00", comments="Source Table: additional_attributes")
+    public AdditionalAttributes(Long id, String entityType, Long entityId, String name, String value) {
+        this.id = id;
+        this.entityType = entityType;
+        this.entityId = entityId;
+        this.name = name;
+        this.value = value;
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.641+01:00", comments="Source field: additional_attributes.id")
+    public Long getId() {
+        return id;
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.641+01:00", comments="Source field: additional_attributes.entity_type")
+    public String getEntityType() {
+        return entityType;
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.641+01:00", comments="Source field: additional_attributes.entity_id")
+    public Long getEntityId() {
+        return entityId;
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.641+01:00", comments="Source field: additional_attributes.name")
+    public String getName() {
+        return name;
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.641+01:00", comments="Source field: additional_attributes.value")
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table additional_attributes
+     *
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", entityType=").append(entityType);
+        sb.append(", entityId=").append(entityId);
+        sb.append(", name=").append(name);
+        sb.append(", value=").append(value);
+        sb.append("]");
+        return sb.toString();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table additional_attributes
+     *
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
+     */
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        AdditionalAttributes other = (AdditionalAttributes) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getEntityType() == null ? other.getEntityType() == null : this.getEntityType().equals(other.getEntityType()))
+            && (this.getEntityId() == null ? other.getEntityId() == null : this.getEntityId().equals(other.getEntityId()))
+            && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
+            && (this.getValue() == null ? other.getValue() == null : this.getValue().equals(other.getValue()));
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table additional_attributes
+     *
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
+     */
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getEntityType() == null) ? 0 : getEntityType().hashCode());
+        result = prime * result + ((getEntityId() == null) ? 0 : getEntityId().hashCode());
+        result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
+        result = prime * result + ((getValue() == null) ? 0 : getValue().hashCode());
+        return result;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java
index 163d5df5..eb094fbe 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java
@@ -3,31 +3,31 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class ClientConnectionRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.585+01:00", comments="Source field: client_connection.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.586+01:00", comments="Source field: client_connection.exam_id")
     private Long examId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.status")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.586+01:00", comments="Source field: client_connection.status")
     private String status;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.connection_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.586+01:00", comments="Source field: client_connection.connection_token")
     private String connectionToken;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.user_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.586+01:00", comments="Source field: client_connection.user_name")
     private String userName;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.vdi")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.586+01:00", comments="Source field: client_connection.vdi")
     private Boolean vdi;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.client_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.586+01:00", comments="Source field: client_connection.client_address")
     private String clientAddress;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.virtual_client_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.586+01:00", comments="Source field: client_connection.virtual_client_address")
     private String virtualClientAddress;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.585+01:00", comments="Source Table: client_connection")
     public ClientConnectionRecord(Long id, Long examId, String status, String connectionToken, String userName, Boolean vdi, String clientAddress, String virtualClientAddress) {
         this.id = id;
         this.examId = examId;
@@ -39,42 +39,42 @@ public class ClientConnectionRecord {
         this.virtualClientAddress = virtualClientAddress;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.586+01:00", comments="Source field: client_connection.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.586+01:00", comments="Source field: client_connection.exam_id")
     public Long getExamId() {
         return examId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.status")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.586+01:00", comments="Source field: client_connection.status")
     public String getStatus() {
         return status;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.connection_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.586+01:00", comments="Source field: client_connection.connection_token")
     public String getConnectionToken() {
         return connectionToken;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.user_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.586+01:00", comments="Source field: client_connection.user_name")
     public String getUserName() {
         return userName;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.vdi")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.586+01:00", comments="Source field: client_connection.vdi")
     public Boolean getVdi() {
         return vdi;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.client_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.586+01:00", comments="Source field: client_connection.client_address")
     public String getClientAddress() {
         return clientAddress;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_connection.virtual_client_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.586+01:00", comments="Source field: client_connection.virtual_client_address")
     public String getVirtualClientAddress() {
         return virtualClientAddress;
     }
@@ -83,7 +83,7 @@ public class ClientConnectionRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table client_connection
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public String toString() {
@@ -107,7 +107,7 @@ public class ClientConnectionRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table client_connection
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -135,7 +135,7 @@ public class ClientConnectionRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table client_connection
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java
index 713b2746..bdef1064 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java
@@ -4,28 +4,28 @@ import java.math.BigDecimal;
 import javax.annotation.Generated;
 
 public class ClientEventRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.592+01:00", comments="Source field: client_event.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.connection_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.592+01:00", comments="Source field: client_event.connection_id")
     private Long connectionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.user_identifier")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.592+01:00", comments="Source field: client_event.user_identifier")
     private String userIdentifier;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.592+01:00", comments="Source field: client_event.type")
     private Integer type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.timestamp")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.593+01:00", comments="Source field: client_event.timestamp")
     private Long timestamp;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.numeric_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.593+01:00", comments="Source field: client_event.numeric_value")
     private BigDecimal numericValue;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.text")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.593+01:00", comments="Source field: client_event.text")
     private String text;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.592+01:00", comments="Source Table: client_event")
     public ClientEventRecord(Long id, Long connectionId, String userIdentifier, Integer type, Long timestamp, BigDecimal numericValue, String text) {
         this.id = id;
         this.connectionId = connectionId;
@@ -36,37 +36,37 @@ public class ClientEventRecord {
         this.text = text;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.592+01:00", comments="Source field: client_event.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.connection_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.592+01:00", comments="Source field: client_event.connection_id")
     public Long getConnectionId() {
         return connectionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.user_identifier")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.592+01:00", comments="Source field: client_event.user_identifier")
     public String getUserIdentifier() {
         return userIdentifier;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.593+01:00", comments="Source field: client_event.type")
     public Integer getType() {
         return type;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.timestamp")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.593+01:00", comments="Source field: client_event.timestamp")
     public Long getTimestamp() {
         return timestamp;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.numeric_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.593+01:00", comments="Source field: client_event.numeric_value")
     public BigDecimal getNumericValue() {
         return numericValue;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: client_event.text")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.593+01:00", comments="Source field: client_event.text")
     public String getText() {
         return text;
     }
@@ -75,7 +75,7 @@ public class ClientEventRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table client_event
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public String toString() {
@@ -98,7 +98,7 @@ public class ClientEventRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table client_event
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -125,7 +125,7 @@ public class ClientEventRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table client_event
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java
index 049ae68c..e4fc9e53 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java
@@ -3,31 +3,31 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class ConfigurationAttributeRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.303+01:00", comments="Source field: configuration_attribute.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.301+01:00", comments="Source field: configuration_attribute.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.303+01:00", comments="Source field: configuration_attribute.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.302+01:00", comments="Source field: configuration_attribute.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.303+01:00", comments="Source field: configuration_attribute.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.302+01:00", comments="Source field: configuration_attribute.type")
     private String type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.303+01:00", comments="Source field: configuration_attribute.parent_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.304+01:00", comments="Source field: configuration_attribute.parent_id")
     private Long parentId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.303+01:00", comments="Source field: configuration_attribute.resources")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.304+01:00", comments="Source field: configuration_attribute.resources")
     private String resources;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.303+01:00", comments="Source field: configuration_attribute.validator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.304+01:00", comments="Source field: configuration_attribute.validator")
     private String validator;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.303+01:00", comments="Source field: configuration_attribute.dependencies")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.304+01:00", comments="Source field: configuration_attribute.dependencies")
     private String dependencies;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.303+01:00", comments="Source field: configuration_attribute.default_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.304+01:00", comments="Source field: configuration_attribute.default_value")
     private String defaultValue;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.303+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.294+01:00", comments="Source Table: configuration_attribute")
     public ConfigurationAttributeRecord(Long id, String name, String type, Long parentId, String resources, String validator, String dependencies, String defaultValue) {
         this.id = id;
         this.name = name;
@@ -39,42 +39,42 @@ public class ConfigurationAttributeRecord {
         this.defaultValue = defaultValue;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.303+01:00", comments="Source field: configuration_attribute.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.302+01:00", comments="Source field: configuration_attribute.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.303+01:00", comments="Source field: configuration_attribute.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.302+01:00", comments="Source field: configuration_attribute.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.303+01:00", comments="Source field: configuration_attribute.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.302+01:00", comments="Source field: configuration_attribute.type")
     public String getType() {
         return type;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.303+01:00", comments="Source field: configuration_attribute.parent_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.304+01:00", comments="Source field: configuration_attribute.parent_id")
     public Long getParentId() {
         return parentId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.303+01:00", comments="Source field: configuration_attribute.resources")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.304+01:00", comments="Source field: configuration_attribute.resources")
     public String getResources() {
         return resources;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.303+01:00", comments="Source field: configuration_attribute.validator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.304+01:00", comments="Source field: configuration_attribute.validator")
     public String getValidator() {
         return validator;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.303+01:00", comments="Source field: configuration_attribute.dependencies")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.304+01:00", comments="Source field: configuration_attribute.dependencies")
     public String getDependencies() {
         return dependencies;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.303+01:00", comments="Source field: configuration_attribute.default_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.305+01:00", comments="Source field: configuration_attribute.default_value")
     public String getDefaultValue() {
         return defaultValue;
     }
@@ -83,7 +83,7 @@ public class ConfigurationAttributeRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration_attribute
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public String toString() {
@@ -107,7 +107,7 @@ public class ConfigurationAttributeRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration_attribute
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -135,7 +135,7 @@ public class ConfigurationAttributeRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration_attribute
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java
index 1daef315..ed8e1011 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java
@@ -3,31 +3,31 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class ConfigurationNodeRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration_node.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.546+01:00", comments="Source field: configuration_node.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration_node.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.546+01:00", comments="Source field: configuration_node.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.owner")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.547+01:00", comments="Source field: configuration_node.owner")
     private String owner;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.547+01:00", comments="Source field: configuration_node.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.description")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.547+01:00", comments="Source field: configuration_node.description")
     private String description;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.547+01:00", comments="Source field: configuration_node.type")
     private String type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.template")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.547+01:00", comments="Source field: configuration_node.template")
     private String template;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.547+01:00", comments="Source field: configuration_node.active")
     private Integer active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.546+01:00", comments="Source Table: configuration_node")
     public ConfigurationNodeRecord(Long id, Long institutionId, String owner, String name, String description, String type, String template, Integer active) {
         this.id = id;
         this.institutionId = institutionId;
@@ -39,42 +39,42 @@ public class ConfigurationNodeRecord {
         this.active = active;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration_node.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.546+01:00", comments="Source field: configuration_node.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration_node.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.547+01:00", comments="Source field: configuration_node.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.owner")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.547+01:00", comments="Source field: configuration_node.owner")
     public String getOwner() {
         return owner;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.547+01:00", comments="Source field: configuration_node.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.description")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.547+01:00", comments="Source field: configuration_node.description")
     public String getDescription() {
         return description;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.547+01:00", comments="Source field: configuration_node.type")
     public String getType() {
         return type;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.template")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.547+01:00", comments="Source field: configuration_node.template")
     public String getTemplate() {
         return template;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: configuration_node.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.547+01:00", comments="Source field: configuration_node.active")
     public Integer getActive() {
         return active;
     }
@@ -83,7 +83,7 @@ public class ConfigurationNodeRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration_node
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public String toString() {
@@ -107,7 +107,7 @@ public class ConfigurationNodeRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration_node
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -135,7 +135,7 @@ public class ConfigurationNodeRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration_node
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java
index ae648fb4..0a1d54cf 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java
@@ -4,22 +4,22 @@ import javax.annotation.Generated;
 import org.joda.time.DateTime;
 
 public class ConfigurationRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.540+01:00", comments="Source field: configuration.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration.configuration_node_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.541+01:00", comments="Source field: configuration.configuration_node_id")
     private Long configurationNodeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration.version")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.541+01:00", comments="Source field: configuration.version")
     private String version;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration.version_date")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.541+01:00", comments="Source field: configuration.version_date")
     private DateTime versionDate;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration.followup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.542+01:00", comments="Source field: configuration.followup")
     private Integer followup;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.540+01:00", comments="Source Table: configuration")
     public ConfigurationRecord(Long id, Long configurationNodeId, String version, DateTime versionDate, Integer followup) {
         this.id = id;
         this.configurationNodeId = configurationNodeId;
@@ -28,27 +28,27 @@ public class ConfigurationRecord {
         this.followup = followup;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.540+01:00", comments="Source field: configuration.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration.configuration_node_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.541+01:00", comments="Source field: configuration.configuration_node_id")
     public Long getConfigurationNodeId() {
         return configurationNodeId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration.version")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.541+01:00", comments="Source field: configuration.version")
     public String getVersion() {
         return version;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration.version_date")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.542+01:00", comments="Source field: configuration.version_date")
     public DateTime getVersionDate() {
         return versionDate;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration.followup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.542+01:00", comments="Source field: configuration.followup")
     public Integer getFollowup() {
         return followup;
     }
@@ -57,7 +57,7 @@ public class ConfigurationRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public String toString() {
@@ -78,7 +78,7 @@ public class ConfigurationRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -103,7 +103,7 @@ public class ConfigurationRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java
index bee00ad1..0bdb4ae5 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java
@@ -3,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class ConfigurationValueRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.490+01:00", comments="Source field: configuration_value.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.518+01:00", comments="Source field: configuration_value.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.490+01:00", comments="Source field: configuration_value.configuration_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.518+01:00", comments="Source field: configuration_value.configuration_id")
     private Long configurationId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.490+01:00", comments="Source field: configuration_value.configuration_attribute_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.518+01:00", comments="Source field: configuration_value.configuration_attribute_id")
     private Long configurationAttributeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration_value.list_index")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.518+01:00", comments="Source field: configuration_value.list_index")
     private Integer listIndex;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration_value.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.518+01:00", comments="Source field: configuration_value.value")
     private String value;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration_value.text")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.523+01:00", comments="Source field: configuration_value.text")
     private String text;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.490+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.518+01:00", comments="Source Table: configuration_value")
     public ConfigurationValueRecord(Long id, Long configurationId, Long configurationAttributeId, Integer listIndex, String value, String text) {
         this.id = id;
         this.configurationId = configurationId;
@@ -31,32 +31,32 @@ public class ConfigurationValueRecord {
         this.text = text;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.490+01:00", comments="Source field: configuration_value.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.518+01:00", comments="Source field: configuration_value.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.490+01:00", comments="Source field: configuration_value.configuration_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.518+01:00", comments="Source field: configuration_value.configuration_id")
     public Long getConfigurationId() {
         return configurationId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration_value.configuration_attribute_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.518+01:00", comments="Source field: configuration_value.configuration_attribute_id")
     public Long getConfigurationAttributeId() {
         return configurationAttributeId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration_value.list_index")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.518+01:00", comments="Source field: configuration_value.list_index")
     public Integer getListIndex() {
         return listIndex;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration_value.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.523+01:00", comments="Source field: configuration_value.value")
     public String getValue() {
         return value;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: configuration_value.text")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.524+01:00", comments="Source field: configuration_value.text")
     public String getText() {
         return text;
     }
@@ -65,7 +65,7 @@ public class ConfigurationValueRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration_value
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public String toString() {
@@ -87,7 +87,7 @@ public class ConfigurationValueRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration_value
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -113,7 +113,7 @@ public class ConfigurationValueRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration_value
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java
index 32985f11..d9df28bc 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java
@@ -3,19 +3,19 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class ExamConfigurationMapRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam_configuration_map.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.554+01:00", comments="Source field: exam_configuration_map.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam_configuration_map.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.554+01:00", comments="Source field: exam_configuration_map.exam_id")
     private Long examId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam_configuration_map.configuration_node_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.554+01:00", comments="Source field: exam_configuration_map.configuration_node_id")
     private Long configurationNodeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam_configuration_map.user_names")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.554+01:00", comments="Source field: exam_configuration_map.user_names")
     private String userNames;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.554+01:00", comments="Source Table: exam_configuration_map")
     public ExamConfigurationMapRecord(Long id, Long examId, Long configurationNodeId, String userNames) {
         this.id = id;
         this.examId = examId;
@@ -23,22 +23,22 @@ public class ExamConfigurationMapRecord {
         this.userNames = userNames;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam_configuration_map.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.554+01:00", comments="Source field: exam_configuration_map.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam_configuration_map.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.554+01:00", comments="Source field: exam_configuration_map.exam_id")
     public Long getExamId() {
         return examId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam_configuration_map.configuration_node_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.554+01:00", comments="Source field: exam_configuration_map.configuration_node_id")
     public Long getConfigurationNodeId() {
         return configurationNodeId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam_configuration_map.user_names")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.555+01:00", comments="Source field: exam_configuration_map.user_names")
     public String getUserNames() {
         return userNames;
     }
@@ -47,7 +47,7 @@ public class ExamConfigurationMapRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table exam_configuration_map
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public String toString() {
@@ -67,7 +67,7 @@ public class ExamConfigurationMapRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table exam_configuration_map
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -91,7 +91,7 @@ public class ExamConfigurationMapRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table exam_configuration_map
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java
index 52fa63a0..822700e1 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java
@@ -3,35 +3,38 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class ExamRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.574+01:00", comments="Source field: exam.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.574+01:00", comments="Source field: exam.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.lms_setup_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.574+01:00", comments="Source field: exam.lms_setup_id")
     private Long lmsSetupId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.external_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.575+01:00", comments="Source field: exam.external_id")
     private String externalId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.owner")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.575+01:00", comments="Source field: exam.owner")
     private String owner;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.supporter")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.575+01:00", comments="Source field: exam.supporter")
     private String supporter;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.575+01:00", comments="Source field: exam.type")
     private String type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.status")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.575+01:00", comments="Source field: exam.status")
     private String status;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.576+01:00", comments="Source field: exam.quit_password")
+    private String quitPassword;
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.576+01:00", comments="Source field: exam.active")
     private Integer active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source Table: exam")
-    public ExamRecord(Long id, Long institutionId, Long lmsSetupId, String externalId, String owner, String supporter, String type, String status, Integer active) {
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.574+01:00", comments="Source Table: exam")
+    public ExamRecord(Long id, Long institutionId, Long lmsSetupId, String externalId, String owner, String supporter, String type, String status, String quitPassword, Integer active) {
         this.id = id;
         this.institutionId = institutionId;
         this.lmsSetupId = lmsSetupId;
@@ -40,50 +43,56 @@ public class ExamRecord {
         this.supporter = supporter;
         this.type = type;
         this.status = status;
+        this.quitPassword = quitPassword;
         this.active = active;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.574+01:00", comments="Source field: exam.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.574+01:00", comments="Source field: exam.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.lms_setup_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.575+01:00", comments="Source field: exam.lms_setup_id")
     public Long getLmsSetupId() {
         return lmsSetupId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.external_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.575+01:00", comments="Source field: exam.external_id")
     public String getExternalId() {
         return externalId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.owner")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.575+01:00", comments="Source field: exam.owner")
     public String getOwner() {
         return owner;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.supporter")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.575+01:00", comments="Source field: exam.supporter")
     public String getSupporter() {
         return supporter;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.575+01:00", comments="Source field: exam.type")
     public String getType() {
         return type;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.status")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.575+01:00", comments="Source field: exam.status")
     public String getStatus() {
         return status;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.521+01:00", comments="Source field: exam.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.576+01:00", comments="Source field: exam.quit_password")
+    public String getQuitPassword() {
+        return quitPassword;
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.576+01:00", comments="Source field: exam.active")
     public Integer getActive() {
         return active;
     }
@@ -92,7 +101,7 @@ public class ExamRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table exam
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public String toString() {
@@ -108,6 +117,7 @@ public class ExamRecord {
         sb.append(", supporter=").append(supporter);
         sb.append(", type=").append(type);
         sb.append(", status=").append(status);
+        sb.append(", quitPassword=").append(quitPassword);
         sb.append(", active=").append(active);
         sb.append("]");
         return sb.toString();
@@ -117,7 +127,7 @@ public class ExamRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table exam
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -139,6 +149,7 @@ public class ExamRecord {
             && (this.getSupporter() == null ? other.getSupporter() == null : this.getSupporter().equals(other.getSupporter()))
             && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
             && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+            && (this.getQuitPassword() == null ? other.getQuitPassword() == null : this.getQuitPassword().equals(other.getQuitPassword()))
             && (this.getActive() == null ? other.getActive() == null : this.getActive().equals(other.getActive()));
     }
 
@@ -146,7 +157,7 @@ public class ExamRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table exam
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public int hashCode() {
@@ -160,6 +171,7 @@ public class ExamRecord {
         result = prime * result + ((getSupporter() == null) ? 0 : getSupporter().hashCode());
         result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
         result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        result = prime * result + ((getQuitPassword() == null) ? 0 : getQuitPassword().hashCode());
         result = prime * result + ((getActive() == null) ? 0 : getActive().hashCode());
         return result;
     }
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java
index 7c91acc8..d5f0df53 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java
@@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class IndicatorRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: indicator.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.600+01:00", comments="Source field: indicator.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: indicator.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.600+01:00", comments="Source field: indicator.exam_id")
     private Long examId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: indicator.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.600+01:00", comments="Source field: indicator.type")
     private String type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: indicator.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.600+01:00", comments="Source field: indicator.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: indicator.color")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.600+01:00", comments="Source field: indicator.color")
     private String color;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.600+01:00", comments="Source Table: indicator")
     public IndicatorRecord(Long id, Long examId, String type, String name, String color) {
         this.id = id;
         this.examId = examId;
@@ -27,27 +27,27 @@ public class IndicatorRecord {
         this.color = color;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: indicator.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.600+01:00", comments="Source field: indicator.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: indicator.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.600+01:00", comments="Source field: indicator.exam_id")
     public Long getExamId() {
         return examId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: indicator.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.600+01:00", comments="Source field: indicator.type")
     public String getType() {
         return type;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: indicator.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.600+01:00", comments="Source field: indicator.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: indicator.color")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.600+01:00", comments="Source field: indicator.color")
     public String getColor() {
         return color;
     }
@@ -56,7 +56,7 @@ public class IndicatorRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table indicator
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public String toString() {
@@ -77,7 +77,7 @@ public class IndicatorRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table indicator
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -102,7 +102,7 @@ public class IndicatorRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table indicator
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java
index 7e276335..41f05654 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java
@@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class InstitutionRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: institution.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.607+01:00", comments="Source field: institution.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: institution.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.607+01:00", comments="Source field: institution.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: institution.url_suffix")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.607+01:00", comments="Source field: institution.url_suffix")
     private String urlSuffix;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: institution.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.607+01:00", comments="Source field: institution.active")
     private Integer active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: institution.logo_image")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.607+01:00", comments="Source field: institution.logo_image")
     private String logoImage;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.607+01:00", comments="Source Table: institution")
     public InstitutionRecord(Long id, String name, String urlSuffix, Integer active, String logoImage) {
         this.id = id;
         this.name = name;
@@ -27,27 +27,27 @@ public class InstitutionRecord {
         this.logoImage = logoImage;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: institution.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.607+01:00", comments="Source field: institution.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: institution.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.607+01:00", comments="Source field: institution.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: institution.url_suffix")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.607+01:00", comments="Source field: institution.url_suffix")
     public String getUrlSuffix() {
         return urlSuffix;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: institution.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.607+01:00", comments="Source field: institution.active")
     public Integer getActive() {
         return active;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: institution.logo_image")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.608+01:00", comments="Source field: institution.logo_image")
     public String getLogoImage() {
         return logoImage;
     }
@@ -56,7 +56,7 @@ public class InstitutionRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table institution
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public String toString() {
@@ -77,7 +77,7 @@ public class InstitutionRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table institution
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -102,7 +102,7 @@ public class InstitutionRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table institution
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java
index f3b040a4..1d235b33 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java
@@ -3,40 +3,40 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class LmsSetupRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.613+01:00", comments="Source field: lms_setup.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.613+01:00", comments="Source field: lms_setup.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.613+01:00", comments="Source field: lms_setup.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.lms_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.613+01:00", comments="Source field: lms_setup.lms_type")
     private String lmsType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.lms_url")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.613+01:00", comments="Source field: lms_setup.lms_url")
     private String lmsUrl;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.lms_clientname")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.614+01:00", comments="Source field: lms_setup.lms_clientname")
     private String lmsClientname;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.lms_clientsecret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.614+01:00", comments="Source field: lms_setup.lms_clientsecret")
     private String lmsClientsecret;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.lms_rest_api_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.614+01:00", comments="Source field: lms_setup.lms_rest_api_token")
     private String lmsRestApiToken;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.seb_clientname")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.614+01:00", comments="Source field: lms_setup.seb_clientname")
     private String sebClientname;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.seb_clientsecret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.614+01:00", comments="Source field: lms_setup.seb_clientsecret")
     private String sebClientsecret;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.614+01:00", comments="Source field: lms_setup.active")
     private Integer active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.613+01:00", comments="Source Table: lms_setup")
     public LmsSetupRecord(Long id, Long institutionId, String name, String lmsType, String lmsUrl, String lmsClientname, String lmsClientsecret, String lmsRestApiToken, String sebClientname, String sebClientsecret, Integer active) {
         this.id = id;
         this.institutionId = institutionId;
@@ -51,57 +51,57 @@ public class LmsSetupRecord {
         this.active = active;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.613+01:00", comments="Source field: lms_setup.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.613+01:00", comments="Source field: lms_setup.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.613+01:00", comments="Source field: lms_setup.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.lms_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.613+01:00", comments="Source field: lms_setup.lms_type")
     public String getLmsType() {
         return lmsType;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.lms_url")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.613+01:00", comments="Source field: lms_setup.lms_url")
     public String getLmsUrl() {
         return lmsUrl;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.lms_clientname")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.614+01:00", comments="Source field: lms_setup.lms_clientname")
     public String getLmsClientname() {
         return lmsClientname;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.lms_clientsecret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.614+01:00", comments="Source field: lms_setup.lms_clientsecret")
     public String getLmsClientsecret() {
         return lmsClientsecret;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.lms_rest_api_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.614+01:00", comments="Source field: lms_setup.lms_rest_api_token")
     public String getLmsRestApiToken() {
         return lmsRestApiToken;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.seb_clientname")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.614+01:00", comments="Source field: lms_setup.seb_clientname")
     public String getSebClientname() {
         return sebClientname;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.seb_clientsecret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.614+01:00", comments="Source field: lms_setup.seb_clientsecret")
     public String getSebClientsecret() {
         return sebClientsecret;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.568+01:00", comments="Source field: lms_setup.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.614+01:00", comments="Source field: lms_setup.active")
     public Integer getActive() {
         return active;
     }
@@ -110,7 +110,7 @@ public class LmsSetupRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table lms_setup
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public String toString() {
@@ -137,7 +137,7 @@ public class LmsSetupRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table lms_setup
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -168,7 +168,7 @@ public class LmsSetupRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table lms_setup
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java
index 4deace15..4c054220 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java
@@ -3,34 +3,34 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class OrientationRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.530+01:00", comments="Source field: orientation.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.config_attribute_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.530+01:00", comments="Source field: orientation.config_attribute_id")
     private Long configAttributeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.template")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.531+01:00", comments="Source field: orientation.template")
     private String template;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.531+01:00", comments="Source field: orientation.view")
     private String view;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.group")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.531+01:00", comments="Source field: orientation.group")
     private String group;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.x_position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.531+01:00", comments="Source field: orientation.x_position")
     private Integer xPosition;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.y_position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.531+01:00", comments="Source field: orientation.y_position")
     private Integer yPosition;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.width")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.531+01:00", comments="Source field: orientation.width")
     private Integer width;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.height")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.532+01:00", comments="Source field: orientation.height")
     private Integer height;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.530+01:00", comments="Source Table: orientation")
     public OrientationRecord(Long id, Long configAttributeId, String template, String view, String group, Integer xPosition, Integer yPosition, Integer width, Integer height) {
         this.id = id;
         this.configAttributeId = configAttributeId;
@@ -43,47 +43,47 @@ public class OrientationRecord {
         this.height = height;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.530+01:00", comments="Source field: orientation.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.config_attribute_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.530+01:00", comments="Source field: orientation.config_attribute_id")
     public Long getConfigAttributeId() {
         return configAttributeId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.template")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.531+01:00", comments="Source field: orientation.template")
     public String getTemplate() {
         return template;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.531+01:00", comments="Source field: orientation.view")
     public String getView() {
         return view;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.group")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.531+01:00", comments="Source field: orientation.group")
     public String getGroup() {
         return group;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.x_position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.531+01:00", comments="Source field: orientation.x_position")
     public Integer getxPosition() {
         return xPosition;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.y_position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.531+01:00", comments="Source field: orientation.y_position")
     public Integer getyPosition() {
         return yPosition;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.width")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.532+01:00", comments="Source field: orientation.width")
     public Integer getWidth() {
         return width;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.506+01:00", comments="Source field: orientation.height")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.532+01:00", comments="Source field: orientation.height")
     public Integer getHeight() {
         return height;
     }
@@ -92,7 +92,7 @@ public class OrientationRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table orientation
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public String toString() {
@@ -117,7 +117,7 @@ public class OrientationRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table orientation
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -146,7 +146,7 @@ public class OrientationRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table orientation
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java
index 80c79006..d804aed2 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java
@@ -3,33 +3,33 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class RoleRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_role.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.626+01:00", comments="Source field: user_role.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_role.user_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.626+01:00", comments="Source field: user_role.user_id")
     private Long userId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_role.role_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.626+01:00", comments="Source field: user_role.role_name")
     private String roleName;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.626+01:00", comments="Source Table: user_role")
     public RoleRecord(Long id, Long userId, String roleName) {
         this.id = id;
         this.userId = userId;
         this.roleName = roleName;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_role.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.626+01:00", comments="Source field: user_role.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_role.user_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.626+01:00", comments="Source field: user_role.user_id")
     public Long getUserId() {
         return userId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_role.role_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.626+01:00", comments="Source field: user_role.role_name")
     public String getRoleName() {
         return roleName;
     }
@@ -38,7 +38,7 @@ public class RoleRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user_role
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public String toString() {
@@ -57,7 +57,7 @@ public class RoleRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user_role
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -80,7 +80,7 @@ public class RoleRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user_role
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java
index 5496f311..eb6921c0 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java
@@ -4,19 +4,19 @@ import java.math.BigDecimal;
 import javax.annotation.Generated;
 
 public class ThresholdRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: threshold.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.604+01:00", comments="Source field: threshold.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: threshold.indicator_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.604+01:00", comments="Source field: threshold.indicator_id")
     private Long indicatorId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: threshold.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.604+01:00", comments="Source field: threshold.value")
     private BigDecimal value;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: threshold.color")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.605+01:00", comments="Source field: threshold.color")
     private String color;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.604+01:00", comments="Source Table: threshold")
     public ThresholdRecord(Long id, Long indicatorId, BigDecimal value, String color) {
         this.id = id;
         this.indicatorId = indicatorId;
@@ -24,22 +24,22 @@ public class ThresholdRecord {
         this.color = color;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: threshold.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.604+01:00", comments="Source field: threshold.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: threshold.indicator_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.604+01:00", comments="Source field: threshold.indicator_id")
     public Long getIndicatorId() {
         return indicatorId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: threshold.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.605+01:00", comments="Source field: threshold.value")
     public BigDecimal getValue() {
         return value;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.537+01:00", comments="Source field: threshold.color")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.605+01:00", comments="Source field: threshold.color")
     public String getColor() {
         return color;
     }
@@ -48,7 +48,7 @@ public class ThresholdRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table threshold
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public String toString() {
@@ -68,7 +68,7 @@ public class ThresholdRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table threshold
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -92,7 +92,7 @@ public class ThresholdRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table threshold
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java
index 3afcefde..d03e777c 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java
@@ -3,28 +3,28 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class UserActivityLogRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_activity_log.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.630+01:00", comments="Source field: user_activity_log.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_activity_log.user_uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.630+01:00", comments="Source field: user_activity_log.user_uuid")
     private String userUuid;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_activity_log.timestamp")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.630+01:00", comments="Source field: user_activity_log.timestamp")
     private Long timestamp;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_activity_log.activity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.630+01:00", comments="Source field: user_activity_log.activity_type")
     private String activityType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_activity_log.entity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.631+01:00", comments="Source field: user_activity_log.entity_type")
     private String entityType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_activity_log.entity_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.631+01:00", comments="Source field: user_activity_log.entity_id")
     private String entityId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_activity_log.message")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.631+01:00", comments="Source field: user_activity_log.message")
     private String message;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.630+01:00", comments="Source Table: user_activity_log")
     public UserActivityLogRecord(Long id, String userUuid, Long timestamp, String activityType, String entityType, String entityId, String message) {
         this.id = id;
         this.userUuid = userUuid;
@@ -35,37 +35,37 @@ public class UserActivityLogRecord {
         this.message = message;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_activity_log.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.630+01:00", comments="Source field: user_activity_log.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_activity_log.user_uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.630+01:00", comments="Source field: user_activity_log.user_uuid")
     public String getUserUuid() {
         return userUuid;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_activity_log.timestamp")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.630+01:00", comments="Source field: user_activity_log.timestamp")
     public Long getTimestamp() {
         return timestamp;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_activity_log.activity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.631+01:00", comments="Source field: user_activity_log.activity_type")
     public String getActivityType() {
         return activityType;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_activity_log.entity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.631+01:00", comments="Source field: user_activity_log.entity_type")
     public String getEntityType() {
         return entityType;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_activity_log.entity_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.631+01:00", comments="Source field: user_activity_log.entity_id")
     public String getEntityId() {
         return entityId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user_activity_log.message")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.631+01:00", comments="Source field: user_activity_log.message")
     public String getMessage() {
         return message;
     }
@@ -74,7 +74,7 @@ public class UserActivityLogRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user_activity_log
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public String toString() {
@@ -97,7 +97,7 @@ public class UserActivityLogRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user_activity_log
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -124,7 +124,7 @@ public class UserActivityLogRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user_activity_log
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java
index a5cffe56..f2f2e61c 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java
@@ -3,37 +3,37 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class UserRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.619+01:00", comments="Source field: user.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.620+01:00", comments="Source field: user.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.620+01:00", comments="Source field: user.uuid")
     private String uuid;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.620+01:00", comments="Source field: user.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.username")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.620+01:00", comments="Source field: user.username")
     private String username;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.password")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.620+01:00", comments="Source field: user.password")
     private String password;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.email")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.620+01:00", comments="Source field: user.email")
     private String email;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.locale")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.621+01:00", comments="Source field: user.locale")
     private String locale;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.timezone")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.621+01:00", comments="Source field: user.timezone")
     private String timezone;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.621+01:00", comments="Source field: user.active")
     private Integer active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.619+01:00", comments="Source Table: user")
     public UserRecord(Long id, Long institutionId, String uuid, String name, String username, String password, String email, String locale, String timezone, Integer active) {
         this.id = id;
         this.institutionId = institutionId;
@@ -47,52 +47,52 @@ public class UserRecord {
         this.active = active;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.620+01:00", comments="Source field: user.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.620+01:00", comments="Source field: user.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.620+01:00", comments="Source field: user.uuid")
     public String getUuid() {
         return uuid;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.620+01:00", comments="Source field: user.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.username")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.620+01:00", comments="Source field: user.username")
     public String getUsername() {
         return username;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.password")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.620+01:00", comments="Source field: user.password")
     public String getPassword() {
         return password;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.email")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.621+01:00", comments="Source field: user.email")
     public String getEmail() {
         return email;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.locale")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.621+01:00", comments="Source field: user.locale")
     public String getLocale() {
         return locale;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.timezone")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.621+01:00", comments="Source field: user.timezone")
     public String getTimezone() {
         return timezone;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-24T13:19:09.584+01:00", comments="Source field: user.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2019-01-31T09:18:13.621+01:00", comments="Source field: user.active")
     public Integer getActive() {
         return active;
     }
@@ -101,7 +101,7 @@ public class UserRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public String toString() {
@@ -127,7 +127,7 @@ public class UserRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public boolean equals(Object that) {
@@ -157,7 +157,7 @@ public class UserRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Thu Jan 24 13:19:09 CET 2019
+     * @mbg.generated Thu Jan 31 09:18:13 CET 2019
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java
index 21a0b9b0..f7006f5b 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java
@@ -169,6 +169,7 @@ public class ExamDAOImpl implements ExamDAO {
                             : null,
                     (exam.type != null) ? exam.type.name() : null,
                     (exam.status != null) ? exam.status.name() : null,
+                    exam.quitPassword,
                     BooleanUtils.toIntegerObject(exam.active));
 
             this.examRecordMapper.updateByPrimaryKeySelective(examRecord);
@@ -204,6 +205,7 @@ public class ExamDAOImpl implements ExamDAO {
                     null,
                     null,
                     null,
+                    null,
                     BooleanUtils.toInteger(false));
 
             this.examRecordMapper.updateByPrimaryKeySelective(examRecord);
@@ -220,7 +222,7 @@ public class ExamDAOImpl implements ExamDAO {
 
             final List<Long> ids = extractPKsFromKeys(all);
             final ExamRecord examRecord = new ExamRecord(null, null, null, null, null,
-                    null, null, null, BooleanUtils.toInteger(active));
+                    null, null, null, null, BooleanUtils.toInteger(active));
 
             this.examRecordMapper.updateByExampleSelective(examRecord)
                     .where(ExamRecordDynamicSqlSupport.id, isIn(ids))
@@ -382,6 +384,7 @@ public class ExamDAOImpl implements ExamDAO {
                     quizData.endTime,
                     quizData.startURL,
                     ExamType.valueOf(record.getType()),
+                    record.getQuitPassword(),
                     record.getOwner(),
                     supporter,
                     BooleanUtils.toBooleanObject(record.getActive()));
diff --git a/src/main/resources/schema-dev.sql b/src/main/resources/schema-dev.sql
index 0514473e..adf67b49 100644
--- a/src/main/resources/schema-dev.sql
+++ b/src/main/resources/schema-dev.sql
@@ -1,11 +1,12 @@
--- -----------------------------------------------------
--- Schema SEBServerDemo
--- -----------------------------------------------------
 
 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0;
 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0;
 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL,ALLOW_INVALID_DATES';
 
+-- -----------------------------------------------------
+-- Schema SEBServerDemo
+-- -----------------------------------------------------
+
 -- -----------------------------------------------------
 -- Table `institution`
 -- -----------------------------------------------------
@@ -63,6 +64,7 @@ CREATE TABLE IF NOT EXISTS `exam` (
   `supporter` VARCHAR(4000) NULL COMMENT 'comma separated list of user_uuid',
   `type` VARCHAR(45) NOT NULL,
   `status` VARCHAR(45) NOT NULL,
+  `quit_password` VARCHAR(255) NULL,
   `active` INT(1) NOT NULL,
   PRIMARY KEY (`id`),
   INDEX `lms_setup_key_idx` (`lms_setup_id` ASC),
@@ -406,6 +408,21 @@ CREATE TABLE IF NOT EXISTS `user_activity_log` (
 ;
 
 
+-- -----------------------------------------------------
+-- Table `additional_attributes`
+-- -----------------------------------------------------
+DROP TABLE IF EXISTS `additional_attributes` ;
+
+CREATE TABLE IF NOT EXISTS `additional_attributes` (
+  `id` BIGINT UNSIGNED NOT NULL,
+  `entity_type` VARCHAR(45) NOT NULL,
+  `entity_id` BIGINT UNSIGNED NOT NULL,
+  `name` VARCHAR(255) NOT NULL,
+  `value` VARCHAR(4000) NULL,
+  PRIMARY KEY (`id`))
+;
+
+
 SET SQL_MODE=@OLD_SQL_MODE;
 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS;
-SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
\ No newline at end of file
+SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS;
diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/InstitutionAPITest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/InstitutionAPITest.java
index 708c9ffc..64b7aa4a 100644
--- a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/InstitutionAPITest.java
+++ b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/InstitutionAPITest.java
@@ -11,6 +11,7 @@ package ch.ethz.seb.sebserver.webservice.integration.api.admin;
 import static org.junit.Assert.*;
 
 import java.util.Collection;
+import java.util.List;
 
 import org.junit.Test;
 import org.springframework.http.HttpMethod;
@@ -80,16 +81,17 @@ public class InstitutionAPITest extends AdministrationAPIIntegrationTester {
         assertContainsInstitution("Institution1", institutions.content);
 
         // Institutional admin tries to get data from other institution
-        final APIMessage errorMessage = new RestAPITestHelper()
+        final List<APIMessage> errorMessage = new RestAPITestHelper()
                 .withAccessToken(getAdminInstitution1Access())
                 .withPath(SEBServerRestEndpoints.ENDPOINT_INSTITUTION)
                 .withAttribute("institutionId", "2") // try to hack
                 .withExpectedStatus(HttpStatus.FORBIDDEN)
-                .getAsObject(new TypeReference<APIMessage>() {
+                .getAsObject(new TypeReference<List<APIMessage>>() {
                 });
 
         assertNotNull(errorMessage);
-        assertEquals("1001", errorMessage.messageCode);
+        assertTrue(errorMessage.size() > 0);
+        assertEquals("1001", errorMessage.get(0).messageCode);
     }
 
     @Test
@@ -142,7 +144,7 @@ public class InstitutionAPITest extends AdministrationAPIIntegrationTester {
         assertEquals("new institution", institution.name);
 
         // an institutional admin should not be allowed to create a new institution
-        APIMessage errorMessage = new RestAPITestHelper()
+        List<APIMessage> errorMessage = new RestAPITestHelper()
                 .withAccessToken(getAdminInstitution1Access())
                 .withPath(SEBServerRestEndpoints.ENDPOINT_INSTITUTION)
                 .withMethod(HttpMethod.POST)
@@ -150,7 +152,7 @@ public class InstitutionAPITest extends AdministrationAPIIntegrationTester {
                 .withAttribute("urlSuffix", "new_inst")
                 .withAttribute("active", "false")
                 .withExpectedStatus(HttpStatus.FORBIDDEN)
-                .getAsObject(new TypeReference<APIMessage>() {
+                .getAsObject(new TypeReference<List<APIMessage>>() {
                 });
 
         // and name for institution must be unique
@@ -162,11 +164,12 @@ public class InstitutionAPITest extends AdministrationAPIIntegrationTester {
                 .withAttribute("urlSuffix", "new_inst")
                 .withAttribute("active", "false")
                 .withExpectedStatus(HttpStatus.BAD_REQUEST)
-                .getAsObject(new TypeReference<APIMessage>() {
+                .getAsObject(new TypeReference<List<APIMessage>>() {
                 });
 
         assertNotNull(errorMessage);
-        assertEquals("1010", errorMessage.messageCode);
+        assertTrue(errorMessage.size() > 0);
+        assertEquals("1010", errorMessage.get(0).messageCode);
 
         // and predefined id should be ignored
         institution = new RestAPITestHelper()
@@ -205,7 +208,8 @@ public class InstitutionAPITest extends AdministrationAPIIntegrationTester {
         // get
         institution = new RestAPITestHelper()
                 .withAccessToken(sebAdminAccess)
-                .withPath(SEBServerRestEndpoints.ENDPOINT_INSTITUTION).withPath("/").withPath(String.valueOf(institution.id))
+                .withPath(SEBServerRestEndpoints.ENDPOINT_INSTITUTION).withPath("/")
+                .withPath(String.valueOf(institution.id))
                 .withMethod(HttpMethod.GET)
                 .withExpectedStatus(HttpStatus.OK)
                 .getAsObject(new TypeReference<Institution>() {
@@ -219,7 +223,8 @@ public class InstitutionAPITest extends AdministrationAPIIntegrationTester {
         // modify
         institution = new RestAPITestHelper()
                 .withAccessToken(sebAdminAccess)
-                .withPath(SEBServerRestEndpoints.ENDPOINT_INSTITUTION).withPath("/").withPath(String.valueOf(institution.id))
+                .withPath(SEBServerRestEndpoints.ENDPOINT_INSTITUTION).withPath("/")
+                .withPath(String.valueOf(institution.id))
                 .withMethod(HttpMethod.PUT)
                 .withBodyJson(new Institution(null, "testInstitution", "testSuffix", null, null))
                 .withExpectedStatus(HttpStatus.OK)
@@ -250,7 +255,8 @@ public class InstitutionAPITest extends AdministrationAPIIntegrationTester {
         // get
         institution = new RestAPITestHelper()
                 .withAccessToken(sebAdminAccess)
-                .withPath(SEBServerRestEndpoints.ENDPOINT_INSTITUTION).withPath("/").withPath(String.valueOf(institution.id))
+                .withPath(SEBServerRestEndpoints.ENDPOINT_INSTITUTION).withPath("/")
+                .withPath(String.valueOf(institution.id))
                 .withMethod(HttpMethod.GET)
                 .withExpectedStatus(HttpStatus.OK)
                 .getAsObject(new TypeReference<Institution>() {
@@ -278,7 +284,8 @@ public class InstitutionAPITest extends AdministrationAPIIntegrationTester {
         // get
         institution = new RestAPITestHelper()
                 .withAccessToken(sebAdminAccess)
-                .withPath(SEBServerRestEndpoints.ENDPOINT_INSTITUTION).withPath("/").withPath(String.valueOf(institution.id))
+                .withPath(SEBServerRestEndpoints.ENDPOINT_INSTITUTION).withPath("/")
+                .withPath(String.valueOf(institution.id))
                 .withMethod(HttpMethod.GET)
                 .withExpectedStatus(HttpStatus.OK)
                 .getAsObject(new TypeReference<Institution>() {
@@ -305,16 +312,18 @@ public class InstitutionAPITest extends AdministrationAPIIntegrationTester {
                 report.toString());
 
         // get
-        final APIMessage error = new RestAPITestHelper()
+        final List<APIMessage> error = new RestAPITestHelper()
                 .withAccessToken(sebAdminAccess)
-                .withPath(SEBServerRestEndpoints.ENDPOINT_INSTITUTION).withPath("/").withPath(String.valueOf(institution.id))
+                .withPath(SEBServerRestEndpoints.ENDPOINT_INSTITUTION).withPath("/")
+                .withPath(String.valueOf(institution.id))
                 .withMethod(HttpMethod.GET)
                 .withExpectedStatus(HttpStatus.NOT_FOUND)
-                .getAsObject(new TypeReference<APIMessage>() {
+                .getAsObject(new TypeReference<List<APIMessage>>() {
                 });
 
         assertNotNull(error);
-        assertEquals("Resource INSTITUTION with ID: 4 not found", error.details);
+        assertTrue(error.size() > 0);
+        assertEquals("Resource INSTITUTION with ID: 4 not found", error.get(0).details);
     }
 
     static void assertContainsInstitution(final String name, final Collection<Institution> institutions) {
diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/UserAPITest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/UserAPITest.java
index e057e69b..00cbdf31 100644
--- a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/UserAPITest.java
+++ b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/UserAPITest.java
@@ -90,9 +90,10 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
     @Test
     public void getUserInfoWithUUID() throws Exception {
         final String sebAdminAccessToken = getSebAdminAccess();
-        String contentAsString = this.mockMvc.perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/user2")
-                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                .header("Authorization", "Bearer " + sebAdminAccessToken))
+        String contentAsString = this.mockMvc
+                .perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/user2")
+                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                        .header("Authorization", "Bearer " + sebAdminAccessToken))
                 .andExpect(status().isOk())
                 .andReturn().getResponse().getContentAsString();
 
@@ -109,17 +110,18 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
                 contentAsString);
 
         final String adminInstitution2AccessToken = getAdminInstitution2Access();
-        contentAsString = this.mockMvc.perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/user1")
-                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                .header("Authorization", "Bearer " + adminInstitution2AccessToken))
+        contentAsString = this.mockMvc
+                .perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/user1")
+                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                        .header("Authorization", "Bearer " + adminInstitution2AccessToken))
                 .andExpect(status().isForbidden())
                 .andReturn().getResponse().getContentAsString();
 
         assertEquals(
-                "{\"messageCode\":\"1001\","
+                "[{\"messageCode\":\"1001\","
                         + "\"systemMessage\":\"FORBIDDEN\","
                         + "\"details\":\"No grant: READ_ONLY on type: USER entity institution: 1 entity owner: user1 for user: user3\","
-                        + "\"attributes\":[]}",
+                        + "\"attributes\":[]}]",
                 contentAsString);
     }
 
@@ -225,9 +227,10 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
 
         final String token = getSebAdminAccess();
         final Page<UserInfo> userInfos = this.jsonMapper.readValue(
-                this.mockMvc.perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "?institutionId=2")
-                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                        .header("Authorization", "Bearer " + token))
+                this.mockMvc
+                        .perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "?institutionId=2")
+                                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                                .header("Authorization", "Bearer " + token))
                         .andExpect(status().isOk())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<Page<UserInfo>>() {
@@ -366,9 +369,11 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
     public void getAllUserInfoWithOnlyActive() throws Exception {
         final String token = getSebAdminAccess();
         final Page<UserInfo> userInfos = this.jsonMapper.readValue(
-                this.mockMvc.perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "?active=true&institutionId=2")
-                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                        .header("Authorization", "Bearer " + token))
+                this.mockMvc
+                        .perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT
+                                + "?active=true&institutionId=2")
+                                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                                        .header("Authorization", "Bearer " + token))
                         .andExpect(status().isOk())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<Page<UserInfo>>() {
@@ -399,9 +404,10 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
         // expecting one for institution 2
         userInfos = this.jsonMapper.readValue(
                 this.mockMvc
-                        .perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "?active=false&institutionId=2")
-                                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                                .header("Authorization", "Bearer " + token))
+                        .perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT
+                                + "?active=false&institutionId=2")
+                                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                                        .header("Authorization", "Bearer " + token))
                         .andExpect(status().isOk())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<Page<UserInfo>>() {
@@ -416,9 +422,10 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
     public void getAllUserInfoWithSearchUsernameLike() throws Exception {
         final String token = getSebAdminAccess();
         final Page<UserInfo> userInfos = this.jsonMapper.readValue(
-                this.mockMvc.perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "?username=exam")
-                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                        .header("Authorization", "Bearer " + token))
+                this.mockMvc
+                        .perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "?username=exam")
+                                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                                .header("Authorization", "Bearer " + token))
                         .andExpect(status().isOk())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<Page<UserInfo>>() {
@@ -461,9 +468,10 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
 
         // get newly created user and check equality
         final UserInfo createdUserGet = this.jsonMapper.readValue(
-                this.mockMvc.perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/" + createdUser.uuid)
-                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                        .header("Authorization", "Bearer " + token))
+                this.mockMvc.perform(
+                        get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/" + createdUser.uuid)
+                                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                                .header("Authorization", "Bearer " + token))
                         .andExpect(status().isOk())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<UserInfo>() {
@@ -586,10 +594,12 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
         final String modifyUserJson = this.jsonMapper.writeValueAsString(modifyUser);
 
         UserInfo modifiedUserResult = this.jsonMapper.readValue(
-                this.mockMvc.perform(put(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/" + user.getUuid())
-                        .header("Authorization", "Bearer " + token)
-                        .contentType(MediaType.APPLICATION_JSON_UTF8)
-                        .content(modifyUserJson))
+                this.mockMvc
+                        .perform(
+                                put(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/" + user.getUuid())
+                                        .header("Authorization", "Bearer " + token)
+                                        .contentType(MediaType.APPLICATION_JSON_UTF8)
+                                        .content(modifyUserJson))
                         .andExpect(status().isOk())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<UserInfo>() {
@@ -604,9 +614,11 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
 
         // double check by getting the user by UUID
         modifiedUserResult = this.jsonMapper.readValue(
-                this.mockMvc.perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/" + modifiedUserResult.uuid)
-                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                        .header("Authorization", "Bearer " + token))
+                this.mockMvc
+                        .perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/"
+                                + modifiedUserResult.uuid)
+                                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                                        .header("Authorization", "Bearer " + token))
                         .andExpect(status().isOk())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<UserInfo>() {
@@ -802,10 +814,11 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
         String modifiedUserJson = this.jsonMapper.writeValueAsString(modifiedUser);
 
         List<APIMessage> messages = this.jsonMapper.readValue(
-                this.mockMvc.perform(put(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/" + modifiedUser.uuid)
-                        .header("Authorization", "Bearer " + sebAdminToken)
-                        .contentType(MediaType.APPLICATION_JSON_UTF8)
-                        .content(modifiedUserJson))
+                this.mockMvc.perform(
+                        put(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/" + modifiedUser.uuid)
+                                .header("Authorization", "Bearer " + sebAdminToken)
+                                .contentType(MediaType.APPLICATION_JSON_UTF8)
+                                .content(modifiedUserJson))
                         .andExpect(status().isBadRequest())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<List<APIMessage>>() {
@@ -824,10 +837,11 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
         modifiedUserJson = this.jsonMapper.writeValueAsString(modifiedUser);
 
         messages = this.jsonMapper.readValue(
-                this.mockMvc.perform(put(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/" + modifiedUser.uuid)
-                        .header("Authorization", "Bearer " + sebAdminToken)
-                        .contentType(MediaType.APPLICATION_JSON_UTF8)
-                        .content(modifiedUserJson))
+                this.mockMvc.perform(
+                        put(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/" + modifiedUser.uuid)
+                                .header("Authorization", "Bearer " + sebAdminToken)
+                                .contentType(MediaType.APPLICATION_JSON_UTF8)
+                                .content(modifiedUserJson))
                         .andExpect(status().isBadRequest())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<List<APIMessage>>() {
@@ -851,9 +865,10 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
         // With SEB Administrator it should work
         final String sebAdminToken = getSebAdminAccess();
         final EntityProcessingReport report = this.jsonMapper.readValue(
-                this.mockMvc.perform(post(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/user4/inactive")
-                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                        .header("Authorization", "Bearer " + sebAdminToken))
+                this.mockMvc
+                        .perform(post(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/user4/inactive")
+                                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                                .header("Authorization", "Bearer " + sebAdminToken))
                         .andExpect(status().isOk())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<EntityProcessingReport>() {
@@ -868,9 +883,10 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
         // get user and check activity
         final EntityKey key = report.source.iterator().next();
         final UserInfo user = this.jsonMapper.readValue(
-                this.mockMvc.perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/" + key.modelId)
-                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                        .header("Authorization", "Bearer " + sebAdminToken))
+                this.mockMvc
+                        .perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/" + key.modelId)
+                                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                                .header("Authorization", "Bearer " + sebAdminToken))
                         .andExpect(status().isOk())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<UserInfo>() {
@@ -883,9 +899,10 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
         final Page<UserActivityLog> userLogs = this.jsonMapper.readValue(
                 this.mockMvc
                         .perform(
-                                get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACTIVITY_LOG + "/?user=user1&from=" + timeNow)
-                                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                                        .header("Authorization", "Bearer " + sebAdminToken))
+                                get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACTIVITY_LOG
+                                        + "/?user=user1&from=" + timeNow)
+                                                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                                                .header("Authorization", "Bearer " + sebAdminToken))
                         .andExpect(status().isOk())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<Page<UserActivityLog>>() {
@@ -911,9 +928,10 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
         // With SEB Administrator it should work
         final String sebAdminToken = getSebAdminAccess();
         final EntityProcessingReport report = this.jsonMapper.readValue(
-                this.mockMvc.perform(post(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/user6/active")
-                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                        .header("Authorization", "Bearer " + sebAdminToken))
+                this.mockMvc
+                        .perform(post(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/user6/active")
+                                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                                .header("Authorization", "Bearer " + sebAdminToken))
                         .andExpect(status().isOk())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<EntityProcessingReport>() {
@@ -928,9 +946,10 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
         // get user and check activity
         final EntityKey key = report.source.iterator().next();
         final UserInfo user = this.jsonMapper.readValue(
-                this.mockMvc.perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/" + key.modelId)
-                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                        .header("Authorization", "Bearer " + sebAdminToken))
+                this.mockMvc
+                        .perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/" + key.modelId)
+                                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                                .header("Authorization", "Bearer " + sebAdminToken))
                         .andExpect(status().isOk())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<UserInfo>() {
@@ -942,8 +961,9 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
         // check also user activity log
         final Page<UserActivityLog> userLogs = this.jsonMapper.readValue(
                 this.mockMvc
-                        .perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACTIVITY_LOG + "?user=user1&from=" + timeNow)
-                                .header("Authorization", "Bearer " + sebAdminToken))
+                        .perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACTIVITY_LOG
+                                + "?user=user1&from=" + timeNow)
+                                        .header("Authorization", "Bearer " + sebAdminToken))
                         .andExpect(status().isOk())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<Page<UserActivityLog>>() {
@@ -990,9 +1010,11 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
 
         // all active of institution 2
         usersPage = this.jsonMapper.readValue(
-                this.mockMvc.perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/all/active?institutionId=2")
-                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                        .header("Authorization", "Bearer " + sebAdminToken))
+                this.mockMvc
+                        .perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT
+                                + "/all/active?institutionId=2")
+                                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                                        .header("Authorization", "Bearer " + sebAdminToken))
                         .andExpect(status().isOk())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<Page<UserInfo>>() {
@@ -1005,9 +1027,10 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
         // all inactive of institution 2
         usersPage = this.jsonMapper.readValue(
                 this.mockMvc
-                        .perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/all/inactive?institutionId=2")
-                                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                                .header("Authorization", "Bearer " + sebAdminToken))
+                        .perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT
+                                + "/all/inactive?institutionId=2")
+                                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                                        .header("Authorization", "Bearer " + sebAdminToken))
                         .andExpect(status().isOk())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<Page<UserInfo>>() {
@@ -1026,9 +1049,10 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
         Collection<UserInfo> users = this.jsonMapper.readValue(
                 this.mockMvc
                         .perform(
-                                get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/list?ids=user1,user2,user6,user7")
-                                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                                        .header("Authorization", "Bearer " + sebAdminToken))
+                                get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT
+                                        + "/list?ids=user1,user2,user6,user7")
+                                                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                                                .header("Authorization", "Bearer " + sebAdminToken))
                         .andExpect(status().isOk())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<Collection<UserInfo>>() {
@@ -1043,9 +1067,10 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
         users = this.jsonMapper.readValue(
                 this.mockMvc
                         .perform(
-                                get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/list?ids=user1,user2,user6,user7")
-                                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                                        .header("Authorization", "Bearer " + instAdminToken))
+                                get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT
+                                        + "/list?ids=user1,user2,user6,user7")
+                                                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                                                .header("Authorization", "Bearer " + instAdminToken))
                         .andExpect(status().isOk())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<Collection<UserInfo>>() {
@@ -1099,9 +1124,10 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
         // for an institutional admin 2 only active
         names = this.jsonMapper.readValue(
                 this.mockMvc
-                        .perform(get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/names?active=true")
-                                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                                .header("Authorization", "Bearer " + instAdminToken))
+                        .perform(
+                                get(this.endpoint + SEBServerRestEndpoints.ENDPOINT_USER_ACCOUNT + "/names?active=true")
+                                        .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+                                        .header("Authorization", "Bearer " + instAdminToken))
                         .andExpect(status().isOk())
                         .andReturn().getResponse().getContentAsString(),
                 new TypeReference<Collection<EntityName>>() {
diff --git a/src/test/resources/schema-test.sql b/src/test/resources/schema-test.sql
index 9239652f..43f82ab8 100644
--- a/src/test/resources/schema-test.sql
+++ b/src/test/resources/schema-test.sql
@@ -1,3 +1,4 @@
+
 -- -----------------------------------------------------
 -- Schema SEBServerDemo
 -- -----------------------------------------------------
@@ -59,6 +60,7 @@ CREATE TABLE IF NOT EXISTS `exam` (
   `supporter` VARCHAR(4000) NULL COMMENT 'comma separated list of user_uuid',
   `type` VARCHAR(45) NOT NULL,
   `status` VARCHAR(45) NOT NULL,
+  `quit_password` VARCHAR(255) NULL,
   `active` INT(1) NOT NULL,
   PRIMARY KEY (`id`),
   INDEX `lms_setup_key_idx` (`lms_setup_id` ASC),
@@ -400,3 +402,19 @@ CREATE TABLE IF NOT EXISTS `user_activity_log` (
   `message` VARCHAR(255) NULL,
   PRIMARY KEY (`id`))
 ;
+
+
+-- -----------------------------------------------------
+-- Table `additional_attributes`
+-- -----------------------------------------------------
+DROP TABLE IF EXISTS `additional_attributes` ;
+
+CREATE TABLE IF NOT EXISTS `additional_attributes` (
+  `id` BIGINT UNSIGNED NOT NULL,
+  `entity_type` VARCHAR(45) NOT NULL,
+  `entity_id` BIGINT UNSIGNED NOT NULL,
+  `name` VARCHAR(255) NOT NULL,
+  `value` VARCHAR(4000) NULL,
+  PRIMARY KEY (`id`))
+;
+