diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonSchemaExtensions.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonSchemaExtensions.cs
index 0e6f33524..43a967a20 100644
--- a/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonSchemaExtensions.cs
+++ b/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonSchemaExtensions.cs
@@ -69,7 +69,7 @@ namespace Squidex.Domain.Apps.Core.GenerateJsonSchema
                 jsonProperty.Description = field.Name;
             }
 
-            jsonProperty.IsRequired = field.RawProperties.IsRequired;
+            jsonProperty.SetRequired(field.RawProperties.IsRequired);
 
             return jsonProperty;
         }
diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonTypeVisitor.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonTypeVisitor.cs
index f680d1cea..6f6e402e4 100644
--- a/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonTypeVisitor.cs
+++ b/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonTypeVisitor.cs
@@ -69,20 +69,16 @@ namespace Squidex.Domain.Apps.Core.GenerateJsonSchema
             geolocationSchema.Properties.Add("latitude", new JsonSchemaProperty
             {
                 Type = JsonObjectType.Number,
-                IsNullableRaw = false,
-                IsRequired = true,
                 Maximum = 90,
                 Minimum = -90
-            });
+            }.SetRequired(true));
 
             geolocationSchema.Properties.Add("longitude", new JsonSchemaProperty
             {
                 Type = JsonObjectType.Number,
-                IsNullableRaw = false,
-                IsRequired = true,
                 Maximum = 180,
                 Minimum = -180
-            });
+            }.SetRequired(true));
 
             var reference = schemaResolver("GeolocationDto", geolocationSchema);
 
diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/SchemaBuilder.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/SchemaBuilder.cs
index 8a1a95b7e..751f23330 100644
--- a/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/SchemaBuilder.cs
+++ b/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/SchemaBuilder.cs
@@ -74,16 +74,12 @@ namespace Squidex.Domain.Apps.Core.GenerateJsonSchema
             return property;
         }
 
-        public static void SetRequired(this JsonSchemaProperty property, bool isRequired)
+        public static JsonSchemaProperty SetRequired(this JsonSchemaProperty property, bool isRequired)
         {
-            if (isRequired)
-            {
-                property.IsRequired = true;
-            }
-            else
-            {
-                property.IsNullableRaw = true;
-            }
+            property.IsRequired = isRequired;
+            property.IsNullableRaw = !isRequired;
+
+            return property;
         }
     }
 }
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Apps/AppHistoryEventsCreator.cs b/backend/src/Squidex.Domain.Apps.Entities/Apps/AppHistoryEventsCreator.cs
index c039bd0eb..54db7f9b8 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Apps/AppHistoryEventsCreator.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Apps/AppHistoryEventsCreator.cs
@@ -12,7 +12,6 @@ using Squidex.Domain.Apps.Events.Apps;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.EventSourcing;
 using Squidex.Infrastructure.Reflection;
-using Squidex.Infrastructure.Translations;
 
 namespace Squidex.Domain.Apps.Entities.Apps
 {
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetHistoryEventsCreator.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetHistoryEventsCreator.cs
index afd9da930..bfcdb6f98 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetHistoryEventsCreator.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetHistoryEventsCreator.cs
@@ -10,7 +10,6 @@ using Squidex.Domain.Apps.Entities.History;
 using Squidex.Domain.Apps.Events.Assets;
 using Squidex.Infrastructure.EventSourcing;
 using Squidex.Infrastructure.Reflection;
-using Squidex.Infrastructure.Translations;
 
 namespace Squidex.Domain.Apps.Entities.Assets
 {
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentHistoryEventsCreator.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentHistoryEventsCreator.cs
index 2d2ef4270..b4ce15b21 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentHistoryEventsCreator.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentHistoryEventsCreator.cs
@@ -11,7 +11,6 @@ using Squidex.Domain.Apps.Events;
 using Squidex.Domain.Apps.Events.Contents;
 using Squidex.Infrastructure.EventSourcing;
 using Squidex.Infrastructure.Reflection;
-using Squidex.Infrastructure.Translations;
 
 namespace Squidex.Domain.Apps.Entities.Contents
 {
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Schemas/SchemaHistoryEventsCreator.cs b/backend/src/Squidex.Domain.Apps.Entities/Schemas/SchemaHistoryEventsCreator.cs
index ff602c23e..85ce2470c 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Schemas/SchemaHistoryEventsCreator.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Schemas/SchemaHistoryEventsCreator.cs
@@ -11,7 +11,6 @@ using Squidex.Domain.Apps.Events;
 using Squidex.Domain.Apps.Events.Schemas;
 using Squidex.Infrastructure.EventSourcing;
 using Squidex.Infrastructure.Reflection;
-using Squidex.Infrastructure.Translations;
 
 namespace Squidex.Domain.Apps.Entities.Schemas
 {
diff --git a/backend/src/Squidex.Web/Pipeline/ApiCostsFilter.cs b/backend/src/Squidex.Web/Pipeline/ApiCostsFilter.cs
index 152f7597f..05df7513f 100644
--- a/backend/src/Squidex.Web/Pipeline/ApiCostsFilter.cs
+++ b/backend/src/Squidex.Web/Pipeline/ApiCostsFilter.cs
@@ -12,7 +12,6 @@ using Microsoft.AspNetCore.Mvc.Filters;
 using Squidex.Domain.Apps.Entities.Apps.Plans;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.Log;
-using Squidex.Infrastructure.Security;
 
 namespace Squidex.Web.Pipeline
 {
diff --git a/backend/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs b/backend/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs
index 58e7e6efc..43e694e59 100644
--- a/backend/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs
+++ b/backend/src/Squidex/Areas/Api/Controllers/Rules/Models/RuleActionProcessor.cs
@@ -11,6 +11,7 @@ using Namotion.Reflection;
 using NJsonSchema;
 using NSwag.Generation.Processors;
 using NSwag.Generation.Processors.Contexts;
+using Squidex.Domain.Apps.Core.GenerateJsonSchema;
 using Squidex.Domain.Apps.Core.HandleRules;
 using Squidex.Domain.Apps.Core.Rules;
 using Squidex.Infrastructure;
@@ -43,10 +44,8 @@ namespace Squidex.Areas.Api.Controllers.Rules.Models
 
                     schema.Properties["actionType"] = new JsonSchemaProperty
                     {
-                        Type = JsonObjectType.String,
-                        IsRequired = true,
-                        IsNullableRaw = null
-                    };
+                        Type = JsonObjectType.String
+                    }.SetRequired(true);
 
                     foreach (var (key, value) in ruleRegistry.Actions)
                     {
diff --git a/backend/src/Squidex/Areas/Api/Controllers/Statistics/Models/CallsUsageDtoDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Statistics/Models/CallsUsageDtoDto.cs
index 677905e34..47e536676 100644
--- a/backend/src/Squidex/Areas/Api/Controllers/Statistics/Models/CallsUsageDtoDto.cs
+++ b/backend/src/Squidex/Areas/Api/Controllers/Statistics/Models/CallsUsageDtoDto.cs
@@ -5,7 +5,6 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
-using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;