diff --git a/src/ReC.Application/Common/Procedures/InsertObjectProcedure.cs b/src/ReC.Application/Common/Procedures/InsertObjectProcedure.cs
index 1ab6e6c..79800ca 100644
--- a/src/ReC.Application/Common/Procedures/InsertObjectProcedure.cs
+++ b/src/ReC.Application/Common/Procedures/InsertObjectProcedure.cs
@@ -8,91 +8,84 @@ namespace ReC.Application.Common.Procedures;
 
 public record InsertObjectProcedure : IRequest<long>
 {
-    #region Common
-
-    /// <summary>
-    /// Target entity: ACTION, ENDPOINT, ENDPOINT_AUTH, ENDPOINT_PARAMS, PROFILE, RESULT
-    /// </summary>
     public string Entity { get; set; } = "ACTION";
 
     public string? AddedWho { get; set; }
-    public DateTime? AddedWhen { get; set; }
 
-    #endregion
+    public ActionInfo Action { get; init; } = new();
+    public EndpointInfo Endpoint { get; init; } = new();
+    public EndpointAuthInfo EndpointAuth { get; init; } = new();
+    public ProfileInfo Profile { get; init; } = new();
+    public ResultInfo Result { get; init; } = new();
+    public EndpointParamsInfo EndpointParams { get; init; } = new();
 
-    #region ACTION
+    public record ActionInfo
+    {
+        public long? ProfileId { get; set; }
+        public bool? Active { get; set; }
+        public byte? Sequence { get; set; }
+        public long? EndpointId { get; set; }
+        public long? EndpointAuthId { get; set; }
+        public short? EndpointParamsId { get; set; }
+        public short? SqlConnectionId { get; set; }
+        public byte? TypeId { get; set; }
+        public string? PreSql { get; set; }
+        public string? HeaderSql { get; set; }
+        public string? BodySql { get; set; }
+        public string? PostSql { get; set; }
+        public byte? ErrorActionId { get; set; }
+    }
 
-    public long? ActionProfileId { get; set; }
-    public bool? ActionActive { get; set; }
-    public byte? ActionSequence { get; set; }
-    public long? ActionEndpointId { get; set; }
-    public long? ActionEndpointAuthId { get; set; }
-    public short? ActionEndpointParamsId { get; set; }
-    public short? ActionSqlConnectionId { get; set; }
-    public byte? ActionTypeId { get; set; }
-    public string? ActionPreSql { get; set; }
-    public string? ActionHeaderSql { get; set; }
-    public string? ActionBodySql { get; set; }
-    public string? ActionPostSql { get; set; }
-    public byte? ActionErrorActionId { get; set; }
+    public record EndpointInfo
+    {
+        public bool? Active { get; set; }
+        public string? Description { get; set; }
+        public string? Uri { get; set; }
+    }
 
-    #endregion
+    public record EndpointAuthInfo
+    {
+        public bool? Active { get; set; }
+        public string? Description { get; set; }
+        public byte? TypeId { get; set; }
+        public string? ApiKey { get; set; }
+        public string? ApiValue { get; set; }
+        public bool? ApiKeyAddToId { get; set; }
+        public string? Token { get; set; }
+        public string? Username { get; set; }
+        public string? Password { get; set; }
+        public string? Domain { get; set; }
+        public string? Workstation { get; set; }
+    }
 
-    #region ENDPOINT
+    public record ProfileInfo
+    {
+        public bool? Active { get; set; }
+        public byte? TypeId { get; set; }
+        public string? Mandantor { get; set; }
+        public string? Name { get; set; }
+        public string? Description { get; set; }
+        public byte? LogLevelId { get; set; }
+        public short? LanguageId { get; set; }
+    }
 
-    public bool? EndpointActive { get; set; }
-    public string? EndpointDescription { get; set; }
-    public string? EndpointUri { get; set; }
+    public record ResultInfo
+    {
+        public long? ActionId { get; set; }
+        public short? StatusId { get; set; }
+        public string? Header { get; set; }
+        public string? Body { get; set; }
+    }
 
-    #endregion
-
-    #region ENDPOINT_AUTH
-
-    public bool? EndpointAuthActive { get; set; }
-    public string? EndpointAuthDescription { get; set; }
-    public byte? EndpointAuthTypeId { get; set; }
-    public string? EndpointAuthApiKey { get; set; }
-    public string? EndpointAuthApiValue { get; set; }
-    public bool? EndpointAuthApiKeyAddToId { get; set; }
-    public string? EndpointAuthToken { get; set; }
-    public string? EndpointAuthUsername { get; set; }
-    public string? EndpointAuthPassword { get; set; }
-    public string? EndpointAuthDomain { get; set; }
-    public string? EndpointAuthWorkstation { get; set; }
-
-    #endregion
-
-    #region PROFILE
-
-    public bool? ProfileActive { get; set; }
-    public byte? ProfileTypeId { get; set; }
-    public string? ProfileMandantor { get; set; }
-    public string? ProfileName { get; set; }
-    public string? ProfileDescription { get; set; }
-    public byte? ProfileLogLevelId { get; set; }
-    public short? ProfileLanguageId { get; set; }
-
-    #endregion
-
-    #region RESULT
-
-    public long? ResultActionId { get; set; }
-    public short? ResultStatusId { get; set; }
-    public string? ResultHeader { get; set; }
-    public string? ResultBody { get; set; }
-
-    #endregion
-
-    #region ENDPOINT_PARAMS
-
-    public bool? EndpointParamsActive { get; set; }
-    public string? EndpointParamsDescription { get; set; }
-    public short? EndpointParamsGroupId { get; set; }
-    public byte? EndpointParamsSequence { get; set; }
-    public string? EndpointParamsKey { get; set; }
-    public string? EndpointParamsValue { get; set; }
-
-    #endregion
+    public record EndpointParamsInfo
+    {
+        public bool? Active { get; set; }
+        public string? Description { get; set; }
+        public short? GroupId { get; set; }
+        public byte? Sequence { get; set; }
+        public string? Key { get; set; }
+        public string? Value { get; set; }
+    }
 }
 
 public class InsertObjectProcedureHandler(IRepository repo) : IRequestHandler<InsertObjectProcedure, long>
