diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/Application.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/Application.java
index 99fc74601..3cdfbdf98 100644
--- a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/Application.java
+++ b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/Application.java
@@ -51,7 +51,7 @@ public class Application extends BaseEntity {
     @Column
     @Schema(
         description = "The name of the application.",
-        required = true,
+        requiredMode = Schema.RequiredMode.REQUIRED,
         example = "My SHOGun application"
     )
     private String name;
diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/BaseEntity.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/BaseEntity.java
index 69e1e2e90..a38c83b84 100644
--- a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/BaseEntity.java
+++ b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/BaseEntity.java
@@ -51,8 +51,7 @@ public abstract class BaseEntity implements Serializable {
     @Getter
     @Schema(
         description = "The ID of the entity.",
-        accessMode = Schema.AccessMode.READ_ONLY,
-        readOnly = true
+        accessMode = Schema.AccessMode.READ_ONLY
     )
     private Long id;
 
@@ -61,8 +60,7 @@ public abstract class BaseEntity implements Serializable {
     @Getter @Setter
     @Schema(
         description = "The timestamp of creation.",
-        accessMode = Schema.AccessMode.READ_ONLY,
-        readOnly = true
+        accessMode = Schema.AccessMode.READ_ONLY
     )
     private OffsetDateTime created;
 
@@ -71,8 +69,7 @@ public abstract class BaseEntity implements Serializable {
     @Getter @Setter
     @Schema(
         description = "The timestamp of the last modification.",
-        accessMode = Schema.AccessMode.READ_ONLY,
-        readOnly = true
+        accessMode = Schema.AccessMode.READ_ONLY
     )
     private OffsetDateTime modified;
 
diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/Layer.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/Layer.java
index 871249956..caf9f4e80 100644
--- a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/Layer.java
+++ b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/Layer.java
@@ -71,7 +71,7 @@ public class Layer extends BaseEntity {
     @Schema(
         description = "The configuration of the datasource of the layer, e.g. the URL of the server, the name or " +
             "the grid configuration.",
-        required = true
+        requiredMode = Schema.RequiredMode.REQUIRED
     )
     private LayerSourceConfig sourceConfig;
 
@@ -89,7 +89,7 @@ public class Layer extends BaseEntity {
     @Enumerated(EnumType.STRING)
     @Schema(
         description = "The type of the layer. Currently one of `TileWMS`, `VectorTile`, `WFS`, `WMS`, `WMTS` or `XYZ`.",
-        required = true
+        requiredMode = Schema.RequiredMode.REQUIRED
     )
     private LayerType type;
 
diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/User.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/User.java
index 8d9d7a30c..62bd6cc61 100644
--- a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/User.java
+++ b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/User.java
@@ -48,7 +48,7 @@ public class User<T> extends BaseEntity {
     @Column(unique = true, nullable = false)
     @Schema(
         description = "The backend ID of the user.",
-        required = true
+        requiredMode = Schema.RequiredMode.REQUIRED
     )
     private String authProviderId;
 
diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/application/DefaultApplicationClientConfig.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/application/DefaultApplicationClientConfig.java
index 788667977..861a26957 100644
--- a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/application/DefaultApplicationClientConfig.java
+++ b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/application/DefaultApplicationClientConfig.java
@@ -35,7 +35,7 @@ public class DefaultApplicationClientConfig implements ApplicationClientConfig {
 
     @Schema(
         description = "The configuration of the map view.",
-        required = true
+        requiredMode = Schema.RequiredMode.REQUIRED
     )
     private DefaultMapView mapView;
 
diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/application/DefaultApplicationLayerConfig.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/application/DefaultApplicationLayerConfig.java
index 1fa8ad73e..2abf8baca 100644
--- a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/application/DefaultApplicationLayerConfig.java
+++ b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/application/DefaultApplicationLayerConfig.java
@@ -37,7 +37,7 @@ public class DefaultApplicationLayerConfig implements LayerConfig {
 
     @Schema(
         description = "The ID of the layer to apply the custom configuration to.",
-        required = true
+        requiredMode = Schema.RequiredMode.REQUIRED
     )
     private Integer layerId;
 
diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/application/DefaultApplicationToolConfig.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/application/DefaultApplicationToolConfig.java
index f2673bf3a..ef1217ba6 100644
--- a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/application/DefaultApplicationToolConfig.java
+++ b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/application/DefaultApplicationToolConfig.java
@@ -37,7 +37,7 @@ public class DefaultApplicationToolConfig implements ApplicationToolConfig {
     @Schema(
         description = "The name of the tool.",
         example = "map-tool",
-        required = true
+        requiredMode = Schema.RequiredMode.REQUIRED
     )
     private String name;
 
diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/layer/DefaultLayerPropertyConfig.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/layer/DefaultLayerPropertyConfig.java
index 77d9261c8..3b7a8077d 100644
--- a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/layer/DefaultLayerPropertyConfig.java
+++ b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/layer/DefaultLayerPropertyConfig.java
@@ -32,8 +32,8 @@ public class DefaultLayerPropertyConfig implements Serializable {
 
     @Schema(
         description = "The name of the property.",
-        example = "description",
-        required = true
+        example = "desc",
+        requiredMode = Schema.RequiredMode.REQUIRED
     )
     private String propertyName;
 
diff --git a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/layer/DownloadConfig.java b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/layer/DownloadConfig.java
index 4a2c6510f..18d651e5a 100644
--- a/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/layer/DownloadConfig.java
+++ b/shogun-lib/src/main/java/de/terrestris/shogun/lib/model/jsonb/layer/DownloadConfig.java
@@ -33,7 +33,7 @@ public class DownloadConfig implements Serializable {
     @Schema(
         description = "URL which allows to download the layer data.",
         example = "https://example.com/geoserver/SHOGUN/ows?service=WFS&version=1.0.0&request=GetFeature&outputFormat=application%2Fjson",
-        required = true
+        requiredMode = Schema.RequiredMode.REQUIRED
     )
     private String downloadUrl;