diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml
index cd0bb79..c23ac42 100644
--- a/.github/workflows/checkBuild.yml
+++ b/.github/workflows/checkBuild.yml
@@ -25,7 +25,7 @@ jobs:
         distribution: [temurin]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       
     - name: Set up JDK
       uses: actions/setup-java@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 609af70..53d1c12 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
   check_code: # Validates the code
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       
     - name: Set up JDK
       uses: actions/setup-java@v3
@@ -52,7 +52,7 @@ jobs:
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       
     - name: Configure Git
       run: |
@@ -111,7 +111,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare_release]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     
     - name: Init Git and pull
       run: |
@@ -143,7 +143,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare_release]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       
     - name: Init Git and pull
       run: |
@@ -197,7 +197,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [publish_central]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       
     - name: Init Git and pull
       run: |
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index 171b60d..f7c82af 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -26,7 +26,7 @@ jobs:
     # Dependabot PRs have no access to secrets (SONAR_TOKEN) -> Ignore them
     if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'dependabot/') }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
index 3e44f39..d2a8e2f 100644
--- a/.github/workflows/test-deploy.yml
+++ b/.github/workflows/test-deploy.yml
@@ -10,7 +10,7 @@ jobs:
   publish_central: # Publish the code to central
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     
     - name: Set up JDK OSSRH
       uses: actions/setup-java@v3
diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml
index 7da8af8..fc7a684 100644
--- a/.github/workflows/update-from-template.yml
+++ b/.github/workflows/update-from-template.yml
@@ -14,7 +14,7 @@ on:
 
 env:
   UPDATE_BRANCH: update-from-template
-  REMOTE_URL: https://github.com/xdev-software/standard-maven-template.git
+  REMOTE_URL: https://github.com/xdev-software/openapi-client-maven-template.git
   REMOTE_BRANCH: master
 
 permissions:
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # Required because otherwise there are always changes detected when executing diff/rev-list
           fetch-depth: 0
diff --git a/.run/Run Demo.run.xml b/.run/Run Demo.run.xml
index 8aa97dd..c3b0773 100644
--- a/.run/Run Demo.run.xml	
+++ b/.run/Run Demo.run.xml	
@@ -13,4 +13,4 @@
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 220a6bc..2bcd23e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,11 @@
+# 1.0.1
+* Shrunk generated code a bit
+* Updated openapi generator
+
 # 1.0.0 
 
 * Initial release
-* Supports Sessionize API ``v2`` and the following endpoints
+* Supports the following endpoints of the Sessionize API ``v2``: 
   * ``/view/All``
   * ``/view/Speakers``
   * ``/view/Sessions``