@@ -104,57 +97,57 @@ public class InsertObjectProcedureHandler(IRepository repo) : IRequestHandler<In
             new SqlParameter("@pENTITY", request.Entity ?? (object)DBNull.Value),
 
             new SqlParameter("@pADDED_WHO", (object?)request.AddedWho ?? DBNull.Value),
-            new SqlParameter("@pADDED_WHEN", (object?)request.AddedWhen ?? DBNull.Value),
+            new SqlParameter("@pADDED_WHEN", (object?)DateTime.UtcNow ?? DBNull.Value),
 
-            new SqlParameter("@pACTION_PROFILE_ID", (object?)request.ActionProfileId ?? DBNull.Value),
-            new SqlParameter("@pACTION_ACTIVE", (object?)request.ActionActive ?? DBNull.Value),
-            new SqlParameter("@pACTION_SEQUENCE", (object?)request.ActionSequence ?? DBNull.Value),
-            new SqlParameter("@pACTION_ENDPOINT_ID", (object?)request.ActionEndpointId ?? DBNull.Value),
-            new SqlParameter("@pACTION_ENDPOINT_AUTH_ID", (object?)request.ActionEndpointAuthId ?? DBNull.Value),
-            new SqlParameter("@pACTION_ENDPOINT_PARAMS_ID", (object?)request.ActionEndpointParamsId ?? DBNull.Value),
-            new SqlParameter("@pACTION_SQL_CONNECTION_ID", (object?)request.ActionSqlConnectionId ?? DBNull.Value),
-            new SqlParameter("@pACTION_TYPE_ID", (object?)request.ActionTypeId ?? DBNull.Value),
-            new SqlParameter("@pACTION_PRE_SQL", (object?)request.ActionPreSql ?? DBNull.Value),
-            new SqlParameter("@pACTION_HEADER_SQL", (object?)request.ActionHeaderSql ?? DBNull.Value),
-            new SqlParameter("@pACTION_BODY_SQL", (object?)request.ActionBodySql ?? DBNull.Value),
-            new SqlParameter("@pACTION_POST_SQL", (object?)request.ActionPostSql ?? DBNull.Value),
-            new SqlParameter("@pACTION_ERROR_ACTION_ID", (object?)request.ActionErrorActionId ?? DBNull.Value),
+            new SqlParameter("@pACTION_PROFILE_ID", (object?)request.Action.ProfileId ?? DBNull.Value),
+            new SqlParameter("@pACTION_ACTIVE", (object?)request.Action.Active ?? DBNull.Value),
+            new SqlParameter("@pACTION_SEQUENCE", (object?)request.Action.Sequence ?? DBNull.Value),
+            new SqlParameter("@pACTION_ENDPOINT_ID", (object?)request.Action.EndpointId ?? DBNull.Value),
+            new SqlParameter("@pACTION_ENDPOINT_AUTH_ID", (object?)request.Action.EndpointAuthId ?? DBNull.Value),
+            new SqlParameter("@pACTION_ENDPOINT_PARAMS_ID", (object?)request.Action.EndpointParamsId ?? DBNull.Value),
+            new SqlParameter("@pACTION_SQL_CONNECTION_ID", (object?)request.Action.SqlConnectionId ?? DBNull.Value),
+            new SqlParameter("@pACTION_TYPE_ID", (object?)request.Action.TypeId ?? DBNull.Value),
+            new SqlParameter("@pACTION_PRE_SQL", (object?)request.Action.PreSql ?? DBNull.Value),
+            new SqlParameter("@pACTION_HEADER_SQL", (object?)request.Action.HeaderSql ?? DBNull.Value),
+            new SqlParameter("@pACTION_BODY_SQL", (object?)request.Action.BodySql ?? DBNull.Value),
+            new SqlParameter("@pACTION_POST_SQL", (object?)request.Action.PostSql ?? DBNull.Value),
+            new SqlParameter("@pACTION_ERROR_ACTION_ID", (object?)request.Action.ErrorActionId ?? DBNull.Value),
 
