diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/FieldConverters.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/FieldConverters.cs
index 381a5a369..797426bde 100644
--- a/backend/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/FieldConverters.cs
+++ b/backend/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/FieldConverters.cs
@@ -32,7 +32,7 @@ namespace Squidex.Domain.Apps.Core.ConvertContent
         {
             return (data, field) =>
             {
-                foreach (var value in data.Values)
+                foreach (var (_, value) in data)
                 {
                     if (value.Type == JsonValueType.Null)
                     {
@@ -72,7 +72,7 @@ namespace Squidex.Domain.Apps.Core.ConvertContent
                     }
                     else if (data.Count > 0)
                     {
-                        result[iv] = data.Values.First();
+                        result[iv] = data.First().Value;
                     }
 
                     return result;
diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ContentReferencesExtensions.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ContentReferencesExtensions.cs
index e87c12a3a..e1703b417 100644
--- a/backend/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ContentReferencesExtensions.cs
+++ b/backend/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ContentReferencesExtensions.cs
@@ -31,7 +31,7 @@ namespace Squidex.Domain.Apps.Core.ExtractReferenceIds
 
                 if (value is JsonObject obj)
                 {
-                    foreach (var nested in obj.Values)
+                    foreach (var (_, nested) in obj)
                     {
                         if (CanHaveReference(nested))
                         {
@@ -43,7 +43,21 @@ namespace Squidex.Domain.Apps.Core.ExtractReferenceIds
                 return false;
             }
 
-            return source.Values.NotNull().SelectMany(x => x.Values).Any(CanHaveReference);
+            foreach (var (_, field) in source)
+            {
+                if (field != null)
+                {
+                    foreach (var (_, value) in field)
+                    {
+                        if (CanHaveReference(value))
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+
+            return false;
         }
 
         public static HashSet<DomainId> GetReferencedIds(this ContentData source, Schema schema,
diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateFilters/FilterVisitor.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateFilters/FilterVisitor.cs
index 0e40cb78f..163a4480d 100644
--- a/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateFilters/FilterVisitor.cs
+++ b/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateFilters/FilterVisitor.cs
@@ -171,7 +171,7 @@ namespace Squidex.Domain.Apps.Core.GenerateFilters
 
             var nestedArgs = args with { Level = args.Level + 1 };
 
-            foreach (var schema in args.Components.Resolve(schemaIds).Values)
+            foreach (var (_, schema) in args.Components.Resolve(schemaIds))
             {
                 var componentName = schema.DisplayName();
 
diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleService.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleService.cs
index e7b87b06f..a8b50e063 100644
--- a/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleService.cs
+++ b/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleService.cs
@@ -339,7 +339,7 @@ namespace Squidex.Domain.Apps.Core.HandleRules
 
         public string GetName(AppEvent @event)
         {
-            foreach (var handler in ruleTriggerHandlers.Values)
+            foreach (var (_, handler) in ruleTriggerHandlers)
             {
                 if (handler.Handles(@event))
                 {
diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleTypeProvider.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleTypeProvider.cs
index f47327d07..a648bd0f7 100644
--- a/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleTypeProvider.cs
+++ b/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleTypeProvider.cs
@@ -208,7 +208,7 @@ namespace Squidex.Domain.Apps.Core.HandleRules
 
         public void Map(TypeNameRegistry typeNameRegistry)
         {
-            foreach (var actionType in actionTypes.Values)
+            foreach (var (_, actionType) in actionTypes)
             {
                 typeNameRegistry.Map(actionType.Type, actionType.Type.Name);
             }
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Extensions.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Extensions.cs
index 8eb753e78..3066f9936 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Extensions.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Extensions.cs
@@ -49,7 +49,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text
                 var languages = new Dictionary<string, StringBuilder>();
                 try
                 {
-                    foreach (var value in data.Values)
+                    foreach (var (_, value) in data)
                     {
                         if (value != null)
                         {
@@ -96,7 +96,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text
             }
             else if (value is JsonObject obj)
             {
-                foreach (var item in obj.Values)
+                foreach (var (_, item) in obj)
                 {
                     AppendJsonText(languages, language, item);
                 }
diff --git a/backend/src/Squidex/Areas/Api/Config/OpenApi/FixProcessor.cs b/backend/src/Squidex/Areas/Api/Config/OpenApi/FixProcessor.cs
index 55e4ff20d..50b2488ed 100644
--- a/backend/src/Squidex/Areas/Api/Config/OpenApi/FixProcessor.cs
+++ b/backend/src/Squidex/Areas/Api/Config/OpenApi/FixProcessor.cs
@@ -17,7 +17,7 @@ namespace Squidex.Areas.Api.Config.OpenApi
 
         public bool Process(OperationProcessorContext context)
         {
-            foreach (var parameter in context.Parameters.Values)
+            foreach (var (_, parameter) in context.Parameters)
             {
                 if (parameter.IsRequired && parameter.Schema != null && parameter.Schema.Type == JsonObjectType.String)
                 {