diff --git a/src/ReC.Application/Common/Procedures/DeleteProcedure/DeleteObjectProcedure.cs b/src/ReC.Application/Common/Procedures/DeleteProcedure/DeleteObjectProcedure.cs
index 3083a51..4b49d52 100644
--- a/src/ReC.Application/Common/Procedures/DeleteProcedure/DeleteObjectProcedure.cs
+++ b/src/ReC.Application/Common/Procedures/DeleteProcedure/DeleteObjectProcedure.cs
@@ -11,9 +11,9 @@ namespace ReC.Application.Common.Procedures.DeleteProcedure;
 public record DeleteObjectProcedure : IRequest<int>
 {
     /// <summary>
-    /// Target entity: ACTION, ENDPOINT, ENDPOINT_AUTH, ENDPOINT_PARAMS, PROFILE, RESULT
+    /// Target entity for the delete operation.
     /// </summary>
-    public string Entity { get; set; } = null!;
+    public required EntityType Entity { get; set; }
 
     /// <summary>
     /// Start GUID/ID (inclusive)
diff --git a/src/ReC.Application/Common/Procedures/InsertProcedure/InsertObjectProcedure.cs b/src/ReC.Application/Common/Procedures/InsertProcedure/InsertObjectProcedure.cs
index ee7ad9f..af8ba15 100644
--- a/src/ReC.Application/Common/Procedures/InsertProcedure/InsertObjectProcedure.cs
+++ b/src/ReC.Application/Common/Procedures/InsertProcedure/InsertObjectProcedure.cs
@@ -18,9 +18,9 @@ namespace ReC.Application.Common.Procedures.InsertProcedure;
 public record InsertObjectProcedure : IRequest<long>
 {
     /// <summary>
-    /// Target entity: ACTION, ENDPOINT, ENDPOINT_AUTH, ENDPOINT_PARAMS, PROFILE, RESULT
+    /// Target entity for the insert operation.
     /// </summary>
-    public string Entity { get; set; } = null!;
+    public required EntityType Entity { get; set; }
 
     //TODO: update to set in authentication middleware or similar, and remove from procedure properties
     internal string? AddedWho { get; private set; } = "ReC.API";
diff --git a/src/ReC.Application/Common/Procedures/UpdateProcedure/UpdateObjectProcedure.cs b/src/ReC.Application/Common/Procedures/UpdateProcedure/UpdateObjectProcedure.cs
index ff704e0..49bcd34 100644
--- a/src/ReC.Application/Common/Procedures/UpdateProcedure/UpdateObjectProcedure.cs
+++ b/src/ReC.Application/Common/Procedures/UpdateProcedure/UpdateObjectProcedure.cs
@@ -13,9 +13,9 @@ namespace ReC.Application.Common.Procedures.UpdateProcedure;
 public record UpdateObjectProcedure : IRequest<int>
 {
     /// <summary>
-    /// Target entity: ACTION, ENDPOINT, ENDPOINT_AUTH, ENDPOINT_PARAMS, PROFILE, RESULT
+    /// Target entity for the update operation.
     /// </summary>
-    public string Entity { get; set; } = null!;
+    public required EntityType Entity { get; set; }
 
     /// <summary>
     /// Target GUID to update (required)
diff --git a/src/ReC.Application/EndpointAuth/Commands/DeleteEndpointAuthCommand.cs b/src/ReC.Application/EndpointAuth/Commands/DeleteEndpointAuthCommand.cs
index 54a09ca..9774c3f 100644
--- a/src/ReC.Application/EndpointAuth/Commands/DeleteEndpointAuthCommand.cs
+++ b/src/ReC.Application/EndpointAuth/Commands/DeleteEndpointAuthCommand.cs
@@ -1,5 +1,6 @@
 using MediatR;
 using ReC.Application.Common.Procedures.DeleteProcedure;
+using ReC.Application.Common.Procedures;
 
 namespace ReC.Application.EndpointAuth.Commands;
 
@@ -27,7 +28,7 @@ public class DeleteEndpointAuthProcedureHandler(ISender sender) : IRequestHandle
     {
         return await sender.Send(new DeleteObjectProcedure
         {
-            Entity = "ENDPOINT_AUTH",
+            Entity = EntityType.EndpointAuth,
             Start = request.Start,
             End = request.End,
             Force = request.Force
diff --git a/src/ReC.Application/EndpointAuth/Commands/InsertEndpointAuthCommand.cs b/src/ReC.Application/EndpointAuth/Commands/InsertEndpointAuthCommand.cs
index 8f4a2b0..94920e8 100644
--- a/src/ReC.Application/EndpointAuth/Commands/InsertEndpointAuthCommand.cs
+++ b/src/ReC.Application/EndpointAuth/Commands/InsertEndpointAuthCommand.cs
@@ -1,5 +1,6 @@
-using MediatR;
+using MediatR;
 using ReC.Application.Common.Procedures.InsertProcedure;
+using ReC.Application.Common.Procedures;
 
 namespace ReC.Application.EndpointAuth.Commands;
 
@@ -24,7 +25,7 @@ public class InsertEndpointAuthProcedureHandler(ISender sender) : IRequestHandle
     {
         return await sender.Send(new InsertObjectProcedure
         {
-            Entity = "ENDPOINT_AUTH",
+            Entity = EntityType.EndpointAuth,
             EndpointAuth = request
         }, cancel);
     }
diff --git a/src/ReC.Application/EndpointAuth/Commands/UpdateEndpointAuthCommand.cs b/src/ReC.Application/EndpointAuth/Commands/UpdateEndpointAuthCommand.cs
index 7c68d23..56f4c26 100644
--- a/src/ReC.Application/EndpointAuth/Commands/UpdateEndpointAuthCommand.cs
+++ b/src/ReC.Application/EndpointAuth/Commands/UpdateEndpointAuthCommand.cs
@@ -1,6 +1,7 @@
 using MediatR;
 using ReC.Application.Common.Procedures.UpdateProcedure;
 using ReC.Application.Common.Procedures.UpdateProcedure.Dto;
+using ReC.Application.Common.Procedures;
 
 namespace ReC.Application.EndpointAuth.Commands;
 
@@ -17,7 +18,7 @@ public class UpdateEndpointAuthProcedureHandler(ISender sender) : IRequestHandle
     {
         return await sender.Send(new UpdateObjectProcedure
         {
-            Entity = "ENDPOINT_AUTH",
+            Entity = EntityType.EndpointAuth,
             Id = request.Id,
             EndpointAuth = request.Data
         }, cancel);
diff --git a/src/ReC.Application/EndpointParams/Commands/DeleteEndpointParamsCommand.cs b/src/ReC.Application/EndpointParams/Commands/DeleteEndpointParamsCommand.cs
index eea8d52..c2ac04d 100644
--- a/src/ReC.Application/EndpointParams/Commands/DeleteEndpointParamsCommand.cs
+++ b/src/ReC.Application/EndpointParams/Commands/DeleteEndpointParamsCommand.cs
@@ -1,5 +1,6 @@
 using MediatR;
 using ReC.Application.Common.Procedures.DeleteProcedure;
+using ReC.Application.Common.Procedures;
 
 namespace ReC.Application.EndpointParams.Commands;
 
@@ -27,7 +28,7 @@ public class DeleteEndpointParamsProcedureHandler(ISender sender) : IRequestHand
     {
         return await sender.Send(new DeleteObjectProcedure
         {
-            Entity = "ENDPOINT_PARAMS",
+            Entity = EntityType.EndpointParams,
             Start = request.Start,
             End = request.End,
             Force = request.Force
diff --git a/src/ReC.Application/EndpointParams/Commands/InsertEndpointParamsCommand.cs b/src/ReC.Application/EndpointParams/Commands/InsertEndpointParamsCommand.cs
index 40e0fbb..05ec2e9 100644
--- a/src/ReC.Application/EndpointParams/Commands/InsertEndpointParamsCommand.cs
+++ b/src/ReC.Application/EndpointParams/Commands/InsertEndpointParamsCommand.cs
@@ -1,5 +1,6 @@
-using MediatR;
+using MediatR;
 using ReC.Application.Common.Procedures.InsertProcedure;
+using ReC.Application.Common.Procedures;
 
 namespace ReC.Application.EndpointParams.Commands;
 
@@ -19,7 +20,7 @@ public class InsertEndpointParamsProcedureHandler(ISender sender) : IRequestHand
     {
         return await sender.Send(new InsertObjectProcedure
         {
-            Entity = "ENDPOINT_PARAMS",
+            Entity = EntityType.EndpointParams,
             EndpointParams = request
         }, cancel);
     }
diff --git a/src/ReC.Application/EndpointParams/Commands/UpdateEndpointParamsCommand.cs b/src/ReC.Application/EndpointParams/Commands/UpdateEndpointParamsCommand.cs
index 446e71e..21462df 100644
--- a/src/ReC.Application/EndpointParams/Commands/UpdateEndpointParamsCommand.cs
+++ b/src/ReC.Application/EndpointParams/Commands/UpdateEndpointParamsCommand.cs
@@ -1,6 +1,7 @@
 using MediatR;
 using ReC.Application.Common.Procedures.UpdateProcedure;
 using ReC.Application.Common.Procedures.UpdateProcedure.Dto;
+using ReC.Application.Common.Procedures;
 
 namespace ReC.Application.EndpointParams.Commands;
 
@@ -17,7 +18,7 @@ public class UpdateEndpointParamsProcedureHandler(ISender sender) : IRequestHand
     {
         return await sender.Send(new UpdateObjectProcedure
         {
-            Entity = "ENDPOINT_PARAMS",
+            Entity = EntityType.EndpointParams,
             Id = request.Id,
             EndpointParams = request.Data
         }, cancel);
diff --git a/src/ReC.Application/Endpoints/Commands/DeleteEndpointCommand.cs b/src/ReC.Application/Endpoints/Commands/DeleteEndpointCommand.cs
index 1a9469e..d7beab8 100644
--- a/src/ReC.Application/Endpoints/Commands/DeleteEndpointCommand.cs
+++ b/src/ReC.Application/Endpoints/Commands/DeleteEndpointCommand.cs
@@ -1,5 +1,6 @@
 using MediatR;
 using ReC.Application.Common.Procedures.DeleteProcedure;
+using ReC.Application.Common.Procedures;
 
 namespace ReC.Application.Endpoints.Commands;
 
@@ -27,7 +28,7 @@ public class DeleteEndpointProcedureHandler(ISender sender) : IRequestHandler<De
     {
         return await sender.Send(new DeleteObjectProcedure
         {
-            Entity = "ENDPOINT",
+            Entity = EntityType.Endpoint,
             Start = request.Start,
             End = request.End,
             Force = request.Force
diff --git a/src/ReC.Application/Endpoints/Commands/InsertEndpointCommand.cs b/src/ReC.Application/Endpoints/Commands/InsertEndpointCommand.cs
index b812a94..5d2768d 100644
--- a/src/ReC.Application/Endpoints/Commands/InsertEndpointCommand.cs
+++ b/src/ReC.Application/Endpoints/Commands/InsertEndpointCommand.cs
@@ -1,5 +1,6 @@
-using MediatR;
+using MediatR;
 using ReC.Application.Common.Procedures.InsertProcedure;
+using ReC.Application.Common.Procedures;
 
 namespace ReC.Application.Endpoints.Commands;
 
@@ -16,7 +17,7 @@ public class InsertEndpointProcedureHandler(ISender sender) : IRequestHandler<In
     {
         return await sender.Send(new InsertObjectProcedure
         {
-            Entity = "ENDPOINT",
+            Entity = EntityType.Endpoint,
             Endpoint = request
         }, cancel);
     }
diff --git a/src/ReC.Application/Endpoints/Commands/UpdateEndpointCommand.cs b/src/ReC.Application/Endpoints/Commands/UpdateEndpointCommand.cs
index a530f40..2854186 100644
--- a/src/ReC.Application/Endpoints/Commands/UpdateEndpointCommand.cs
+++ b/src/ReC.Application/Endpoints/Commands/UpdateEndpointCommand.cs
@@ -1,6 +1,7 @@
 using MediatR;
 using ReC.Application.Common.Procedures.UpdateProcedure;
 using ReC.Application.Common.Procedures.UpdateProcedure.Dto;
+using ReC.Application.Common.Procedures;
 
 namespace ReC.Application.Endpoints.Commands;
 
@@ -17,7 +18,7 @@ public class UpdateEndpointProcedureHandler(ISender sender) : IRequestHandler<Up
     {
         return await sender.Send(new UpdateObjectProcedure
         {
-            Entity = "ENDPOINT",
+            Entity = EntityType.Endpoint,
             Id = request.Id,
             Endpoint = request.Data
         }, cancel);
diff --git a/src/ReC.Application/Profile/Commands/DeleteProfileCommand.cs b/src/ReC.Application/Profile/Commands/DeleteProfileCommand.cs
index c7183c5..6870ff0 100644
--- a/src/ReC.Application/Profile/Commands/DeleteProfileCommand.cs
+++ b/src/ReC.Application/Profile/Commands/DeleteProfileCommand.cs
@@ -1,5 +1,6 @@
 using MediatR;
 using ReC.Application.Common.Procedures.DeleteProcedure;
+using ReC.Application.Common.Procedures;
 
 namespace ReC.Application.Profile.Commands;
 
@@ -27,7 +28,7 @@ public class DeleteProfileProcedureHandler(ISender sender) : IRequestHandler<Del
     {
         return await sender.Send(new DeleteObjectProcedure
         {
-            Entity = "PROFILE",
+            Entity = EntityType.Profile,
             Start = request.Start,
             End = request.End,
             Force = request.Force
diff --git a/src/ReC.Application/Profile/Commands/InsertProfileCommand.cs b/src/ReC.Application/Profile/Commands/InsertProfileCommand.cs
index e79e3fc..d0886d6 100644
--- a/src/ReC.Application/Profile/Commands/InsertProfileCommand.cs
+++ b/src/ReC.Application/Profile/Commands/InsertProfileCommand.cs
@@ -1,5 +1,6 @@
-using MediatR;
+using MediatR;
 using ReC.Application.Common.Procedures.InsertProcedure;
+using ReC.Application.Common.Procedures;
 
 namespace ReC.Application.Profile.Commands;
 
@@ -20,7 +21,7 @@ public class InsertProfileProcedureHandler(ISender sender) : IRequestHandler<Ins
     {
         return await sender.Send(new InsertObjectProcedure
         {
-            Entity = "PROFILE",
+            Entity = EntityType.Profile,
             Profile = request
         }, cancel);
     }
diff --git a/src/ReC.Application/Profile/Commands/UpdateProfileCommand.cs b/src/ReC.Application/Profile/Commands/UpdateProfileCommand.cs
index 1f0791d..d878a49 100644
--- a/src/ReC.Application/Profile/Commands/UpdateProfileCommand.cs
+++ b/src/ReC.Application/Profile/Commands/UpdateProfileCommand.cs
@@ -1,6 +1,7 @@
 using MediatR;
 using ReC.Application.Common.Procedures.UpdateProcedure;
 using ReC.Application.Common.Procedures.UpdateProcedure.Dto;
+using ReC.Application.Common.Procedures;
 
 namespace ReC.Application.Profile.Commands;
 
@@ -17,7 +18,7 @@ public class UpdateProfileProcedureHandler(ISender sender) : IRequestHandler<Upd
     {
         return await sender.Send(new UpdateObjectProcedure
         {
-            Entity = "PROFILE",
+            Entity = EntityType.Profile,
             Id = request.Id,
             Profile = request.Data
         }, cancel);
diff --git a/src/ReC.Application/RecActions/Commands/DeleteActionCommand.cs b/src/ReC.Application/RecActions/Commands/DeleteActionCommand.cs
index bb5da83..4e6496e 100644
--- a/src/ReC.Application/RecActions/Commands/DeleteActionCommand.cs
+++ b/src/ReC.Application/RecActions/Commands/DeleteActionCommand.cs
@@ -1,5 +1,6 @@
 using MediatR;
 using ReC.Application.Common.Procedures.DeleteProcedure;
+using ReC.Application.Common.Procedures;
 
 namespace ReC.Application.RecActions.Commands;
 
@@ -27,7 +28,7 @@ public class DeleteActionProcedureHandler(ISender sender) : IRequestHandler<Dele
     {
         return await sender.Send(new DeleteObjectProcedure
         {
-            Entity = "ACTION",
+            Entity = EntityType.Action,
             Start = request.Start,
             End = request.End,
             Force = request.Force
diff --git a/src/ReC.Application/RecActions/Commands/InsertActionCommand.cs b/src/ReC.Application/RecActions/Commands/InsertActionCommand.cs
index 255409e..b5cd3a4 100644
--- a/src/ReC.Application/RecActions/Commands/InsertActionCommand.cs
+++ b/src/ReC.Application/RecActions/Commands/InsertActionCommand.cs
@@ -1,6 +1,7 @@
-using MediatR;
+using MediatR;
 using ReC.Application.Common.Procedures.InsertProcedure;
 using ReC.Domain.Constants;
+using ReC.Application.Common.Procedures;
 
 namespace ReC.Application.RecActions.Commands;
 
@@ -27,7 +28,7 @@ public class InsertActionProcedureHandler(ISender sender) : IRequestHandler<Inse
     {
         return await sender.Send(new InsertObjectProcedure
         {
-            Entity = "ACTION",
+            Entity = EntityType.Action,
             Action = request
         }, cancel);
     }
diff --git a/src/ReC.Application/RecActions/Commands/UpdateActionCommand.cs b/src/ReC.Application/RecActions/Commands/UpdateActionCommand.cs
index 51be35d..94b3369 100644
--- a/src/ReC.Application/RecActions/Commands/UpdateActionCommand.cs
+++ b/src/ReC.Application/RecActions/Commands/UpdateActionCommand.cs
@@ -1,6 +1,7 @@
 using MediatR;
 using ReC.Application.Common.Procedures.UpdateProcedure;
 using ReC.Application.Common.Procedures.UpdateProcedure.Dto;
+using ReC.Application.Common.Procedures;
 
 namespace ReC.Application.RecActions.Commands;
 
@@ -17,7 +18,7 @@ public class UpdateActionProcedureHandler(ISender sender) : IRequestHandler<Upda
     {
         return await sender.Send(new UpdateObjectProcedure
         {
-            Entity = "ACTION",
+            Entity = EntityType.Action,
             Id = request.Id,
             Action = request.Data
         }, cancel);
diff --git a/src/ReC.Application/Results/Commands/DeleteResultCommand.cs b/src/ReC.Application/Results/Commands/DeleteResultCommand.cs
index c5fca0f..95ae830 100644
--- a/src/ReC.Application/Results/Commands/DeleteResultCommand.cs
+++ b/src/ReC.Application/Results/Commands/DeleteResultCommand.cs
@@ -1,5 +1,6 @@
 using MediatR;
 using ReC.Application.Common.Procedures.DeleteProcedure;
+using ReC.Application.Common.Procedures;
 
 namespace ReC.Application.Results.Commands;
 
@@ -27,7 +28,7 @@ public class DeleteResultProcedureHandler(ISender sender) : IRequestHandler<Dele
     {
         return await sender.Send(new DeleteObjectProcedure
         {
-            Entity = "RESULT",
+            Entity = EntityType.Result,
             Start = request.Start,
             End = request.End,
             Force = request.Force
diff --git a/src/ReC.Application/Results/Commands/InsertResultCommand.cs b/src/ReC.Application/Results/Commands/InsertResultCommand.cs
index 0fcc838..3484400 100644
--- a/src/ReC.Application/Results/Commands/InsertResultCommand.cs
+++ b/src/ReC.Application/Results/Commands/InsertResultCommand.cs
@@ -1,7 +1,8 @@
-using MediatR;
+using MediatR;
 using ReC.Application.Common.Procedures.InsertProcedure;
 using ReC.Application.RecActions.Commands;
 using ReC.Domain.Constants;
+using ReC.Application.Common.Procedures;
 
 namespace ReC.Application.Results.Commands;
 
@@ -24,7 +25,7 @@ public class InsertResultProcedureHandler(ISender sender) : IRequestHandler<Inse
     {
         return await sender.Send(new InsertObjectProcedure
         {
-            Entity = "RESULT",
+            Entity = EntityType.Result,
             Result = request
         }, cancel);
     }
diff --git a/src/ReC.Application/Results/Commands/UpdateResultCommand.cs b/src/ReC.Application/Results/Commands/UpdateResultCommand.cs
index 5847b4a..f34f04d 100644
--- a/src/ReC.Application/Results/Commands/UpdateResultCommand.cs
+++ b/src/ReC.Application/Results/Commands/UpdateResultCommand.cs
@@ -1,6 +1,7 @@
 using MediatR;
 using ReC.Application.Common.Procedures.UpdateProcedure;
 using ReC.Application.Common.Procedures.UpdateProcedure.Dto;
+using ReC.Application.Common.Procedures;
 
 namespace ReC.Application.Results.Commands;
 
@@ -17,7 +18,7 @@ public class UpdateResultProcedureHandler(ISender sender) : IRequestHandler<Upda
     {
         return await sender.Send(new UpdateObjectProcedure
         {
-            Entity = "RESULT",
+            Entity = EntityType.Result,
             Id = request.Id,
             Result = request.Data
         }, cancel);