diff --git a/src/ReC.Domain/Entities/Endpoint.cs b/src/ReC.Domain/Entities/Endpoint.cs
index 71e7884..f3f8db2 100644
--- a/src/ReC.Domain/Entities/Endpoint.cs
+++ b/src/ReC.Domain/Entities/Endpoint.cs
@@ -1,34 +1,20 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
+namespace ReC.Domain.Entities;
 
-namespace ReC.Domain.Entities;
-
-[Table("TBREC_CFG_ENDPOINT")]
 public class Endpoint
 {
-    [Key]
-    [Column("GUID")]
-    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
     public long Id { get; set; }
 
-    [Column("ACTIVE")]
     public bool? Active { get; set; }
 
-    [Column("DESCRIPTION")]
     public string? Description { get; set; }
 
-    [Column("URI")]
     public string? Uri { get; set; }
 
-    [Column("ADDED_WHO")]
     public string? AddedWho { get; set; }
 
-    [Column("ADDED_WHEN")]
     public DateTime? AddedWhen { get; set; }
 
-    [Column("CHANGED_WHO")]
     public string? ChangedWho { get; set; }
 
-    [Column("CHANGED_WHEN")]
     public DateTime? ChangedWhen { get; set; }
 }
\ No newline at end of file
diff --git a/src/ReC.Infrastructure/RecDbContext.cs b/src/ReC.Infrastructure/RecDbContext.cs
index fb67d9c..545fa4a 100644
--- a/src/ReC.Infrastructure/RecDbContext.cs
+++ b/src/ReC.Infrastructure/RecDbContext.cs
@@ -55,6 +55,25 @@ public class RecDbContext(DbContextOptions<RecDbContext> options) : DbContext(op
             b.Property(e => e.SysConnection).HasColumnName("SYS_CONNECTION");
         });
 
+        modelBuilder.Entity<Endpoint>(b =>
+        {
+            b.ToTable("TBREC_CFG_ENDPOINT");
+
+            b.HasKey(e => e.Id);
+
+            b.Property(e => e.Id)
+                .HasColumnName("GUID")
+                .ValueGeneratedOnAdd();
+
+            b.Property(e => e.Active).HasColumnName("ACTIVE");
+            b.Property(e => e.Description).HasColumnName("DESCRIPTION");
+            b.Property(e => e.Uri).HasColumnName("URI");
+            b.Property(e => e.AddedWho).HasColumnName("ADDED_WHO");
+            b.Property(e => e.AddedWhen).HasColumnName("ADDED_WHEN");
+            b.Property(e => e.ChangedWho).HasColumnName("CHANGED_WHO");
+            b.Property(e => e.ChangedWhen).HasColumnName("CHANGED_WHEN");
+        });
+
         modelBuilder.Entity<EndpointParam>(b =>
         {
             b.ToTable("TBREC_CFG_ENDPOINT_PARAMS", "dbo");