diff --git a/src/Database/EntityFramework/Configuration/Hl7ApplicationConfigConfiguration.cs b/src/Database/EntityFramework/Configuration/Hl7ApplicationConfigConfiguration.cs
index 1eb7a26bd..66b37bff9 100644
--- a/src/Database/EntityFramework/Configuration/Hl7ApplicationConfigConfiguration.cs
+++ b/src/Database/EntityFramework/Configuration/Hl7ApplicationConfigConfiguration.cs
@@ -25,11 +25,9 @@ internal class Hl7ApplicationConfigConfiguration : IEntityTypeConfiguration<Hl7A
         public void Configure(EntityTypeBuilder<Hl7ApplicationConfigEntity> builder)
         {
             builder.HasKey(j => j.Id);
-            builder.Property(j => j.DataLink.Key).IsRequired();
-            builder.Property(j => j.DataLink.Value).IsRequired();
+            builder.Property(j => j.DataLink).IsRequired();
             builder.Property(j => j.DataMapping).IsRequired();
-            builder.Property(j => j.SendingId.Key).IsRequired();
-            builder.Property(j => j.SendingId.Value).IsRequired();
+            builder.Property(j => j.SendingId).IsRequired();
 
             builder.Ignore(p => p.Id);
         }