diff --git a/src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs b/src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs
index e747e1b52..9ea5f1d54 100644
--- a/src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs
+++ b/src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs
@@ -239,7 +239,7 @@ namespace Squidex.Areas.Api.Controllers.Contents
             var context = await CommandBus.PublishAsync(command);
 
             var result = context.Result<EntityCreatedResult<NamedContentData>>();
-            var response = ContentDto.Create(command, result);
+            var response = ContentDto.FromCommand(command, result);
 
             return CreatedAtAction(nameof(GetContent), new { id = command.ContentId }, response);
         }
diff --git a/src/Squidex/Areas/Api/Controllers/Content/Models/ContentDto.cs b/src/Squidex/Areas/Api/Controllers/Content/Models/ContentDto.cs
index 897d75743..98f5f31bf 100644
--- a/src/Squidex/Areas/Api/Controllers/Content/Models/ContentDto.cs
+++ b/src/Squidex/Areas/Api/Controllers/Content/Models/ContentDto.cs
@@ -75,7 +75,7 @@ namespace Squidex.Areas.Api.Controllers.Contents.Models
         /// </summary>
         public long Version { get; set; }
 
-        public static ContentDto Create(CreateContent command, EntityCreatedResult<NamedContentData> result)
+        public static ContentDto FromCommand(CreateContent command, EntityCreatedResult<NamedContentData> result)
         {
             var now = SystemClock.Instance.GetCurrentInstant();
 
diff --git a/src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs b/src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs
index 6dee278b9..8265d5835 100644
--- a/src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs
+++ b/src/Squidex/Areas/Api/Controllers/EventConsumers/EventConsumersController.cs
@@ -13,7 +13,6 @@ using Orleans;
 using Squidex.Areas.Api.Controllers.EventConsumers.Models;
 using Squidex.Infrastructure.Commands;
 using Squidex.Infrastructure.EventSourcing.Grains;
-using Squidex.Infrastructure.Reflection;
 using Squidex.Pipeline;
 
 namespace Squidex.Areas.Api.Controllers.EventConsumers
@@ -39,9 +38,9 @@ namespace Squidex.Areas.Api.Controllers.EventConsumers
         {
             var entities = await eventConsumerManagerGrain.GetConsumersAsync();
 
-            var models = entities.Value.Select(x => SimpleMapper.Map(x, new EventConsumerDto())).ToList();
+            var response = entities.Value.Select(EventConsumerDto.FromEventConsumerInfo).ToList();
 
-            return Ok(models);
+            return Ok(response);
         }
 
         [HttpPut]
diff --git a/src/Squidex/Areas/Api/Controllers/EventConsumers/Models/EventConsumerDto.cs b/src/Squidex/Areas/Api/Controllers/EventConsumers/Models/EventConsumerDto.cs
index 5dbb479b0..3ef6535c3 100644
--- a/src/Squidex/Areas/Api/Controllers/EventConsumers/Models/EventConsumerDto.cs
+++ b/src/Squidex/Areas/Api/Controllers/EventConsumers/Models/EventConsumerDto.cs
@@ -5,6 +5,9 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+using Squidex.Infrastructure.EventSourcing;
+using Squidex.Infrastructure.Reflection;
+
 namespace Squidex.Areas.Api.Controllers.EventConsumers.Models
 {
     public sealed class EventConsumerDto
@@ -18,5 +21,10 @@ namespace Squidex.Areas.Api.Controllers.EventConsumers.Models
         public string Error { get; set; }
 
         public string Position { get; set; }
+
+        public static EventConsumerDto FromEventConsumerInfo(EventConsumerInfo eventConsumerInfo)
+        {
+            return SimpleMapper.Map(eventConsumerInfo, new EventConsumerDto());
+        }
     }
 }
diff --git a/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs b/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs
index a80a8308f..c908e8888 100644
--- a/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs
+++ b/src/Squidex/Areas/Api/Controllers/History/HistoryController.cs
@@ -12,7 +12,6 @@ using NSwag.Annotations;
 using Squidex.Areas.Api.Controllers.History.Models;
 using Squidex.Domain.Apps.Entities.History.Repositories;
 using Squidex.Infrastructure.Commands;
-using Squidex.Infrastructure.Reflection;
 using Squidex.Pipeline;
 
 namespace Squidex.Areas.Api.Controllers.History
@@ -52,7 +51,7 @@ namespace Squidex.Areas.Api.Controllers.History
         {
             var entities = await historyEventRepository.QueryByChannelAsync(App.Id, channel, 100);
 
-            var response = entities.Select(x => SimpleMapper.Map(x, new HistoryEventDto())).ToList();
+            var response = entities.Select(HistoryEventDto.FromHistoryEvent).ToList();
 
             return Ok(response);
         }
diff --git a/src/Squidex/Areas/Api/Controllers/History/Models/HistoryEventDto.cs b/src/Squidex/Areas/Api/Controllers/History/Models/HistoryEventDto.cs
index 39f8755be..c868caeb3 100644
--- a/src/Squidex/Areas/Api/Controllers/History/Models/HistoryEventDto.cs
+++ b/src/Squidex/Areas/Api/Controllers/History/Models/HistoryEventDto.cs
@@ -8,6 +8,8 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using NodaTime;
+using Squidex.Domain.Apps.Entities.History;
+using Squidex.Infrastructure.Reflection;
 
 namespace Squidex.Areas.Api.Controllers.History.Models
 {
@@ -39,5 +41,10 @@ namespace Squidex.Areas.Api.Controllers.History.Models
         /// The version identifier.
         /// </summary>
         public long Version { get; set; }
+
+        public static HistoryEventDto FromHistoryEvent(IHistoryEventEntity x)
+        {
+            return SimpleMapper.Map(x, new HistoryEventDto());
+        }
     }
 }
diff --git a/src/Squidex/Areas/Api/Controllers/LanguageDto.cs b/src/Squidex/Areas/Api/Controllers/LanguageDto.cs
index 10e02e773..4d4c369fa 100644
--- a/src/Squidex/Areas/Api/Controllers/LanguageDto.cs
+++ b/src/Squidex/Areas/Api/Controllers/LanguageDto.cs
@@ -6,6 +6,8 @@
 // ==========================================================================
 
 using System.ComponentModel.DataAnnotations;
+using Squidex.Infrastructure;
+using Squidex.Infrastructure.Reflection;
 
 namespace Squidex.Areas.Api.Controllers
 {
@@ -22,5 +24,10 @@ namespace Squidex.Areas.Api.Controllers
         /// </summary>
         [Required]
         public string EnglishName { get; set; }
+
+        public static LanguageDto FromLanguage(Language language)
+        {
+            return SimpleMapper.Map(language, new LanguageDto());
+        }
     }
 }
diff --git a/src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs b/src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs
index bf636ab99..e36ef7dc0 100644
--- a/src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs
+++ b/src/Squidex/Areas/Api/Controllers/Languages/LanguagesController.cs
@@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Mvc;
 using NSwag.Annotations;
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.Commands;
-using Squidex.Infrastructure.Reflection;
 using Squidex.Pipeline;
 
 namespace Squidex.Areas.Api.Controllers.Languages
@@ -43,7 +42,7 @@ namespace Squidex.Areas.Api.Controllers.Languages
         [ApiCosts(0)]
         public IActionResult GetLanguages()
         {
-            var response = Language.AllLanguages.Select(x => SimpleMapper.Map(x, new LanguageDto())).ToList();
+            var response = Language.AllLanguages.Select(LanguageDto.FromLanguage).ToList();
 
             return Ok(response);
         }