diff --git a/pom.xml b/pom.xml
index 6ae37ba7..5d130514 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,10 +222,6 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-tomcat</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-websocket</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-jdbc</artifactId>
@@ -242,6 +238,16 @@
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-xml</artifactId>
     </dependency>
+    <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+             <exclusions>
+                <exclusion>
+                    <artifactId>spring-boot-starter-reactor-netty</artifactId>
+                    <groupId>org.springframework.boot</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     <!-- NOTE since org.springframework.security.oauth is not fully migrated 
       to spring-boot-starter-security we have to declare a separate version here. 
       This refers to the latest version of spring-security-oauth2 and should be 
diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java b/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java
index 40636fae..68829163 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java
@@ -2,7 +2,7 @@ package ch.ethz.seb.sebserver.gbl.api;
 
 import javax.annotation.Generated;
 
-@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2020-01-09T10:29:16.698+01:00")
+@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2020-01-29T14:47:50.177+01:00")
 public enum EntityType {
     CONFIGURATION_ATTRIBUTE,
     CONFIGURATION_VALUE,
diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/async/AsyncService.java b/src/main/java/ch/ethz/seb/sebserver/gbl/async/AsyncService.java
index 6c154027..38b9b5c4 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gbl/async/AsyncService.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gbl/async/AsyncService.java
@@ -40,16 +40,6 @@ public class AsyncService {
                 timeToRecover);
     }
 