diff --git a/README.md b/README.md
index d971c7d..620ba54 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,17 @@
 [![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/sessionize-java-client?logo=apache%20maven)](https://mvnrepository.com/artifact/com.xdev-software/sessionize-java-client)
 [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/sessionize-java-client/checkBuild.yml?branch=develop)](https://github.com/xdev-software/sessionize-java-client/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_sessionize-java-client&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_sessionize-java-client)
+[![API Specification Editor](https://img.shields.io/badge/API--Spec-Editor-85ea2d?logo=swagger)](https://editor.swagger.io/?url=https://raw.githubusercontent.com/xdev-software/sessionize-java-client/develop/openapi/openapi.yml)
 
 # <img src="https://sessionize.com/landing/images/brand/logo/sessionize-avatar.svg" height="22" /> [sessionize](https://sessionize.com/)-java-client
 Java client for the [Sessionize API](https://sessionize.com/playbook/api)
 
 This client [is generated](./sessionize-java-client/pom.xml) from an [``openapi.yml``](./openapi/openapi.yml) using [OpenAPI Generator](https://openapi-generator.tech/).
 
-Currently this client supports Sessionize API ``v2`` and the following endpoints
-  * ``/view/All``
-  * ``/view/Speakers``
-  * ``/view/Sessions``
+Currently this client supports the following endpoints of the Sessionize API ``v2``:
+* ``/view/All``
+* ``/view/Speakers``
+* ``/view/Sessions``
 
 ## Installation
 [Installation guide for the latest release](https://github.com/xdev-software/sessionize-java-client/releases/latest#Installation)
diff --git a/openapi/INFO.md b/openapi/INFO.md
index 524539f..638e89b 100644
--- a/openapi/INFO.md
+++ b/openapi/INFO.md
@@ -1,7 +1,8 @@
-This ``openapi.yml`` was written manually as sessionize fails to provide an API schema or something similar.
+This ``openapi.yml`` was written manually as Sessionize fails to provide an API schema or something similar.
 
 The Java API Client can be generated using ``mvn clean compile -P openapi-generator`` inside [``sessionize-java-client``](../sessionize-java-client/).
 
 Helpful links:
 * https://jsonformatter.org/json-to-jsonschema
 * https://swagger.io/specification/
+* https://editor.swagger.io/
diff --git a/sessionize-java-client-demo/pom.xml b/sessionize-java-client-demo/pom.xml
index 4bcdd31..cd1fb76 100644
--- a/sessionize-java-client-demo/pom.xml
+++ b/sessionize-java-client-demo/pom.xml
@@ -9,7 +9,7 @@
 	<version>1.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<inceptionYear>2022</inceptionYear>
+	<inceptionYear>2023</inceptionYear>
 
 	<organization>
 		<name>XDEV Software</name>
diff --git a/sessionize-java-client/pom.xml b/sessionize-java-client/pom.xml
index 40248cc..a1bcdea 100644
--- a/sessionize-java-client/pom.xml
+++ b/sessionize-java-client/pom.xml
@@ -295,10 +295,39 @@
 			</properties>
 			<build>
 				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-clean-plugin</artifactId>
+						<version>3.3.1</version>
+						<executions>
+							<execution>
+								<id>pre-generation-clean</id>
+								<phase>initialize</phase>
+								<goals>
+									<goal>clean</goal>
+								</goals>
+								<configuration>
+									<excludeDefaultDirectories>true</excludeDefaultDirectories>
+									<filesets>
+										<fileset>
+											<directory>${generatedDir}</directory>
+										</fileset>
+									</filesets>
+								</configuration>
+							</execution>
+							<execution>
+								<id>post-generation-clean</id>
+								<phase>process-resources</phase>
+								<goals>
+									<goal>clean</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>org.openapitools</groupId>
 						<artifactId>openapi-generator-maven-plugin</artifactId>
-						<version>6.6.0</version>
+						<version>7.0.0</version>
 						<executions>
 							<execution>
 								<goals>
@@ -320,6 +349,7 @@
 										</disallowAdditionalPropertiesIfNotPresent>
 										<!-- Use newer Jakarta EE instead of Javax -->
 										<useJakartaEe>true</useJakartaEe>
+										<hideGenerationTimestamp>true</hideGenerationTimestamp>
 										<!-- No tests and documentation because we don't use that -->
 										<generateModelTests>false</generateModelTests>
 										<generateApiTests>false</generateApiTests>
@@ -337,7 +367,7 @@
 						<executions>
 							<execution>
 								<id>copy-generated-resources</id>
-								<phase>process-resources</phase>
+								<phase>process-sources</phase>
 								<goals>
 									<goal>copy-resources</goal>
 								</goals>
@@ -352,35 +382,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-clean-plugin</artifactId>
-						<version>3.3.1</version>
-						<executions>
-							<execution>
-								<id>pre-generation-clean</id>
-								<phase>initialize</phase>
-								<goals>
-									<goal>clean</goal>
-								</goals>
-								<configuration>
-									<excludeDefaultDirectories>true</excludeDefaultDirectories>
-									<filesets>
-										<fileset>
-											<directory>${generatedDir}</directory>
-										</fileset>
-									</filesets>
-								</configuration>
-							</execution>
-							<execution>
-								<id>post-generation-clean</id>
-								<phase>process-resources</phase>
-								<goals>
-									<goal>clean</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
 				</plugins>
 			</build>
 		</profile>
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/api/AllApi.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/api/AllApi.java
index 6a88e16..7e8b32b 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/api/AllApi.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/api/AllApi.java
@@ -17,7 +17,6 @@
 import software.xdev.sessionize.client.ApiException;
 import software.xdev.sessionize.client.ApiClient;
 import software.xdev.sessionize.client.Configuration;
-import software.xdev.sessionize.model.*;
 import software.xdev.sessionize.client.Pair;
 
 import software.xdev.sessionize.model.AllResult;
@@ -30,7 +29,7 @@
 import java.util.Map;
 import java.util.StringJoiner;
 
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AllApi {
 
 
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/api/SessionsApi.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/api/SessionsApi.java
index 172a6cd..b25bcfd 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/api/SessionsApi.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/api/SessionsApi.java
@@ -17,7 +17,6 @@
 import software.xdev.sessionize.client.ApiException;
 import software.xdev.sessionize.client.ApiClient;
 import software.xdev.sessionize.client.Configuration;
-import software.xdev.sessionize.model.*;
 import software.xdev.sessionize.client.Pair;
 
 import software.xdev.sessionize.model.SessionGroup;
@@ -30,7 +29,7 @@
 import java.util.Map;
 import java.util.StringJoiner;
 
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SessionsApi {
 
 
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/api/SpeakersApi.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/api/SpeakersApi.java
index 888f524..c3009c2 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/api/SpeakersApi.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/api/SpeakersApi.java
@@ -17,7 +17,6 @@
 import software.xdev.sessionize.client.ApiException;
 import software.xdev.sessionize.client.ApiClient;
 import software.xdev.sessionize.client.Configuration;
-import software.xdev.sessionize.model.*;
 import software.xdev.sessionize.client.Pair;
 
 import software.xdev.sessionize.model.Speaker;
@@ -30,7 +29,7 @@
 import java.util.Map;
 import java.util.StringJoiner;
 
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpeakersApi {
 
 
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/ApiClient.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/ApiClient.java
index cfa5793..7bb5788 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/ApiClient.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/ApiClient.java
@@ -77,7 +77,7 @@
 
 import software.xdev.sessionize.client.auth.Authentication;
 
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiClient extends JavaTimeFormatter {
   private Map<String, String> defaultHeaderMap = new HashMap<String, String>();
   private Map<String, String> defaultCookieMap = new HashMap<String, String>();
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/ApiException.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/ApiException.java
index 26a752f..7e14cfb 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/ApiException.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/ApiException.java
@@ -16,7 +16,7 @@
 import java.util.Map;
 import java.util.List;
 
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiException extends RuntimeException {
     private int code = 0;
     private Map<String, List<String>> responseHeaders = null;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/Configuration.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/Configuration.java
index 10f7363..0f13317 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/Configuration.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/Configuration.java
@@ -13,8 +13,10 @@
 
 package software.xdev.sessionize.client;
 
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
+    public static final String VERSION = "2.0";
+
     private static ApiClient defaultApiClient = new ApiClient();
 
     /**
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/JavaTimeFormatter.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/JavaTimeFormatter.java
index 37ed48a..c0ed915 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/JavaTimeFormatter.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/JavaTimeFormatter.java
@@ -20,7 +20,7 @@
  * Class that add parsing/formatting support for Java 8+ {@code OffsetDateTime} class.
  * It's generated for java clients when {@code AbstractJavaCodegen#dateLibrary} specified as {@code java8}.
  */
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class JavaTimeFormatter {
 
     private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/Pair.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/Pair.java
index b87aa6b..091ede1 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/Pair.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/Pair.java
@@ -13,7 +13,7 @@
 
 package software.xdev.sessionize.client;
 
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Pair {
     private String name = "";
     private String value = "";
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/StringUtil.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/StringUtil.java
index 5292c3f..cfb9ea8 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/StringUtil.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/StringUtil.java
@@ -16,7 +16,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/auth/ApiKeyAuth.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/auth/ApiKeyAuth.java
index 078905a..1a7f26c 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/auth/ApiKeyAuth.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/auth/ApiKeyAuth.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.List;
 
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/auth/HttpBasicAuth.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/auth/HttpBasicAuth.java
index 6ce2184..be179aa 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/auth/HttpBasicAuth.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/auth/HttpBasicAuth.java
@@ -21,7 +21,7 @@
 import java.util.Map;
 import java.util.List;
 
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/auth/HttpBearerAuth.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/auth/HttpBearerAuth.java
index b0f5055..89648f7 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/auth/HttpBearerAuth.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/client/auth/HttpBearerAuth.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.List;
 
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/AllResult.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/AllResult.java
index c6522d9..6bd7a00 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/AllResult.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/AllResult.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import software.xdev.sessionize.model.Category;
 import software.xdev.sessionize.model.Question;
@@ -43,7 +44,7 @@
   AllResult.JSON_PROPERTY_CATEGORIES,
   AllResult.JSON_PROPERTY_ROOMS
 })
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class AllResult {
   public static final String JSON_PROPERTY_SESSIONS = "sessions";
   private List<SessionAll> sessions = new ArrayList<>();
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/BaseSession.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/BaseSession.java
index 6cc35eb..734143d 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/BaseSession.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/BaseSession.java
@@ -23,6 +23,7 @@
 import java.net.URI;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import org.openapitools.jackson.nullable.JsonNullable;
 import software.xdev.sessionize.model.Status;
@@ -51,7 +52,7 @@
   BaseSession.JSON_PROPERTY_RECORDING_URL,
   BaseSession.JSON_PROPERTY_STATUS
 })
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BaseSession {
   public static final String JSON_PROPERTY_TITLE = "title";
   private String title;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/BaseSpeaker.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/BaseSpeaker.java
index 6abdec1..f35b348 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/BaseSpeaker.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/BaseSpeaker.java
@@ -22,6 +22,7 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 import org.openapitools.jackson.nullable.JsonNullable;
@@ -49,7 +50,7 @@
   BaseSpeaker.JSON_PROPERTY_LINKS,
   BaseSpeaker.JSON_PROPERTY_FULL_NAME
 })
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class BaseSpeaker {
   public static final String JSON_PROPERTY_ID = "id";
   private UUID id;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Category.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Category.java
index f05fc36..bbafb48 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Category.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Category.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import software.xdev.sessionize.model.CategoryItem;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -39,7 +40,7 @@
   Category.JSON_PROPERTY_SORT,
   Category.JSON_PROPERTY_TYPE
 })
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Category {
   public static final String JSON_PROPERTY_ID = "id";
   private Integer id;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/CategoryItem.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/CategoryItem.java
index fe2ca3c..5c0bdc6 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/CategoryItem.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/CategoryItem.java
@@ -34,7 +34,7 @@
   CategoryItem.JSON_PROPERTY_NAME,
   CategoryItem.JSON_PROPERTY_SORT
 })
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class CategoryItem {
   public static final String JSON_PROPERTY_ID = "id";
   private Integer id;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Link.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Link.java
index 1e65e31..72c3119 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Link.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Link.java
@@ -35,7 +35,7 @@
   Link.JSON_PROPERTY_URL,
   Link.JSON_PROPERTY_LINK_TYPE
 })
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Link {
   public static final String JSON_PROPERTY_TITLE = "title";
   private String title;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Question.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Question.java
index e93f9a1..e875d05 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Question.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Question.java
@@ -35,7 +35,7 @@
   Question.JSON_PROPERTY_QUESTION_TYPE,
   Question.JSON_PROPERTY_SORT
 })
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Question {
   public static final String JSON_PROPERTY_ID = "id";
   private Integer id;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/QuestionAnswer.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/QuestionAnswer.java
index d171e7c..070a1ce 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/QuestionAnswer.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/QuestionAnswer.java
@@ -33,7 +33,7 @@
   QuestionAnswer.JSON_PROPERTY_QUESTION_ID,
   QuestionAnswer.JSON_PROPERTY_ANSWER_VALUE
 })
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class QuestionAnswer {
   public static final String JSON_PROPERTY_QUESTION_ID = "questionId";
   private Integer questionId;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/QuestionAnswerFull.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/QuestionAnswerFull.java
index a2a7f77..ec2e3b7 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/QuestionAnswerFull.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/QuestionAnswerFull.java
@@ -36,7 +36,7 @@
   QuestionAnswerFull.JSON_PROPERTY_ANSWER,
   QuestionAnswerFull.JSON_PROPERTY_SORT
 })
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class QuestionAnswerFull {
   public static final String JSON_PROPERTY_ID = "id";
   private Integer id;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Room.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Room.java
index e9f87db..c48b1e8 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Room.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Room.java
@@ -34,7 +34,7 @@
   Room.JSON_PROPERTY_NAME,
   Room.JSON_PROPERTY_SORT
 })
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Room {
   public static final String JSON_PROPERTY_ID = "id";
   private Integer id;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Session.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Session.java
index 67851e8..a7f1cb6 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Session.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Session.java
@@ -23,6 +23,7 @@
 import java.net.URI;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import org.openapitools.jackson.nullable.JsonNullable;
 import software.xdev.sessionize.model.QuestionAnswerFull;
@@ -56,7 +57,7 @@
   Session.JSON_PROPERTY_SPEAKERS,
   Session.JSON_PROPERTY_QUESTION_ANSWERS
 })
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Session {
   public static final String JSON_PROPERTY_TITLE = "title";
   private String title;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SessionAll.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SessionAll.java
index 6e6110d..9865fa3 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SessionAll.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SessionAll.java
@@ -23,6 +23,7 @@
 import java.net.URI;
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import org.openapitools.jackson.nullable.JsonNullable;
 import software.xdev.sessionize.model.QuestionAnswer;
@@ -55,7 +56,7 @@
   SessionAll.JSON_PROPERTY_SPEAKERS,
   SessionAll.JSON_PROPERTY_QUESTION_ANSWERS
 })
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SessionAll {
   public static final String JSON_PROPERTY_TITLE = "title";
   private String title;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SessionAllAllOf.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SessionAllAllOf.java
deleted file mode 100644
index 97a1bde..0000000
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SessionAllAllOf.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Sessionize JSON-REST API
- * Sessionize JSON-REST API documentation by XDEV Software
- *
- * The version of the OpenAPI document: 2.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package software.xdev.sessionize.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.ArrayList;
-import java.util.List;
-import software.xdev.sessionize.model.QuestionAnswer;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.StringJoiner;
-
-/**
- * SessionAllAllOf
- */
-@JsonPropertyOrder({
-  SessionAllAllOf.JSON_PROPERTY_ID,
-  SessionAllAllOf.JSON_PROPERTY_SPEAKERS,
-  SessionAllAllOf.JSON_PROPERTY_QUESTION_ANSWERS
-})
-@JsonTypeName("SessionAll_allOf")
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
-public class SessionAllAllOf {
-  public static final String JSON_PROPERTY_ID = "id";
-  private String id;
-
-  public static final String JSON_PROPERTY_SPEAKERS = "speakers";
-  private List<String> speakers = new ArrayList<>();
-
-  public static final String JSON_PROPERTY_QUESTION_ANSWERS = "questionAnswers";
-  private List<QuestionAnswer> questionAnswers = new ArrayList<>();
-
-  public SessionAllAllOf() {
-  }
-
-  public SessionAllAllOf id(String id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @jakarta.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getId() {
-    return id;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setId(String id) {
-    this.id = id;
-  }
-
-
-  public SessionAllAllOf speakers(List<String> speakers) {
-    
-    this.speakers = speakers;
-    return this;
-  }
-
-  public SessionAllAllOf addSpeakersItem(String speakersItem) {
-    if (this.speakers == null) {
-      this.speakers = new ArrayList<>();
-    }
-    this.speakers.add(speakersItem);
-    return this;
-  }
-
-   /**
-   * Get speakers
-   * @return speakers
-  **/
-  @jakarta.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_SPEAKERS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public List<String> getSpeakers() {
-    return speakers;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_SPEAKERS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setSpeakers(List<String> speakers) {
-    this.speakers = speakers;
-  }
-
-
-  public SessionAllAllOf questionAnswers(List<QuestionAnswer> questionAnswers) {
-    
-    this.questionAnswers = questionAnswers;
-    return this;
-  }
-
-  public SessionAllAllOf addQuestionAnswersItem(QuestionAnswer questionAnswersItem) {
-    if (this.questionAnswers == null) {
-      this.questionAnswers = new ArrayList<>();
-    }
-    this.questionAnswers.add(questionAnswersItem);
-    return this;
-  }
-
-   /**
-   * Get questionAnswers
-   * @return questionAnswers
-  **/
-  @jakarta.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_QUESTION_ANSWERS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public List<QuestionAnswer> getQuestionAnswers() {
-    return questionAnswers;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_QUESTION_ANSWERS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setQuestionAnswers(List<QuestionAnswer> questionAnswers) {
-    this.questionAnswers = questionAnswers;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    SessionAllAllOf sessionAllAllOf = (SessionAllAllOf) o;
-    return Objects.equals(this.id, sessionAllAllOf.id) &&
-        Objects.equals(this.speakers, sessionAllAllOf.speakers) &&
-        Objects.equals(this.questionAnswers, sessionAllAllOf.questionAnswers);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, speakers, questionAnswers);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SessionAllAllOf {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    speakers: ").append(toIndentedString(speakers)).append("\n");
-    sb.append("    questionAnswers: ").append(toIndentedString(questionAnswers)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-  /**
-   * Convert the instance into URL query string.
-   *
-   * @return URL query string
-   */
-  public String toUrlQueryString() {
-    return toUrlQueryString(null);
-  }
-
-  /**
-   * Convert the instance into URL query string.
-   *
-   * @param prefix prefix of the query string
-   * @return URL query string
-   */
-  public String toUrlQueryString(String prefix) {
-    String suffix = "";
-    String containerSuffix = "";
-    String containerPrefix = "";
-    if (prefix == null) {
-      // style=form, explode=true, e.g. /pet?name=cat&type=manx
-      prefix = "";
-    } else {
-      // deepObject style e.g. /pet?id[name]=cat&id[type]=manx
-      prefix = prefix + "[";
-      suffix = "]";
-      containerSuffix = "]";
-      containerPrefix = "[";
-    }
-
-    StringJoiner joiner = new StringJoiner("&");
-
-    // add `id` to the URL query string
-    if (getId() != null) {
-      try {
-        joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), "UTF-8").replaceAll("\\+", "%20")));
-      } catch (UnsupportedEncodingException e) {
-        // Should never happen, UTF-8 is always supported
-        throw new RuntimeException(e);
-      }
-    }
-
-    // add `speakers` to the URL query string
-    if (getSpeakers() != null) {
-      for (int i = 0; i < getSpeakers().size(); i++) {
-        try {
-          joiner.add(String.format("%sspeakers%s%s=%s", prefix, suffix,
-              "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix),
-              URLEncoder.encode(String.valueOf(getSpeakers().get(i)), "UTF-8").replaceAll("\\+", "%20")));
-        } catch (UnsupportedEncodingException e) {
-          // Should never happen, UTF-8 is always supported
-          throw new RuntimeException(e);
-        }
-      }
-    }
-
-    // add `questionAnswers` to the URL query string
-    if (getQuestionAnswers() != null) {
-      for (int i = 0; i < getQuestionAnswers().size(); i++) {
-        if (getQuestionAnswers().get(i) != null) {
-          joiner.add(getQuestionAnswers().get(i).toUrlQueryString(String.format("%squestionAnswers%s%s", prefix, suffix,
-              "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix))));
-        }
-      }
-    }
-
-    return joiner.toString();
-  }
-
-}
-
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SessionAllOf.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SessionAllOf.java
deleted file mode 100644
index 10bafbf..0000000
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SessionAllOf.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Sessionize JSON-REST API
- * Sessionize JSON-REST API documentation by XDEV Software
- *
- * The version of the OpenAPI document: 2.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package software.xdev.sessionize.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.ArrayList;
-import java.util.List;
-import software.xdev.sessionize.model.QuestionAnswerFull;
-import software.xdev.sessionize.model.SpeakerMinimal;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.StringJoiner;
-
-/**
- * SessionAllOf
- */
-@JsonPropertyOrder({
-  SessionAllOf.JSON_PROPERTY_ID,
-  SessionAllOf.JSON_PROPERTY_SPEAKERS,
-  SessionAllOf.JSON_PROPERTY_QUESTION_ANSWERS
-})
-@JsonTypeName("Session_allOf")
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
-public class SessionAllOf {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Integer id;
-
-  public static final String JSON_PROPERTY_SPEAKERS = "speakers";
-  private List<SpeakerMinimal> speakers = new ArrayList<>();
-
-  public static final String JSON_PROPERTY_QUESTION_ANSWERS = "questionAnswers";
-  private List<QuestionAnswerFull> questionAnswers = new ArrayList<>();
-
-  public SessionAllOf() {
-  }
-
-  public SessionAllOf id(Integer id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @jakarta.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Integer getId() {
-    return id;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setId(Integer id) {
-    this.id = id;
-  }
-
-
-  public SessionAllOf speakers(List<SpeakerMinimal> speakers) {
-    
-    this.speakers = speakers;
-    return this;
-  }
-
-  public SessionAllOf addSpeakersItem(SpeakerMinimal speakersItem) {
-    if (this.speakers == null) {
-      this.speakers = new ArrayList<>();
-    }
-    this.speakers.add(speakersItem);
-    return this;
-  }
-
-   /**
-   * Get speakers
-   * @return speakers
-  **/
-  @jakarta.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_SPEAKERS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public List<SpeakerMinimal> getSpeakers() {
-    return speakers;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_SPEAKERS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setSpeakers(List<SpeakerMinimal> speakers) {
-    this.speakers = speakers;
-  }
-
-
-  public SessionAllOf questionAnswers(List<QuestionAnswerFull> questionAnswers) {
-    
-    this.questionAnswers = questionAnswers;
-    return this;
-  }
-
-  public SessionAllOf addQuestionAnswersItem(QuestionAnswerFull questionAnswersItem) {
-    if (this.questionAnswers == null) {
-      this.questionAnswers = new ArrayList<>();
-    }
-    this.questionAnswers.add(questionAnswersItem);
-    return this;
-  }
-
-   /**
-   * Get questionAnswers
-   * @return questionAnswers
-  **/
-  @jakarta.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_QUESTION_ANSWERS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public List<QuestionAnswerFull> getQuestionAnswers() {
-    return questionAnswers;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_QUESTION_ANSWERS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setQuestionAnswers(List<QuestionAnswerFull> questionAnswers) {
-    this.questionAnswers = questionAnswers;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    SessionAllOf sessionAllOf = (SessionAllOf) o;
-    return Objects.equals(this.id, sessionAllOf.id) &&
-        Objects.equals(this.speakers, sessionAllOf.speakers) &&
-        Objects.equals(this.questionAnswers, sessionAllOf.questionAnswers);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, speakers, questionAnswers);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SessionAllOf {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    speakers: ").append(toIndentedString(speakers)).append("\n");
-    sb.append("    questionAnswers: ").append(toIndentedString(questionAnswers)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-  /**
-   * Convert the instance into URL query string.
-   *
-   * @return URL query string
-   */
-  public String toUrlQueryString() {
-    return toUrlQueryString(null);
-  }
-
-  /**
-   * Convert the instance into URL query string.
-   *
-   * @param prefix prefix of the query string
-   * @return URL query string
-   */
-  public String toUrlQueryString(String prefix) {
-    String suffix = "";
-    String containerSuffix = "";
-    String containerPrefix = "";
-    if (prefix == null) {
-      // style=form, explode=true, e.g. /pet?name=cat&type=manx
-      prefix = "";
-    } else {
-      // deepObject style e.g. /pet?id[name]=cat&id[type]=manx
-      prefix = prefix + "[";
-      suffix = "]";
-      containerSuffix = "]";
-      containerPrefix = "[";
-    }
-
-    StringJoiner joiner = new StringJoiner("&");
-
-    // add `id` to the URL query string
-    if (getId() != null) {
-      try {
-        joiner.add(String.format("%sid%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getId()), "UTF-8").replaceAll("\\+", "%20")));
-      } catch (UnsupportedEncodingException e) {
-        // Should never happen, UTF-8 is always supported
-        throw new RuntimeException(e);
-      }
-    }
-
-    // add `speakers` to the URL query string
-    if (getSpeakers() != null) {
-      for (int i = 0; i < getSpeakers().size(); i++) {
-        if (getSpeakers().get(i) != null) {
-          joiner.add(getSpeakers().get(i).toUrlQueryString(String.format("%sspeakers%s%s", prefix, suffix,
-              "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix))));
-        }
-      }
-    }
-
-    // add `questionAnswers` to the URL query string
-    if (getQuestionAnswers() != null) {
-      for (int i = 0; i < getQuestionAnswers().size(); i++) {
-        if (getQuestionAnswers().get(i) != null) {
-          joiner.add(getQuestionAnswers().get(i).toUrlQueryString(String.format("%squestionAnswers%s%s", prefix, suffix,
-              "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix))));
-        }
-      }
-    }
-
-    return joiner.toString();
-  }
-
-}
-
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SessionGroup.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SessionGroup.java
index ee39322..e206453 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SessionGroup.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SessionGroup.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import software.xdev.sessionize.model.Session;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -38,7 +39,7 @@
   SessionGroup.JSON_PROPERTY_SESSIONS,
   SessionGroup.JSON_PROPERTY_IS_DEFAULT
 })
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SessionGroup {
   public static final String JSON_PROPERTY_GROUP_ID = "groupId";
   private Integer groupId;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SessionMinimal.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SessionMinimal.java
index fb04271..2ae68cf 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SessionMinimal.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SessionMinimal.java
@@ -33,7 +33,7 @@
   SessionMinimal.JSON_PROPERTY_ID,
   SessionMinimal.JSON_PROPERTY_NAME
 })
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SessionMinimal {
   public static final String JSON_PROPERTY_ID = "id";
   private Integer id;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Speaker.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Speaker.java
index d415b53..3f73cc2 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Speaker.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/Speaker.java
@@ -22,6 +22,7 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 import org.openapitools.jackson.nullable.JsonNullable;
@@ -51,7 +52,7 @@
   Speaker.JSON_PROPERTY_FULL_NAME,
   Speaker.JSON_PROPERTY_SESSIONS
 })
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Speaker {
   public static final String JSON_PROPERTY_ID = "id";
   private UUID id;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SpeakerAll.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SpeakerAll.java
index 934eddb..c73fae0 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SpeakerAll.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SpeakerAll.java
@@ -22,6 +22,7 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 import org.openapitools.jackson.nullable.JsonNullable;
@@ -50,7 +51,7 @@
   SpeakerAll.JSON_PROPERTY_FULL_NAME,
   SpeakerAll.JSON_PROPERTY_SESSIONS
 })
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpeakerAll {
   public static final String JSON_PROPERTY_ID = "id";
   private UUID id;
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SpeakerAllAllOf.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SpeakerAllAllOf.java
deleted file mode 100644
index 94f67c4..0000000
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SpeakerAllAllOf.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Sessionize JSON-REST API
- * Sessionize JSON-REST API documentation by XDEV Software
- *
- * The version of the OpenAPI document: 2.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package software.xdev.sessionize.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.StringJoiner;
-
-/**
- * SpeakerAllAllOf
- */
-@JsonPropertyOrder({
-  SpeakerAllAllOf.JSON_PROPERTY_SESSIONS
-})
-@JsonTypeName("SpeakerAll_allOf")
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
-public class SpeakerAllAllOf {
-  public static final String JSON_PROPERTY_SESSIONS = "sessions";
-  private List<Integer> sessions = new ArrayList<>();
-
-  public SpeakerAllAllOf() {
-  }
-
-  public SpeakerAllAllOf sessions(List<Integer> sessions) {
-    
-    this.sessions = sessions;
-    return this;
-  }
-
-  public SpeakerAllAllOf addSessionsItem(Integer sessionsItem) {
-    if (this.sessions == null) {
-      this.sessions = new ArrayList<>();
-    }
-    this.sessions.add(sessionsItem);
-    return this;
-  }
-
-   /**
-   * Get sessions
-   * @return sessions
-  **/
-  @jakarta.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_SESSIONS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public List<Integer> getSessions() {
-    return sessions;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_SESSIONS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setSessions(List<Integer> sessions) {
-    this.sessions = sessions;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    SpeakerAllAllOf speakerAllAllOf = (SpeakerAllAllOf) o;
-    return Objects.equals(this.sessions, speakerAllAllOf.sessions);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(sessions);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SpeakerAllAllOf {\n");
-    sb.append("    sessions: ").append(toIndentedString(sessions)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-  /**
-   * Convert the instance into URL query string.
-   *
-   * @return URL query string
-   */
-  public String toUrlQueryString() {
-    return toUrlQueryString(null);
-  }
-
-  /**
-   * Convert the instance into URL query string.
-   *
-   * @param prefix prefix of the query string
-   * @return URL query string
-   */
-  public String toUrlQueryString(String prefix) {
-    String suffix = "";
-    String containerSuffix = "";
-    String containerPrefix = "";
-    if (prefix == null) {
-      // style=form, explode=true, e.g. /pet?name=cat&type=manx
-      prefix = "";
-    } else {
-      // deepObject style e.g. /pet?id[name]=cat&id[type]=manx
-      prefix = prefix + "[";
-      suffix = "]";
-      containerSuffix = "]";
-      containerPrefix = "[";
-    }
-
-    StringJoiner joiner = new StringJoiner("&");
-
-    // add `sessions` to the URL query string
-    if (getSessions() != null) {
-      for (int i = 0; i < getSessions().size(); i++) {
-        try {
-          joiner.add(String.format("%ssessions%s%s=%s", prefix, suffix,
-              "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix),
-              URLEncoder.encode(String.valueOf(getSessions().get(i)), "UTF-8").replaceAll("\\+", "%20")));
-        } catch (UnsupportedEncodingException e) {
-          // Should never happen, UTF-8 is always supported
-          throw new RuntimeException(e);
-        }
-      }
-    }
-
-    return joiner.toString();
-  }
-
-}
-
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SpeakerAllOf.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SpeakerAllOf.java
deleted file mode 100644
index b97caa5..0000000
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SpeakerAllOf.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Sessionize JSON-REST API
- * Sessionize JSON-REST API documentation by XDEV Software
- *
- * The version of the OpenAPI document: 2.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-package software.xdev.sessionize.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.annotation.JsonValue;
-import java.util.ArrayList;
-import java.util.List;
-import software.xdev.sessionize.model.SessionMinimal;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.StringJoiner;
-
-/**
- * SpeakerAllOf
- */
-@JsonPropertyOrder({
-  SpeakerAllOf.JSON_PROPERTY_SESSIONS
-})
-@JsonTypeName("Speaker_allOf")
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
-public class SpeakerAllOf {
-  public static final String JSON_PROPERTY_SESSIONS = "sessions";
-  private List<SessionMinimal> sessions = new ArrayList<>();
-
-  public SpeakerAllOf() {
-  }
-
-  public SpeakerAllOf sessions(List<SessionMinimal> sessions) {
-    
-    this.sessions = sessions;
-    return this;
-  }
-
-  public SpeakerAllOf addSessionsItem(SessionMinimal sessionsItem) {
-    if (this.sessions == null) {
-      this.sessions = new ArrayList<>();
-    }
-    this.sessions.add(sessionsItem);
-    return this;
-  }
-
-   /**
-   * Get sessions
-   * @return sessions
-  **/
-  @jakarta.annotation.Nonnull
-  @JsonProperty(JSON_PROPERTY_SESSIONS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public List<SessionMinimal> getSessions() {
-    return sessions;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_SESSIONS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setSessions(List<SessionMinimal> sessions) {
-    this.sessions = sessions;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    SpeakerAllOf speakerAllOf = (SpeakerAllOf) o;
-    return Objects.equals(this.sessions, speakerAllOf.sessions);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(sessions);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SpeakerAllOf {\n");
-    sb.append("    sessions: ").append(toIndentedString(sessions)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-  /**
-   * Convert the instance into URL query string.
-   *
-   * @return URL query string
-   */
-  public String toUrlQueryString() {
-    return toUrlQueryString(null);
-  }
-
-  /**
-   * Convert the instance into URL query string.
-   *
-   * @param prefix prefix of the query string
-   * @return URL query string
-   */
-  public String toUrlQueryString(String prefix) {
-    String suffix = "";
-    String containerSuffix = "";
-    String containerPrefix = "";
-    if (prefix == null) {
-      // style=form, explode=true, e.g. /pet?name=cat&type=manx
-      prefix = "";
-    } else {
-      // deepObject style e.g. /pet?id[name]=cat&id[type]=manx
-      prefix = prefix + "[";
-      suffix = "]";
-      containerSuffix = "]";
-      containerPrefix = "[";
-    }
-
-    StringJoiner joiner = new StringJoiner("&");
-
-    // add `sessions` to the URL query string
-    if (getSessions() != null) {
-      for (int i = 0; i < getSessions().size(); i++) {
-        if (getSessions().get(i) != null) {
-          joiner.add(getSessions().get(i).toUrlQueryString(String.format("%ssessions%s%s", prefix, suffix,
-              "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix))));
-        }
-      }
-    }
-
-    return joiner.toString();
-  }
-
-}
-
diff --git a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SpeakerMinimal.java b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SpeakerMinimal.java
index 9cde8d7..292d2ed 100644
--- a/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SpeakerMinimal.java
+++ b/sessionize-java-client/src/generated/java/software/xdev/sessionize/model/SpeakerMinimal.java
@@ -34,7 +34,7 @@
   SpeakerMinimal.JSON_PROPERTY_ID,
   SpeakerMinimal.JSON_PROPERTY_NAME
 })
-@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-04-26T17:30:53.867882+02:00[Europe/Berlin]")
+@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SpeakerMinimal {
   public static final String JSON_PROPERTY_ID = "id";
   private UUID id;