-            new SqlParameter("@pENDPOINT_ACTIVE", (object?)request.EndpointActive ?? DBNull.Value),
-            new SqlParameter("@pENDPOINT_DESCRIPTION", (object?)request.EndpointDescription ?? DBNull.Value),
-            new SqlParameter("@pENDPOINT_URI", (object?)request.EndpointUri ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_ACTIVE", (object?)request.Endpoint.Active ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_DESCRIPTION", (object?)request.Endpoint.Description ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_URI", (object?)request.Endpoint.Uri ?? DBNull.Value),
 
-            new SqlParameter("@pENDPOINT_AUTH_ACTIVE", (object?)request.EndpointAuthActive ?? DBNull.Value),
-            new SqlParameter("@pENDPOINT_AUTH_DESCRIPTION", (object?)request.EndpointAuthDescription ?? DBNull.Value),
-            new SqlParameter("@pENDPOINT_AUTH_TYPE_ID", (object?)request.EndpointAuthTypeId ?? DBNull.Value),
-            new SqlParameter("@pENDPOINT_AUTH_API_KEY", (object?)request.EndpointAuthApiKey ?? DBNull.Value),
-            new SqlParameter("@pENDPOINT_AUTH_API_VALUE", (object?)request.EndpointAuthApiValue ?? DBNull.Value),
-            new SqlParameter("@pENDPOINT_AUTH_API_KEY_ADD_TO_ID", (object?)request.EndpointAuthApiKeyAddToId ?? DBNull.Value),
-            new SqlParameter("@pENDPOINT_AUTH_TOKEN", (object?)request.EndpointAuthToken ?? DBNull.Value),
-            new SqlParameter("@pENDPOINT_AUTH_USERNAME", (object?)request.EndpointAuthUsername ?? DBNull.Value),
-            new SqlParameter("@pENDPOINT_AUTH_PASSWORD", (object?)request.EndpointAuthPassword ?? DBNull.Value),
-            new SqlParameter("@pENDPOINT_AUTH_DOMAIN", (object?)request.EndpointAuthDomain ?? DBNull.Value),
-            new SqlParameter("@pENDPOINT_AUTH_WORKSTATION", (object?)request.EndpointAuthWorkstation ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_AUTH_ACTIVE", (object?)request.EndpointAuth.Active ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_AUTH_DESCRIPTION", (object?)request.EndpointAuth.Description ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_AUTH_TYPE_ID", (object?)request.EndpointAuth.TypeId ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_AUTH_API_KEY", (object?)request.EndpointAuth.ApiKey ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_AUTH_API_VALUE", (object?)request.EndpointAuth.ApiValue ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_AUTH_API_KEY_ADD_TO_ID", (object?)request.EndpointAuth.ApiKeyAddToId ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_AUTH_TOKEN", (object?)request.EndpointAuth.Token ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_AUTH_USERNAME", (object?)request.EndpointAuth.Username ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_AUTH_PASSWORD", (object?)request.EndpointAuth.Password ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_AUTH_DOMAIN", (object?)request.EndpointAuth.Domain ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_AUTH_WORKSTATION", (object?)request.EndpointAuth.Workstation ?? DBNull.Value),
 
-            new SqlParameter("@pPROFILE_ACTIVE", (object?)request.ProfileActive ?? DBNull.Value),
-            new SqlParameter("@pPROFILE_TYPE_ID", (object?)request.ProfileTypeId ?? DBNull.Value),
-            new SqlParameter("@pPROFILE_MANDANTOR", (object?)request.ProfileMandantor ?? DBNull.Value),
-            new SqlParameter("@pPROFILE_NAME", (object?)request.ProfileName ?? DBNull.Value),
-            new SqlParameter("@pPROFILE_DESCRIPTION", (object?)request.ProfileDescription ?? DBNull.Value),
-            new SqlParameter("@pPROFILE_LOG_LEVEL_ID", (object?)request.ProfileLogLevelId ?? DBNull.Value),
-            new SqlParameter("@pPROFILE_LANGUAGE_ID", (object?)request.ProfileLanguageId ?? DBNull.Value),
+            new SqlParameter("@pPROFILE_ACTIVE", (object?)request.Profile.Active ?? DBNull.Value),
+            new SqlParameter("@pPROFILE_TYPE_ID", (object?)request.Profile.TypeId ?? DBNull.Value),
+            new SqlParameter("@pPROFILE_MANDANTOR", (object?)request.Profile.Mandantor ?? DBNull.Value),
+            new SqlParameter("@pPROFILE_NAME", (object?)request.Profile.Name ?? DBNull.Value),
+            new SqlParameter("@pPROFILE_DESCRIPTION", (object?)request.Profile.Description ?? DBNull.Value),
+            new SqlParameter("@pPROFILE_LOG_LEVEL_ID", (object?)request.Profile.LogLevelId ?? DBNull.Value),
+            new SqlParameter("@pPROFILE_LANGUAGE_ID", (object?)request.Profile.LanguageId ?? DBNull.Value),
 
-            new SqlParameter("@pRESULT_ACTION_ID", (object?)request.ResultActionId ?? DBNull.Value),
-            new SqlParameter("@pRESULT_STATUS_ID", (object?)request.ResultStatusId ?? DBNull.Value),
-            new SqlParameter("@pRESULT_HEADER", (object?)request.ResultHeader ?? DBNull.Value),
-            new SqlParameter("@pRESULT_BODY", (object?)request.ResultBody ?? DBNull.Value),
+            new SqlParameter("@pRESULT_ACTION_ID", (object?)request.Result.ActionId ?? DBNull.Value),
+            new SqlParameter("@pRESULT_STATUS_ID", (object?)request.Result.StatusId ?? DBNull.Value),
+            new SqlParameter("@pRESULT_HEADER", (object?)request.Result.Header ?? DBNull.Value),
+            new SqlParameter("@pRESULT_BODY", (object?)request.Result.Body ?? DBNull.Value),
 
-            new SqlParameter("@pENDPOINT_PARAMS_ACTIVE", (object?)request.EndpointParamsActive ?? DBNull.Value),
-            new SqlParameter("@pENDPOINT_PARAMS_DESCRIPTION", (object?)request.EndpointParamsDescription ?? DBNull.Value),
-            new SqlParameter("@pENDPOINT_PARAMS_GROUP_ID", (object?)request.EndpointParamsGroupId ?? DBNull.Value),
-            new SqlParameter("@pENDPOINT_PARAMS_SEQUENCE", (object?)request.EndpointParamsSequence ?? DBNull.Value),
-            new SqlParameter("@pENDPOINT_PARAMS_KEY", (object?)request.EndpointParamsKey ?? DBNull.Value),
-            new SqlParameter("@pENDPOINT_PARAMS_VALUE", (object?)request.EndpointParamsValue ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_PARAMS_ACTIVE", (object?)request.EndpointParams.Active ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_PARAMS_DESCRIPTION", (object?)request.EndpointParams.Description ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_PARAMS_GROUP_ID", (object?)request.EndpointParams.GroupId ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_PARAMS_SEQUENCE", (object?)request.EndpointParams.Sequence ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_PARAMS_KEY", (object?)request.EndpointParams.Key ?? DBNull.Value),
+            new SqlParameter("@pENDPOINT_PARAMS_VALUE", (object?)request.EndpointParams.Value ?? DBNull.Value),
 
             new SqlParameter
             {
@@ -164,18 +157,18 @@ public class InsertObjectProcedureHandler(IRepository repo) : IRequestHandler<In
             }
         };
 
-        await repo
-            .ExecuteQueryRawAsync(
-                "EXEC [dbo].[PRREC_INSERT_OBJECT] " +
-                "@pENTITY, @pADDED_WHO, @pADDED_WHEN, " +
-                "@pACTION_PROFILE_ID, @pACTION_ACTIVE, @pACTION_SEQUENCE, @pACTION_ENDPOINT_ID, @pACTION_ENDPOINT_AUTH_ID, @pACTION_ENDPOINT_PARAMS_ID, @pACTION_SQL_CONNECTION_ID, @pACTION_TYPE_ID, @pACTION_PRE_SQL, @pACTION_HEADER_SQL, @pACTION_BODY_SQL, @pACTION_POST_SQL, @pACTION_ERROR_ACTION_ID, " +
-                "@pENDPOINT_ACTIVE, @pENDPOINT_DESCRIPTION, @pENDPOINT_URI, " +
-                "@pENDPOINT_AUTH_ACTIVE, @pENDPOINT_AUTH_DESCRIPTION, @pENDPOINT_AUTH_TYPE_ID, @pENDPOINT_AUTH_API_KEY, @pENDPOINT_AUTH_API_VALUE, @pENDPOINT_AUTH_API_KEY_ADD_TO_ID, @pENDPOINT_AUTH_TOKEN, @pENDPOINT_AUTH_USERNAME, @pENDPOINT_AUTH_PASSWORD, @pENDPOINT_AUTH_DOMAIN, @pENDPOINT_AUTH_WORKSTATION, " +
-                "@pPROFILE_ACTIVE, @pPROFILE_TYPE_ID, @pPROFILE_MANDANTOR, @pPROFILE_NAME, @pPROFILE_DESCRIPTION, @pPROFILE_LOG_LEVEL_ID, @pPROFILE_LANGUAGE_ID, " +
-                "@pRESULT_ACTION_ID, @pRESULT_STATUS_ID, @pRESULT_HEADER, @pRESULT_BODY, " +
-                "@pENDPOINT_PARAMS_ACTIVE, @pENDPOINT_PARAMS_DESCRIPTION, @pENDPOINT_PARAMS_GROUP_ID, @pENDPOINT_PARAMS_SEQUENCE, @pENDPOINT_PARAMS_KEY, @pENDPOINT_PARAMS_VALUE, " +
-                "@oGUID OUTPUT",
-                parameters, cancel);
+        await repo.ExecuteQueryRawAsync(
+            "EXEC [dbo].[PRREC_INSERT_OBJECT] " +
+            "@pENTITY, @pADDED_WHO, @pADDED_WHEN, " +
+            "@pACTION_PROFILE_ID, @pACTION_ACTIVE, @pACTION_SEQUENCE, @pACTION_ENDPOINT_ID, @pACTION_ENDPOINT_AUTH_ID, @pACTION_ENDPOINT_PARAMS_ID, @pACTION_SQL_CONNECTION_ID, @pACTION_TYPE_ID, @pACTION_PRE_SQL, @pACTION_HEADER_SQL, @pACTION_BODY_SQL, @pACTION_POST_SQL, @pACTION_ERROR_ACTION_ID, " +
+            "@pENDPOINT_ACTIVE, @pENDPOINT_DESCRIPTION, @pENDPOINT_URI, " +
+            "@pENDPOINT_AUTH_ACTIVE, @pENDPOINT_AUTH_DESCRIPTION, @pENDPOINT_AUTH_TYPE_ID, @pENDPOINT_AUTH_API_KEY, @pENDPOINT_AUTH_API_VALUE, @pENDPOINT_AUTH_API_KEY_ADD_TO_ID, @pENDPOINT_AUTH_TOKEN, @pENDPOINT_AUTH_USERNAME, @pENDPOINT_AUTH_PASSWORD, @pENDPOINT_AUTH_DOMAIN, @pENDPOINT_AUTH_WORKSTATION, " +
+            "@pPROFILE_ACTIVE, @pPROFILE_TYPE_ID, @pPROFILE_MANDANTOR, @pPROFILE_NAME, @pPROFILE_DESCRIPTION, @pPROFILE_LOG_LEVEL_ID, @pPROFILE_LANGUAGE_ID, " +
+            "@pRESULT_ACTION_ID, @pRESULT_STATUS_ID, @pRESULT_HEADER, @pRESULT_BODY, " +
+            "@pENDPOINT_PARAMS_ACTIVE, @pENDPOINT_PARAMS_DESCRIPTION, @pENDPOINT_PARAMS_GROUP_ID, @pENDPOINT_PARAMS_SEQUENCE, @pENDPOINT_PARAMS_KEY, @pENDPOINT_PARAMS_VALUE, " +
+            "@oGUID OUTPUT",
+            parameters,
+            cancel);
 
         var guidParam = parameters.Last();
 
@@ -186,7 +179,7 @@ public class InsertObjectProcedureHandler(IRepository repo) : IRequestHandler<In
                 return guid;
 
         throw new InsertObjectFailedException(
-            $"InsertObject stored procedure did not return a valid identifier." +
-            $"{JsonSerializer.Serialize(request, options: new() { WriteIndented = true })}");
+            "InsertObject stored procedure did not return a valid identifier." +
+            JsonSerializer.Serialize(request, options: new() { WriteIndented = true }));
     }
 }
\ No newline at end of file