-//    public <T> MemoizingCircuitBreaker<T> createMemoizingCircuitBreaker(
-//            final Supplier<T> blockingSupplier) {
-//
-//        return new MemoizingCircuitBreaker<>(
-//                this.asyncRunner,
-//                blockingSupplier,
-//                true,
-//                Constants.HOUR_IN_MILLIS);
-//    }
-
     public <T> MemoizingCircuitBreaker<T> createMemoizingCircuitBreaker(
             final Supplier<T> blockingSupplier,
             final int maxFailingAttempts,
diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/async/AsyncServiceSpringConfig.java b/src/main/java/ch/ethz/seb/sebserver/gbl/async/AsyncServiceSpringConfig.java
index be1a2922..bdd9a34b 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gbl/async/AsyncServiceSpringConfig.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gbl/async/AsyncServiceSpringConfig.java
@@ -37,6 +37,20 @@ public class AsyncServiceSpringConfig implements AsyncConfigurer {
         return executor;
     }
 
+    public static final String EXAMP_AIP_EXECUTOR_BEAN_NAME = "ExamAPIAsyncServiceExecutorBean";
+
+    @Bean(name = EXAMP_AIP_EXECUTOR_BEAN_NAME)
+    public Executor examAPIThreadPoolTaskExecutor() {
+        final ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(200);
+        executor.setMaxPoolSize(2000);
+        executor.setQueueCapacity(2000);
+        executor.setThreadNamePrefix("examService-");
+        executor.initialize();
+        executor.setWaitForTasksToCompleteOnShutdown(false);
+        return executor;
+    }
+
     @Override
     public Executor getAsyncExecutor() {
         return threadPoolTaskExecutor();
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 845dad6c..6fc486b1 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
@@ -3,9 +3,12 @@ package ch.ethz.seb.sebserver.gbl.model;
 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="2020-01-09T10:29:16.659+01:00")
+ * 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 = "2020-01-29T14:47:50.132+01:00")
 public interface Domain {
 
     interface CONFIGURATION_ATTRIBUTE {
@@ -215,6 +218,7 @@ public interface Domain {
         String ATTR_INSTITUTION_ID = "institutionId";
         String ATTR_UUID = "uuid";
         String ATTR_NAME = "name";
+        String ATTR_SURNAME = "surname";
         String ATTR_USERNAME = "username";
         String ATTR_PASSWORD = "password";
         String ATTR_EMAIL = "email";
diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserAccount.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserAccount.java
index ab94296e..f84c2496 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserAccount.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserAccount.java
@@ -29,10 +29,13 @@ public interface UserAccount extends GrantEntity, Activatable {
     @Override
     Long getInstitutionId();
 
-    /** The name of the User-Account */
+    /** The first name of the User */
     @Override
     String getName();
 
+    /** The surname of the User */
+    String getSurname();
+
     /** The user-name or login-name of the User-Account */
     String getUsername();
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserInfo.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserInfo.java
index d7672c62..94ddd222 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserInfo.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserInfo.java
@@ -63,12 +63,17 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
     @JsonProperty(USER.ATTR_INSTITUTION_ID)
     public final Long institutionId;
 
-    /** Full name of the user */
+    /** First name of the user */
     @NotNull(message = "user:name:notNull")
     @Size(min = 3, max = 255, message = "user:name:size:{min}:{max}:${validatedValue}")
     @JsonProperty(USER.ATTR_NAME)
     public final String name;
 
+    /** Surname of the user */
+    @Size(max = 255, message = "user:surname:size:{min}:{max}:${validatedValue}")
+    @JsonProperty(USER.ATTR_SURNAME)
+    public final String surname;
+
     /** The internal user name */
     @NotNull(message = "user:username:notNull")
     @Size(min = 3, max = 255, message = "user:username:size:{min}:{max}:${validatedValue}")
@@ -106,6 +111,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
             @JsonProperty(USER.ATTR_UUID) final String uuid,
             @JsonProperty(USER.ATTR_INSTITUTION_ID) final Long institutionId,
             @JsonProperty(USER.ATTR_NAME) final String name,
+            @JsonProperty(USER.ATTR_SURNAME) final String surname,
             @JsonProperty(USER.ATTR_USERNAME) final String username,
             @JsonProperty(USER.ATTR_EMAIL) final String email,
             @JsonProperty(USER.ATTR_ACTIVE) final Boolean active,
@@ -116,6 +122,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
         this.uuid = uuid;
         this.institutionId = institutionId;
         this.name = name;
+        this.surname = surname;
         this.username = username;
         this.email = email;
         this.active = BooleanUtils.isTrue(active);
@@ -153,6 +160,11 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
         return this.name;
     }
 
+    @Override
+    public String getSurname() {
+        return this.surname;
+    }
+
     @Override
     public String getUsername() {
         return this.username;
@@ -280,6 +292,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
                 userInfo.getInstitutionId(),
                 userInfo.getName(),
                 userInfo.getUsername(),
+                userInfo.getSurname(),
                 userInfo.getEmail(),
                 userInfo.getActive(),
                 userInfo.getLanguage(),
@@ -291,6 +304,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
      *
      * @param userInfo UserInfo instance to copy
      * @param name new name or null if the name of given userInfo should be taken
+     * @param surname new surname or null if the name of given userInfo should be taken
      * @param username new username or null if the username of given userInfo should be taken
      * @param email new email or null if the email of given userInfo should be taken
      * @param language new language or null if the language of given userInfo should be taken
@@ -301,6 +315,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
             final UserInfo userInfo,
             final String name,
             final String username,
+            final String surname,
             final String email,
             final Locale language,
             final DateTimeZone timeZone,
@@ -310,6 +325,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
                 userInfo.getUuid(),
                 userInfo.getInstitutionId(),
                 (name != null) ? name : userInfo.getName(),
+                (surname != null) ? surname : userInfo.getSurname(),
                 (username != null) ? username : userInfo.getUsername(),
                 (email != null) ? email : userInfo.getEmail(),
                 userInfo.getActive(),
@@ -318,19 +334,11 @@ public final class UserInfo implements UserAccount, Activatable, Serializable {
                 (roles != null) ? new HashSet<>(Arrays.asList(roles)) : userInfo.roles);
     }
 
-    public static final UserInfo withName(final UserInfo userInfo, final String name) {
-        return of(userInfo, name, null, null, null, null, (String[]) null);
-    }
-
-    public static final UserInfo withUserName(final UserInfo userInfo, final String username) {
-        return of(userInfo, null, username, null, null, null, (String[]) null);
-    }
-
     public static final UserInfo withEMail(final UserInfo userInfo, final String email) {
-        return of(userInfo, null, null, email, null, null, (String[]) null);
+        return of(userInfo, null, null, null, email, null, null, (String[]) null);
     }
 
     public static final UserInfo withRoles(final UserInfo userInfo, final String... roles) {
-        return of(userInfo, null, null, null, null, null, roles);
+        return of(userInfo, null, null, null, null, null, null, roles);
     }
 }
diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserMod.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserMod.java
index 04da7a61..92fbca5e 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserMod.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserMod.java
@@ -46,12 +46,17 @@ public final class UserMod implements UserAccount {
     @JsonProperty(USER.ATTR_INSTITUTION_ID)
     public final Long institutionId;
 
-    /** Full name of the user */
+    /** first (or full) name of the user */
     @NotNull(message = "user:name:notNull")
     @Size(min = 3, max = 255, message = "user:name:size:{min}:{max}:${validatedValue}")
     @JsonProperty(USER.ATTR_NAME)
     public final String name;
 
+    /** surname of the user */
+    @Size(max = 255, message = "user:surname:size:{min}:{max}:${validatedValue}")
+    @JsonProperty(USER.ATTR_SURNAME)
+    public final String surname;
+
     /** The internal user name */
     @NotNull(message = "user:username:notNull")
     @Size(min = 3, max = 255, message = "user:username:size:{min}:{max}:${validatedValue}")
@@ -93,6 +98,7 @@ public final class UserMod implements UserAccount {
             @JsonProperty(USER.ATTR_UUID) final String uuid,
             @JsonProperty(USER.ATTR_INSTITUTION_ID) final Long institutionId,
             @JsonProperty(USER.ATTR_NAME) final String name,
+            @JsonProperty(USER.ATTR_SURNAME) final String surname,
             @JsonProperty(USER.ATTR_USERNAME) final String username,
             @JsonProperty(PasswordChange.ATTR_NAME_NEW_PASSWORD) final CharSequence newPassword,
             @JsonProperty(PasswordChange.ATTR_NAME_CONFIRM_NEW_PASSWORD) final CharSequence confirmNewPassword,
@@ -106,6 +112,7 @@ public final class UserMod implements UserAccount {
         this.newPassword = newPassword;
         this.confirmNewPassword = confirmNewPassword;
         this.name = name;
+        this.surname = surname;
         this.username = username;
         this.email = email;
         this.language = (language != null) ? language : Locale.ENGLISH;
@@ -121,6 +128,7 @@ public final class UserMod implements UserAccount {
         this.newPassword = postAttrMapper.getString(PasswordChange.ATTR_NAME_NEW_PASSWORD);
         this.confirmNewPassword = postAttrMapper.getString(PasswordChange.ATTR_NAME_CONFIRM_NEW_PASSWORD);
         this.name = postAttrMapper.getString(USER.ATTR_NAME);
+        this.surname = postAttrMapper.getString(USER.ATTR_SURNAME);
         this.username = postAttrMapper.getString(USER.ATTR_USERNAME);
         this.email = postAttrMapper.getString(USER.ATTR_EMAIL);
         this.language = postAttrMapper.getLocale(USER.ATTR_LANGUAGE);
@@ -157,6 +165,11 @@ public final class UserMod implements UserAccount {
         return this.name;
     }
 
+    @Override
+    public String getSurname() {
+        return this.surname;
+    }
+
     @Override
     public String getUsername() {
         return this.username;
@@ -235,6 +248,8 @@ public final class UserMod implements UserAccount {
         builder.append(this.institutionId);
         builder.append(", name=");
         builder.append(this.name);
+        builder.append(", surname=");
+        builder.append(this.surname);
         builder.append(", username=");
         builder.append(this.username);
         builder.append(", email=");
@@ -257,7 +272,7 @@ public final class UserMod implements UserAccount {
         return new UserMod(
                 UUID.randomUUID().toString(),
                 institutionId,
-                null, null, null, null, null, null, null, null);
+                null, null, null, null, null, null, null, null, null);
     }
 
 }
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java
index b95ade56..3ea38459 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java
@@ -281,14 +281,14 @@ public class ExamForm implements TemplateComposer {
                 .addField(FormBuilder.text(
                         QuizData.QUIZ_ATTR_START_TIME,
                         FORM_STARTTIME_TEXT_KEY,
-                        i18nSupport.formatDisplayDate(exam.startTime))
+                        i18nSupport.formatDisplayDateWithTimeZone(exam.startTime))
                         .readonly(true)
                         .withInputSpan(3)
                         .withEmptyCellSeparation(false))
                 .addField(FormBuilder.text(
                         QuizData.QUIZ_ATTR_END_TIME,
                         FORM_ENDTIME_TEXT_KEY,
-                        i18nSupport.formatDisplayDate(exam.endTime))
+                        i18nSupport.formatDisplayDateWithTimeZone(exam.endTime))
                         .readonly(true)
                         .withInputSpan(3)
                         .withEmptyCellSeparation(false))
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamList.java
index d0d75389..cccdc95b 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamList.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamList.java
@@ -203,8 +203,9 @@ public class ExamList implements TemplateComposer {
         final GrantCheck userGrant = currentUser.grantCheck(EntityType.EXAM);
         actionBuilder
 
-                .newAction(ActionDefinition.EXAM_IMPORT)
-                .publishIf(userGrant::im)
+// Removed as discussed in SEBSERV-52
+//                .newAction(ActionDefinition.EXAM_IMPORT)
+//                .publishIf(userGrant::im)
 
                 .newAction(ActionDefinition.EXAM_VIEW_FROM_LIST)
                 .withSelect(table::getSelection, PageAction::applySingleSelectionAsEntityKey, EMPTY_SELECTION_TEXT_KEY)
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionForm.java
index 75857063..b8d69605 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionForm.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionForm.java
@@ -86,7 +86,6 @@ public class InstitutionForm implements TemplateComposer {
         final EntityGrantCheck instGrant = this.currentUser.entityGrantCheck(institution);
         final boolean writeGrant = instGrant.w();
         final boolean modifyGrant = instGrant.m();
-        final boolean userWriteGrant = this.currentUser.grantCheck(EntityType.USER).w();
         final boolean isReadonly = pageContext.isReadonly();
 
         // new PageContext with actual EntityKey
@@ -131,9 +130,10 @@ public class InstitutionForm implements TemplateComposer {
                 .newAction(ActionDefinition.INSTITUTION_NEW)
                 .publishIf(() -> writeGrant && isReadonly)
 
-                .newAction(ActionDefinition.USER_ACCOUNT_NEW)
-                .withParentEntityKey(entityKey)
-                .publishIf(() -> userWriteGrant && isReadonly && institution.isActive())
+// Removed as discussed in SEBSERV-52
+//                .newAction(ActionDefinition.USER_ACCOUNT_NEW)
+//                .withParentEntityKey(entityKey)
+//                .publishIf(() -> userWriteGrant && isReadonly && institution.isActive())
 
                 .newAction(ActionDefinition.INSTITUTION_MODIFY)
                 .withEntityKey(entityKey)
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionList.java
index 0be6d66b..03333618 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionList.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionList.java
@@ -123,7 +123,6 @@ public class InstitutionList implements TemplateComposer {
 
         // propagate content actions to action-pane
         final GrantCheck instGrant = this.currentUser.grantCheck(EntityType.INSTITUTION);
-        final GrantCheck userGrant = this.currentUser.grantCheck(EntityType.USER);
 
         pageActionBuilder
 
@@ -149,12 +148,14 @@ public class InstitutionList implements TemplateComposer {
                 .withConfirm(this.pageService.confirmDeactivation(table))
                 .publishIf(() -> instGrant.m() && table.hasAnyContent())
 
-                .newAction(ActionDefinition.INSTITUTION_USER_ACCOUNT_NEW)
-                .withSelect(
-                        table::getSelection,
-                        PageAction::applySingleSelectionAsParentEntityKey,
-                        EMPTY_SELECTION_TEXT_KEY)
-                .publishIf(() -> table.hasAnyContent() && userGrant.w());
+// Removed as discussed in SEBSERV-52
+//                .newAction(ActionDefinition.INSTITUTION_USER_ACCOUNT_NEW)
+//                .withSelect(
+//                        table::getSelection,
+//                        PageAction::applySingleSelectionAsParentEntityKey,
+//                        EMPTY_SELECTION_TEXT_KEY)
+//                .publishIf(() -> table.hasAnyContent() && userGrant.w())
+        ;
     }
 
 }
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/MainPage.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/MainPage.java
index 4e70be12..95fa56c9 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/MainPage.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/MainPage.java
@@ -86,7 +86,7 @@ public class MainPage implements TemplateComposer {
                 mainSash,
                 scrolledComposite -> {
                     final Composite reusult = new Composite(scrolledComposite, SWT.NONE);
-                    reusult.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+                    reusult.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
                     final GridLayout contentOuterlayout = new GridLayout();
                     contentOuterlayout.marginHeight = 0;
                     contentOuterlayout.marginWidth = 0;
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringClientConnection.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringClientConnection.java
index e80c297a..6f1a7b4e 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringClientConnection.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringClientConnection.java
@@ -192,13 +192,15 @@ public class MonitoringClientConnection implements TemplateComposer {
                                 .widthProportion(1))
                 .withColumn(new ColumnDefinition<>(
                         Domain.CLIENT_EVENT.ATTR_CLIENT_TIME,
-                        LIST_COLUMN_CLIENT_TIME_KEY,
+                        new LocTextKey(LIST_COLUMN_CLIENT_TIME_KEY.name,
+                                this.i18nSupport.getUsersTimeZoneTitleSuffix()),
                         this::getClientTime)
                                 .sortable()
                                 .widthProportion(1))
                 .withColumn(new ColumnDefinition<>(
                         Domain.CLIENT_EVENT.ATTR_SERVER_TIME,
-                        LIST_COLUMN_SERVER_TIME_KEY,
+                        new LocTextKey(LIST_COLUMN_SERVER_TIME_KEY.name,
+                                this.i18nSupport.getUsersTimeZoneTitleSuffix()),
                         this::getServerTime)
                                 .sortable()
                                 .widthProportion(1))
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/QuizDiscoveryList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/QuizDiscoveryList.java
index 413c8357..3fc04ca1 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/QuizDiscoveryList.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/QuizDiscoveryList.java
@@ -59,18 +59,12 @@ public class QuizDiscoveryList implements TemplateComposer {
     // localized text keys
     private static final LocTextKey QUIZ_DETAILS_URL_TEXT_KEY =
             new LocTextKey("sebserver.quizdiscovery.quiz.details.url");
-    private static final LocTextKey QUIZ_DETAILS_ENDTIME_TEXT_KEY =
-            new LocTextKey("sebserver.quizdiscovery.quiz.details.endtime");
-    private static final LocTextKey QUIZ_DETAILS_STARTTIME_TEXT_KEY =
-            new LocTextKey("sebserver.quizdiscovery.quiz.details.starttime");
     private static final LocTextKey QUIZ_DETAILS_DESCRIPTION_TEXT_KEY =
             new LocTextKey("sebserver.quizdiscovery.quiz.details.description");
-    private static final LocTextKey QUIZ_DETAILS_NAME_TEXT_KEY =
-            new LocTextKey("sebserver.quizdiscovery.quiz.details.name");
-    private static final LocTextKey QUIZ_DETAILS_INSTITUION_TEXT_KEY =
-            new LocTextKey("sebserver.quizdiscovery.quiz.details.institution");
-    private static final LocTextKey QUIZ_DETAILS_LMS_TEXT_KEY =
-            new LocTextKey("sebserver.quizdiscovery.quiz.details.lms");
+    private static final LocTextKey QUIZ_DETAILS_START_TIME_TEXT_KEY =
+            new LocTextKey("sebserver.quizdiscovery.quiz.details.starttime");
+    private static final LocTextKey QUIZ_DETAILS_END_TIME_TEXT_KEY =
+            new LocTextKey("sebserver.quizdiscovery.quiz.details.endtime");
     private static final LocTextKey TITLE_TEXT_KEY =
             new LocTextKey("sebserver.quizdiscovery.list.title");
     private static final LocTextKey EMPTY_LIST_TEXT_KEY =
@@ -83,6 +77,10 @@ public class QuizDiscoveryList implements TemplateComposer {
             new LocTextKey("sebserver.quizdiscovery.list.column.lmssetup");
     private final static LocTextKey NAME_TEXT_KEY =
             new LocTextKey("sebserver.quizdiscovery.list.column.name");
+    private final static LocTextKey START_TIME_TEXT_KEY =
+            new LocTextKey("sebserver.quizdiscovery.list.column.starttime");
+    private final static LocTextKey END_TIME_TEXT_KEY =
+            new LocTextKey("sebserver.quizdiscovery.list.column.endtime");
     private final static LocTextKey DETAILS_TITLE_TEXT_KEY =
             new LocTextKey("sebserver.quizdiscovery.quiz.details.title");
     private final static LocTextKey NO_IMPORT_OF_OUT_DATED_QUIZ =
@@ -176,7 +174,7 @@ public class QuizDiscoveryList implements TemplateComposer {
                         .withColumn(new ColumnDefinition<>(
                                 QuizData.QUIZ_ATTR_START_TIME,
                                 new LocTextKey(
-                                        "sebserver.quizdiscovery.list.column.starttime",
+                                        START_TIME_TEXT_KEY.name,
                                         i18nSupport.getUsersTimeZoneTitleSuffix()),
                                 QuizData::getStartTime)
                                         .withFilter(new TableFilterAttribute(
@@ -190,7 +188,7 @@ public class QuizDiscoveryList implements TemplateComposer {
                         .withColumn(new ColumnDefinition<>(
                                 QuizData.QUIZ_ATTR_END_TIME,
                                 new LocTextKey(
-                                        "sebserver.quizdiscovery.list.column.endtime",
+                                        END_TIME_TEXT_KEY.name,
                                         i18nSupport.getUsersTimeZoneTitleSuffix()),
                                 QuizData::getEndTime)
                                         .sortable())
@@ -207,12 +205,12 @@ public class QuizDiscoveryList implements TemplateComposer {
                         .compose(pageContext.copyOf(content));
 
         // propagate content actions to action-pane
-        final GrantCheck lmsSetupGrant = currentUser.grantCheck(EntityType.LMS_SETUP);
         final GrantCheck examGrant = currentUser.grantCheck(EntityType.EXAM);
         actionBuilder
 
-                .newAction(ActionDefinition.LMS_SETUP_NEW)
-                .publishIf(lmsSetupGrant::iw)
+// Removed as discussed in SEBSERV-52
+//                .newAction(ActionDefinition.LMS_SETUP_NEW)
+//                .publishIf(lmsSetupGrant::iw)
 
                 .newAction(ActionDefinition.QUIZ_DISCOVERY_SHOW_DETAILS)
                 .withSelect(
@@ -294,16 +292,16 @@ public class QuizDiscoveryList implements TemplateComposer {
                         () -> this.resourceService.getCurrentUser().get().hasRole(UserRole.SEB_SERVER_ADMIN),
                         () -> FormBuilder.text(
                                 QuizData.QUIZ_ATTR_INSTITUION_ID,
-                                QUIZ_DETAILS_INSTITUION_TEXT_KEY,
+                                INSTITUION_TEXT_KEY,
                                 institutionNameFunction.apply(quizData.getModelId())))
                 .addField(FormBuilder.singleSelection(
                         QuizData.QUIZ_ATTR_LMS_SETUP_ID,
-                        QUIZ_DETAILS_LMS_TEXT_KEY,
+                        LMS_TEXT_KEY,
                         String.valueOf(quizData.lmsSetupId),
                         () -> this.resourceService.lmsSetupResource()))
                 .addField(FormBuilder.text(
                         QuizData.QUIZ_ATTR_NAME,
-                        QUIZ_DETAILS_NAME_TEXT_KEY,
+                        NAME_TEXT_KEY,
                         quizData.name))
                 .addField(FormBuilder.text(
                         QuizData.QUIZ_ATTR_DESCRIPTION,
@@ -312,12 +310,12 @@ public class QuizDiscoveryList implements TemplateComposer {
                         .asHTML())
                 .addField(FormBuilder.text(
                         QuizData.QUIZ_ATTR_START_TIME,
-                        QUIZ_DETAILS_STARTTIME_TEXT_KEY,
-                        this.widgetFactory.getI18nSupport().formatDisplayDate(quizData.startTime)))
+                        QUIZ_DETAILS_START_TIME_TEXT_KEY,
+                        this.widgetFactory.getI18nSupport().formatDisplayDateWithTimeZone(quizData.startTime)))
                 .addField(FormBuilder.text(
                         QuizData.QUIZ_ATTR_END_TIME,
-                        QUIZ_DETAILS_ENDTIME_TEXT_KEY,
-                        this.widgetFactory.getI18nSupport().formatDisplayDate(quizData.endTime)))
+                        QUIZ_DETAILS_END_TIME_TEXT_KEY,
+                        this.widgetFactory.getI18nSupport().formatDisplayDateWithTimeZone(quizData.endTime)))
                 .addField(FormBuilder.text(
                         QuizData.QUIZ_ATTR_START_URL,
                         QUIZ_DETAILS_URL_TEXT_KEY,
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/RegisterPage.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/RegisterPage.java
index cad8eb43..5c04682b 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/RegisterPage.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/RegisterPage.java
@@ -19,8 +19,6 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.client.ClientHttpRequestFactory;
@@ -38,7 +36,6 @@ import ch.ethz.seb.sebserver.gbl.util.Tuple;
 import ch.ethz.seb.sebserver.gui.InstitutionalAuthenticationEntryPoint;
 import ch.ethz.seb.sebserver.gui.form.FormBuilder;
 import ch.ethz.seb.sebserver.gui.service.ResourceService;
-import ch.ethz.seb.sebserver.gui.service.i18n.I18nSupport;
 import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey;
 import ch.ethz.seb.sebserver.gui.service.page.PageContext;
 import ch.ethz.seb.sebserver.gui.service.page.PageService;
@@ -52,8 +49,6 @@ import ch.ethz.seb.sebserver.gui.widget.WidgetFactory;
 @GuiProfile
 public class RegisterPage implements TemplateComposer {
 
-    private static final Logger log = LoggerFactory.getLogger(RegisterPage.class);
-
     static final LocTextKey TITLE_TEXT_KEY =
             new LocTextKey("sebserver.login.register.form.title");
     static final LocTextKey FORM_PASSWORD_CONFIRM_TEXT_KEY =
@@ -70,6 +65,8 @@ public class RegisterPage implements TemplateComposer {
             new LocTextKey("sebserver.useraccount.form.username");
     static final LocTextKey FORM_NAME_TEXT_KEY =
             new LocTextKey("sebserver.useraccount.form.name");
+    static final LocTextKey FORM_SURNAME_TEXT_KEY =
+            new LocTextKey("sebserver.useraccount.form.surname");
     static final LocTextKey FORM_INSTITUTION_TEXT_KEY =
             new LocTextKey("sebserver.useraccount.form.institution");
     static final LocTextKey FORM_LANG_TEXT_KEY =
@@ -78,8 +75,6 @@ public class RegisterPage implements TemplateComposer {
     private final PageService pageService;
     private final ResourceService resourceService;
     private final WidgetFactory widgetFactory;
-    private final I18nSupport i18nSupport;
-    private final WebserviceURIService webserviceURIService;
     private final RestTemplate restTemplate;
     private final boolean multilingual;
 
@@ -92,8 +87,6 @@ public class RegisterPage implements TemplateComposer {
         this.pageService = pageService;
         this.resourceService = pageService.getResourceService();
         this.widgetFactory = pageService.getWidgetFactory();
-        this.i18nSupport = pageService.getI18nSupport();
-        this.webserviceURIService = webserviceURIService;
         this.multilingual = BooleanUtils.toBoolean(multilingual);
 
         this.restTemplate = new RestTemplate();
@@ -148,6 +141,9 @@ public class RegisterPage implements TemplateComposer {
                 .addField(FormBuilder.text(
                         Domain.USER.ATTR_NAME,
                         FORM_NAME_TEXT_KEY))
+                .addField(FormBuilder.text(
+                        Domain.USER.ATTR_SURNAME,
+                        FORM_SURNAME_TEXT_KEY))
                 .addField(FormBuilder.text(
                         Domain.USER.ATTR_USERNAME,
                         FORM_USERNAME_TEXT_KEY))
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/SebClientConfigForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/SebClientConfigForm.java
index ab7e20b9..e8b6d317 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/SebClientConfigForm.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/SebClientConfigForm.java
@@ -143,7 +143,7 @@ public class SebClientConfigForm implements TemplateComposer {
                         () -> FormBuilder.text(
                                 Domain.SEB_CLIENT_CONFIGURATION.ATTR_DATE,
                                 FORM_DATE_TEXT_KEY,
-                                i18nSupport.formatDisplayDate(clientConfig.date))
+                                i18nSupport.formatDisplayDateWithTimeZone(clientConfig.date))
                                 .readonly(true))
                 .addField(FormBuilder.text(
                         Domain.SEB_CLIENT_CONFIGURATION.ATTR_ENCRYPT_SECRET,
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/SebClientLogs.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/SebClientLogs.java
index a165adce..f534984b 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/SebClientLogs.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/SebClientLogs.java
@@ -197,7 +197,9 @@ public class SebClientLogs implements TemplateComposer {
 
                 .withColumn(new ColumnDefinition<>(
                         Domain.CLIENT_EVENT.ATTR_SERVER_TIME,
-                        TIME_TEXT_KEY,
+                        new LocTextKey(
+                                TIME_TEXT_KEY.name,
+                                this.i18nSupport.getUsersTimeZoneTitleSuffix()),
                         this::getEventTime)
                                 .withFilter(new TableFilterAttribute(
                                         CriteriaType.DATE_TIME_RANGE,
@@ -272,11 +274,13 @@ public class SebClientLogs implements TemplateComposer {
                 .addField(FormBuilder.text(
                         Domain.CLIENT_EVENT.ATTR_CLIENT_TIME,
                         FORM_CLIENTTIME_TEXT_KEY,
-                        this.i18nSupport.formatDisplayDateTime(clientEvent.clientTime)))
+                        this.i18nSupport.formatDisplayDateTime(clientEvent.clientTime) + " " +
+                                this.i18nSupport.getUsersTimeZoneTitleSuffix()))
                 .addField(FormBuilder.text(
                         Domain.CLIENT_EVENT.ATTR_SERVER_TIME,
                         FORM_SERVERTIME_TEXT_KEY,
-                        this.i18nSupport.formatDisplayDateTime(clientEvent.serverTime)))
+                        this.i18nSupport.formatDisplayDateTime(clientEvent.serverTime) + " " +
+                                this.i18nSupport.getUsersTimeZoneTitleSuffix()))
                 .addField(FormBuilder.text(
                         Domain.CLIENT_EVENT.ATTR_NUMERIC_VALUE,
                         FORM_VALUE_TEXT_KEY,
@@ -357,11 +361,11 @@ public class SebClientLogs implements TemplateComposer {
                 .addField(FormBuilder.text(
                         QuizData.QUIZ_ATTR_START_TIME,
                         FORM_START_TIME_TEXT_KEY,
-                        this.i18nSupport.formatDisplayDateTime(exam.startTime)))
+                        this.i18nSupport.formatDisplayDateWithTimeZone(exam.startTime)))
                 .addField(FormBuilder.text(
                         QuizData.QUIZ_ATTR_END_TIME,
                         FORM_END_TIME_TEXT_KEY,
-                        this.i18nSupport.formatDisplayDateTime(exam.endTime)))
+                        this.i18nSupport.formatDisplayDateWithTimeZone(exam.endTime)))
                 .build();
 
     }
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountForm.java
index 265de53b..ec337a79 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountForm.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountForm.java
@@ -74,6 +74,8 @@ public class UserAccountForm implements TemplateComposer {
             new LocTextKey("sebserver.useraccount.form.username");
     static final LocTextKey FORM_NAME_TEXT_KEY =
             new LocTextKey("sebserver.useraccount.form.name");
+    static final LocTextKey FORM_SURNAME_TEXT_KEY =
+            new LocTextKey("sebserver.useraccount.form.surname");
     static final LocTextKey FORM_INSTITUTION_TEXT_KEY =
             new LocTextKey("sebserver.useraccount.form.institution");
     static final LocTextKey FORM_LANG_TEXT_KEY =
@@ -172,6 +174,10 @@ public class UserAccountForm implements TemplateComposer {
                         Domain.USER.ATTR_NAME,
                         FORM_NAME_TEXT_KEY,
                         userAccount.getName()))
+                .addField(FormBuilder.text(
+                        Domain.USER.ATTR_SURNAME,
+                        FORM_SURNAME_TEXT_KEY,
+                        userAccount.getSurname()))
                 .addField(FormBuilder.text(
                         Domain.USER.ATTR_USERNAME,
                         FORM_USERNAME_TEXT_KEY,
@@ -194,7 +200,7 @@ public class UserAccountForm implements TemplateComposer {
                         this.resourceService::timeZoneResources))
                 .addFieldIf(
                         () -> modifyGrant,
-                        () -> FormBuilder.multiSelection(
+                        () -> FormBuilder.multiCheckboxSelection(
                                 USER_ROLE.REFERENCE_NAME,
                                 FORM_ROLES_TEXT_KEY,
                                 StringUtils.join(userAccount.getRoles(), Constants.LIST_SEPARATOR_CHAR),
@@ -248,7 +254,6 @@ public class UserAccountForm implements TemplateComposer {
                             .map(userInfo -> {
                                 if (ownAccount) {
                                     currentUser.refresh(userInfo);
-                                    pageContext.forwardToMainPage();
                                 }
                                 return userInfo;
                             }),
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountList.java
index fd4b1260..c420fe45 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountList.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountList.java
@@ -11,6 +11,7 @@ package ch.ethz.seb.sebserver.gui.content;
 import java.util.function.BooleanSupplier;
 import java.util.function.Function;
 
+import org.apache.commons.lang3.BooleanUtils;
 import org.eclipse.swt.widgets.Composite;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
@@ -87,15 +88,18 @@ public class UserAccountList implements TemplateComposer {
     private final PageService pageService;
     private final ResourceService resourceService;
     private final int pageSize;
+    private final boolean multilingual;
 
     protected UserAccountList(
             final PageService pageService,
             final ResourceService resourceService,
-            @Value("${sebserver.gui.list.page.size:20}") final Integer pageSize) {
+            @Value("${sebserver.gui.list.page.size:20}") final Integer pageSize,
+            @Value("${sebserver.gui.multilingual:false}") final Boolean ml) {
 
         this.pageService = pageService;
         this.resourceService = resourceService;
         this.pageSize = pageSize;
+        this.multilingual = BooleanUtils.isTrue(ml);
 
         this.institutionFilter = new TableFilterAttribute(
                 CriteriaType.SINGLE_SELECTION,
@@ -165,14 +169,15 @@ public class UserAccountList implements TemplateComposer {
                                 .sortable()
                                 .widthProportion(3))
 
-                .withColumn(new ColumnDefinition<>(
-                        Domain.USER.ATTR_LANGUAGE,
-                        LANG_TEXT_KEY,
-                        this::getLocaleDisplayText)
-                                .withFilter(this.languageFilter)
-                                .localized()
-                                .sortable()
-                                .widthProportion(1))
+                .withColumnIf(() -> this.multilingual,
+                        () -> new ColumnDefinition<>(
+                                Domain.USER.ATTR_LANGUAGE,
+                                LANG_TEXT_KEY,
+                                this::getLocaleDisplayText)
+                                        .withFilter(this.languageFilter)
+                                        .localized()
+                                        .sortable()
+                                        .widthProportion(1))
 
                 .withColumn(new ColumnDefinition<>(
                         Domain.USER.ATTR_ACTIVE,
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/UserActivityLogs.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/UserActivityLogs.java
index b7ee79a0..5529e9c7 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/UserActivityLogs.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/UserActivityLogs.java
@@ -63,6 +63,8 @@ public class UserActivityLogs implements TemplateComposer {
             new LocTextKey("sebserver.userlogs.list.column.user");
     private static final LocTextKey DATE_TEXT_KEY =
             new LocTextKey("sebserver.userlogs.list.column.dateTime");
+    private static final LocTextKey DETAILS_DATE_TEXT_KEY =
+            new LocTextKey("sebserver.seblogs.details.dateTime");
     private static final LocTextKey ACTIVITY_TEXT_KEY =
             new LocTextKey("sebserver.userlogs.list.column.activityType");
     private static final LocTextKey ENTITY_TYPE_TEXT_KEY =
@@ -179,7 +181,7 @@ public class UserActivityLogs implements TemplateComposer {
 
                 .withColumn(new ColumnDefinition<>(
                         Domain.USER_ACTIVITY_LOG.ATTR_TIMESTAMP,
-                        DATE_TEXT_KEY,
+                        new LocTextKey(DATE_TEXT_KEY.name, this.i18nSupport.getUsersTimeZoneTitleSuffix()),
                         this::getLogTime)
                                 .withFilter(new TableFilterAttribute(
                                         CriteriaType.DATE_RANGE,
@@ -259,9 +261,10 @@ public class UserActivityLogs implements TemplateComposer {
                         userActivityLog.entityId))
                 .addField(FormBuilder.text(
                         Domain.USER_ACTIVITY_LOG.ATTR_TIMESTAMP,
-                        DATE_TEXT_KEY,
+                        DETAILS_DATE_TEXT_KEY,
                         this.widgetFactory.getI18nSupport()
-                                .formatDisplayDateTime(Utils.toDateTimeUTC(userActivityLog.timestamp))))
+                                .formatDisplayDateTime(Utils.toDateTimeUTC(userActivityLog.timestamp)) + " " +
+                                this.i18nSupport.getUsersTimeZoneTitleSuffix()))
                 .addField(FormBuilder.text(
                         Domain.USER_ACTIVITY_LOG.ATTR_MESSAGE,
                         MESSAGE_TEXT_KEY,
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionCategory.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionCategory.java
index 4d366bd8..75aa5ef6 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionCategory.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionCategory.java
@@ -27,7 +27,7 @@ public enum ActionCategory {
     CLIENT_EVENT_LIST(new LocTextKey("sebserver.monitoring.exam.connection.list.actions"), 1),
     LOGS_USER_ACTIVITY_LIST(new LocTextKey("sebserver.userlogs.list.actions"), 1),
     LOGS_SEB_CLIENT_LIST(new LocTextKey("sebserver.userlogs.list.actions"), 1),
-    VARIA(new LocTextKey("sebserver.overall.action.category.varia"), 100),
+    VARIA(new LocTextKey("sebserver.overall.action.category.varia"), 0),
     FILTER(new LocTextKey("sebserver.overall.action.category.filter"), 50);
 
     public final LocTextKey title;
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java
index 174fd065..c55f7146 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java
@@ -12,6 +12,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.template.ImageCell;
 import org.eclipse.rap.rwt.template.Template;
@@ -44,6 +45,7 @@ import ch.ethz.seb.sebserver.gui.widget.WidgetFactory.CustomVariant;
 public class ActionPane implements TemplateComposer {
 
     private static final String ACTION_EVENT_CALL_KEY = "ACTION_EVENT_CALL";
+    private static final LocTextKey TITLE_KEY = new LocTextKey("sebserver.actionpane.title");
 
     private final PageService pageService;
     private final WidgetFactory widgetFactory;
@@ -61,11 +63,14 @@ public class ActionPane implements TemplateComposer {
         final Label label = this.widgetFactory.labelLocalized(
                 pageContext.getParent(),
                 CustomVariant.TEXT_H2,
-                new LocTextKey("sebserver.actionpane.title"));
+                TITLE_KEY);
 
         final GridData titleLayout = new GridData(SWT.FILL, SWT.TOP, true, false);
         titleLayout.verticalIndent = 10;
         titleLayout.horizontalIndent = 10;
+        if (StringUtils.isBlank(label.getText())) {
+            titleLayout.heightHint = 0;
+        }
         label.setLayoutData(titleLayout);
 
         label.setData(
@@ -107,7 +112,9 @@ public class ActionPane implements TemplateComposer {
         final Composite composite = new Composite(parent, SWT.NONE);
         final GridData layout = new GridData(SWT.FILL, SWT.TOP, true, false);
         composite.setLayoutData(layout);
-        composite.setLayout(new GridLayout());
+        final GridLayout gridLayout = new GridLayout();
+        gridLayout.marginHeight = 0;
+        composite.setLayout(gridLayout);
         composite.setData(RWT.CUSTOM_VARIANT, "actionPane");
         composite.setData("CATEGORY", category);
 
@@ -121,14 +128,12 @@ public class ActionPane implements TemplateComposer {
         }
 
         // title
-        if (category.title != null) {
+        if (this.pageService.getI18nSupport().hasText(category.title)) {
             final Label actionsTitle = this.widgetFactory.labelLocalized(
                     composite,
                     CustomVariant.TEXT_H3,
                     category.title);
             final GridData titleLayout = new GridData(SWT.FILL, SWT.TOP, true, false);
-            titleLayout.horizontalIndent = 10;
-            titleLayout.verticalIndent = 10;
             actionsTitle.setLayoutData(titleLayout);
         }
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/activity/ActivitiesPane.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/activity/ActivitiesPane.java
index c3f1dfdf..c53f2018 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/activity/ActivitiesPane.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/activity/ActivitiesPane.java
@@ -47,6 +47,7 @@ public class ActivitiesPane implements TemplateComposer {
     private static final String SKIP_EXPAND = "SKIP_EXPAND";
 
     private static final String ATTR_ACTIVITY_SELECTION = "ACTIVITY_SELECTION";
+    private static final LocTextKey TITLE_KEY = new LocTextKey("sebserver.activitiespane.title");
 
     private final WidgetFactory widgetFactory;
     private final CurrentUser currentUser;
@@ -66,13 +67,15 @@ public class ActivitiesPane implements TemplateComposer {
         final UserInfo userInfo = this.currentUser
                 .getOrHandleError(t -> this.pageService.logoutOnError(t, pageContext));
 
-        final Label activities = this.widgetFactory.labelLocalized(
-                pageContext.getParent(),
-                CustomVariant.TEXT_H2,
-                new LocTextKey("sebserver.activitiespane.title"));
-        final GridData activitiesGridData = new GridData(SWT.FILL, SWT.TOP, true, false);
-        activitiesGridData.horizontalIndent = 20;
-        activities.setLayoutData(activitiesGridData);
+        if (this.pageService.getI18nSupport().hasText(TITLE_KEY)) {
+            final Label activities = this.widgetFactory.labelLocalized(
+                    pageContext.getParent(),
+                    CustomVariant.TEXT_H2,
+                    TITLE_KEY);
+            final GridData activitiesGridData = new GridData(SWT.FILL, SWT.TOP, true, false);
+            activitiesGridData.horizontalIndent = 20;
+            activities.setLayoutData(activitiesGridData);
+        }
 
         final Tree navigation = this.widgetFactory.treeLocalized(
                 pageContext.getParent(),
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/form/Form.java b/src/main/java/ch/ethz/seb/sebserver/gui/form/Form.java
index 6fa3421a..be75dd1c 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/form/Form.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/form/Form.java
@@ -313,6 +313,7 @@ public final class Form implements FormBinding {
         switch (selection.type()) {
             case MULTI:
             case MULTI_COMBO:
+            case MULTI_CHECKBOX:
                 return createAccessor(label, selection, Form::adaptCommaSeparatedStringToJsonArray, errorLabel);
             default : return createAccessor(label, selection, null, errorLabel);
         }
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/form/FormBuilder.java b/src/main/java/ch/ethz/seb/sebserver/gui/form/FormBuilder.java
index f55f8ab9..4baf55a8 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/form/FormBuilder.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/form/FormBuilder.java
@@ -237,6 +237,15 @@ public class FormBuilder {
         return new SelectionFieldBuilder(Selection.Type.MULTI, name, label, value, itemsSupplier);
     }
 
+    public static SelectionFieldBuilder multiCheckboxSelection(
+            final String name,
+            final LocTextKey label,
+            final String value,
+            final Supplier<List<Tuple<String>>> itemsSupplier) {
+
+        return new SelectionFieldBuilder(Selection.Type.MULTI_CHECKBOX, name, label, value, itemsSupplier);
+    }
+
     public static SelectionFieldBuilder multiComboSelection(
             final String name,
             final LocTextKey label,
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/form/SelectionFieldBuilder.java b/src/main/java/ch/ethz/seb/sebserver/gui/form/SelectionFieldBuilder.java
index 926a1395..bb87a473 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/form/SelectionFieldBuilder.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/form/SelectionFieldBuilder.java
@@ -94,7 +94,7 @@ public final class SelectionFieldBuilder extends FieldBuilder<String> {
 
     /* Build the read-only representation of the selection field */
     private void buildReadOnly(final FormBuilder builder, final Label titleLabel) {
-        if (this.type == Type.MULTI || this.type == Type.MULTI_COMBO) {
+        if (this.type == Type.MULTI || this.type == Type.MULTI_COMBO || this.type == Type.MULTI_CHECKBOX) {
             final Composite composite = new Composite(builder.formParent, SWT.NONE);
             final GridLayout gridLayout = new GridLayout(1, true);
             //gridLayout.verticalSpacing = 5;
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java
index fdc04b92..e8ec56be 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java
@@ -349,7 +349,7 @@ public class ResourceService {
         return DateTimeZone
                 .getAvailableIDs()
                 .stream()
-                .map(id -> new Tuple<>(id, DateTimeZone.forID(id).getName(0, currentLocale) + " (" + id + ")"))
+                .map(id -> new Tuple<>(id, id + " (" + DateTimeZone.forID(id).getName(0, currentLocale) + ")"))
                 .sorted(RESOURCE_COMPARATOR)
                 .collect(Collectors.toList());
     }
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/I18nSupport.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/I18nSupport.java
index 1929165d..ec0d436c 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/I18nSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/I18nSupport.java
@@ -34,12 +34,24 @@ public interface I18nSupport {
      * This uses the date-format defined by either the attribute 'sebserver.gui.date.displayformat'
      * or the Constants.DEFAULT_DISPLAY_DATE_FORMAT
      *
-     * Adds time-zone information if the currents user time-zone is different form UTC
+     * Adds time-zone offset information if the currents user time-zone is different form UTC
      *
      * @param date the DateTime instance
      * @return date formatted date String to display */
     String formatDisplayDate(DateTime date);
 
+    /** Format a DateTime to a text format to display with additional time zone name at the end.
+     * This uses the date-format defined by either the attribute 'sebserver.gui.date.displayformat'
+     * or the Constants.DEFAULT_DISPLAY_DATE_FORMAT
+     *
+     * Adds time-zone offset information if the currents user time-zone is different form UTC
+     *
+     * @param date the DateTime instance
+     * @return date formatted date String to display */
+    default String formatDisplayDateWithTimeZone(final DateTime date) {
+        return formatDisplayDate(date) + " " + this.getUsersTimeZoneTitleSuffix();
+    }
+
     /** Format a time-stamp (milliseconds) to a text format to display.
      * This uses the date-format defined by either the attribute 'sebserver.gui.date.displayformat'
      * or the Constants.DEFAULT_DISPLAY_DATE_FORMAT
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/I18nSupportImpl.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/I18nSupportImpl.java
index 92412f5c..9409b5c5 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/I18nSupportImpl.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/I18nSupportImpl.java
@@ -50,6 +50,7 @@ public class I18nSupportImpl implements I18nSupport {
     private static final String DATE_DISPLAYFORMAT_TIMEZONE_KEY = "sebserver.gui.date.displayformat.timezone";
     private static final String ATTR_CURRENT_SESSION_LOCALE = "CURRENT_SESSION_LOCALE";
 
+    @SuppressWarnings("unused")
     private final DateTimeFormatter timeZoneFormatter;
     private final DateTimeFormatter displayDateFormatter;
     private final DateTimeFormatter displayDateTimeFormatter;
@@ -171,7 +172,7 @@ public class I18nSupportImpl implements I18nSupport {
         if (userInfo.timeZone == null || userInfo.timeZone.equals(DateTimeZone.UTC)) {
             return "";
         } else {
-            return "(UTC|" + this.currentUser.get().timeZone.getID() + ")";
+            return "(" + this.currentUser.get().timeZone.getID() + ")";
         }
     }
 
@@ -191,7 +192,7 @@ public class I18nSupportImpl implements I18nSupport {
             return false;
         }
 
-        return getText(key.name, (String) null) != null;
+        return StringUtils.isNotBlank(getText(key.name, (String) null));
     }
 
     private String formatDisplayDate(final DateTime date, final DateTimeFormatter formatter) {
@@ -206,15 +207,11 @@ public class I18nSupportImpl implements I18nSupport {
             dateUTC = date.withZone(DateTimeZone.UTC);
         }
 
-        final String dateTimeStringUTC = dateUTC.toString(formatter);
         final UserInfo userInfo = this.currentUser.get();
         if (userInfo != null && userInfo.timeZone != null && !userInfo.timeZone.equals(DateTimeZone.UTC)) {
-
-            return dateTimeStringUTC + dateUTC
-                    .withZone(userInfo.timeZone)
-                    .toString(this.timeZoneFormatter);
+            return dateUTC.toString(formatter.withZone(userInfo.timeZone));
         } else {
-            return dateTimeStringUTC;
+            return dateUTC.toString(formatter);
         }
     }
 
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/table/TableFilter.java b/src/main/java/ch/ethz/seb/sebserver/gui/table/TableFilter.java
index cbdb50a7..fc69fa04 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/table/TableFilter.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/table/TableFilter.java
@@ -32,6 +32,7 @@ import org.springframework.util.MultiValueMap;
 
 import ch.ethz.seb.sebserver.gbl.Constants;
 import ch.ethz.seb.sebserver.gbl.model.Entity;
+import ch.ethz.seb.sebserver.gbl.model.user.UserInfo;
 import ch.ethz.seb.sebserver.gbl.util.Tuple;
 import ch.ethz.seb.sebserver.gbl.util.Utils;
 import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey;
@@ -200,8 +201,8 @@ public class TableFilter<ROW extends Entity> {
         inner.setLayout(gridLayout);
         inner.setLayoutData(new RowData());
 
-        final GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, true);
-
+        final GridData gridData = new GridData(SWT.FILL, SWT.BOTTOM, true, true);
+        gridData.heightHint = 20;
         final Label imageButton = this.entityTable.widgetFactory.imageButton(
                 ImageIcon.SEARCH,
                 inner,
@@ -411,9 +412,15 @@ public class TableFilter<ROW extends Entity> {
     private class Date extends FilterComponent {
 
         private DateTime selector;
+        private final DateTimeZone timeZone;
 
         Date(final TableFilterAttribute attribute) {
             super(attribute);
+            final UserInfo userInfo = TableFilter.this.entityTable.pageService.getCurrentUser().get();
+            this.timeZone =
+                    (userInfo != null && userInfo.timeZone != null && !userInfo.timeZone.equals(DateTimeZone.UTC))
+                            ? userInfo.timeZone
+                            : DateTimeZone.UTC;
         }
 
         @Override
@@ -440,7 +447,7 @@ public class TableFilter<ROW extends Entity> {
         @Override
         String getValue() {
             if (this.selector != null) {
-                final org.joda.time.DateTime date = org.joda.time.DateTime.now(DateTimeZone.UTC)
+                final org.joda.time.DateTime date = org.joda.time.DateTime.now(this.timeZone)
                         .withYear(this.selector.getYear())
                         .withMonthOfYear(this.selector.getMonth() + 1)
                         .withDayOfMonth(this.selector.getDay())
@@ -456,7 +463,9 @@ public class TableFilter<ROW extends Entity> {
         void setValue(final String value) {
             if (this.selector != null) {
                 try {
-                    final org.joda.time.DateTime date = Utils.toDateTime(value);
+                    final org.joda.time.DateTime date = new org.joda.time.DateTime(
+                            Utils.toDateTime(value),
+                            this.timeZone);
                     this.selector.setDate(date.getYear(), date.getMonthOfYear() - 1, date.getDayOfMonth());
                 } catch (final Exception e) {
                     log.error("Failed to set date filter attribute: ", e);
@@ -482,6 +491,7 @@ public class TableFilter<ROW extends Entity> {
         private DateTime fromTimeSelector;
         private DateTime toTimeSelector;
         private final boolean withTime;
+        private final DateTimeZone timeZone;
 
         DateRange(final TableFilterAttribute attribute) {
             this(attribute, false);
@@ -490,6 +500,11 @@ public class TableFilter<ROW extends Entity> {
         DateRange(final TableFilterAttribute attribute, final boolean withTime) {
             super(attribute);
             this.withTime = withTime;
+            final UserInfo userInfo = TableFilter.this.entityTable.pageService.getCurrentUser().get();
+            this.timeZone =
+                    (userInfo != null && userInfo.timeZone != null && !userInfo.timeZone.equals(DateTimeZone.UTC))
+                            ? userInfo.timeZone
+                            : DateTimeZone.UTC;
         }
 
         @Override
@@ -521,10 +536,12 @@ public class TableFilter<ROW extends Entity> {
 
         @Override
         FilterComponent reset() {
-            final org.joda.time.DateTime now = org.joda.time.DateTime.now(DateTimeZone.UTC);
+            final org.joda.time.DateTime now = org.joda.time.DateTime.now(this.timeZone);
             if (this.fromDateSelector != null) {
                 try {
-                    final org.joda.time.DateTime parse = org.joda.time.DateTime.parse(this.attribute.initValue);
+                    final org.joda.time.DateTime parse = new org.joda.time.DateTime(
+                            org.joda.time.DateTime.parse(this.attribute.initValue),
+                            this.timeZone);
 
                     this.fromDateSelector.setDate(
                             parse.getYear(),
@@ -568,14 +585,14 @@ public class TableFilter<ROW extends Entity> {
         @Override
         String getValue() {
             if (this.fromDateSelector != null && this.toDateSelector != null) {
-                org.joda.time.DateTime fromDate = org.joda.time.DateTime.now(DateTimeZone.UTC)
+                org.joda.time.DateTime fromDate = org.joda.time.DateTime.now(this.timeZone)
                         .withYear(this.fromDateSelector.getYear())
                         .withMonthOfYear(this.fromDateSelector.getMonth() + 1)
                         .withDayOfMonth(this.fromDateSelector.getDay())
                         .withHourOfDay((this.fromTimeSelector != null) ? this.fromTimeSelector.getHours() : 0)
                         .withMinuteOfHour((this.fromTimeSelector != null) ? this.fromTimeSelector.getMinutes() : 0)
                         .withSecondOfMinute((this.fromTimeSelector != null) ? this.fromTimeSelector.getSeconds() : 0);
-                org.joda.time.DateTime toDate = org.joda.time.DateTime.now(DateTimeZone.UTC)
+                org.joda.time.DateTime toDate = org.joda.time.DateTime.now(this.timeZone)
                         .withYear(this.toDateSelector.getYear())
                         .withMonthOfYear(this.toDateSelector.getMonth() + 1)
                         .withDayOfMonth(this.toDateSelector.getDay())
@@ -603,8 +620,10 @@ public class TableFilter<ROW extends Entity> {
             if (this.fromDateSelector != null && this.toDateSelector != null) {
                 try {
                     final String[] split = StringUtils.split(value, Constants.EMBEDDED_LIST_SEPARATOR);
-                    final org.joda.time.DateTime fromDate = Utils.toDateTime(split[0]);
-                    final org.joda.time.DateTime toDate = Utils.toDateTime(split[1]);
+                    final org.joda.time.DateTime fromDate =
+                            new org.joda.time.DateTime(Utils.toDateTime(split[0]), this.timeZone);
+                    final org.joda.time.DateTime toDate =
+                            new org.joda.time.DateTime(Utils.toDateTime(split[1]), this.timeZone);
                     this.fromDateSelector.setDate(
                             fromDate.getYear(),
                             fromDate.getMonthOfYear() - 1,
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/table/TableNavigator.java b/src/main/java/ch/ethz/seb/sebserver/gui/table/TableNavigator.java
index ccf6b22d..fa01c40a 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/table/TableNavigator.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/table/TableNavigator.java
@@ -10,12 +10,8 @@ package ch.ethz.seb.sebserver.gui.table;
 
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowData;
-import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 
@@ -35,7 +31,6 @@ public class TableNavigator {
         final GridData gridData = new GridData(SWT.LEFT, SWT.CENTER, true, true);
         this.composite.setLayoutData(gridData);
         final GridLayout layout = new GridLayout(3, false);
-        layout.marginLeft = 10;
         this.composite.setLayout(layout);
 
         this.entityTable = entityTable;
@@ -68,7 +63,7 @@ public class TableNavigator {
         final Composite numNav = new Composite(this.composite, SWT.NONE);
         final GridData gridData = new GridData(SWT.CENTER, SWT.TOP, true, false);
         numNav.setLayoutData(gridData);
-        final RowLayout rowLayout = new RowLayout(SWT.HORIZONTAL);
+        final GridLayout rowLayout = new GridLayout(PAGE_NAV_SIZE + 5, true);
         numNav.setLayout(rowLayout);
 
         if (numberOfPages > 1) {
@@ -89,7 +84,7 @@ public class TableNavigator {
                 createPageNumberLabel(i, i != pageNumber, numNav);
             }
 
-            createForwardLabel(pageNumber < numberOfPages, pageNumber, numNav);
+            createForwardLabel(pageNumber < numberOfPages, pageNumber, numberOfPages, numNav);
         }
 
         return pageData;
@@ -97,12 +92,12 @@ public class TableNavigator {
 
     private void createPagingHeader(final int page, final int of) {
         final Label pageHeader = new Label(this.composite, SWT.NONE);
-        final GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, true);
+        final GridData gridData = new GridData(SWT.CENTER, SWT.CENTER, true, false);
         gridData.widthHint = 100;
         gridData.minimumWidth = 100;
-        gridData.verticalAlignment = SWT.CENTER;
+        gridData.heightHint = 16;
         pageHeader.setLayoutData(gridData);
-        pageHeader.setText("Page " + page + "/" + of);
+        pageHeader.setText("Page " + page + " / " + of);
     }
 
     private void createPageNumberLabel(
@@ -110,28 +105,31 @@ public class TableNavigator {
             final boolean selectable,
             final Composite parent) {
 
+        final GridData rowData = new GridData(22, 16);
         final Label pageLabel = new Label(parent, SWT.NONE);
-
         pageLabel.setText(" " + String.valueOf(page) + " ");
-        pageLabel.setLayoutData(new RowData(22, 16));
+        pageLabel.setLayoutData(rowData);
         pageLabel.setAlignment(SWT.CENTER);
         if (selectable) {
-            pageLabel.setData(RWT.CUSTOM_VARIANT, "action");
+            pageLabel.setData(RWT.CUSTOM_VARIANT, CustomVariant.LIST_NAVIGATION.key);
             pageLabel.addListener(SWT.MouseDown, event -> {
                 this.entityTable.selectPage(page);
             });
-            pageLabel.setBackground(new Color(parent.getDisplay(), new RGB(245, 245, 245)));
         }
     }
 
     private void createForwardLabel(
             final boolean visible,
             final int pageNumber,
+            final int numberOfPages,
             final Composite parent) {
 
+        final GridData rowData = new GridData(22, 16);
         final Label forward = new Label(parent, SWT.NONE);
         forward.setText(">");
-        forward.setData(RWT.CUSTOM_VARIANT, "action");
+        forward.setData(RWT.CUSTOM_VARIANT, CustomVariant.LIST_NAVIGATION.key);
+        forward.setLayoutData(rowData);
+        forward.setAlignment(SWT.CENTER);
         if (visible) {
             forward.addListener(SWT.MouseDown, event -> {
                 this.entityTable.selectPage(pageNumber + 1);
@@ -139,6 +137,19 @@ public class TableNavigator {
         } else {
             forward.setVisible(false);
         }
+
+        final Label end = new Label(parent, SWT.NONE);
+        end.setText(">>");
+        end.setData(RWT.CUSTOM_VARIANT, CustomVariant.LIST_NAVIGATION.key);
+        end.setLayoutData(rowData);
+        end.setAlignment(SWT.CENTER);
+        if (visible) {
+            end.addListener(SWT.MouseDown, event -> {
+                this.entityTable.selectPage(numberOfPages);
+            });
+        } else {
+            end.setVisible(false);
+        }
     }
 
     private void createBackwardLabel(
@@ -146,9 +157,25 @@ public class TableNavigator {
             final int pageNumber,
             final Composite parent) {
 
+        final GridData rowData = new GridData(22, 16);
+        final Label start = new Label(parent, SWT.NONE);
+        start.setText("<<");
+        start.setLayoutData(rowData);
+        start.setAlignment(SWT.CENTER);
+        start.setData(RWT.CUSTOM_VARIANT, CustomVariant.LIST_NAVIGATION.key);
+        if (visible) {
+            start.addListener(SWT.MouseDown, event -> {
+                this.entityTable.selectPage(1);
+            });
+        } else {
+            start.setVisible(false);
+        }
+
         final Label backward = new Label(parent, SWT.NONE);
         backward.setText("<");
-        backward.setData(RWT.CUSTOM_VARIANT, "action");
+        backward.setLayoutData(rowData);
+        backward.setAlignment(SWT.CENTER);
+        backward.setData(RWT.CUSTOM_VARIANT, CustomVariant.LIST_NAVIGATION.key);
         if (visible) {
             backward.addListener(SWT.MouseDown, event -> {
                 this.entityTable.selectPage(pageNumber - 1);
@@ -156,6 +183,7 @@ public class TableNavigator {
         } else {
             backward.setVisible(false);
         }
+
     }
 
 }
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java b/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java
index 5a3121b4..11a91f13 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/widget/WidgetFactory.java
@@ -155,7 +155,9 @@ public class WidgetFactory {
         LIGHT_COLOR_LABEL("colorlight"),
 
         LOGIN("login"),
-        LOGIN_BACK("login-back")
+        LOGIN_BACK("login-back"),
+
+        LIST_NAVIGATION("list-nav")
 
         ;
 
@@ -188,7 +190,7 @@ public class WidgetFactory {
         final GridLayout contentLayout = new GridLayout();
         contentLayout.marginLeft = 10;
         content.setLayout(contentLayout);
-        final GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
+        final GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
         content.setLayoutData(gridData);
         return content;
     }
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/AdminUserInitializer.java b/src/main/java/ch/ethz/seb/sebserver/webservice/AdminUserInitializer.java
index 4d206337..2a064c7a 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/AdminUserInitializer.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/AdminUserInitializer.java
@@ -121,6 +121,7 @@ class AdminUserInitializer {
                             institutionId,
                             this.adminName,
                             this.adminName,
+                            this.adminName,
                             generateAdminPassword,
                             generateAdminPassword,
                             null,
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordDynamicSqlSupport.java
index 4067a498..a5f0289d 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordDynamicSqlSupport.java
@@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class AdditionalAttributeRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source Table: additional_attributes")
     public static final AdditionalAttributeRecord additionalAttributeRecord = new AdditionalAttributeRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.id")
     public static final SqlColumn<Long> id = additionalAttributeRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.entity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.entity_type")
     public static final SqlColumn<String> entityType = additionalAttributeRecord.entityType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.entity_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.entity_id")
     public static final SqlColumn<Long> entityId = additionalAttributeRecord.entityId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.name")
     public static final SqlColumn<String> name = additionalAttributeRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.825+01:00", comments="Source field: additional_attributes.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.value")
     public static final SqlColumn<String> value = additionalAttributeRecord.value;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source Table: additional_attributes")
     public static final class AdditionalAttributeRecord 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/AdditionalAttributeRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordMapper.java
index f4eb4ba6..6f9c6e2f 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordMapper.java
@@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface AdditionalAttributeRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.825+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+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="2020-01-09T10:29:16.825+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+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="2020-01-09T10:29:16.825+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+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<AdditionalAttributeRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.825+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+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),
@@ -56,7 +56,7 @@ public interface AdditionalAttributeRecordMapper {
     })
     AdditionalAttributeRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.825+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+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),
@@ -67,22 +67,22 @@ public interface AdditionalAttributeRecordMapper {
     })
     List<AdditionalAttributeRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.825+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.304+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="2020-01-09T10:29:16.825+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.304+01:00", comments="Source Table: additional_attributes")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(additionalAttributeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.825+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.304+01:00", comments="Source Table: additional_attributes")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.825+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.304+01:00", comments="Source Table: additional_attributes")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, additionalAttributeRecord)
                 .where(id, isEqualTo(id_))
@@ -90,7 +90,7 @@ public interface AdditionalAttributeRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.825+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.304+01:00", comments="Source Table: additional_attributes")
     default int insert(AdditionalAttributeRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(additionalAttributeRecord)
@@ -102,7 +102,7 @@ public interface AdditionalAttributeRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.825+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.304+01:00", comments="Source Table: additional_attributes")
     default int insertSelective(AdditionalAttributeRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(additionalAttributeRecord)
@@ -114,19 +114,19 @@ public interface AdditionalAttributeRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.825+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.304+01:00", comments="Source Table: additional_attributes")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<AdditionalAttributeRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, entityType, entityId, name, value)
                 .from(additionalAttributeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.825+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.304+01:00", comments="Source Table: additional_attributes")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<AdditionalAttributeRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, entityType, entityId, name, value)
                 .from(additionalAttributeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.825+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.304+01:00", comments="Source Table: additional_attributes")
     default AdditionalAttributeRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, entityType, entityId, name, value)
                 .from(additionalAttributeRecord)
@@ -135,7 +135,7 @@ public interface AdditionalAttributeRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.825+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.304+01:00", comments="Source Table: additional_attributes")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(AdditionalAttributeRecord record) {
         return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord)
                 .set(entityType).equalTo(record::getEntityType)
@@ -144,7 +144,7 @@ public interface AdditionalAttributeRecordMapper {
                 .set(value).equalTo(record::getValue);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.825+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.304+01:00", comments="Source Table: additional_attributes")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(AdditionalAttributeRecord record) {
         return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord)
                 .set(entityType).equalToWhenPresent(record::getEntityType)
@@ -153,7 +153,7 @@ public interface AdditionalAttributeRecordMapper {
                 .set(value).equalToWhenPresent(record::getValue);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.825+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.304+01:00", comments="Source Table: additional_attributes")
     default int updateByPrimaryKey(AdditionalAttributeRecord record) {
         return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord)
                 .set(entityType).equalTo(record::getEntityType)
@@ -165,7 +165,7 @@ public interface AdditionalAttributeRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.825+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.304+01:00", comments="Source Table: additional_attributes")
     default int updateByPrimaryKeySelective(AdditionalAttributeRecord record) {
         return UpdateDSL.updateWithMapper(this::update, additionalAttributeRecord)
                 .set(entityType).equalToWhenPresent(record::getEntityType)
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 2e0c6050..540c562a 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,37 +6,37 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class ClientConnectionRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.793+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source Table: client_connection")
     public static final ClientConnectionRecord clientConnectionRecord = new ClientConnectionRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.793+01:00", comments="Source field: client_connection.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.id")
     public static final SqlColumn<Long> id = clientConnectionRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.793+01:00", comments="Source field: client_connection.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+01:00", comments="Source field: client_connection.institution_id")
     public static final SqlColumn<Long> institutionId = clientConnectionRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.793+01:00", comments="Source field: client_connection.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.793+01:00", comments="Source field: client_connection.status")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+01:00", comments="Source field: client_connection.status")
     public static final SqlColumn<String> status = clientConnectionRecord.status;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.793+01:00", comments="Source field: client_connection.connection_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.793+01:00", comments="Source field: client_connection.exam_user_session_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+01:00", comments="Source field: client_connection.exam_user_session_id")
     public static final SqlColumn<String> examUserSessionId = clientConnectionRecord.examUserSessionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.794+01:00", comments="Source field: client_connection.client_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.794+01:00", comments="Source field: client_connection.virtual_client_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.794+01:00", comments="Source field: client_connection.creation_time")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+01:00", comments="Source field: client_connection.creation_time")
     public static final SqlColumn<Long> creationTime = clientConnectionRecord.creationTime;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.793+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+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 46e22eec..ede84bb5 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="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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),
@@ -60,7 +60,7 @@ public interface ClientConnectionRecordMapper {
     })
     ClientConnectionRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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),
@@ -75,22 +75,22 @@ public interface ClientConnectionRecordMapper {
     })
     List<ClientConnectionRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+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="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+01:00", comments="Source Table: client_connection")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, clientConnectionRecord)
                 .where(id, isEqualTo(id_))
@@ -98,7 +98,7 @@ public interface ClientConnectionRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.275+01:00", comments="Source Table: client_connection")
     default int insert(ClientConnectionRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(clientConnectionRecord)
@@ -114,7 +114,7 @@ public interface ClientConnectionRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_connection")
     default int insertSelective(ClientConnectionRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(clientConnectionRecord)
@@ -130,19 +130,19 @@ public interface ClientConnectionRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_connection")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, creationTime)
                 .from(clientConnectionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_connection")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientConnectionRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, creationTime)
                 .from(clientConnectionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_connection")
     default ClientConnectionRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, status, connectionToken, examUserSessionId, clientAddress, virtualClientAddress, creationTime)
                 .from(clientConnectionRecord)
@@ -151,7 +151,7 @@ public interface ClientConnectionRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.794+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_connection")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientConnectionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -164,7 +164,7 @@ public interface ClientConnectionRecordMapper {
                 .set(creationTime).equalTo(record::getCreationTime);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.795+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_connection")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientConnectionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@@ -177,7 +177,7 @@ public interface ClientConnectionRecordMapper {
                 .set(creationTime).equalToWhenPresent(record::getCreationTime);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.795+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_connection")
     default int updateByPrimaryKey(ClientConnectionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -193,7 +193,7 @@ public interface ClientConnectionRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.795+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_connection")
     default int updateByPrimaryKeySelective(ClientConnectionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientConnectionRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
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 1f28e042..95b78731 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="2020-01-09T10:29:16.797+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+01:00", comments="Source Table: client_event")
     public static final ClientEventRecord clientEventRecord = new ClientEventRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.797+01:00", comments="Source field: client_event.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+01:00", comments="Source field: client_event.id")
     public static final SqlColumn<Long> id = clientEventRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.797+01:00", comments="Source field: client_event.client_connection_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+01:00", comments="Source field: client_event.client_connection_id")
     public static final SqlColumn<Long> clientConnectionId = clientEventRecord.clientConnectionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.797+01:00", comments="Source field: client_event.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+01:00", comments="Source field: client_event.type")
     public static final SqlColumn<Integer> type = clientEventRecord.type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.797+01:00", comments="Source field: client_event.client_time")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+01:00", comments="Source field: client_event.client_time")
     public static final SqlColumn<Long> clientTime = clientEventRecord.clientTime;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.797+01:00", comments="Source field: client_event.server_time")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+01:00", comments="Source field: client_event.server_time")
     public static final SqlColumn<Long> serverTime = clientEventRecord.serverTime;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.797+01:00", comments="Source field: client_event.numeric_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+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="2020-01-09T10:29:16.797+01:00", comments="Source field: client_event.text")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+01:00", comments="Source field: client_event.text")
     public static final SqlColumn<String> text = clientEventRecord.text;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.797+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+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 a1e406a5..5311c8ca 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
@@ -32,19 +32,19 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface ClientEventRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.797+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+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="2020-01-09T10:29:16.797+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+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="2020-01-09T10:29:16.797+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+01:00", comments="Source Table: client_event")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     int insert(InsertStatementProvider<ClientEventRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.797+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.278+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),
@@ -57,7 +57,7 @@ public interface ClientEventRecordMapper {
     })
     ClientEventRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+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),
@@ -70,22 +70,22 @@ public interface ClientEventRecordMapper {
     })
     List<ClientEventRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+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="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+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="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+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="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source Table: client_event")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, clientEventRecord)
                 .where(id, isEqualTo(id_))
@@ -93,7 +93,7 @@ public interface ClientEventRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source Table: client_event")
     default int insert(ClientEventRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(clientEventRecord)
@@ -108,7 +108,7 @@ public interface ClientEventRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+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="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source Table: client_event")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientEventRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, clientConnectionId, type, clientTime, serverTime, numericValue, text)
                 .from(clientEventRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source Table: client_event")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientEventRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, clientConnectionId, type, clientTime, serverTime, numericValue, text)
                 .from(clientEventRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source Table: client_event")
     default ClientEventRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, clientConnectionId, type, clientTime, serverTime, numericValue, text)
                 .from(clientEventRecord)
@@ -144,7 +144,7 @@ public interface ClientEventRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source Table: client_event")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientEventRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
                 .set(id).equalTo(record::getId)
@@ -156,7 +156,7 @@ public interface ClientEventRecordMapper {
                 .set(text).equalTo(record::getText);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source Table: client_event")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientEventRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
                 .set(id).equalToWhenPresent(record::getId)
@@ -168,7 +168,7 @@ public interface ClientEventRecordMapper {
                 .set(text).equalToWhenPresent(record::getText);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source Table: client_event")
     default int updateByPrimaryKey(ClientEventRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
                 .set(clientConnectionId).equalTo(record::getClientConnectionId)
@@ -182,7 +182,7 @@ public interface ClientEventRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.798+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source Table: client_event")
     default int updateByPrimaryKeySelective(ClientEventRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientEventRecord)
                 .set(clientConnectionId).equalToWhenPresent(record::getClientConnectionId)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordDynamicSqlSupport.java
index 0cf922e6..e92d1d60 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordDynamicSqlSupport.java
@@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class ClientInstructionRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source Table: client_instruction")
     public static final ClientInstructionRecord clientInstructionRecord = new ClientInstructionRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.id")
     public static final SqlColumn<Long> id = clientInstructionRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.exam_id")
     public static final SqlColumn<Long> examId = clientInstructionRecord.examId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source field: client_instruction.connection_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.connection_token")
     public static final SqlColumn<String> connectionToken = clientInstructionRecord.connectionToken;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source field: client_instruction.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.type")
     public static final SqlColumn<String> type = clientInstructionRecord.type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source field: client_instruction.attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source field: client_instruction.attributes")
     public static final SqlColumn<String> attributes = clientInstructionRecord.attributes;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source Table: client_instruction")
     public static final class ClientInstructionRecord 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/ClientInstructionRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordMapper.java
index d450ed82..af45b86d 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordMapper.java
@@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface ClientInstructionRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<ClientInstructionRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -56,7 +56,7 @@ public interface ClientInstructionRecordMapper {
     })
     ClientInstructionRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -67,22 +67,22 @@ public interface ClientInstructionRecordMapper {
     })
     List<ClientInstructionRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(clientInstructionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, clientInstructionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, clientInstructionRecord)
                 .where(id, isEqualTo(id_))
@@ -90,7 +90,7 @@ public interface ClientInstructionRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
     default int insert(ClientInstructionRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(clientInstructionRecord)
@@ -102,7 +102,7 @@ public interface ClientInstructionRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
     default int insertSelective(ClientInstructionRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(clientInstructionRecord)
@@ -114,19 +114,19 @@ public interface ClientInstructionRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientInstructionRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, examId, connectionToken, type, attributes)
                 .from(clientInstructionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ClientInstructionRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, examId, connectionToken, type, attributes)
                 .from(clientInstructionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.800+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
     default ClientInstructionRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, examId, connectionToken, type, attributes)
                 .from(clientInstructionRecord)
@@ -135,7 +135,7 @@ public interface ClientInstructionRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.801+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ClientInstructionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord)
                 .set(examId).equalTo(record::getExamId)
@@ -144,7 +144,7 @@ public interface ClientInstructionRecordMapper {
                 .set(attributes).equalTo(record::getAttributes);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.801+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.281+01:00", comments="Source Table: client_instruction")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ClientInstructionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord)
                 .set(examId).equalToWhenPresent(record::getExamId)
@@ -153,7 +153,7 @@ public interface ClientInstructionRecordMapper {
                 .set(attributes).equalToWhenPresent(record::getAttributes);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.801+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+01:00", comments="Source Table: client_instruction")
     default int updateByPrimaryKey(ClientInstructionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord)
                 .set(examId).equalTo(record::getExamId)
@@ -165,7 +165,7 @@ public interface ClientInstructionRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.801+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+01:00", comments="Source Table: client_instruction")
     default int updateByPrimaryKeySelective(ClientInstructionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, clientInstructionRecord)
                 .set(examId).equalToWhenPresent(record::getExamId)
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 d56cded3..a39bb24d 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="2020-01-09T10:29:16.624+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.090+01:00", comments="Source Table: configuration_attribute")
     public static final ConfigurationAttributeRecord configurationAttributeRecord = new ConfigurationAttributeRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.627+01:00", comments="Source field: configuration_attribute.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.092+01:00", comments="Source field: configuration_attribute.id")
     public static final SqlColumn<Long> id = configurationAttributeRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.628+01:00", comments="Source field: configuration_attribute.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.093+01:00", comments="Source field: configuration_attribute.name")
     public static final SqlColumn<String> name = configurationAttributeRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.629+01:00", comments="Source field: configuration_attribute.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.093+01:00", comments="Source field: configuration_attribute.type")
     public static final SqlColumn<String> type = configurationAttributeRecord.type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.629+01:00", comments="Source field: configuration_attribute.parent_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.093+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="2020-01-09T10:29:16.629+01:00", comments="Source field: configuration_attribute.resources")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.094+01:00", comments="Source field: configuration_attribute.resources")
     public static final SqlColumn<String> resources = configurationAttributeRecord.resources;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.630+01:00", comments="Source field: configuration_attribute.validator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.094+01:00", comments="Source field: configuration_attribute.validator")
     public static final SqlColumn<String> validator = configurationAttributeRecord.validator;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.630+01:00", comments="Source field: configuration_attribute.dependencies")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.094+01:00", comments="Source field: configuration_attribute.dependencies")
     public static final SqlColumn<String> dependencies = configurationAttributeRecord.dependencies;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.630+01:00", comments="Source field: configuration_attribute.default_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.094+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="2020-01-09T10:29:16.627+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.092+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 3237f1ed..4130ee68 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="2020-01-09T10:29:16.632+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.095+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="2020-01-09T10:29:16.633+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.097+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="2020-01-09T10:29:16.634+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.101+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="2020-01-09T10:29:16.637+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.103+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="2020-01-09T10:29:16.639+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.104+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="2020-01-09T10:29:16.640+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.105+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="2020-01-09T10:29:16.640+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.105+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="2020-01-09T10:29:16.641+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.106+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="2020-01-09T10:29:16.641+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.107+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="2020-01-09T10:29:16.642+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.108+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="2020-01-09T10:29:16.643+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.110+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="2020-01-09T10:29:16.644+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.111+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="2020-01-09T10:29:16.645+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.114+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="2020-01-09T10:29:16.645+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.115+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="2020-01-09T10:29:16.646+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.116+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="2020-01-09T10:29:16.647+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.118+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="2020-01-09T10:29:16.648+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.119+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="2020-01-09T10:29:16.649+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.120+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 25ed959a..761a5f03 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="2020-01-09T10:29:16.767+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source Table: configuration_node")
     public static final ConfigurationNodeRecord configurationNodeRecord = new ConfigurationNodeRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.id")
     public static final SqlColumn<Long> id = configurationNodeRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+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="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.template_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+01:00", comments="Source field: configuration_node.template_id")
     public static final SqlColumn<Long> templateId = configurationNodeRecord.templateId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.owner")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+01:00", comments="Source field: configuration_node.owner")
     public static final SqlColumn<String> owner = configurationNodeRecord.owner;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+01:00", comments="Source field: configuration_node.name")
     public static final SqlColumn<String> name = configurationNodeRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.768+01:00", comments="Source field: configuration_node.description")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+01:00", comments="Source field: configuration_node.description")
     public static final SqlColumn<String> description = configurationNodeRecord.description;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.768+01:00", comments="Source field: configuration_node.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+01:00", comments="Source field: configuration_node.type")
     public static final SqlColumn<String> type = configurationNodeRecord.type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.768+01:00", comments="Source field: configuration_node.status")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+01:00", comments="Source field: configuration_node.status")
     public static final SqlColumn<String> status = configurationNodeRecord.status;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.767+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+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 05a326d1..740b81e3 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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.259+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+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="2020-01-09T10:29:16.768+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+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="2020-01-09T10:29:16.769+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+01:00", comments="Source Table: configuration_node")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status)
                 .from(configurationNodeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.769+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+01:00", comments="Source Table: configuration_node")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationNodeRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, templateId, owner, name, description, type, status)
                 .from(configurationNodeRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.769+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+01:00", comments="Source Table: configuration_node")
     default ConfigurationNodeRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, templateId, owner, name, description, type, status)
                 .from(configurationNodeRecord)
@@ -147,7 +147,7 @@ public interface ConfigurationNodeRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.769+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+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(status).equalTo(record::getStatus);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.769+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+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(status).equalToWhenPresent(record::getStatus);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.769+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.260+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="2020-01-09T10:29:16.769+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.261+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 a651ffe9..c2c4160d 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,28 +7,28 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class ConfigurationRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.760+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source Table: configuration")
     public static final ConfigurationRecord configurationRecord = new ConfigurationRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.763+01:00", comments="Source field: configuration.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.id")
     public static final SqlColumn<Long> id = configurationRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.763+01:00", comments="Source field: configuration.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.institution_id")
     public static final SqlColumn<Long> institutionId = configurationRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.763+01:00", comments="Source field: configuration.configuration_node_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+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="2020-01-09T10:29:16.763+01:00", comments="Source field: configuration.version")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source field: configuration.version")
     public static final SqlColumn<String> version = configurationRecord.version;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.764+01:00", comments="Source field: configuration.version_date")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source field: configuration.version_date")
     public static final SqlColumn<DateTime> versionDate = configurationRecord.versionDate;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.764+01:00", comments="Source field: configuration.followup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source field: configuration.followup")
     public static final SqlColumn<Integer> followup = configurationRecord.followup;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.761+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+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 602968ec..63a40858 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="2020-01-09T10:29:16.764+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source Table: configuration")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.764+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source Table: configuration")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.764+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+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="2020-01-09T10:29:16.764+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source Table: configuration")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -59,7 +59,7 @@ public interface ConfigurationRecordMapper {
     })
     ConfigurationRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.764+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source Table: configuration")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -71,22 +71,22 @@ public interface ConfigurationRecordMapper {
     })
     List<ConfigurationRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.764+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source Table: configuration")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.764+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+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="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+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="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source Table: configuration")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, configurationRecord)
                 .where(id, isEqualTo(id_))
@@ -94,7 +94,7 @@ public interface ConfigurationRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source Table: configuration")
     default int insert(ConfigurationRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(configurationRecord)
@@ -107,7 +107,7 @@ public interface ConfigurationRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source Table: configuration")
     default int insertSelective(ConfigurationRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(configurationRecord)
@@ -120,19 +120,19 @@ public interface ConfigurationRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source Table: configuration")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup)
                 .from(configurationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.256+01:00", comments="Source Table: configuration")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationNodeId, version, versionDate, followup)
                 .from(configurationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source Table: configuration")
     default ConfigurationRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationNodeId, version, versionDate, followup)
                 .from(configurationRecord)
@@ -141,7 +141,7 @@ public interface ConfigurationRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source Table: configuration")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -151,7 +151,7 @@ public interface ConfigurationRecordMapper {
                 .set(followup).equalTo(record::getFollowup);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source Table: configuration")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@@ -161,7 +161,7 @@ public interface ConfigurationRecordMapper {
                 .set(followup).equalToWhenPresent(record::getFollowup);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source Table: configuration")
     default int updateByPrimaryKey(ConfigurationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -174,7 +174,7 @@ public interface ConfigurationRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.765+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source Table: configuration")
     default int updateByPrimaryKeySelective(ConfigurationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
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 37496e4d..42e18ea2 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="2020-01-09T10:29:16.749+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.240+01:00", comments="Source Table: configuration_value")
     public static final ConfigurationValueRecord configurationValueRecord = new ConfigurationValueRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.749+01:00", comments="Source field: configuration_value.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.240+01:00", comments="Source field: configuration_value.id")
     public static final SqlColumn<Long> id = configurationValueRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.749+01:00", comments="Source field: configuration_value.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.240+01:00", comments="Source field: configuration_value.institution_id")
     public static final SqlColumn<Long> institutionId = configurationValueRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.749+01:00", comments="Source field: configuration_value.configuration_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.240+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="2020-01-09T10:29:16.749+01:00", comments="Source field: configuration_value.configuration_attribute_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+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="2020-01-09T10:29:16.749+01:00", comments="Source field: configuration_value.list_index")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+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="2020-01-09T10:29:16.749+01:00", comments="Source field: configuration_value.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+01:00", comments="Source field: configuration_value.value")
     public static final SqlColumn<String> value = configurationValueRecord.value;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.749+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.240+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 a1cf3a20..eb6a7723 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
@@ -31,19 +31,19 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface ConfigurationValueRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.749+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+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="2020-01-09T10:29:16.749+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+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="2020-01-09T10:29:16.749+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+01:00", comments="Source Table: configuration_value")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     int insert(InsertStatementProvider<ConfigurationValueRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.749+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+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),
@@ -55,7 +55,7 @@ public interface ConfigurationValueRecordMapper {
     })
     ConfigurationValueRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+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),
@@ -67,22 +67,22 @@ public interface ConfigurationValueRecordMapper {
     })
     List<ConfigurationValueRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+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="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+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="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+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="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.241+01:00", comments="Source Table: configuration_value")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, configurationValueRecord)
                 .where(id, isEqualTo(id_))
@@ -90,7 +90,7 @@ public interface ConfigurationValueRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.242+01:00", comments="Source Table: configuration_value")
     default int insert(ConfigurationValueRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(configurationValueRecord)
@@ -104,7 +104,7 @@ public interface ConfigurationValueRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.242+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="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.242+01:00", comments="Source Table: configuration_value")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value)
                 .from(configurationValueRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.242+01:00", comments="Source Table: configuration_value")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ConfigurationValueRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, configurationId, configurationAttributeId, listIndex, value)
                 .from(configurationValueRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.242+01:00", comments="Source Table: configuration_value")
     default ConfigurationValueRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, configurationId, configurationAttributeId, listIndex, value)
                 .from(configurationValueRecord)
@@ -139,7 +139,7 @@ public interface ConfigurationValueRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.242+01:00", comments="Source Table: configuration_value")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ConfigurationValueRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
                 .set(id).equalTo(record::getId)
@@ -150,7 +150,7 @@ public interface ConfigurationValueRecordMapper {
                 .set(value).equalTo(record::getValue);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.242+01:00", comments="Source Table: configuration_value")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ConfigurationValueRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
                 .set(id).equalToWhenPresent(record::getId)
@@ -161,7 +161,7 @@ public interface ConfigurationValueRecordMapper {
                 .set(value).equalToWhenPresent(record::getValue);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.242+01:00", comments="Source Table: configuration_value")
     default int updateByPrimaryKey(ConfigurationValueRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -174,7 +174,7 @@ public interface ConfigurationValueRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.750+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.242+01:00", comments="Source Table: configuration_value")
     default int updateByPrimaryKeySelective(ConfigurationValueRecord record) {
         return UpdateDSL.updateWithMapper(this::update, configurationValueRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
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 2fa15bc0..0e560a73 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,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class ExamConfigurationMapRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+01:00", comments="Source Table: exam_configuration_map")
     public static final ExamConfigurationMapRecord examConfigurationMapRecord = new ExamConfigurationMapRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.774+01:00", comments="Source field: exam_configuration_map.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+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="2020-01-09T10:29:16.774+01:00", comments="Source field: exam_configuration_map.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+01:00", comments="Source field: exam_configuration_map.institution_id")
     public static final SqlColumn<Long> institutionId = examConfigurationMapRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.774+01:00", comments="Source field: exam_configuration_map.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+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="2020-01-09T10:29:16.774+01:00", comments="Source field: exam_configuration_map.configuration_node_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+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="2020-01-09T10:29:16.774+01:00", comments="Source field: exam_configuration_map.user_names")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+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="2020-01-09T10:29:16.774+01:00", comments="Source field: exam_configuration_map.encrypt_secret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+01:00", comments="Source field: exam_configuration_map.encrypt_secret")
     public static final SqlColumn<String> encryptSecret = examConfigurationMapRecord.encryptSecret;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.774+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+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 b464f044..7fdd2993 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="2020-01-09T10:29:16.774+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+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="2020-01-09T10:29:16.774+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+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="2020-01-09T10:29:16.774+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+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="2020-01-09T10:29:16.774+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+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),
@@ -57,7 +57,7 @@ public interface ExamConfigurationMapRecordMapper {
     })
     ExamConfigurationMapRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.774+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.264+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),
@@ -69,22 +69,22 @@ public interface ExamConfigurationMapRecordMapper {
     })
     List<ExamConfigurationMapRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+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="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+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="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+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="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+01:00", comments="Source Table: exam_configuration_map")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, examConfigurationMapRecord)
                 .where(id, isEqualTo(id_))
@@ -92,7 +92,7 @@ public interface ExamConfigurationMapRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+01:00", comments="Source Table: exam_configuration_map")
     default int insert(ExamConfigurationMapRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(examConfigurationMapRecord)
@@ -105,7 +105,7 @@ public interface ExamConfigurationMapRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+01:00", comments="Source Table: exam_configuration_map")
     default int insertSelective(ExamConfigurationMapRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(examConfigurationMapRecord)
@@ -118,19 +118,19 @@ public interface ExamConfigurationMapRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+01:00", comments="Source Table: exam_configuration_map")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames, encryptSecret)
                 .from(examConfigurationMapRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+01:00", comments="Source Table: exam_configuration_map")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamConfigurationMapRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, examId, configurationNodeId, userNames, encryptSecret)
                 .from(examConfigurationMapRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+01:00", comments="Source Table: exam_configuration_map")
     default ExamConfigurationMapRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, examId, configurationNodeId, userNames, encryptSecret)
                 .from(examConfigurationMapRecord)
@@ -139,7 +139,7 @@ public interface ExamConfigurationMapRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+01:00", comments="Source Table: exam_configuration_map")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ExamConfigurationMapRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -149,7 +149,7 @@ public interface ExamConfigurationMapRecordMapper {
                 .set(encryptSecret).equalTo(record::getEncryptSecret);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+01:00", comments="Source Table: exam_configuration_map")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ExamConfigurationMapRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@@ -159,7 +159,7 @@ public interface ExamConfigurationMapRecordMapper {
                 .set(encryptSecret).equalToWhenPresent(record::getEncryptSecret);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.265+01:00", comments="Source Table: exam_configuration_map")
     default int updateByPrimaryKey(ExamConfigurationMapRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -172,7 +172,7 @@ public interface ExamConfigurationMapRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.775+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.266+01:00", comments="Source Table: exam_configuration_map")
     default int updateByPrimaryKeySelective(ExamConfigurationMapRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examConfigurationMapRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
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 6c6c831b..5f0012c3 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,52 +6,52 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class ExamRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source Table: exam")
     public static final ExamRecord examRecord = new ExamRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.782+01:00", comments="Source field: exam.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.id")
     public static final SqlColumn<Long> id = examRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.783+01:00", comments="Source field: exam.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.271+01:00", comments="Source field: exam.institution_id")
     public static final SqlColumn<Long> institutionId = examRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.784+01:00", comments="Source field: exam.lms_setup_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.271+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="2020-01-09T10:29:16.784+01:00", comments="Source field: exam.external_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.271+01:00", comments="Source field: exam.external_id")
     public static final SqlColumn<String> externalId = examRecord.externalId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.784+01:00", comments="Source field: exam.owner")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.271+01:00", comments="Source field: exam.owner")
     public static final SqlColumn<String> owner = examRecord.owner;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.784+01:00", comments="Source field: exam.supporter")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.271+01:00", comments="Source field: exam.supporter")
     public static final SqlColumn<String> supporter = examRecord.supporter;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.784+01:00", comments="Source field: exam.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.271+01:00", comments="Source field: exam.type")
     public static final SqlColumn<String> type = examRecord.type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.784+01:00", comments="Source field: exam.quit_password")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.271+01:00", comments="Source field: exam.quit_password")
     public static final SqlColumn<String> quitPassword = examRecord.quitPassword;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.785+01:00", comments="Source field: exam.browser_keys")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.271+01:00", comments="Source field: exam.browser_keys")
     public static final SqlColumn<String> browserKeys = examRecord.browserKeys;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.785+01:00", comments="Source field: exam.status")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.271+01:00", comments="Source field: exam.status")
     public static final SqlColumn<String> status = examRecord.status;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.786+01:00", comments="Source field: exam.lms_seb_restriction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source field: exam.lms_seb_restriction")
     public static final SqlColumn<Integer> lmsSebRestriction = examRecord.lmsSebRestriction;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.786+01:00", comments="Source field: exam.updating")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source field: exam.updating")
     public static final SqlColumn<Integer> updating = examRecord.updating;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.786+01:00", comments="Source field: exam.lastupdate")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source field: exam.lastupdate")
     public static final SqlColumn<String> lastupdate = examRecord.lastupdate;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.787+01:00", comments="Source field: exam.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source field: exam.active")
     public static final SqlColumn<Integer> active = examRecord.active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.782+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source Table: exam")
     public static final class ExamRecord 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/ExamRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java
index 4134eb66..ab5619bc 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="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source Table: exam")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source Table: exam")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+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="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source Table: exam")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -65,7 +65,7 @@ public interface ExamRecordMapper {
     })
     ExamRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source Table: exam")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -85,22 +85,22 @@ public interface ExamRecordMapper {
     })
     List<ExamRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source Table: exam")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+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="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+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="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source Table: exam")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, examRecord)
                 .where(id, isEqualTo(id_))
@@ -108,7 +108,7 @@ public interface ExamRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source Table: exam")
     default int insert(ExamRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(examRecord)
@@ -129,7 +129,7 @@ public interface ExamRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source Table: exam")
     default int insertSelective(ExamRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(examRecord)
@@ -150,19 +150,19 @@ public interface ExamRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source Table: exam")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active)
                 .from(examRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.787+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source Table: exam")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ExamRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active)
                 .from(examRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.789+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source Table: exam")
     default ExamRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, lmsSetupId, externalId, owner, supporter, type, quitPassword, browserKeys, status, lmsSebRestriction, updating, lastupdate, active)
                 .from(examRecord)
@@ -171,7 +171,7 @@ public interface ExamRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.789+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.272+01:00", comments="Source Table: exam")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ExamRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -189,7 +189,7 @@ public interface ExamRecordMapper {
                 .set(active).equalTo(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.789+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.273+01:00", comments="Source Table: exam")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ExamRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@@ -207,7 +207,7 @@ public interface ExamRecordMapper {
                 .set(active).equalToWhenPresent(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.789+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.273+01:00", comments="Source Table: exam")
     default int updateByPrimaryKey(ExamRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -228,7 +228,7 @@ public interface ExamRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.789+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.273+01:00", comments="Source Table: exam")
     default int updateByPrimaryKeySelective(ExamRecord record) {
         return UpdateDSL.updateWithMapper(this::update, examRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
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 c26371ff..51174d01 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="2020-01-09T10:29:16.804+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+01:00", comments="Source Table: indicator")
     public static final IndicatorRecord indicatorRecord = new IndicatorRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.804+01:00", comments="Source field: indicator.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+01:00", comments="Source field: indicator.id")
     public static final SqlColumn<Long> id = indicatorRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.804+01:00", comments="Source field: indicator.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+01:00", comments="Source field: indicator.exam_id")
     public static final SqlColumn<Long> examId = indicatorRecord.examId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.804+01:00", comments="Source field: indicator.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+01:00", comments="Source field: indicator.type")
     public static final SqlColumn<String> type = indicatorRecord.type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.804+01:00", comments="Source field: indicator.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+01:00", comments="Source field: indicator.name")
     public static final SqlColumn<String> name = indicatorRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.804+01:00", comments="Source field: indicator.color")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+01:00", comments="Source field: indicator.color")
     public static final SqlColumn<String> color = indicatorRecord.color;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.804+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+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 1e3e41c1..4c7ec8c2 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="2020-01-09T10:29:16.804+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+01:00", comments="Source Table: indicator")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.804+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+01:00", comments="Source Table: indicator")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.804+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.283+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="2020-01-09T10:29:16.804+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.805+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.805+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+01:00", comments="Source Table: indicator")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.805+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.805+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.284+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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="2020-01-09T10:29:16.806+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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 a11e51ee..b7c42f57 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,28 +6,28 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class InstitutionRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source Table: institution")
     public static final InstitutionRecord institutionRecord = new InstitutionRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+01:00", comments="Source field: institution.id")
     public static final SqlColumn<Long> id = institutionRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+01:00", comments="Source field: institution.name")
     public static final SqlColumn<String> name = institutionRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.url_suffix")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+01:00", comments="Source field: institution.url_suffix")
     public static final SqlColumn<String> urlSuffix = institutionRecord.urlSuffix;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source field: institution.theme_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+01:00", comments="Source field: institution.theme_name")
     public static final SqlColumn<String> themeName = institutionRecord.themeName;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source field: institution.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+01:00", comments="Source field: institution.active")
     public static final SqlColumn<Integer> active = institutionRecord.active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source field: institution.logo_image")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+01:00", comments="Source field: institution.logo_image")
     public static final SqlColumn<String> logoImage = institutionRecord.logoImage;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+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 c155ca04..20641ed4 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="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+01:00", comments="Source Table: institution")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+01:00", comments="Source Table: institution")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+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="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+01:00", comments="Source Table: institution")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -57,7 +57,7 @@ public interface InstitutionRecordMapper {
     })
     InstitutionRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+01:00", comments="Source Table: institution")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -69,22 +69,22 @@ public interface InstitutionRecordMapper {
     })
     List<InstitutionRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+01:00", comments="Source Table: institution")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.288+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="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+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="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: institution")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, institutionRecord)
                 .where(id, isEqualTo(id_))
@@ -92,7 +92,7 @@ public interface InstitutionRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: institution")
     default int insert(InstitutionRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(institutionRecord)
@@ -105,7 +105,7 @@ public interface InstitutionRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: institution")
     default int insertSelective(InstitutionRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(institutionRecord)
@@ -118,19 +118,19 @@ public interface InstitutionRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: institution")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage)
                 .from(institutionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: institution")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<InstitutionRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, urlSuffix, themeName, active, logoImage)
                 .from(institutionRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: institution")
     default InstitutionRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, name, urlSuffix, themeName, active, logoImage)
                 .from(institutionRecord)
@@ -139,7 +139,7 @@ public interface InstitutionRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: institution")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(InstitutionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, institutionRecord)
                 .set(name).equalTo(record::getName)
@@ -149,7 +149,7 @@ public interface InstitutionRecordMapper {
                 .set(logoImage).equalTo(record::getLogoImage);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.810+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: institution")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(InstitutionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, institutionRecord)
                 .set(name).equalToWhenPresent(record::getName)
@@ -159,7 +159,7 @@ public interface InstitutionRecordMapper {
                 .set(logoImage).equalToWhenPresent(record::getLogoImage);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: institution")
     default int updateByPrimaryKey(InstitutionRecord record) {
         return UpdateDSL.updateWithMapper(this::update, institutionRecord)
                 .set(name).equalTo(record::getName)
@@ -172,7 +172,7 @@ public interface InstitutionRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+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 30a259f1..51090fed 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,49 +6,49 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class LmsSetupRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+01:00", comments="Source Table: lms_setup")
     public static final LmsSetupRecord lmsSetupRecord = new LmsSetupRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+01:00", comments="Source field: lms_setup.id")
     public static final SqlColumn<Long> id = lmsSetupRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+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="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+01:00", comments="Source field: lms_setup.name")
     public static final SqlColumn<String> name = lmsSetupRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.lms_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+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="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.lms_url")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+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="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.lms_clientname")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+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="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.lms_clientsecret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+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="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.lms_rest_api_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+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="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.lms_proxy_host")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+01:00", comments="Source field: lms_setup.lms_proxy_host")
     public static final SqlColumn<String> lmsProxyHost = lmsSetupRecord.lmsProxyHost;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.lms_proxy_port")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+01:00", comments="Source field: lms_setup.lms_proxy_port")
     public static final SqlColumn<Integer> lmsProxyPort = lmsSetupRecord.lmsProxyPort;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.lms_proxy_auth_username")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+01:00", comments="Source field: lms_setup.lms_proxy_auth_username")
     public static final SqlColumn<String> lmsProxyAuthUsername = lmsSetupRecord.lmsProxyAuthUsername;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.lms_proxy_auth_secret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+01:00", comments="Source field: lms_setup.lms_proxy_auth_secret")
     public static final SqlColumn<String> lmsProxyAuthSecret = lmsSetupRecord.lmsProxyAuthSecret;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source field: lms_setup.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+01:00", comments="Source field: lms_setup.active")
     public static final SqlColumn<Integer> active = lmsSetupRecord.active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+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 69d80d42..8d759e33 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="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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),
@@ -64,7 +64,7 @@ public interface LmsSetupRecordMapper {
     })
     LmsSetupRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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),
@@ -83,22 +83,22 @@ public interface LmsSetupRecordMapper {
     })
     List<LmsSetupRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+01:00", comments="Source Table: lms_setup")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, lmsSetupRecord)
                 .where(id, isEqualTo(id_))
@@ -106,7 +106,7 @@ public interface LmsSetupRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+01:00", comments="Source Table: lms_setup")
     default int insert(LmsSetupRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(lmsSetupRecord)
@@ -126,7 +126,7 @@ public interface LmsSetupRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.815+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+01:00", comments="Source Table: lms_setup")
     default int insertSelective(LmsSetupRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(lmsSetupRecord)
@@ -146,19 +146,19 @@ public interface LmsSetupRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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, lmsProxyHost, lmsProxyPort, lmsProxyAuthUsername, lmsProxyAuthSecret, active)
                 .from(lmsSetupRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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, lmsProxyHost, lmsProxyPort, lmsProxyAuthUsername, lmsProxyAuthSecret, active)
                 .from(lmsSetupRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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, lmsProxyHost, lmsProxyPort, lmsProxyAuthUsername, lmsProxyAuthSecret, active)
                 .from(lmsSetupRecord)
@@ -167,7 +167,7 @@ public interface LmsSetupRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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)
@@ -184,7 +184,7 @@ public interface LmsSetupRecordMapper {
                 .set(active).equalTo(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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)
@@ -201,7 +201,7 @@ public interface LmsSetupRecordMapper {
                 .set(active).equalToWhenPresent(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+01:00", comments="Source Table: lms_setup")
     default int updateByPrimaryKey(LmsSetupRecord record) {
         return UpdateDSL.updateWithMapper(this::update, lmsSetupRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -221,7 +221,7 @@ public interface LmsSetupRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.294+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 3e076a4b..5014e67a 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,40 +6,40 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class OrientationRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.756+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.252+01:00", comments="Source Table: orientation")
     public static final OrientationRecord orientationRecord = new OrientationRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.756+01:00", comments="Source field: orientation.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.252+01:00", comments="Source field: orientation.id")
     public static final SqlColumn<Long> id = orientationRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.756+01:00", comments="Source field: orientation.config_attribute_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.252+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="2020-01-09T10:29:16.756+01:00", comments="Source field: orientation.template_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.252+01:00", comments="Source field: orientation.template_id")
     public static final SqlColumn<Long> templateId = orientationRecord.templateId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.756+01:00", comments="Source field: orientation.view_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.252+01:00", comments="Source field: orientation.view_id")
     public static final SqlColumn<Long> viewId = orientationRecord.viewId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.756+01:00", comments="Source field: orientation.group_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.252+01:00", comments="Source field: orientation.group_id")
     public static final SqlColumn<String> groupId = orientationRecord.groupId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.756+01:00", comments="Source field: orientation.x_position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+01:00", comments="Source field: orientation.x_position")
     public static final SqlColumn<Integer> xPosition = orientationRecord.xPosition;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.756+01:00", comments="Source field: orientation.y_position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+01:00", comments="Source field: orientation.y_position")
     public static final SqlColumn<Integer> yPosition = orientationRecord.yPosition;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.757+01:00", comments="Source field: orientation.width")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+01:00", comments="Source field: orientation.width")
     public static final SqlColumn<Integer> width = orientationRecord.width;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.757+01:00", comments="Source field: orientation.height")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+01:00", comments="Source field: orientation.height")
     public static final SqlColumn<Integer> height = orientationRecord.height;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.757+01:00", comments="Source field: orientation.title")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+01:00", comments="Source field: orientation.title")
     public static final SqlColumn<String> title = orientationRecord.title;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.756+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.252+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 97c8423e..cab58b50 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="2020-01-09T10:29:16.757+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+01:00", comments="Source Table: orientation")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.757+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+01:00", comments="Source Table: orientation")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.757+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+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="2020-01-09T10:29:16.757+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+01:00", comments="Source Table: orientation")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -61,7 +61,7 @@ public interface OrientationRecordMapper {
     })
     OrientationRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.757+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+01:00", comments="Source Table: orientation")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -77,22 +77,22 @@ public interface OrientationRecordMapper {
     })
     List<OrientationRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.757+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+01:00", comments="Source Table: orientation")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.757+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+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="2020-01-09T10:29:16.757+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+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="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+01:00", comments="Source Table: orientation")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, orientationRecord)
                 .where(id, isEqualTo(id_))
@@ -100,7 +100,7 @@ public interface OrientationRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.253+01:00", comments="Source Table: orientation")
     default int insert(OrientationRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(orientationRecord)
@@ -117,7 +117,7 @@ public interface OrientationRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source Table: orientation")
     default int insertSelective(OrientationRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(orientationRecord)
@@ -134,19 +134,19 @@ public interface OrientationRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source Table: orientation")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title)
                 .from(orientationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source Table: orientation")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<OrientationRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title)
                 .from(orientationRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source Table: orientation")
     default OrientationRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, configAttributeId, templateId, viewId, groupId, xPosition, yPosition, width, height, title)
                 .from(orientationRecord)
@@ -155,7 +155,7 @@ public interface OrientationRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source Table: orientation")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(OrientationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, orientationRecord)
                 .set(configAttributeId).equalTo(record::getConfigAttributeId)
@@ -169,7 +169,7 @@ public interface OrientationRecordMapper {
                 .set(title).equalTo(record::getTitle);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source Table: orientation")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(OrientationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, orientationRecord)
                 .set(configAttributeId).equalToWhenPresent(record::getConfigAttributeId)
@@ -183,7 +183,7 @@ public interface OrientationRecordMapper {
                 .set(title).equalToWhenPresent(record::getTitle);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source Table: orientation")
     default int updateByPrimaryKey(OrientationRecord record) {
         return UpdateDSL.updateWithMapper(this::update, orientationRecord)
                 .set(configAttributeId).equalTo(record::getConfigAttributeId)
@@ -200,7 +200,7 @@ public interface OrientationRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.758+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+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 d499167f..55424513 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="2020-01-09T10:29:16.819+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+01:00", comments="Source Table: user_role")
     public static final RoleRecord roleRecord = new RoleRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.820+01:00", comments="Source field: user_role.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+01:00", comments="Source field: user_role.id")
     public static final SqlColumn<Long> id = roleRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.820+01:00", comments="Source field: user_role.user_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source field: user_role.role_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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 eb42c71d..13713f2c 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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.299+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+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="2020-01-09T10:29:16.820+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+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/SebClientConfigRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java
index 5936b351..5aa593bb 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java
@@ -7,34 +7,34 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class SebClientConfigRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source Table: seb_client_configuration")
     public static final SebClientConfigRecord sebClientConfigRecord = new SebClientConfigRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.id")
     public static final SqlColumn<Long> id = sebClientConfigRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.institution_id")
     public static final SqlColumn<Long> institutionId = sebClientConfigRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.name")
     public static final SqlColumn<String> name = sebClientConfigRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.date")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.date")
     public static final SqlColumn<DateTime> date = sebClientConfigRecord.date;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.client_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source field: seb_client_configuration.client_name")
     public static final SqlColumn<String> clientName = sebClientConfigRecord.clientName;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.client_secret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source field: seb_client_configuration.client_secret")
     public static final SqlColumn<String> clientSecret = sebClientConfigRecord.clientSecret;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.encrypt_secret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source field: seb_client_configuration.encrypt_secret")
     public static final SqlColumn<String> encryptSecret = sebClientConfigRecord.encryptSecret;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source field: seb_client_configuration.active")
     public static final SqlColumn<Integer> active = sebClientConfigRecord.active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source Table: seb_client_configuration")
     public static final class SebClientConfigRecord 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/SebClientConfigRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java
index ba3d170f..c3ce0894 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java
@@ -34,20 +34,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface SebClientConfigRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source Table: seb_client_configuration")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source Table: seb_client_configuration")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source Table: seb_client_configuration")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<SebClientConfigRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source Table: seb_client_configuration")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -61,7 +61,7 @@ public interface SebClientConfigRecordMapper {
     })
     SebClientConfigRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source Table: seb_client_configuration")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -75,22 +75,22 @@ public interface SebClientConfigRecordMapper {
     })
     List<SebClientConfigRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source Table: seb_client_configuration")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.813+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source Table: seb_client_configuration")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(sebClientConfigRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.813+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source Table: seb_client_configuration")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.813+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source Table: seb_client_configuration")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, sebClientConfigRecord)
                 .where(id, isEqualTo(id_))
@@ -98,7 +98,7 @@ public interface SebClientConfigRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.813+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source Table: seb_client_configuration")
     default int insert(SebClientConfigRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(sebClientConfigRecord)
@@ -113,7 +113,7 @@ public interface SebClientConfigRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.813+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source Table: seb_client_configuration")
     default int insertSelective(SebClientConfigRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(sebClientConfigRecord)
@@ -128,19 +128,19 @@ public interface SebClientConfigRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.813+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source Table: seb_client_configuration")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<SebClientConfigRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active)
                 .from(sebClientConfigRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.813+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source Table: seb_client_configuration")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<SebClientConfigRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active)
                 .from(sebClientConfigRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.813+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source Table: seb_client_configuration")
     default SebClientConfigRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, name, date, clientName, clientSecret, encryptSecret, active)
                 .from(sebClientConfigRecord)
@@ -149,7 +149,7 @@ public interface SebClientConfigRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.813+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source Table: seb_client_configuration")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(SebClientConfigRecord record) {
         return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -161,7 +161,7 @@ public interface SebClientConfigRecordMapper {
                 .set(active).equalTo(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.813+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source Table: seb_client_configuration")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(SebClientConfigRecord record) {
         return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
@@ -173,7 +173,7 @@ public interface SebClientConfigRecordMapper {
                 .set(active).equalToWhenPresent(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.813+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source Table: seb_client_configuration")
     default int updateByPrimaryKey(SebClientConfigRecord record) {
         return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
@@ -188,7 +188,7 @@ public interface SebClientConfigRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.813+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.291+01:00", comments="Source Table: seb_client_configuration")
     default int updateByPrimaryKeySelective(SebClientConfigRecord record) {
         return UpdateDSL.updateWithMapper(this::update, sebClientConfigRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
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 1fba8fac..77e94fb0 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="2020-01-09T10:29:16.807+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+01:00", comments="Source Table: threshold")
     public static final ThresholdRecord thresholdRecord = new ThresholdRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+01:00", comments="Source field: threshold.id")
     public static final SqlColumn<Long> id = thresholdRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.indicator_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+01:00", comments="Source field: threshold.indicator_id")
     public static final SqlColumn<Long> indicatorId = thresholdRecord.indicatorId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+01:00", comments="Source field: threshold.value")
     public static final SqlColumn<BigDecimal> value = thresholdRecord.value;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.color")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+01:00", comments="Source field: threshold.color")
     public static final SqlColumn<String> color = thresholdRecord.color;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.807+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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 77ae99d2..f3939938 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="2020-01-09T10:29:16.807+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+01:00", comments="Source Table: threshold")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.807+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+01:00", comments="Source Table: threshold")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.807+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.807+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+01:00", comments="Source Table: threshold")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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="2020-01-09T10:29:16.808+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.286+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 d3cfe926..b30a38b6 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="2020-01-09T10:29:16.822+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source Table: user_activity_log")
     public static final UserActivityLogRecord userActivityLogRecord = new UserActivityLogRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.822+01:00", comments="Source field: user_activity_log.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.822+01:00", comments="Source field: user_activity_log.user_uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.822+01:00", comments="Source field: user_activity_log.timestamp")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.822+01:00", comments="Source field: user_activity_log.activity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.822+01:00", comments="Source field: user_activity_log.entity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source field: user_activity_log.entity_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source field: user_activity_log.message")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.822+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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 0f4c0db6..d7bb0e7f 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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.301+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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="2020-01-09T10:29:16.823+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+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 6cca0fd7..17403f01 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,43 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class UserRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source Table: user")
     public static final UserRecord userRecord = new UserRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source field: user.id")
     public static final SqlColumn<Long> id = userRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source field: user.institution_id")
     public static final SqlColumn<Long> institutionId = userRecord.institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source field: user.uuid")
     public static final SqlColumn<String> uuid = userRecord.uuid;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source field: user.name")
     public static final SqlColumn<String> name = userRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source field: user.username")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source field: user.surname")
+    public static final SqlColumn<String> surname = userRecord.surname;
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source field: user.username")
     public static final SqlColumn<String> username = userRecord.username;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source field: user.password")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source field: user.password")
     public static final SqlColumn<String> password = userRecord.password;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source field: user.email")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+01:00", comments="Source field: user.email")
     public static final SqlColumn<String> email = userRecord.email;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source field: user.language")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+01:00", comments="Source field: user.language")
     public static final SqlColumn<String> language = userRecord.language;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source field: user.timezone")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+01:00", comments="Source field: user.timezone")
     public static final SqlColumn<String> timezone = userRecord.timezone;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source field: user.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+01:00", comments="Source field: user.active")
     public static final SqlColumn<Integer> active = userRecord.active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source Table: user")
     public static final class UserRecord extends SqlTable {
         public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
 
@@ -49,6 +52,8 @@ public final class UserRecordDynamicSqlSupport {
 
         public final SqlColumn<String> name = column("name", JDBCType.VARCHAR);
 
+        public final SqlColumn<String> surname = column("surname", JDBCType.VARCHAR);
+
         public final SqlColumn<String> username = column("username", JDBCType.VARCHAR);
 
         public final SqlColumn<String> password = column("password", JDBCType.VARCHAR);
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 0ba51e33..2202756e 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,26 +32,27 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface UserRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+01:00", comments="Source Table: user")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+01:00", comments="Source Table: user")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+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="2020-01-09T10:29:16.818+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+01:00", comments="Source Table: user")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
         @Arg(column="institution_id", javaType=Long.class, jdbcType=JdbcType.BIGINT),
         @Arg(column="uuid", javaType=String.class, jdbcType=JdbcType.VARCHAR),
         @Arg(column="name", javaType=String.class, jdbcType=JdbcType.VARCHAR),
+        @Arg(column="surname", javaType=String.class, jdbcType=JdbcType.VARCHAR),
         @Arg(column="username", javaType=String.class, jdbcType=JdbcType.VARCHAR),
         @Arg(column="password", javaType=String.class, jdbcType=JdbcType.VARCHAR),
         @Arg(column="email", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@@ -61,13 +62,14 @@ public interface UserRecordMapper {
     })
     UserRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+01:00", comments="Source Table: user")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
         @Arg(column="institution_id", javaType=Long.class, jdbcType=JdbcType.BIGINT),
         @Arg(column="uuid", javaType=String.class, jdbcType=JdbcType.VARCHAR),
         @Arg(column="name", javaType=String.class, jdbcType=JdbcType.VARCHAR),
+        @Arg(column="surname", javaType=String.class, jdbcType=JdbcType.VARCHAR),
         @Arg(column="username", javaType=String.class, jdbcType=JdbcType.VARCHAR),
         @Arg(column="password", javaType=String.class, jdbcType=JdbcType.VARCHAR),
         @Arg(column="email", javaType=String.class, jdbcType=JdbcType.VARCHAR),
@@ -77,22 +79,22 @@ public interface UserRecordMapper {
     })
     List<UserRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+01:00", comments="Source Table: user")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+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="2020-01-09T10:29:16.818+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+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="2020-01-09T10:29:16.818+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+01:00", comments="Source Table: user")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, userRecord)
                 .where(id, isEqualTo(id_))
@@ -100,13 +102,14 @@ public interface UserRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+01:00", comments="Source Table: user")
     default int insert(UserRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(userRecord)
                 .map(institutionId).toProperty("institutionId")
                 .map(uuid).toProperty("uuid")
                 .map(name).toProperty("name")
+                .map(surname).toProperty("surname")
                 .map(username).toProperty("username")
                 .map(password).toProperty("password")
                 .map(email).toProperty("email")
@@ -117,13 +120,14 @@ public interface UserRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.297+01:00", comments="Source Table: user")
     default int insertSelective(UserRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(userRecord)
                 .map(institutionId).toPropertyWhenPresent("institutionId", record::getInstitutionId)
                 .map(uuid).toPropertyWhenPresent("uuid", record::getUuid)
                 .map(name).toPropertyWhenPresent("name", record::getName)
+                .map(surname).toPropertyWhenPresent("surname", record::getSurname)
                 .map(username).toPropertyWhenPresent("username", record::getUsername)
                 .map(password).toPropertyWhenPresent("password", record::getPassword)
                 .map(email).toPropertyWhenPresent("email", record::getEmail)
@@ -134,33 +138,34 @@ public interface UserRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.818+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+01:00", comments="Source Table: user")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectByExample() {
-        return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, language, timezone, active)
+        return SelectDSL.selectWithMapper(this::selectMany, id, institutionId, uuid, name, surname, username, password, email, language, timezone, active)
                 .from(userRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+01:00", comments="Source Table: user")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<UserRecord>>> selectDistinctByExample() {
-        return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, uuid, name, username, password, email, language, timezone, active)
+        return SelectDSL.selectDistinctWithMapper(this::selectMany, id, institutionId, uuid, name, surname, username, password, email, language, timezone, active)
                 .from(userRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+01:00", comments="Source Table: user")
     default UserRecord selectByPrimaryKey(Long id_) {
-        return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, uuid, name, username, password, email, language, timezone, active)
+        return SelectDSL.selectWithMapper(this::selectOne, id, institutionId, uuid, name, surname, username, password, email, language, timezone, active)
                 .from(userRecord)
                 .where(id, isEqualTo(id_))
                 .build()
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+01:00", comments="Source Table: user")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(UserRecord record) {
         return UpdateDSL.updateWithMapper(this::update, userRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
                 .set(uuid).equalTo(record::getUuid)
                 .set(name).equalTo(record::getName)
+                .set(surname).equalTo(record::getSurname)
                 .set(username).equalTo(record::getUsername)
                 .set(password).equalTo(record::getPassword)
                 .set(email).equalTo(record::getEmail)
@@ -169,12 +174,13 @@ public interface UserRecordMapper {
                 .set(active).equalTo(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+01:00", comments="Source Table: user")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(UserRecord record) {
         return UpdateDSL.updateWithMapper(this::update, userRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
                 .set(uuid).equalToWhenPresent(record::getUuid)
                 .set(name).equalToWhenPresent(record::getName)
+                .set(surname).equalToWhenPresent(record::getSurname)
                 .set(username).equalToWhenPresent(record::getUsername)
                 .set(password).equalToWhenPresent(record::getPassword)
                 .set(email).equalToWhenPresent(record::getEmail)
@@ -183,12 +189,13 @@ public interface UserRecordMapper {
                 .set(active).equalToWhenPresent(record::getActive);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+01:00", comments="Source Table: user")
     default int updateByPrimaryKey(UserRecord record) {
         return UpdateDSL.updateWithMapper(this::update, userRecord)
                 .set(institutionId).equalTo(record::getInstitutionId)
                 .set(uuid).equalTo(record::getUuid)
                 .set(name).equalTo(record::getName)
+                .set(surname).equalTo(record::getSurname)
                 .set(username).equalTo(record::getUsername)
                 .set(password).equalTo(record::getPassword)
                 .set(email).equalTo(record::getEmail)
@@ -200,12 +207,13 @@ public interface UserRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source Table: user")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+01:00", comments="Source Table: user")
     default int updateByPrimaryKeySelective(UserRecord record) {
         return UpdateDSL.updateWithMapper(this::update, userRecord)
                 .set(institutionId).equalToWhenPresent(record::getInstitutionId)
                 .set(uuid).equalToWhenPresent(record::getUuid)
                 .set(name).equalToWhenPresent(record::getName)
+                .set(surname).equalToWhenPresent(record::getSurname)
                 .set(username).equalToWhenPresent(record::getUsername)
                 .set(password).equalToWhenPresent(record::getPassword)
                 .set(email).equalToWhenPresent(record::getEmail)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java
index 594713b8..70f74754 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java
@@ -6,25 +6,25 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class ViewRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.752+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source Table: view")
     public static final ViewRecord viewRecord = new ViewRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.752+01:00", comments="Source field: view.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.245+01:00", comments="Source field: view.id")
     public static final SqlColumn<Long> id = viewRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.752+01:00", comments="Source field: view.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.245+01:00", comments="Source field: view.name")
     public static final SqlColumn<String> name = viewRecord.name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.752+01:00", comments="Source field: view.columns")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.245+01:00", comments="Source field: view.columns")
     public static final SqlColumn<Integer> columns = viewRecord.columns;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.752+01:00", comments="Source field: view.position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.245+01:00", comments="Source field: view.position")
     public static final SqlColumn<Integer> position = viewRecord.position;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.752+01:00", comments="Source field: view.template_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.245+01:00", comments="Source field: view.template_id")
     public static final SqlColumn<Long> templateId = viewRecord.templateId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.752+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.245+01:00", comments="Source Table: view")
     public static final class ViewRecord 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/ViewRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java
index 87cb7bfc..396c7187 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java
@@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface ViewRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.752+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.245+01:00", comments="Source Table: view")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.752+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.245+01:00", comments="Source Table: view")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.752+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.246+01:00", comments="Source Table: view")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<ViewRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.752+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.246+01:00", comments="Source Table: view")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -56,7 +56,7 @@ public interface ViewRecordMapper {
     })
     ViewRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.753+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.246+01:00", comments="Source Table: view")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -67,22 +67,22 @@ public interface ViewRecordMapper {
     })
     List<ViewRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.753+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.246+01:00", comments="Source Table: view")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.753+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.246+01:00", comments="Source Table: view")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(viewRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.753+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.246+01:00", comments="Source Table: view")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, viewRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.753+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.246+01:00", comments="Source Table: view")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, viewRecord)
                 .where(id, isEqualTo(id_))
@@ -90,7 +90,7 @@ public interface ViewRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.753+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.247+01:00", comments="Source Table: view")
     default int insert(ViewRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(viewRecord)
@@ -102,7 +102,7 @@ public interface ViewRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.753+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.247+01:00", comments="Source Table: view")
     default int insertSelective(ViewRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(viewRecord)
@@ -114,19 +114,19 @@ public interface ViewRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.753+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.247+01:00", comments="Source Table: view")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ViewRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, name, columns, position, templateId)
                 .from(viewRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.753+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.247+01:00", comments="Source Table: view")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<ViewRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, name, columns, position, templateId)
                 .from(viewRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.753+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.247+01:00", comments="Source Table: view")
     default ViewRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, name, columns, position, templateId)
                 .from(viewRecord)
@@ -135,7 +135,7 @@ public interface ViewRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.753+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.247+01:00", comments="Source Table: view")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(ViewRecord record) {
         return UpdateDSL.updateWithMapper(this::update, viewRecord)
                 .set(name).equalTo(record::getName)
@@ -144,7 +144,7 @@ public interface ViewRecordMapper {
                 .set(templateId).equalTo(record::getTemplateId);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.753+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.247+01:00", comments="Source Table: view")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(ViewRecord record) {
         return UpdateDSL.updateWithMapper(this::update, viewRecord)
                 .set(name).equalToWhenPresent(record::getName)
@@ -153,7 +153,7 @@ public interface ViewRecordMapper {
                 .set(templateId).equalToWhenPresent(record::getTemplateId);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.753+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.247+01:00", comments="Source Table: view")
     default int updateByPrimaryKey(ViewRecord record) {
         return UpdateDSL.updateWithMapper(this::update, viewRecord)
                 .set(name).equalTo(record::getName)
@@ -165,7 +165,7 @@ public interface ViewRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.753+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.247+01:00", comments="Source Table: view")
     default int updateByPrimaryKeySelective(ViewRecord record) {
         return UpdateDSL.updateWithMapper(this::update, viewRecord)
                 .set(name).equalToWhenPresent(record::getName)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java
index 48d928f8..96efcdd1 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java
@@ -6,19 +6,19 @@ import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 
 public final class WebserviceServerInfoRecordDynamicSqlSupport {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source Table: webservice_server_info")
     public static final WebserviceServerInfoRecord webserviceServerInfoRecord = new WebserviceServerInfoRecord();
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source field: webservice_server_info.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source field: webservice_server_info.id")
     public static final SqlColumn<Long> id = webserviceServerInfoRecord.id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source field: webservice_server_info.uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source field: webservice_server_info.uuid")
     public static final SqlColumn<String> uuid = webserviceServerInfoRecord.uuid;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source field: webservice_server_info.service_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source field: webservice_server_info.service_address")
     public static final SqlColumn<String> serviceAddress = webserviceServerInfoRecord.serviceAddress;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source Table: webservice_server_info")
     public static final class WebserviceServerInfoRecord 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/WebserviceServerInfoRecordMapper.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordMapper.java
index 9fecb306..8f82966e 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordMapper.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordMapper.java
@@ -32,20 +32,20 @@ import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
 @Mapper
 public interface WebserviceServerInfoRecordMapper {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source Table: webservice_server_info")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source Table: webservice_server_info")
     @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
     int delete(DeleteStatementProvider deleteStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source Table: webservice_server_info")
     @InsertProvider(type=SqlProviderAdapter.class, method="insert")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="record.id", before=false, resultType=Long.class)
     int insert(InsertStatementProvider<WebserviceServerInfoRecord> insertStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source Table: webservice_server_info")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -54,7 +54,7 @@ public interface WebserviceServerInfoRecordMapper {
     })
     WebserviceServerInfoRecord selectOne(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source Table: webservice_server_info")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ConstructorArgs({
         @Arg(column="id", javaType=Long.class, jdbcType=JdbcType.BIGINT, id=true),
@@ -63,22 +63,22 @@ public interface WebserviceServerInfoRecordMapper {
     })
     List<WebserviceServerInfoRecord> selectMany(SelectStatementProvider selectStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.306+01:00", comments="Source Table: webservice_server_info")
     @UpdateProvider(type=SqlProviderAdapter.class, method="update")
     int update(UpdateStatementProvider updateStatement);
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.306+01:00", comments="Source Table: webservice_server_info")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(webserviceServerInfoRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.306+01:00", comments="Source Table: webservice_server_info")
     default DeleteDSL<MyBatis3DeleteModelAdapter<Integer>> deleteByExample() {
         return DeleteDSL.deleteFromWithMapper(this::delete, webserviceServerInfoRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.306+01:00", comments="Source Table: webservice_server_info")
     default int deleteByPrimaryKey(Long id_) {
         return DeleteDSL.deleteFromWithMapper(this::delete, webserviceServerInfoRecord)
                 .where(id, isEqualTo(id_))
@@ -86,7 +86,7 @@ public interface WebserviceServerInfoRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.306+01:00", comments="Source Table: webservice_server_info")
     default int insert(WebserviceServerInfoRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(webserviceServerInfoRecord)
@@ -96,7 +96,7 @@ public interface WebserviceServerInfoRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.306+01:00", comments="Source Table: webservice_server_info")
     default int insertSelective(WebserviceServerInfoRecord record) {
         return insert(SqlBuilder.insert(record)
                 .into(webserviceServerInfoRecord)
@@ -106,19 +106,19 @@ public interface WebserviceServerInfoRecordMapper {
                 .render(RenderingStrategy.MYBATIS3));
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.306+01:00", comments="Source Table: webservice_server_info")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<WebserviceServerInfoRecord>>> selectByExample() {
         return SelectDSL.selectWithMapper(this::selectMany, id, uuid, serviceAddress)
                 .from(webserviceServerInfoRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.306+01:00", comments="Source Table: webservice_server_info")
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<WebserviceServerInfoRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id, uuid, serviceAddress)
                 .from(webserviceServerInfoRecord);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.306+01:00", comments="Source Table: webservice_server_info")
     default WebserviceServerInfoRecord selectByPrimaryKey(Long id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id, uuid, serviceAddress)
                 .from(webserviceServerInfoRecord)
@@ -127,21 +127,21 @@ public interface WebserviceServerInfoRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.306+01:00", comments="Source Table: webservice_server_info")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExample(WebserviceServerInfoRecord record) {
         return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord)
                 .set(uuid).equalTo(record::getUuid)
                 .set(serviceAddress).equalTo(record::getServiceAddress);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.306+01:00", comments="Source Table: webservice_server_info")
     default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(WebserviceServerInfoRecord record) {
         return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord)
                 .set(uuid).equalToWhenPresent(record::getUuid)
                 .set(serviceAddress).equalToWhenPresent(record::getServiceAddress);
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.306+01:00", comments="Source Table: webservice_server_info")
     default int updateByPrimaryKey(WebserviceServerInfoRecord record) {
         return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord)
                 .set(uuid).equalTo(record::getUuid)
@@ -151,7 +151,7 @@ public interface WebserviceServerInfoRecordMapper {
                 .execute();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.827+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.306+01:00", comments="Source Table: webservice_server_info")
     default int updateByPrimaryKeySelective(WebserviceServerInfoRecord record) {
         return UpdateDSL.updateWithMapper(this::update, webserviceServerInfoRecord)
                 .set(uuid).equalToWhenPresent(record::getUuid)
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributeRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributeRecord.java
index 7a5c285f..2412116b 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributeRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributeRecord.java
@@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class AdditionalAttributeRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+01:00", comments="Source field: additional_attributes.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.entity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+01:00", comments="Source field: additional_attributes.entity_type")
     private String entityType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.entity_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.entity_id")
     private Long entityId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.value")
     private String value;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source Table: additional_attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+01:00", comments="Source Table: additional_attributes")
     public AdditionalAttributeRecord(Long id, String entityType, Long entityId, String name, String value) {
         this.id = id;
         this.entityType = entityType;
@@ -27,27 +27,27 @@ public class AdditionalAttributeRecord {
         this.value = value;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+01:00", comments="Source field: additional_attributes.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.entity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.302+01:00", comments="Source field: additional_attributes.entity_type")
     public String getEntityType() {
         return entityType;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.entity_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.entity_id")
     public Long getEntityId() {
         return entityId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.824+01:00", comments="Source field: additional_attributes.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.303+01:00", comments="Source field: additional_attributes.value")
     public String getValue() {
         return value;
     }
@@ -56,7 +56,7 @@ public class AdditionalAttributeRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table additional_attributes
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public String toString() {
@@ -77,7 +77,7 @@ public class AdditionalAttributeRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table additional_attributes
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public boolean equals(Object that) {
@@ -102,7 +102,7 @@ public class AdditionalAttributeRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table additional_attributes
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public int hashCode() {
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 f8dfc3ab..938db624 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,34 +3,34 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class ClientConnectionRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.791+01:00", comments="Source field: client_connection.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.273+01:00", comments="Source field: client_connection.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.273+01:00", comments="Source field: client_connection.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.exam_id")
     private Long examId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.status")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.status")
     private String status;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.connection_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.connection_token")
     private String connectionToken;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.exam_user_session_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.exam_user_session_id")
     private String examUserSessionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.client_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.client_address")
     private String clientAddress;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.virtual_client_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.virtual_client_address")
     private String virtualClientAddress;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.creation_time")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.creation_time")
     private Long creationTime;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.790+01:00", comments="Source Table: client_connection")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.273+01:00", comments="Source Table: client_connection")
     public ClientConnectionRecord(Long id, Long institutionId, Long examId, String status, String connectionToken, String examUserSessionId, String clientAddress, String virtualClientAddress, Long creationTime) {
         this.id = id;
         this.institutionId = institutionId;
@@ -43,47 +43,47 @@ public class ClientConnectionRecord {
         this.creationTime = creationTime;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.273+01:00", comments="Source field: client_connection.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.273+01:00", comments="Source field: client_connection.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.exam_id")
     public Long getExamId() {
         return examId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.status")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.status")
     public String getStatus() {
         return status;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.connection_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.connection_token")
     public String getConnectionToken() {
         return connectionToken;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.exam_user_session_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.exam_user_session_id")
     public String getExamUserSessionId() {
         return examUserSessionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.client_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.client_address")
     public String getClientAddress() {
         return clientAddress;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.792+01:00", comments="Source field: client_connection.virtual_client_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.virtual_client_address")
     public String getVirtualClientAddress() {
         return virtualClientAddress;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.793+01:00", comments="Source field: client_connection.creation_time")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.274+01:00", comments="Source field: client_connection.creation_time")
     public Long getCreationTime() {
         return creationTime;
     }
@@ -92,7 +92,7 @@ public class ClientConnectionRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table client_connection
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public String toString() {
@@ -117,7 +117,7 @@ public class ClientConnectionRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table client_connection
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public boolean equals(Object that) {
@@ -146,7 +146,7 @@ public class ClientConnectionRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table client_connection
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 e00e9a1f..bd6d5da6 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="2020-01-09T10:29:16.795+01:00", comments="Source field: client_event.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source field: client_event.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.client_connection_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.client_connection_id")
     private Long clientConnectionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.type")
     private Integer type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.client_time")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.client_time")
     private Long clientTime;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.server_time")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.server_time")
     private Long serverTime;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.numeric_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.numeric_value")
     private BigDecimal numericValue;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.text")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.text")
     private String text;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.795+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_event")
     public ClientEventRecord(Long id, Long clientConnectionId, Integer type, Long clientTime, Long serverTime, BigDecimal numericValue, String text) {
         this.id = id;
         this.clientConnectionId = clientConnectionId;
@@ -36,77 +36,77 @@ public class ClientEventRecord {
         this.text = text;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.795+01:00", comments="Source Table: client_event")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source Table: client_event")
     public ClientEventRecord() {
         super();
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.795+01:00", comments="Source field: client_event.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.276+01:00", comments="Source field: client_event.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.795+01:00", comments="Source field: client_event.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.id")
     public void setId(Long id) {
         this.id = id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.client_connection_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.client_connection_id")
     public Long getClientConnectionId() {
         return clientConnectionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.client_connection_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.client_connection_id")
     public void setClientConnectionId(Long clientConnectionId) {
         this.clientConnectionId = clientConnectionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.type")
     public Integer getType() {
         return type;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.type")
     public void setType(Integer type) {
         this.type = type;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.client_time")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.client_time")
     public Long getClientTime() {
         return clientTime;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.client_time")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.client_time")
     public void setClientTime(Long clientTime) {
         this.clientTime = clientTime;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.server_time")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.server_time")
     public Long getServerTime() {
         return serverTime;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.server_time")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.server_time")
     public void setServerTime(Long serverTime) {
         this.serverTime = serverTime;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.numeric_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.numeric_value")
     public BigDecimal getNumericValue() {
         return numericValue;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.numeric_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.numeric_value")
     public void setNumericValue(BigDecimal numericValue) {
         this.numericValue = numericValue;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.text")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.text")
     public String getText() {
         return text;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.796+01:00", comments="Source field: client_event.text")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.277+01:00", comments="Source field: client_event.text")
     public void setText(String text) {
         this.text = text == null ? null : text.trim();
     }
@@ -115,7 +115,7 @@ public class ClientEventRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table client_event
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public String toString() {
@@ -138,7 +138,7 @@ public class ClientEventRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table client_event
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public boolean equals(Object that) {
@@ -165,7 +165,7 @@ public class ClientEventRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table client_event
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientInstructionRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientInstructionRecord.java
index 8bd118c1..034863ce 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientInstructionRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientInstructionRecord.java
@@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class ClientInstructionRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source field: client_instruction.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.exam_id")
     private Long examId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.connection_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.connection_token")
     private String connectionToken;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.type")
     private String type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.attributes")
     private String attributes;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source Table: client_instruction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.279+01:00", comments="Source Table: client_instruction")
     public ClientInstructionRecord(Long id, Long examId, String connectionToken, String type, String attributes) {
         this.id = id;
         this.examId = examId;
@@ -27,27 +27,27 @@ public class ClientInstructionRecord {
         this.attributes = attributes;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.exam_id")
     public Long getExamId() {
         return examId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.connection_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.connection_token")
     public String getConnectionToken() {
         return connectionToken;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.type")
     public String getType() {
         return type;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.799+01:00", comments="Source field: client_instruction.attributes")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.280+01:00", comments="Source field: client_instruction.attributes")
     public String getAttributes() {
         return attributes;
     }
@@ -56,7 +56,7 @@ public class ClientInstructionRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table client_instruction
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public String toString() {
@@ -77,7 +77,7 @@ public class ClientInstructionRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table client_instruction
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public boolean equals(Object that) {
@@ -102,7 +102,7 @@ public class ClientInstructionRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table client_instruction
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 801ffc67..4f88bf24 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="2020-01-09T10:29:16.615+01:00", comments="Source field: configuration_attribute.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.080+01:00", comments="Source field: configuration_attribute.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.616+01:00", comments="Source field: configuration_attribute.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.081+01:00", comments="Source field: configuration_attribute.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.616+01:00", comments="Source field: configuration_attribute.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.081+01:00", comments="Source field: configuration_attribute.type")
     private String type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.616+01:00", comments="Source field: configuration_attribute.parent_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.081+01:00", comments="Source field: configuration_attribute.parent_id")
     private Long parentId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.616+01:00", comments="Source field: configuration_attribute.resources")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.081+01:00", comments="Source field: configuration_attribute.resources")
     private String resources;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.617+01:00", comments="Source field: configuration_attribute.validator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.082+01:00", comments="Source field: configuration_attribute.validator")
     private String validator;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.617+01:00", comments="Source field: configuration_attribute.dependencies")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.082+01:00", comments="Source field: configuration_attribute.dependencies")
     private String dependencies;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.617+01:00", comments="Source field: configuration_attribute.default_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.082+01:00", comments="Source field: configuration_attribute.default_value")
     private String defaultValue;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.611+01:00", comments="Source Table: configuration_attribute")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.076+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="2020-01-09T10:29:16.616+01:00", comments="Source field: configuration_attribute.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.081+01:00", comments="Source field: configuration_attribute.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.616+01:00", comments="Source field: configuration_attribute.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.081+01:00", comments="Source field: configuration_attribute.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.616+01:00", comments="Source field: configuration_attribute.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.081+01:00", comments="Source field: configuration_attribute.type")
     public String getType() {
         return type;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.616+01:00", comments="Source field: configuration_attribute.parent_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.081+01:00", comments="Source field: configuration_attribute.parent_id")
     public Long getParentId() {
         return parentId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.617+01:00", comments="Source field: configuration_attribute.resources")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.082+01:00", comments="Source field: configuration_attribute.resources")
     public String getResources() {
         return resources;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.617+01:00", comments="Source field: configuration_attribute.validator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.082+01:00", comments="Source field: configuration_attribute.validator")
     public String getValidator() {
         return validator;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.617+01:00", comments="Source field: configuration_attribute.dependencies")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.082+01:00", comments="Source field: configuration_attribute.dependencies")
     public String getDependencies() {
         return dependencies;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.617+01:00", comments="Source field: configuration_attribute.default_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.082+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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 00c8806a..7aa7981c 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="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source field: configuration_node.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source field: configuration_node.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.template_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source field: configuration_node.template_id")
     private Long templateId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.owner")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.owner")
     private String owner;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.description")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.description")
     private String description;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.type")
     private String type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.status")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.status")
     private String status;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.766+01:00", comments="Source Table: configuration_node")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source Table: configuration_node")
     public ConfigurationNodeRecord(Long id, Long institutionId, Long templateId, String owner, String name, String description, String type, String status) {
         this.id = id;
         this.institutionId = institutionId;
@@ -39,42 +39,42 @@ public class ConfigurationNodeRecord {
         this.status = status;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source field: configuration_node.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.257+01:00", comments="Source field: configuration_node.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.template_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.template_id")
     public Long getTemplateId() {
         return templateId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.owner")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.owner")
     public String getOwner() {
         return owner;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.766+01:00", comments="Source field: configuration_node.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.description")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.description")
     public String getDescription() {
         return description;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.type")
     public String getType() {
         return type;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.767+01:00", comments="Source field: configuration_node.status")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.258+01:00", comments="Source field: configuration_node.status")
     public String getStatus() {
         return status;
     }
@@ -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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 7cfd9313..cab918e1 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,25 +4,25 @@ import javax.annotation.Generated;
 import org.joda.time.DateTime;
 
 public class ConfigurationRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.759+01:00", comments="Source field: configuration.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source field: configuration.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.configuration_node_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.configuration_node_id")
     private Long configurationNodeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.version")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.version")
     private String version;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.version_date")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.version_date")
     private DateTime versionDate;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.followup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.followup")
     private Integer followup;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.759+01:00", comments="Source Table: configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source Table: configuration")
     public ConfigurationRecord(Long id, Long institutionId, Long configurationNodeId, String version, DateTime versionDate, Integer followup) {
         this.id = id;
         this.institutionId = institutionId;
@@ -32,32 +32,32 @@ public class ConfigurationRecord {
         this.followup = followup;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.759+01:00", comments="Source field: configuration.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.254+01:00", comments="Source field: configuration.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.configuration_node_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.configuration_node_id")
     public Long getConfigurationNodeId() {
         return configurationNodeId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.version")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.version")
     public String getVersion() {
         return version;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.version_date")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.version_date")
     public DateTime getVersionDate() {
         return versionDate;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.760+01:00", comments="Source field: configuration.followup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.255+01:00", comments="Source field: configuration.followup")
     public Integer getFollowup() {
         return followup;
     }
@@ -66,7 +66,7 @@ public class ConfigurationRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public String toString() {
@@ -88,7 +88,7 @@ public class ConfigurationRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public boolean equals(Object that) {
@@ -114,7 +114,7 @@ public class ConfigurationRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table configuration
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 0ec5f164..2385bfe7 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="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+01:00", comments="Source field: configuration_value.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+01:00", comments="Source field: configuration_value.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.configuration_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+01:00", comments="Source field: configuration_value.configuration_id")
     private Long configurationId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.configuration_attribute_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+01:00", comments="Source field: configuration_value.configuration_attribute_id")
     private Long configurationAttributeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.list_index")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+01:00", comments="Source field: configuration_value.list_index")
     private Integer listIndex;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.240+01:00", comments="Source field: configuration_value.value")
     private String value;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source Table: configuration_value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+01:00", comments="Source Table: configuration_value")
     public ConfigurationValueRecord(Long id, Long institutionId, Long configurationId, Long configurationAttributeId, Integer listIndex, String value) {
         this.id = id;
         this.institutionId = institutionId;
@@ -31,32 +31,32 @@ public class ConfigurationValueRecord {
         this.value = value;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+01:00", comments="Source field: configuration_value.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+01:00", comments="Source field: configuration_value.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.configuration_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+01:00", comments="Source field: configuration_value.configuration_id")
     public Long getConfigurationId() {
         return configurationId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.configuration_attribute_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.239+01:00", comments="Source field: configuration_value.configuration_attribute_id")
     public Long getConfigurationAttributeId() {
         return configurationAttributeId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.list_index")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.240+01:00", comments="Source field: configuration_value.list_index")
     public Integer getListIndex() {
         return listIndex;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.748+01:00", comments="Source field: configuration_value.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.240+01:00", comments="Source field: configuration_value.value")
     public String getValue() {
         return value;
     }
@@ -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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 8ab70b91..869a9050 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,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class ExamConfigurationMapRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.262+01:00", comments="Source field: exam_configuration_map.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.262+01:00", comments="Source field: exam_configuration_map.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+01:00", comments="Source field: exam_configuration_map.exam_id")
     private Long examId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.configuration_node_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+01:00", comments="Source field: exam_configuration_map.configuration_node_id")
     private Long configurationNodeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.user_names")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+01:00", comments="Source field: exam_configuration_map.user_names")
     private String userNames;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.encrypt_secret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+01:00", comments="Source field: exam_configuration_map.encrypt_secret")
     private String encryptSecret;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source Table: exam_configuration_map")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.262+01:00", comments="Source Table: exam_configuration_map")
     public ExamConfigurationMapRecord(Long id, Long institutionId, Long examId, Long configurationNodeId, String userNames, String encryptSecret) {
         this.id = id;
         this.institutionId = institutionId;
@@ -31,32 +31,32 @@ public class ExamConfigurationMapRecord {
         this.encryptSecret = encryptSecret;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.262+01:00", comments="Source field: exam_configuration_map.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.262+01:00", comments="Source field: exam_configuration_map.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+01:00", comments="Source field: exam_configuration_map.exam_id")
     public Long getExamId() {
         return examId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.configuration_node_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+01:00", comments="Source field: exam_configuration_map.configuration_node_id")
     public Long getConfigurationNodeId() {
         return configurationNodeId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.user_names")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+01:00", comments="Source field: exam_configuration_map.user_names")
     public String getUserNames() {
         return userNames;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.773+01:00", comments="Source field: exam_configuration_map.encrypt_secret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.263+01:00", comments="Source field: exam_configuration_map.encrypt_secret")
     public String getEncryptSecret() {
         return encryptSecret;
     }
@@ -65,7 +65,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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public String toString() {
@@ -87,7 +87,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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public boolean equals(Object that) {
@@ -113,7 +113,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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 8715d7c8..d5561e25 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,49 +3,49 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class ExamRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.778+01:00", comments="Source field: exam.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.778+01:00", comments="Source field: exam.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.778+01:00", comments="Source field: exam.lms_setup_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.lms_setup_id")
     private Long lmsSetupId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.778+01:00", comments="Source field: exam.external_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.external_id")
     private String externalId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.owner")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.owner")
     private String owner;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.supporter")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.supporter")
     private String supporter;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.type")
     private String type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.quit_password")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.quit_password")
     private String quitPassword;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.browser_keys")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.browser_keys")
     private String browserKeys;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.status")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.status")
     private String status;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source field: exam.lms_seb_restriction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.lms_seb_restriction")
     private Integer lmsSebRestriction;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source field: exam.updating")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.updating")
     private Integer updating;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source field: exam.lastupdate")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.lastupdate")
     private String lastupdate;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source field: exam.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.active")
     private Integer active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.777+01:00", comments="Source Table: exam")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.268+01:00", comments="Source Table: exam")
     public ExamRecord(Long id, Long institutionId, Long lmsSetupId, String externalId, String owner, String supporter, String type, String quitPassword, String browserKeys, String status, Integer lmsSebRestriction, Integer updating, String lastupdate, Integer active) {
         this.id = id;
         this.institutionId = institutionId;
@@ -63,72 +63,72 @@ public class ExamRecord {
         this.active = active;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.778+01:00", comments="Source field: exam.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.778+01:00", comments="Source field: exam.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.778+01:00", comments="Source field: exam.lms_setup_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.lms_setup_id")
     public Long getLmsSetupId() {
         return lmsSetupId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.778+01:00", comments="Source field: exam.external_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.external_id")
     public String getExternalId() {
         return externalId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.owner")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.owner")
     public String getOwner() {
         return owner;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.supporter")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.supporter")
     public String getSupporter() {
         return supporter;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.269+01:00", comments="Source field: exam.type")
     public String getType() {
         return type;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.quit_password")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.quit_password")
     public String getQuitPassword() {
         return quitPassword;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.779+01:00", comments="Source field: exam.browser_keys")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.browser_keys")
     public String getBrowserKeys() {
         return browserKeys;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source field: exam.status")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.status")
     public String getStatus() {
         return status;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source field: exam.lms_seb_restriction")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.lms_seb_restriction")
     public Integer getLmsSebRestriction() {
         return lmsSebRestriction;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source field: exam.updating")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.updating")
     public Integer getUpdating() {
         return updating;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source field: exam.lastupdate")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.lastupdate")
     public String getLastupdate() {
         return lastupdate;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.781+01:00", comments="Source field: exam.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.270+01:00", comments="Source field: exam.active")
     public Integer getActive() {
         return active;
     }
@@ -137,7 +137,7 @@ public class ExamRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table exam
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public String toString() {
@@ -167,7 +167,7 @@ public class ExamRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table exam
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public boolean equals(Object that) {
@@ -201,7 +201,7 @@ public class ExamRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table exam
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public int hashCode() {
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 34d2d254..0e64234e 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="2020-01-09T10:29:16.803+01:00", comments="Source field: indicator.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+01:00", comments="Source field: indicator.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.803+01:00", comments="Source field: indicator.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+01:00", comments="Source field: indicator.exam_id")
     private Long examId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.803+01:00", comments="Source field: indicator.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+01:00", comments="Source field: indicator.type")
     private String type;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.803+01:00", comments="Source field: indicator.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+01:00", comments="Source field: indicator.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.804+01:00", comments="Source field: indicator.color")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+01:00", comments="Source field: indicator.color")
     private String color;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.803+01:00", comments="Source Table: indicator")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+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="2020-01-09T10:29:16.803+01:00", comments="Source field: indicator.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+01:00", comments="Source field: indicator.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.803+01:00", comments="Source field: indicator.exam_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+01:00", comments="Source field: indicator.exam_id")
     public Long getExamId() {
         return examId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.803+01:00", comments="Source field: indicator.type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+01:00", comments="Source field: indicator.type")
     public String getType() {
         return type;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.803+01:00", comments="Source field: indicator.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+01:00", comments="Source field: indicator.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.804+01:00", comments="Source field: indicator.color")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.282+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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 2ec1ad9b..f8485e3d 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,25 +3,25 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class InstitutionRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.url_suffix")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.url_suffix")
     private String urlSuffix;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.theme_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.theme_name")
     private String themeName;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.active")
     private Integer active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.logo_image")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.logo_image")
     private String logoImage;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.808+01:00", comments="Source Table: institution")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source Table: institution")
     public InstitutionRecord(Long id, String name, String urlSuffix, String themeName, Integer active, String logoImage) {
         this.id = id;
         this.name = name;
@@ -31,32 +31,32 @@ public class InstitutionRecord {
         this.logoImage = logoImage;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.url_suffix")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.url_suffix")
     public String getUrlSuffix() {
         return urlSuffix;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.theme_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.theme_name")
     public String getThemeName() {
         return themeName;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.active")
     public Integer getActive() {
         return active;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.809+01:00", comments="Source field: institution.logo_image")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.287+01:00", comments="Source field: institution.logo_image")
     public String getLogoImage() {
         return logoImage;
     }
@@ -65,7 +65,7 @@ public class InstitutionRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table institution
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public String toString() {
@@ -87,7 +87,7 @@ public class InstitutionRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table institution
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public boolean equals(Object that) {
@@ -113,7 +113,7 @@ public class InstitutionRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table institution
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 0a7aeebf..7f2215d3 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,46 +3,46 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class LmsSetupRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.813+01:00", comments="Source field: lms_setup.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_type")
     private String lmsType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_url")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_url")
     private String lmsUrl;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_clientname")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_clientname")
     private String lmsClientname;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_clientsecret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_clientsecret")
     private String lmsClientsecret;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_rest_api_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_rest_api_token")
     private String lmsRestApiToken;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_proxy_host")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_proxy_host")
     private String lmsProxyHost;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_proxy_port")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_proxy_port")
     private Integer lmsProxyPort;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_proxy_auth_username")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_proxy_auth_username")
     private String lmsProxyAuthUsername;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_proxy_auth_secret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_proxy_auth_secret")
     private String lmsProxyAuthSecret;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+01:00", comments="Source field: lms_setup.active")
     private Integer active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.813+01:00", comments="Source Table: lms_setup")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+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 lmsProxyHost, Integer lmsProxyPort, String lmsProxyAuthUsername, String lmsProxyAuthSecret, Integer active) {
         this.id = id;
         this.institutionId = institutionId;
@@ -59,67 +59,67 @@ public class LmsSetupRecord {
         this.active = active;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_type")
     public String getLmsType() {
         return lmsType;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_url")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_url")
     public String getLmsUrl() {
         return lmsUrl;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_clientname")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_clientname")
     public String getLmsClientname() {
         return lmsClientname;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_clientsecret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_clientsecret")
     public String getLmsClientsecret() {
         return lmsClientsecret;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_rest_api_token")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_rest_api_token")
     public String getLmsRestApiToken() {
         return lmsRestApiToken;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_proxy_host")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_proxy_host")
     public String getLmsProxyHost() {
         return lmsProxyHost;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_proxy_port")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_proxy_port")
     public Integer getLmsProxyPort() {
         return lmsProxyPort;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_proxy_auth_username")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_proxy_auth_username")
     public String getLmsProxyAuthUsername() {
         return lmsProxyAuthUsername;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.lms_proxy_auth_secret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.292+01:00", comments="Source field: lms_setup.lms_proxy_auth_secret")
     public String getLmsProxyAuthSecret() {
         return lmsProxyAuthSecret;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.814+01:00", comments="Source field: lms_setup.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.293+01:00", comments="Source field: lms_setup.active")
     public Integer getActive() {
         return active;
     }
@@ -128,7 +128,7 @@ public class LmsSetupRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table lms_setup
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public String toString() {
@@ -157,7 +157,7 @@ public class LmsSetupRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table lms_setup
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public boolean equals(Object that) {
@@ -190,7 +190,7 @@ public class LmsSetupRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table lms_setup
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 d453c905..00c59a01 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,37 +3,37 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class OrientationRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.754+01:00", comments="Source field: orientation.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+01:00", comments="Source field: orientation.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.754+01:00", comments="Source field: orientation.config_attribute_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+01:00", comments="Source field: orientation.config_attribute_id")
     private Long configAttributeId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.template_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+01:00", comments="Source field: orientation.template_id")
     private Long templateId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.view_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+01:00", comments="Source field: orientation.view_id")
     private Long viewId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.group_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+01:00", comments="Source field: orientation.group_id")
     private String groupId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.x_position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.249+01:00", comments="Source field: orientation.x_position")
     private Integer xPosition;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.y_position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.249+01:00", comments="Source field: orientation.y_position")
     private Integer yPosition;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.width")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.249+01:00", comments="Source field: orientation.width")
     private Integer width;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.height")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.251+01:00", comments="Source field: orientation.height")
     private Integer height;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.title")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.252+01:00", comments="Source field: orientation.title")
     private String title;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.754+01:00", comments="Source Table: orientation")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+01:00", comments="Source Table: orientation")
     public OrientationRecord(Long id, Long configAttributeId, Long templateId, Long viewId, String groupId, Integer xPosition, Integer yPosition, Integer width, Integer height, String title) {
         this.id = id;
         this.configAttributeId = configAttributeId;
@@ -47,52 +47,52 @@ public class OrientationRecord {
         this.title = title;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.754+01:00", comments="Source field: orientation.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+01:00", comments="Source field: orientation.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.754+01:00", comments="Source field: orientation.config_attribute_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+01:00", comments="Source field: orientation.config_attribute_id")
     public Long getConfigAttributeId() {
         return configAttributeId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.template_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+01:00", comments="Source field: orientation.template_id")
     public Long getTemplateId() {
         return templateId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.view_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.248+01:00", comments="Source field: orientation.view_id")
     public Long getViewId() {
         return viewId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.group_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.249+01:00", comments="Source field: orientation.group_id")
     public String getGroupId() {
         return groupId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.x_position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.249+01:00", comments="Source field: orientation.x_position")
     public Integer getxPosition() {
         return xPosition;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.y_position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.249+01:00", comments="Source field: orientation.y_position")
     public Integer getyPosition() {
         return yPosition;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.width")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.249+01:00", comments="Source field: orientation.width")
     public Integer getWidth() {
         return width;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.755+01:00", comments="Source field: orientation.height")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.251+01:00", comments="Source field: orientation.height")
     public Integer getHeight() {
         return height;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.756+01:00", comments="Source field: orientation.title")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.252+01:00", comments="Source field: orientation.title")
     public String getTitle() {
         return title;
     }
@@ -101,7 +101,7 @@ public class OrientationRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table orientation
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public String toString() {
@@ -127,7 +127,7 @@ public class OrientationRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table orientation
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public boolean equals(Object that) {
@@ -157,7 +157,7 @@ public class OrientationRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table orientation
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 a99653c9..7df47902 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="2020-01-09T10:29:16.819+01:00", comments="Source field: user_role.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+01:00", comments="Source field: user_role.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source field: user_role.user_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+01:00", comments="Source field: user_role.user_id")
     private Long userId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source field: user_role.role_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+01:00", comments="Source field: user_role.role_name")
     private String roleName;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source Table: user_role")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+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="2020-01-09T10:29:16.819+01:00", comments="Source field: user_role.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+01:00", comments="Source field: user_role.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source field: user_role.user_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+01:00", comments="Source field: user_role.user_id")
     public Long getUserId() {
         return userId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.819+01:00", comments="Source field: user_role.role_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.298+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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java
index dd06a6c8..9ed6029e 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java
@@ -4,31 +4,31 @@ import javax.annotation.Generated;
 import org.joda.time.DateTime;
 
 public class SebClientConfigRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source field: seb_client_configuration.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.date")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.date")
     private DateTime date;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.client_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.client_name")
     private String clientName;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.client_secret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.client_secret")
     private String clientSecret;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.encrypt_secret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.encrypt_secret")
     private String encryptSecret;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.active")
     private Integer active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source Table: seb_client_configuration")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.289+01:00", comments="Source Table: seb_client_configuration")
     public SebClientConfigRecord(Long id, Long institutionId, String name, DateTime date, String clientName, String clientSecret, String encryptSecret, Integer active) {
         this.id = id;
         this.institutionId = institutionId;
@@ -40,42 +40,42 @@ public class SebClientConfigRecord {
         this.active = active;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.date")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.date")
     public DateTime getDate() {
         return date;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.client_name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.client_name")
     public String getClientName() {
         return clientName;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.client_secret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.client_secret")
     public String getClientSecret() {
         return clientSecret;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.811+01:00", comments="Source field: seb_client_configuration.encrypt_secret")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.encrypt_secret")
     public String getEncryptSecret() {
         return encryptSecret;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.812+01:00", comments="Source field: seb_client_configuration.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.290+01:00", comments="Source field: seb_client_configuration.active")
     public Integer getActive() {
         return active;
     }
@@ -84,7 +84,7 @@ public class SebClientConfigRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table seb_client_configuration
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public String toString() {
@@ -108,7 +108,7 @@ public class SebClientConfigRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table seb_client_configuration
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public boolean equals(Object that) {
@@ -136,7 +136,7 @@ public class SebClientConfigRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table seb_client_configuration
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 0fade253..7875f23c 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="2020-01-09T10:29:16.806+01:00", comments="Source field: threshold.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+01:00", comments="Source field: threshold.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.indicator_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+01:00", comments="Source field: threshold.indicator_id")
     private Long indicatorId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+01:00", comments="Source field: threshold.value")
     private BigDecimal value;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.color")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+01:00", comments="Source field: threshold.color")
     private String color;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.806+01:00", comments="Source Table: threshold")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+01:00", comments="Source field: threshold.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.indicator_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+01:00", comments="Source field: threshold.indicator_id")
     public Long getIndicatorId() {
         return indicatorId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.value")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+01:00", comments="Source field: threshold.value")
     public BigDecimal getValue() {
         return value;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.807+01:00", comments="Source field: threshold.color")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.285+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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 1b760190..30dff477 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="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.user_uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.user_uuid")
     private String userUuid;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.timestamp")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.timestamp")
     private Long timestamp;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.activity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.activity_type")
     private String activityType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.entity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.entity_type")
     private String entityType;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.entity_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.entity_id")
     private String entityId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.message")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.message")
     private String message;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source Table: user_activity_log")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+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="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.user_uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.user_uuid")
     public String getUserUuid() {
         return userUuid;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.timestamp")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.timestamp")
     public Long getTimestamp() {
         return timestamp;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.activity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.activity_type")
     public String getActivityType() {
         return activityType;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.entity_type")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.entity_type")
     public String getEntityType() {
         return entityType;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.entity_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+01:00", comments="Source field: user_activity_log.entity_id")
     public String getEntityId() {
         return entityId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.821+01:00", comments="Source field: user_activity_log.message")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.300+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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @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 5a9fa8fc..4f2c1d59 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,42 +3,46 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class UserRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source field: user.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source field: user.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.institution_id")
     private Long institutionId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source field: user.uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.uuid")
     private String uuid;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.username")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.surname")
+    private String surname;
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.username")
     private String username;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.password")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.password")
     private String password;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.email")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.email")
     private String email;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.language")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.language")
     private String language;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.timezone")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source field: user.timezone")
     private String timezone;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source field: user.active")
     private Integer active;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source Table: user")
-    public UserRecord(Long id, Long institutionId, String uuid, String name, String username, String password, String email, String language, String timezone, Integer active) {
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source Table: user")
+    public UserRecord(Long id, Long institutionId, String uuid, String name, String surname, String username, String password, String email, String language, String timezone, Integer active) {
         this.id = id;
         this.institutionId = institutionId;
         this.uuid = uuid;
         this.name = name;
+        this.surname = surname;
         this.username = username;
         this.password = password;
         this.email = email;
@@ -47,52 +51,57 @@ public class UserRecord {
         this.active = active;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source field: user.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source field: user.institution_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.institution_id")
     public Long getInstitutionId() {
         return institutionId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.816+01:00", comments="Source field: user.uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.uuid")
     public String getUuid() {
         return uuid;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.username")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.surname")
+    public String getSurname() {
+        return surname;
+    }
+
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.username")
     public String getUsername() {
         return username;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.password")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.password")
     public String getPassword() {
         return password;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.email")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.295+01:00", comments="Source field: user.email")
     public String getEmail() {
         return email;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.language")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source field: user.language")
     public String getLanguage() {
         return language;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.timezone")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source field: user.timezone")
     public String getTimezone() {
         return timezone;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.817+01:00", comments="Source field: user.active")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.296+01:00", comments="Source field: user.active")
     public Integer getActive() {
         return active;
     }
@@ -101,7 +110,7 @@ public class UserRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public String toString() {
@@ -113,6 +122,7 @@ public class UserRecord {
         sb.append(", institutionId=").append(institutionId);
         sb.append(", uuid=").append(uuid);
         sb.append(", name=").append(name);
+        sb.append(", surname=").append(surname);
         sb.append(", username=").append(username);
         sb.append(", password=").append(password);
         sb.append(", email=").append(email);
@@ -127,7 +137,7 @@ public class UserRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public boolean equals(Object that) {
@@ -145,6 +155,7 @@ public class UserRecord {
             && (this.getInstitutionId() == null ? other.getInstitutionId() == null : this.getInstitutionId().equals(other.getInstitutionId()))
             && (this.getUuid() == null ? other.getUuid() == null : this.getUuid().equals(other.getUuid()))
             && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
+            && (this.getSurname() == null ? other.getSurname() == null : this.getSurname().equals(other.getSurname()))
             && (this.getUsername() == null ? other.getUsername() == null : this.getUsername().equals(other.getUsername()))
             && (this.getPassword() == null ? other.getPassword() == null : this.getPassword().equals(other.getPassword()))
             && (this.getEmail() == null ? other.getEmail() == null : this.getEmail().equals(other.getEmail()))
@@ -157,7 +168,7 @@ public class UserRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table user
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public int hashCode() {
@@ -167,6 +178,7 @@ public class UserRecord {
         result = prime * result + ((getInstitutionId() == null) ? 0 : getInstitutionId().hashCode());
         result = prime * result + ((getUuid() == null) ? 0 : getUuid().hashCode());
         result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
+        result = prime * result + ((getSurname() == null) ? 0 : getSurname().hashCode());
         result = prime * result + ((getUsername() == null) ? 0 : getUsername().hashCode());
         result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode());
         result = prime * result + ((getEmail() == null) ? 0 : getEmail().hashCode());
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java
index ff05ed81..b3c86a42 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java
@@ -3,22 +3,22 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class ViewRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.name")
     private String name;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.columns")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.columns")
     private Integer columns;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.position")
     private Integer position;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.template_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.template_id")
     private Long templateId;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source Table: view")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source Table: view")
     public ViewRecord(Long id, String name, Integer columns, Integer position, Long templateId) {
         this.id = id;
         this.name = name;
@@ -27,27 +27,27 @@ public class ViewRecord {
         this.templateId = templateId;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.name")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.name")
     public String getName() {
         return name;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.columns")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.columns")
     public Integer getColumns() {
         return columns;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.position")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.position")
     public Integer getPosition() {
         return position;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.751+01:00", comments="Source field: view.template_id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.244+01:00", comments="Source field: view.template_id")
     public Long getTemplateId() {
         return templateId;
     }
@@ -56,7 +56,7 @@ public class ViewRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table view
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public String toString() {
@@ -77,7 +77,7 @@ public class ViewRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table view
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public boolean equals(Object that) {
@@ -102,7 +102,7 @@ public class ViewRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table view
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java
index c25a7931..ad1d9467 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java
@@ -3,33 +3,33 @@ package ch.ethz.seb.sebserver.webservice.datalayer.batis.model;
 import javax.annotation.Generated;
 
 public class WebserviceServerInfoRecord {
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source field: webservice_server_info.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source field: webservice_server_info.id")
     private Long id;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source field: webservice_server_info.uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source field: webservice_server_info.uuid")
     private String uuid;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source field: webservice_server_info.service_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source field: webservice_server_info.service_address")
     private String serviceAddress;
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source Table: webservice_server_info")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source Table: webservice_server_info")
     public WebserviceServerInfoRecord(Long id, String uuid, String serviceAddress) {
         this.id = id;
         this.uuid = uuid;
         this.serviceAddress = serviceAddress;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source field: webservice_server_info.id")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source field: webservice_server_info.id")
     public Long getId() {
         return id;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source field: webservice_server_info.uuid")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source field: webservice_server_info.uuid")
     public String getUuid() {
         return uuid;
     }
 
-    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-09T10:29:16.826+01:00", comments="Source field: webservice_server_info.service_address")
+    @Generated(value="org.mybatis.generator.api.MyBatisGenerator", date="2020-01-29T14:47:50.305+01:00", comments="Source field: webservice_server_info.service_address")
     public String getServiceAddress() {
         return serviceAddress;
     }
@@ -38,7 +38,7 @@ public class WebserviceServerInfoRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table webservice_server_info
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public String toString() {
@@ -57,7 +57,7 @@ public class WebserviceServerInfoRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table webservice_server_info
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public boolean equals(Object that) {
@@ -80,7 +80,7 @@ public class WebserviceServerInfoRecord {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table webservice_server_info
      *
-     * @mbg.generated Thu Jan 09 10:29:16 CET 2020
+     * @mbg.generated Wed Jan 29 14:47:50 CET 2020
      */
     @Override
     public int hashCode() {
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/UserService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/UserService.java
index 9bf8a64f..9710ff45 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/UserService.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/UserService.java
@@ -46,14 +46,8 @@ public interface UserService {
      * @return an overall anonymous user with no rights */
     SEBServerUser getAnonymousUser();
 
-    /** Gets a overall super user with all rights. This can be used for background jobs that are
-     * not user specific but system specific.
-     *
-     * @return an overall super user with all rights */
-    SEBServerUser getSuperUser();
-
     /** Binds the current users institution identifier as default value to a
-     * 
+     *
      * @RequestParam of type API.PARAM_INSTITUTION_ID if needed. See EntityController class for example
      * @param binder Springs WebDataBinder is injected on controller side */
     void addUsersInstitutionDefaultPropertySupport(final WebDataBinder binder);
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/UserServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/UserServiceImpl.java
index dcddcde2..09d9dd71 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/UserServiceImpl.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/impl/UserServiceImpl.java
@@ -79,11 +79,6 @@ public class UserServiceImpl implements UserService {
         return ANONYMOUS_USER;
     }
 
-    @Override
-    public SEBServerUser getSuperUser() {
-        return SUPER_USER;
-    }
-
     @Override
     public void addUsersInstitutionDefaultPropertySupport(final WebDataBinder binder) {
         final PropertyEditorSupport usersInstitutionDefaultEditor = new PropertyEditorSupport() {
@@ -122,18 +117,10 @@ public class UserServiceImpl implements UserService {
         }
     }
 
-    private static final SEBServerUser SUPER_USER = new SEBServerUser(
-            -1L,
-            new UserInfo("SEB_SERVER_SUPER_USER", -1L, "superUser", "superUser", null, false, null, null,
-                    Arrays.asList(UserRole.values())
-                            .stream()
-                            .map(ur -> ur.name())
-                            .collect(Collectors.toSet())),
-            null);
-
     private static final SEBServerUser ANONYMOUS_USER = new SEBServerUser(
             -1L,
-            new UserInfo("SEB_SERVER_ANONYMOUS_USER", -2L, "anonymous", "anonymous", null, false, null, null,
+            new UserInfo("SEB_SERVER_ANONYMOUS_USER", -2L, "anonymous", "anonymous", "anonymous", null, false, null,
+                    null,
                     Arrays.asList(UserRole.values())
                             .stream()
                             .map(ur -> ur.name())
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/UserDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/UserDAOImpl.java
index e4b900a6..989e0c7d 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/UserDAOImpl.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/UserDAOImpl.java
@@ -208,6 +208,7 @@ public class UserDAOImpl implements UserDAO {
                     userMod.institutionId,
                     UUID.randomUUID().toString(),
                     userMod.name,
+                    userMod.surname,
                     userMod.username,
                     this.userPasswordEncoder.encode(userMod.getNewPassword()),
                     userMod.email,
@@ -238,6 +239,7 @@ public class UserDAOImpl implements UserDAO {
                             null,
                             null,
                             null,
+                            null,
                             this.userPasswordEncoder.encode(newPassword),
                             null,
                             null,
@@ -263,6 +265,7 @@ public class UserDAOImpl implements UserDAO {
                             null,
                             null,
                             userInfo.name,
+                            userInfo.surname,
                             userInfo.username,
                             null,
                             (userInfo.email == null) ? "" : userInfo.email,
@@ -285,7 +288,7 @@ public class UserDAOImpl implements UserDAO {
 
             final List<Long> ids = extractListOfPKs(all);
             final UserRecord userRecord = new UserRecord(
-                    null, null, null, null, null, null, null, null, null,
+                    null, null, null, null, null, null, null, null, null, null,
                     BooleanUtils.toIntegerObject(active));
 
             this.userRecordMapper.updateByExampleSelective(userRecord)
@@ -471,6 +474,7 @@ public class UserDAOImpl implements UserDAO {
                     record.getUuid(),
                     record.getInstitutionId(),
                     record.getName(),
+                    record.getSurname(),
                     record.getUsername(),
                     record.getEmail(),
                     BooleanUtils.toBooleanObject(record.getActive()),
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/LmsAPIService.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/LmsAPIService.java
index 1034d4e5..f9043bfe 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/LmsAPIService.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/LmsAPIService.java
@@ -106,7 +106,8 @@ public interface LmsAPIService {
         //final DateTime now = DateTime.now(DateTimeZone.UTC);
         return q -> {
             final boolean nameFilter = StringUtils.isBlank(name) || (q.name != null && q.name.contains(name));
-            final boolean startTimeFilter = (from == null) || (q.startTime != null && q.startTime.isAfter(from));
+            final boolean startTimeFilter =
+                    (from == null) || (q.startTime != null && (q.startTime.isEqual(from) || q.startTime.isAfter(from)));
             return nameFilter && startTimeFilter /* && endTimeFilter */;
         };
     }
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAPI_V1_Controller.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAPI_V1_Controller.java
index 0ef6a42f..e3a96b21 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAPI_V1_Controller.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAPI_V1_Controller.java
@@ -13,6 +13,8 @@ import java.security.Principal;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
 import java.util.stream.Collectors;
 
 import javax.servlet.ServletOutputStream;
@@ -21,6 +23,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.util.MultiValueMap;
@@ -35,6 +38,7 @@ import ch.ethz.seb.sebserver.gbl.api.API;
 import ch.ethz.seb.sebserver.gbl.api.APIMessage;
 import ch.ethz.seb.sebserver.gbl.api.JSONMapper;
 import ch.ethz.seb.sebserver.gbl.api.POSTMapper;
+import ch.ethz.seb.sebserver.gbl.async.AsyncServiceSpringConfig;
 import ch.ethz.seb.sebserver.gbl.model.exam.Exam;
 import ch.ethz.seb.sebserver.gbl.model.session.ClientConnection;
 import ch.ethz.seb.sebserver.gbl.model.session.ClientConnectionData;
@@ -59,19 +63,22 @@ public class ExamAPI_V1_Controller {
     private final SebClientConnectionService sebClientConnectionService;
     private final SebClientConfigDAO sebClientConfigDAO;
     private final JSONMapper jsonMapper;
+    private final Executor executor;
 
     protected ExamAPI_V1_Controller(
             final LmsSetupDAO lmsSetupDAO,
             final ExamSessionService examSessionService,
             final SebClientConnectionService sebClientConnectionService,
             final SebClientConfigDAO sebClientConfigDAO,
-            final JSONMapper jsonMapper) {
+            final JSONMapper jsonMapper,
+            @Qualifier(AsyncServiceSpringConfig.EXAMP_AIP_EXECUTOR_BEAN_NAME) final Executor executor) {
 
         this.lmsSetupDAO = lmsSetupDAO;
         this.examSessionService = examSessionService;
         this.sebClientConnectionService = sebClientConnectionService;
         this.sebClientConfigDAO = sebClientConfigDAO;
         this.jsonMapper = jsonMapper;
+        this.executor = executor;
     }
 
     @RequestMapping(
@@ -304,13 +311,15 @@ public class ExamAPI_V1_Controller {
             method = RequestMethod.POST,
             consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE,
             produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public String ping(
+    public CompletableFuture<String> ping(
             @RequestHeader(name = API.EXAM_API_SEB_CONNECTION_TOKEN, required = true) final String connectionToken,
             @RequestParam(name = API.EXAM_API_PING_TIMESTAMP, required = true) final long timestamp,
             @RequestParam(name = API.EXAM_API_PING_NUMBER, required = false) final int pingNumber) {
 
-        return this.sebClientConnectionService
-                .notifyPing(connectionToken, timestamp, pingNumber);
+        return new CompletableFuture<String>().completeAsync(
+                () -> this.sebClientConnectionService
+                        .notifyPing(connectionToken, timestamp, pingNumber),
+                this.executor);
     }
 
     @RequestMapping(
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/RegisterUserController.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/RegisterUserController.java
index 60c1ad84..f32c46e4 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/RegisterUserController.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/RegisterUserController.java
@@ -72,6 +72,7 @@ public class RegisterUserController {
     public UserInfo registerNewUser(
             @RequestParam(name = Domain.USER.ATTR_INSTITUTION_ID, required = true) final String institutionId,
             @RequestParam(name = Domain.USER.ATTR_NAME, required = true) final String name,
+            @RequestParam(name = Domain.USER.ATTR_SURNAME, required = false) final String surname,
             @RequestParam(name = Domain.USER.ATTR_USERNAME, required = true) final String username,
             @RequestParam(name = Domain.USER.ATTR_EMAIL, required = false) final String email,
             @RequestParam(
@@ -131,6 +132,7 @@ public class RegisterUserController {
                 null,
                 instId,
                 name,
+                surname,
                 username,
                 rawPWD,
                 rawRPWD,
diff --git a/src/main/resources/config/application-dev-gui.properties b/src/main/resources/config/application-dev-gui.properties
index 3efe1d93..e72f3692 100644
--- a/src/main/resources/config/application-dev-gui.properties
+++ b/src/main/resources/config/application-dev-gui.properties
@@ -7,7 +7,7 @@ sebserver.gui.webservice.address=localhost
 sebserver.gui.webservice.port=8080
 sebserver.gui.webservice.apipath=/admin-api/v1
 # defines the polling interval that is used to poll the webservice for client connection data on a monitored exam page
-sebserver.gui.webservice.poll-interval=500
+sebserver.gui.webservice.poll-interval=1000
 sebserver.gui.webservice.mock-lms-enabled=true
 
 
diff --git a/src/main/resources/config/application.properties b/src/main/resources/config/application.properties
index 7a9c6c95..65c62cbd 100644
--- a/src/main/resources/config/application.properties
+++ b/src/main/resources/config/application.properties
@@ -12,6 +12,11 @@ server.port=8080
 # The servlet context path
 server.servlet.context-path=/
 
+# Tomcat
+server.tomcat.max-threads=1000
+server.tomcat.accept-count=300
+
+
 ### encoding
 
 file.encoding=UTF-8 
@@ -119,7 +124,7 @@ sebserver.gui.webservice.address=localhost
 sebserver.gui.webservice.port=8080
 sebserver.gui.webservice.apipath=${sebserver.webservice.api.admin.endpoint}
 # defines the polling interval that is used to poll the webservice for client connection data on a monitored exam page
-sebserver.gui.webservice.poll-interval=500
+sebserver.gui.webservice.poll-interval=1000
 sebserver.gui.webservice.mock-lms-enabled=true
 sebserver.gui.theme=css/sebserver.css
 sebserver.gui.list.page.size=20
diff --git a/src/main/resources/data-demo.sql b/src/main/resources/data-demo.sql
index 8f750f4a..4aa07b5e 100644
--- a/src/main/resources/data-demo.sql
+++ b/src/main/resources/data-demo.sql
@@ -3,7 +3,7 @@ INSERT IGNORE INTO institution VALUES
     ;
 
 INSERT IGNORE INTO user VALUES 
-    (1, 1, 'super-admin', 'super-admin', 'super-admin', '$2a$08$c2GKYEYoUVXH1Yb8GXVXVu66ltPvbZgLMcVSXRH.LgZNF/YeaYB8m', 'super-admin@nomail.nomail', 'en', 'UTC', 1)
+    (1, 1, 'super-admin', 'super-admin', '', 'super-admin', '$2a$08$c2GKYEYoUVXH1Yb8GXVXVu66ltPvbZgLMcVSXRH.LgZNF/YeaYB8m', 'super-admin@nomail.nomail', 'en', 'UTC', 1)
     ;
     
 INSERT IGNORE INTO user_role VALUES
@@ -276,8 +276,8 @@ INSERT IGNORE INTO configuration_attribute VALUES
     (812, 'allowWlan', 'CHECKBOX', null, null, null, null, 'false'),
     (813, 'hookKeys', 'CHECKBOX', null, null, null, null, 'true'),
     
-    (900, 'examSessionClearCookiesOnEnd', 'CHECKBOX', null, null, null, null, 'false'),
-    (901, 'examSessionClearCookiesOnStart', 'CHECKBOX', null, null, null, null, 'false'),
+    (900, 'examSessionClearCookiesOnEnd', 'CHECKBOX', null, null, null, null, 'true'),
+    (901, 'examSessionClearCookiesOnStart', 'CHECKBOX', null, null, null, null, 'true'),
     (902, 'showBackToStartButton', 'CHECKBOX', null, null, null, null, 'true'),
     (903, 'showSettingsInApp', 'CHECKBOX', null, null, null, null, 'false'),
     (904, 'browserUserAgentWinTouchModeIPad', 'TEXT_FIELD', null, null, null, null, 'Mozilla/5.0 (iPad; CPU OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.2 Mobile/15E148 Safari/604.1'),
diff --git a/src/main/resources/data-prod.sql b/src/main/resources/data-prod.sql
index 250fd21a..80759cd5 100644
--- a/src/main/resources/data-prod.sql
+++ b/src/main/resources/data-prod.sql
@@ -3,7 +3,7 @@ INSERT IGNORE INTO institution VALUES
     ;
 
 INSERT IGNORE INTO user VALUES 
-    (1, 1, 'super-admin', 'super-admin', 'super-admin', '$2a$08$c2GKYEYoUVXH1Yb8GXVXVu66ltPvbZgLMcVSXRH.LgZNF/YeaYB8m', 'super-admin@nomail.nomail', 'en', 'UTC', 1)
+    (1, 1, 'super-admin', 'super-admin', '', 'super-admin', '$2a$08$c2GKYEYoUVXH1Yb8GXVXVu66ltPvbZgLMcVSXRH.LgZNF/YeaYB8m', 'super-admin@nomail.nomail', 'en', 'UTC', 1)
     ;
     
 INSERT IGNORE INTO user_role VALUES
@@ -249,8 +249,8 @@ INSERT IGNORE INTO configuration_attribute VALUES
     (812, 'allowWlan', 'CHECKBOX', null, null, null, null, 'false'),
     (813, 'hookKeys', 'CHECKBOX', null, null, null, null, 'true'),
     
-    (900, 'examSessionClearCookiesOnEnd', 'CHECKBOX', null, null, null, null, 'false'),
-    (901, 'examSessionClearCookiesOnStart', 'CHECKBOX', null, null, null, null, 'false'),
+    (900, 'examSessionClearCookiesOnEnd', 'CHECKBOX', null, null, null, null, 'true'),
+    (901, 'examSessionClearCookiesOnStart', 'CHECKBOX', null, null, null, null, 'true'),
     (902, 'showBackToStartButton', 'CHECKBOX', null, null, null, null, 'true'),
     (903, 'showSettingsInApp', 'CHECKBOX', null, null, null, null, 'false'),
     (904, 'browserUserAgentWinTouchModeIPad', 'TEXT_FIELD', null, null, null, null, 'Mozilla/5.0 (iPad; CPU OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.2 Mobile/15E148 Safari/604.1'),
diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
index f26cda57..091247e6 100644
--- a/src/main/resources/messages.properties
+++ b/src/main/resources/messages.properties
@@ -3,8 +3,11 @@
 ################################
 
 sebserver.overall.version=SEB Server Version : {0}
+
+sebserver.overall.about=About
+sebserver.overall.about.markup=<span style='font-family: Arial, Helvetica,sans-serif;font-size: 25px;font-weight: normal;font-style: normal;color: rgb(31, 64, 122);'>SEB Server About</span><br/><br/><span style='font-family: Arial, Helvetica,sans-serif;font-size: 18px;font-weight: bold;font-style: normal;'>1. Installation.</span><br/><br/><span style='font-family: Arial, Helvetica,sans-serif;font-size: 14px;font-weight: normal;font-style: normal;'>This is a SEB Server demo setup, ideal for testing or demonstrations.</span>
 sebserver.overall.help=Documentation
-sebserver.overall.help.link=https://seb-server.readthedocs.io/en/latest/#
+sebserver.overall.help.link=https://www.safeexambrowser.org/news_en.html
 
 sebserver.overall.message.leave.without.save=You have unsaved changes!\nAre you sure you want to leave the page?\The changes will be lost.
 sebserver.overall.upload=Please select a file
@@ -17,7 +20,7 @@ sebserver.overall.action.ok=OK
 sebserver.overall.action.cancel=Cancel
 sebserver.overall.action.close=Close
 sebserver.overall.action.goAwayFromEditPageConfirm=Are you sure you want to leave this page? Unsaved data will be lost.
-sebserver.overall.action.category.varia=Varia
+sebserver.overall.action.category.varia=
 sebserver.overall.action.category.filter=Connection Status Filter
 
 sebserver.overall.status.active=Active
@@ -118,14 +121,14 @@ sebserver.login.register.form.title=Register As New User
 sebserver.logout=Logout
 sebserver.mainpage.maximize.tooltip=Maximize
 sebserver.mainpage.minimize.tooltip=Minimize
-sebserver.activitiespane.title=Administration
-sebserver.actionpane.title=Actions
+sebserver.activitiespane.title=
+sebserver.actionpane.title=
 
 ################################
 # Institution
 ################################
 
-sebserver.institution.list.actions=Selected Institution
+sebserver.institution.list.actions=
 sebserver.institution.list.empty=No institution has been found. Please adapt the filter or create a new institution
 sebserver.institution.list.title=Institutions
 sebserver.institution.list.column.name=Name
@@ -137,7 +140,7 @@ sebserver.institution.action.form=Institution
 sebserver.institution.action.new=Add Institution
 sebserver.institution.action.list.view=View Institution
 sebserver.institution.action.list.modify=Edit Institution
-sebserver.institution.action.modify=Edit
+sebserver.institution.action.modify=Edit Institution
 sebserver.institution.action.save=Save Institution
 sebserver.institution.action.activate=Activate Institution
 sebserver.institution.action.deactivate=Deactivate Institution
@@ -148,7 +151,7 @@ sebserver.institution.form.title.new=Add Institution
 sebserver.institution.form.title=Institution
 
 sebserver.institution.form.name=Name
-sebserver.institution.form.name.tooltip.right=The display name of the institution
+sebserver.institution.form.name.tooltip.right=
 sebserver.institution.form.urlSuffix=URL Suffix
 sebserver.institution.form.urlSuffix.tooltip.right=The URL suffix to the institutional login page.\n Institutional URL is: http(s)://<seb-server-name>/<suffix>
 sebserver.institution.form.logoImage=Logo Image
@@ -169,7 +172,7 @@ sebserver.useraccount.role.EXAM_SUPPORTER=Exam Supporter
 sebserver.useraccount.list.empty=No user account has been found. Please adapt the filter or create a new user account
 sebserver.useraccount.list.title=User Accounts
 sebserver.useraccount.list.column.institution=Institution
-sebserver.useraccount.list.column.name=Name
+sebserver.useraccount.list.column.name=First Name
 sebserver.useraccount.list.column.username=User Name
 sebserver.useraccount.list.column.email=Mail
 sebserver.useraccount.list.column.language=Language
@@ -194,7 +197,8 @@ sebserver.useraccount.info.notEditable=You have no edit rights for this User Acc
 sebserver.useraccount.form.title=User Account
 sebserver.useraccount.form.title.new=Add User Account
 sebserver.useraccount.form.institution=Institution
-sebserver.useraccount.form.name=Name
+sebserver.useraccount.form.name=First Name
+sebserver.useraccount.form.surname=Surname
 sebserver.useraccount.form.username=Username
 sebserver.useraccount.form.mail=E-Mail
 sebserver.useraccount.form.language=Language
@@ -282,9 +286,6 @@ sebserver.quizdiscovery.quiz.import.out.dated=The Selected Quiz is is already fi
 sebserver.quizdiscovery.action.details=Show Details
 
 sebserver.quizdiscovery.quiz.details.title=Quiz Details
-sebserver.quizdiscovery.quiz.details.lms=LMS
-sebserver.quizdiscovery.quiz.details.institution=Institution
-sebserver.quizdiscovery.quiz.details.name=Name
 sebserver.quizdiscovery.quiz.details.description=Description
 sebserver.quizdiscovery.quiz.details.starttime=Start Time
 sebserver.quizdiscovery.quiz.details.endtime=End Time
@@ -456,7 +457,7 @@ sebserver.clientconfig.list.title=SEB Client Configurations
 sebserver.clientconfig.list.actions=Selected Configuration
 sebserver.clientconfig.list.column.institution=Institution
 sebserver.clientconfig.list.column.name=Name
-sebserver.clientconfig.list.column.date=Creation Date
+sebserver.clientconfig.list.column.date=Creation Date {0}
 sebserver.clientconfig.list.column.active=Active
 sebserver.clientconfig.info.pleaseSelect=Please Select a client configuration first
 sebserver.clientconfig.list.action.no.modify.privilege=No Access: A SEB Client Configuration from other institution cannot be modified.
@@ -1086,8 +1087,8 @@ sebserver.monitoring.exam.list.empty=There are currently no running exams
 
 sebserver.monitoring.exam.list.column.name=Name
 sebserver.monitoring.exam.list.column.type=Type
-sebserver.monitoring.exam.list.column.startTime=Start Time
-sebserver.monitoring.exam.list.column.endTime=End Time
+sebserver.monitoring.exam.list.column.startTime=Start Time {0}
+sebserver.monitoring.exam.list.column.endTime=End Time {0}
 
 sebserver.monitoring.exam=Monitoring Exam: {0}
 
@@ -1121,8 +1122,8 @@ sebserver.monitoring.exam.connection.action.show.undefined=Show Undefined
 sebserver.monitoring.exam.connection.eventlist.title=Events
 sebserver.monitoring.exam.connection.eventlist.empty=No event found
 sebserver.monitoring.exam.connection.eventlist.type=Event Type
-sebserver.monitoring.exam.connection.eventlist.clienttime=Client Time
-sebserver.monitoring.exam.connection.eventlist.servertime=Server Time
+sebserver.monitoring.exam.connection.eventlist.clienttime=Client Time {0}
+sebserver.monitoring.exam.connection.eventlist.servertime=Server Time {0}
 sebserver.monitoring.exam.connection.eventlist.value=Value
 sebserver.monitoring.exam.connection.eventlist.text=Text
 
@@ -1154,7 +1155,7 @@ sebserver.logs.activity.seblogs.details=Show Details
 sebserver.userlogs.list.title=User Activity Logs
 sebserver.userlogs.list.column.institution=Institution
 sebserver.userlogs.list.column.user=User
-sebserver.userlogs.list.column.dateTime=Date
+sebserver.userlogs.list.column.dateTime=Date {0}
 sebserver.userlogs.list.column.activityType=User Activity
 sebserver.userlogs.list.column.entityType=Entity Type
 sebserver.userlogs.list.column.entityId=Entity-ID
@@ -1175,13 +1176,14 @@ sebserver.seblogs.list.column.institution=Institution
 sebserver.seblogs.list.column.exam=Exam
 sebserver.seblogs.list.column.client-session=User Session-ID
 sebserver.seblogs.list.column.type=Event Type
-sebserver.seblogs.list.column.time=Event Time
+sebserver.seblogs.list.column.time=Event Time {0}
 sebserver.seblogs.list.column.value=Value
 
 sebserver.seblogs.details.title=SEB Client Log Details
 sebserver.seblogs.details.event.title=Event
 sebserver.seblogs.details.connection.title=SEB Connection Details
 sebserver.seblogs.details.exam.title=Exam Details
+sebserver.seblogs.details.dateTime=Date
 
 sebserver.seblogs.form.column.client-session=Session-ID
 sebserver.seblogs.form.column.type=Event Type
diff --git a/src/main/resources/schema-demo.sql b/src/main/resources/schema-demo.sql
index 0587da5e..1e94d179 100644
--- a/src/main/resources/schema-demo.sql
+++ b/src/main/resources/schema-demo.sql
@@ -362,6 +362,7 @@ CREATE TABLE IF NOT EXISTS `user` (
   `institution_id` BIGINT UNSIGNED NOT NULL,
   `uuid` VARCHAR(255) NOT NULL,
   `name` VARCHAR(255) NOT NULL,
+  `surname` VARCHAR(255) NULL,
   `username` VARCHAR(255) NOT NULL,
   `password` VARCHAR(255) NOT NULL,
   `email` VARCHAR(255) NULL,
diff --git a/src/main/resources/schema-dev.sql b/src/main/resources/schema-dev.sql
index ecd57097..5f45fb72 100644
--- a/src/main/resources/schema-dev.sql
+++ b/src/main/resources/schema-dev.sql
@@ -373,6 +373,7 @@ CREATE TABLE IF NOT EXISTS `user` (
   `institution_id` BIGINT UNSIGNED NOT NULL,
   `uuid` VARCHAR(255) NOT NULL,
   `name` VARCHAR(255) NOT NULL,
+  `surname` VARCHAR(255) NULL,
   `username` VARCHAR(255) NOT NULL,
   `password` VARCHAR(255) NOT NULL,
   `email` VARCHAR(255) NULL,
diff --git a/src/main/resources/schema-prod.sql b/src/main/resources/schema-prod.sql
index 2c3716b3..110732c7 100644
--- a/src/main/resources/schema-prod.sql
+++ b/src/main/resources/schema-prod.sql
@@ -339,6 +339,7 @@ CREATE TABLE IF NOT EXISTS `user` (
   `institution_id` BIGINT UNSIGNED NOT NULL,
   `uuid` VARCHAR(255) NOT NULL,
   `name` VARCHAR(255) NOT NULL,
+  `surname` VARCHAR(255) NULL,
   `username` VARCHAR(255) NOT NULL,
   `password` VARCHAR(255) NOT NULL,
   `email` VARCHAR(255) NULL,
diff --git a/src/main/resources/static/css/sebserver.css b/src/main/resources/static/css/sebserver.css
index 573882da..c07e6480 100644
--- a/src/main/resources/static/css/sebserver.css
+++ b/src/main/resources/static/css/sebserver.css
@@ -51,6 +51,21 @@ Label.action {
     text-shadow: none;
 }
 
+Label.list-nav {
+    font: 12px Arial, Helvetica, sans-serif;
+    color: #ffffff;
+    background-color: #595959;
+    background-image: none;
+    background-repeat: repeat;
+    background-position: left top;
+    border: none;
+    border-radius: 0;
+    text-decoration: none;
+    cursor: default;
+    opacity: 1;
+    text-shadow: none;
+}
+
 Label.h1 {
     font: 25px Arial, Helvetica, sans-serif;
     height: 28px;
diff --git a/src/test/java/ch/ethz/seb/sebserver/gbl/model/user/UserInfoTest.java b/src/test/java/ch/ethz/seb/sebserver/gbl/model/user/UserInfoTest.java
index 186f5a5f..51f2a4ae 100644
--- a/src/test/java/ch/ethz/seb/sebserver/gbl/model/user/UserInfoTest.java
+++ b/src/test/java/ch/ethz/seb/sebserver/gbl/model/user/UserInfoTest.java
@@ -25,18 +25,21 @@ public class UserInfoTest {
     @Test
     public void pageOfUserAccount() throws Exception {
         final Page<UserInfo> page = new Page<>(2, 1, "name", Arrays.asList(
-                new UserInfo("id1", 1L, "user1", "user1", "user1@inst2.none", true, Locale.ENGLISH, DateTimeZone.UTC,
+                new UserInfo("id1", 1L, "user1", "", "user1", "user1@inst2.none", true, Locale.ENGLISH,
+                        DateTimeZone.UTC,
                         new HashSet<>(Arrays.asList(UserRole.EXAM_ADMIN.name()))),
-                new UserInfo("id2", 3L, "user2", "user2", "user2@inst2.none", true, Locale.ENGLISH, DateTimeZone.UTC,
+                new UserInfo("id2", 3L, "user2", "", "user2", "user2@inst2.none", true, Locale.ENGLISH,
+                        DateTimeZone.UTC,
                         new HashSet<>(Arrays.asList(UserRole.EXAM_ADMIN.name()))),
-                new UserInfo("id3", 4L, "user3", "user3", "user3@inst2.none", false, Locale.GERMAN, DateTimeZone.UTC,
+                new UserInfo("id3", 4L, "user3", "", "user3", "user3@inst2.none", false, Locale.GERMAN,
+                        DateTimeZone.UTC,
                         new HashSet<>(Arrays.asList(UserRole.EXAM_ADMIN.name())))));
 
         final JSONMapper jsonMapper = new JSONMapper();
         //final ObjectWriter writerWithDefaultPrettyPrinter = jsonMapper.writerWithDefaultPrettyPrinter();
         final String json = jsonMapper.writeValueAsString(page);
         assertEquals(
-                "{\"number_of_pages\":2,\"page_number\":1,\"sort\":\"name\",\"content\":[{\"uuid\":\"id1\",\"institutionId\":1,\"name\":\"user1\",\"username\":\"user1\",\"email\":\"user1@inst2.none\",\"active\":true,\"language\":\"en\",\"timezone\":\"UTC\",\"userRoles\":[\"EXAM_ADMIN\"]},{\"uuid\":\"id2\",\"institutionId\":3,\"name\":\"user2\",\"username\":\"user2\",\"email\":\"user2@inst2.none\",\"active\":true,\"language\":\"en\",\"timezone\":\"UTC\",\"userRoles\":[\"EXAM_ADMIN\"]},{\"uuid\":\"id3\",\"institutionId\":4,\"name\":\"user3\",\"username\":\"user3\",\"email\":\"user3@inst2.none\",\"active\":false,\"language\":\"de\",\"timezone\":\"UTC\",\"userRoles\":[\"EXAM_ADMIN\"]}],\"page_size\":3}",
+                "{\"number_of_pages\":2,\"page_number\":1,\"sort\":\"name\",\"content\":[{\"uuid\":\"id1\",\"institutionId\":1,\"name\":\"user1\",\"surname\":\"\",\"username\":\"user1\",\"email\":\"user1@inst2.none\",\"active\":true,\"language\":\"en\",\"timezone\":\"UTC\",\"userRoles\":[\"EXAM_ADMIN\"]},{\"uuid\":\"id2\",\"institutionId\":3,\"name\":\"user2\",\"surname\":\"\",\"username\":\"user2\",\"email\":\"user2@inst2.none\",\"active\":true,\"language\":\"en\",\"timezone\":\"UTC\",\"userRoles\":[\"EXAM_ADMIN\"]},{\"uuid\":\"id3\",\"institutionId\":4,\"name\":\"user3\",\"surname\":\"\",\"username\":\"user3\",\"email\":\"user3@inst2.none\",\"active\":false,\"language\":\"de\",\"timezone\":\"UTC\",\"userRoles\":[\"EXAM_ADMIN\"]}],\"page_size\":3}",
                 json);
 
     }
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 22a8db7e..f0331ce5 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
@@ -63,6 +63,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
                 "{\"uuid\":\"user1\","
                         + "\"institutionId\":1,"
                         + "\"name\":\"SEBAdmin\","
+                        + "\"surname\":\"\","
                         + "\"username\":\"admin\","
                         + "\"email\":\"admin@nomail.nomail\","
                         + "\"active\":true,"
@@ -81,6 +82,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
                 "{\"uuid\":\"user2\","
                         + "\"institutionId\":1,"
                         + "\"name\":\"Institutional1 Admin\","
+                        + "\"surname\":\"\","
                         + "\"username\":\"inst1Admin\","
                         + "\"email\":\"admin@nomail.nomail\","
                         + "\"active\":true,"
@@ -104,6 +106,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
                 "{\"uuid\":\"user2\","
                         + "\"institutionId\":1,"
                         + "\"name\":\"Institutional1 Admin\","
+                        + "\"surname\":\"\","
                         + "\"username\":\"inst1Admin\","
                         + "\"email\":\"admin@nomail.nomail\","
                         + "\"active\":true,"
@@ -583,6 +586,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
                 user.uuid,
                 user.getInstitutionId(),
                 user.getName(),
+                user.getSurname(),
                 "newUser1",
                 "newUser@nomail.nomail",
                 user.getActive(),
@@ -743,7 +747,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
                 .andReturn().getResponse().getContentAsString();
 
         final UserInfo userInfo = new UserInfo(
-                "NewTestUser", 2L, "NewTestUser", "NewTestUser",
+                "NewTestUser", 2L, "NewTestUser", "", "NewTestUser",
                 "", true, Locale.CANADA, DateTimeZone.UTC,
                 new HashSet<>(Arrays.asList(UserRole.EXAM_ADMIN.name())));
         final String newUserJson = this.jsonMapper.writeValueAsString(userInfo);
@@ -770,7 +774,7 @@ public class UserAPITest extends AdministrationAPIIntegrationTester {
                 .andReturn().getResponse().getContentAsString();
 
         final UserInfo userInfo = new UserInfo(
-                "NewTestUser", 2L, "NewTestUser", "NewTestUser",
+                "NewTestUser", 2L, "NewTestUser", "", "NewTestUser",
                 "", true, Locale.CANADA, DateTimeZone.UTC,
                 new HashSet<>(Arrays.asList(UserRole.EXAM_ADMIN.name())));
         //final UserMod newUser = new UserMod(userInfo, "12345678", "12345678");
diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/exam/SebConnectionTest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/exam/SebConnectionTest.java
index 0b7d7192..a78a93b9 100644
--- a/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/exam/SebConnectionTest.java
+++ b/src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/exam/SebConnectionTest.java
@@ -465,12 +465,16 @@ public class SebConnectionTest extends ExamAPIIntegrationTester {
         assertEquals("0", String.valueOf(((AbstractPingIndicator) pingIndicator).getPingNumber()));
 
         super.sendPing(accessToken, connectionToken, 1);
+        Thread.sleep(200);
         assertEquals("1", String.valueOf(((AbstractPingIndicator) pingIndicator).getPingNumber()));
         super.sendPing(accessToken, connectionToken, 2);
+        Thread.sleep(200);
         assertEquals("2", String.valueOf(((AbstractPingIndicator) pingIndicator).getPingNumber()));
         super.sendPing(accessToken, connectionToken, 3);
+        Thread.sleep(200);
         assertEquals("3", String.valueOf(((AbstractPingIndicator) pingIndicator).getPingNumber()));
         super.sendPing(accessToken, connectionToken, 5);
+        Thread.sleep(200);
         assertEquals("5", String.valueOf(((AbstractPingIndicator) pingIndicator).getPingNumber()));
     }
 
diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/AuthorizationServiceTest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/AuthorizationServiceTest.java
index ee64ff7f..2f46c7ee 100644
--- a/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/AuthorizationServiceTest.java
+++ b/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/authorization/AuthorizationServiceTest.java
@@ -69,7 +69,7 @@ public class AuthorizationServiceTest {
     }
 
     private SEBServerUser getUser(final UserRole... roles) {
-        final UserInfo userInfo = new UserInfo("test", 1L, "test", "test", "mail", true, Locale.ENGLISH,
+        final UserInfo userInfo = new UserInfo("test", 1L, "test", "", "test", "mail", true, Locale.ENGLISH,
                 DateTimeZone.UTC,
                 roles != null
                         ? new HashSet<>(Arrays.asList(roles).stream().map(r -> r.name()).collect(Collectors.toList()))
diff --git a/src/test/resources/data-test-additional.sql b/src/test/resources/data-test-additional.sql
index 7516d7b3..7fc7e345 100644
--- a/src/test/resources/data-test-additional.sql
+++ b/src/test/resources/data-test-additional.sql
@@ -257,8 +257,8 @@ INSERT IGNORE INTO configuration_attribute VALUES
     (812, 'allowWlan', 'CHECKBOX', null, null, null, null, 'false'),
     (813, 'hookKeys', 'CHECKBOX', null, null, null, null, 'true'),
     
-    (900, 'examSessionClearCookiesOnEnd', 'CHECKBOX', null, null, null, null, 'false'),
-    (901, 'examSessionClearCookiesOnStart', 'CHECKBOX', null, null, null, null, 'false'),
+    (900, 'examSessionClearCookiesOnEnd', 'CHECKBOX', null, null, null, null, 'true'),
+    (901, 'examSessionClearCookiesOnStart', 'CHECKBOX', null, null, null, null, 'true'),
     (902, 'showBackToStartButton', 'CHECKBOX', null, null, null, null, 'true'),
     (903, 'showSettingsInApp', 'CHECKBOX', null, null, null, null, 'false'),
     (904, 'browserUserAgentWinTouchModeIPad', 'TEXT_FIELD', null, null, null, null, 'Mozilla/5.0 (iPad; CPU OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.2 Mobile/15E148 Safari/604.1'),
diff --git a/src/test/resources/data-test.sql b/src/test/resources/data-test.sql
index 0ea9c4a9..3d632a7d 100644
--- a/src/test/resources/data-test.sql
+++ b/src/test/resources/data-test.sql
@@ -5,13 +5,13 @@ INSERT INTO institution VALUES
     ;
 
 INSERT INTO user VALUES 
-    (1, 1, 'user1', 'SEBAdmin', 'admin', '$2a$08$c2GKYEYoUVXH1Yb8GXVXVu66ltPvbZgLMcVSXRH.LgZNF/YeaYB8m', 'admin@nomail.nomail', 'en', 'UTC', 1),
-    (2, 1, 'user2', 'Institutional1 Admin', 'inst1Admin', '$2a$08$c2GKYEYoUVXH1Yb8GXVXVu66ltPvbZgLMcVSXRH.LgZNF/YeaYB8m', 'admin@nomail.nomail', 'en', 'UTC', 1),
-    (5, 1, 'user5', 'Exam Supporter', 'examSupporter', '', 'admin@nomail.nomail', 'en', 'UTC', 1),
-    (3, 2, 'user3', 'Institutional2 Admin', 'inst2Admin', '$2a$08$c2GKYEYoUVXH1Yb8GXVXVu66ltPvbZgLMcVSXRH.LgZNF/YeaYB8m', 'admin@nomail.nomail', 'en', 'UTC', 1),
-    (4, 2, 'user4', 'ExamAdmin1', 'examAdmin1', '$2a$08$c2GKYEYoUVXH1Yb8GXVXVu66ltPvbZgLMcVSXRH.LgZNF/YeaYB8m', 'admin@nomail.nomail', 'en', 'UTC', 1),
-    (6, 2, 'user6', 'Deactivated', 'deactivatedUser', '$2a$08$YICtiLuceLMeY4EE3TyMGuBNt6SXmAE9HZKilzS9RP00nn4OhexBm', 'user@nomail.nomail', 'en', 'UTC', 0),
-    (7, 2, 'user7', 'User', 'user1', '$2a$08$YICtiLuceLMeY4EE3TyMGuBNt6SXmAE9HZKilzS9RP00nn4OhexBm', 'user@nomail.nomail', 'en', 'UTC', 1)
+    (1, 1, 'user1', 'SEBAdmin', '', 'admin', '$2a$08$c2GKYEYoUVXH1Yb8GXVXVu66ltPvbZgLMcVSXRH.LgZNF/YeaYB8m', 'admin@nomail.nomail', 'en', 'UTC', 1),
+    (2, 1, 'user2', 'Institutional1 Admin', '', 'inst1Admin', '$2a$08$c2GKYEYoUVXH1Yb8GXVXVu66ltPvbZgLMcVSXRH.LgZNF/YeaYB8m', 'admin@nomail.nomail', 'en', 'UTC', 1),
+    (5, 1, 'user5', 'Exam Supporter', '', 'examSupporter', '', 'admin@nomail.nomail', 'en', 'UTC', 1),
+    (3, 2, 'user3', 'Institutional2 Admin', '', 'inst2Admin', '$2a$08$c2GKYEYoUVXH1Yb8GXVXVu66ltPvbZgLMcVSXRH.LgZNF/YeaYB8m', 'admin@nomail.nomail', 'en', 'UTC', 1),
+    (4, 2, 'user4', 'ExamAdmin1', '', 'examAdmin1', '$2a$08$c2GKYEYoUVXH1Yb8GXVXVu66ltPvbZgLMcVSXRH.LgZNF/YeaYB8m', 'admin@nomail.nomail', 'en', 'UTC', 1),
+    (6, 2, 'user6', 'Deactivated', '', 'deactivatedUser', '$2a$08$YICtiLuceLMeY4EE3TyMGuBNt6SXmAE9HZKilzS9RP00nn4OhexBm', 'user@nomail.nomail', 'en', 'UTC', 0),
+    (7, 2, 'user7', 'User', '', 'user1', '$2a$08$YICtiLuceLMeY4EE3TyMGuBNt6SXmAE9HZKilzS9RP00nn4OhexBm', 'user@nomail.nomail', 'en', 'UTC', 1)
     ;
     
 INSERT INTO user_role VALUES
diff --git a/src/test/resources/schema-test.sql b/src/test/resources/schema-test.sql
index 39dad81f..8b1b9414 100644
--- a/src/test/resources/schema-test.sql
+++ b/src/test/resources/schema-test.sql
@@ -357,6 +357,7 @@ CREATE TABLE IF NOT EXISTS `user` (
   `institution_id` BIGINT UNSIGNED NOT NULL,
   `uuid` VARCHAR(255) NOT NULL,
   `name` VARCHAR(255) NOT NULL,
+  `surname` VARCHAR(255) NULL,
   `username` VARCHAR(255) NOT NULL,
   `password` VARCHAR(255) NOT NULL,
   `email` VARCHAR(255) NULL,