diff --git a/Gremlin/GremlinData/DBClasses/EntityConfiguration.cs b/Gremlin/GremlinData/DBClasses/EntityConfiguration.cs
index 8feb323..5ac00bf 100644
--- a/Gremlin/GremlinData/DBClasses/EntityConfiguration.cs
+++ b/Gremlin/GremlinData/DBClasses/EntityConfiguration.cs
@@ -42,7 +42,7 @@ namespace Gremlin.GremlinData.DBClasses
                         //.HasDefaultValue("Active")  //Default-Wert wird nicht gesetzt?!? Bug in EF Core?
             entity.Property(e => e.DataModificationDate).HasColumnType("TIMESTAMP").HasDefaultValueSql("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP").ValueGeneratedOnAddOrUpdate().IsConcurrencyToken(true);
                         //.IsRowVersion() impliziert .ValueGeneratedOnAddOrUpdate() und .IsConcurrencyToken(true)
-            entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
+            entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").IsRequired(true).HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
         }
     }
 
@@ -75,7 +75,7 @@ namespace Gremlin.GremlinData.DBClasses
             //.HasDefaultValue("Active")  //Default-Wert wird nicht gesetzt?!? Bug in EF Core?
             entity.Property(e => e.DataModificationDate).HasColumnType("TIMESTAMP").HasDefaultValueSql("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP").ValueGeneratedOnAddOrUpdate().IsConcurrencyToken(true);
             //.IsRowVersion() impliziert .ValueGeneratedOnAddOrUpdate() und .IsConcurrencyToken(true)
-            entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
+            entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").IsRequired(true).HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
         }
     }
 
@@ -112,7 +112,7 @@ namespace Gremlin.GremlinData.DBClasses
             //.HasDefaultValue("Active")  //Default-Wert wird nicht gesetzt?!? Bug in EF Core?
             entity.Property(e => e.DataModificationDate).HasColumnType("TIMESTAMP").HasDefaultValueSql("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP").ValueGeneratedOnAddOrUpdate().IsConcurrencyToken(true);
             //.IsRowVersion() impliziert .ValueGeneratedOnAddOrUpdate() und .IsConcurrencyToken(true)
-            entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
+            entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").IsRequired(true).HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
         }
     }
 
@@ -149,7 +149,7 @@ namespace Gremlin.GremlinData.DBClasses
             //.HasDefaultValue("Active")  //Default-Wert wird nicht gesetzt?!? Bug in EF Core?
             entity.Property(e => e.DataModificationDate).HasColumnType("TIMESTAMP").HasDefaultValueSql("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP").ValueGeneratedOnAddOrUpdate().IsConcurrencyToken(true);
             //.IsRowVersion() impliziert .ValueGeneratedOnAddOrUpdate() und .IsConcurrencyToken(true)
-            entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
+            entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").IsRequired(true).HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
         }
     }
 
@@ -160,6 +160,8 @@ namespace Gremlin.GremlinData.DBClasses
             entity.HasKey(e => e.ProductId);
             entity.HasOne(d => d.CustomDescription).WithMany(p => p.Products).HasForeignKey("CustomDescriptionId").IsRequired(false).OnDelete(DeleteBehavior.Restrict);
             entity.HasOne(p => p.ProductLine).WithMany(d => d.Products).HasForeignKey("ProductLineCode").IsRequired(true).OnDelete(DeleteBehavior.Restrict);
+
+            entity.Property(e => e.CustomDescriptionId).IsRequired(false);
             
             entity.Property(e => e.ProductNumber).IsRequired(true);
             entity.Property(e => e.OptionNumber);
@@ -179,7 +181,7 @@ namespace Gremlin.GremlinData.DBClasses
             //.HasDefaultValue("Active")  //Default-Wert wird nicht gesetzt?!? Bug in EF Core?
             entity.Property(e => e.DataModificationDate).HasColumnType("TIMESTAMP").HasDefaultValueSql("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP").ValueGeneratedOnAddOrUpdate().IsConcurrencyToken(true);
             //.IsRowVersion() impliziert .ValueGeneratedOnAddOrUpdate() und .IsConcurrencyToken(true)
-            entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
+            entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").IsRequired(true).HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
         }
     }
 
@@ -207,7 +209,7 @@ namespace Gremlin.GremlinData.DBClasses
             //.HasDefaultValue("Active")  //Default-Wert wird nicht gesetzt?!? Bug in EF Core?
             entity.Property(e => e.DataModificationDate).HasColumnType("TIMESTAMP").HasDefaultValueSql("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP").ValueGeneratedOnAddOrUpdate().IsConcurrencyToken(true);
             //.IsRowVersion() impliziert .ValueGeneratedOnAddOrUpdate() und .IsConcurrencyToken(true)
-            entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
+            entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").IsRequired(true).HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
         }
     }
 
@@ -215,9 +217,10 @@ namespace Gremlin.GremlinData.DBClasses
     {
         public void Configure(EntityTypeBuilder<ProductLine> entity)
         {
-            //entity.HasKey(e => e.ProductLineId);  //Property removed. PK is AccountTypeCode (defined via data annotation in class).
             entity.HasMany(p => p.Products).WithOne(d => d.ProductLine).IsRequired(true).OnDelete(DeleteBehavior.Restrict);
             
+            entity.Property(e => e.ProductLineDescription).IsRequired(true);
+
             entity.Property(e => e.DataCreationDate).HasColumnType("TIMESTAMP").HasDefaultValueSql("CURRENT_TIMESTAMP").ValueGeneratedOnAdd();
             entity.Property(e => e.DataValidFrom).HasColumnType("DATETIME").HasDefaultValueSql("CURRENT_TIMESTAMP").ValueGeneratedOnAdd();
             entity.Property(e => e.DataValidUntil).HasColumnType("DATETIME").HasDefaultValueSql("'9999-12-31 23:59:59.000000'").ValueGeneratedOnAdd();
@@ -227,7 +230,7 @@ namespace Gremlin.GremlinData.DBClasses
             //.HasDefaultValue("Active")  //Default-Wert wird nicht gesetzt?!? Bug in EF Core?
             entity.Property(e => e.DataModificationDate).HasColumnType("TIMESTAMP").HasDefaultValueSql("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP").ValueGeneratedOnAddOrUpdate().IsConcurrencyToken(true);
             //.IsRowVersion() impliziert .ValueGeneratedOnAddOrUpdate() und .IsConcurrencyToken(true)
-            entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
+            entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").IsRequired(true).HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
         }
     }
 
@@ -238,7 +241,7 @@ namespace Gremlin.GremlinData.DBClasses
             //entity.HasKey(e => e.AccountTypeCode);
             //entity.HasMany(p => p.Accounts).WithOne(d => d.AccountType); //already defined in class Account
             entity.Property(e => e.AccountTypeCode).IsRequired(true).HasColumnType("Char(3)");
-            entity.Property(e => e.AccountTypeDescription).HasColumnType("Varchar(1000)");
+            entity.Property(e => e.AccountTypeDescription).HasColumnType("Varchar(1000)").IsRequired(true);
             
             entity.Property(e => e.DataCreationDate).HasColumnType("TIMESTAMP").HasDefaultValueSql("CURRENT_TIMESTAMP").ValueGeneratedOnAdd();
             entity.Property(e => e.DataValidFrom).HasColumnType("DATETIME").HasDefaultValueSql("CURRENT_TIMESTAMP").ValueGeneratedOnAdd();
@@ -249,7 +252,7 @@ namespace Gremlin.GremlinData.DBClasses
             //.HasDefaultValue("Active")  //Default-Wert wird nicht gesetzt?!? Bug in EF Core?
             entity.Property(e => e.DataModificationDate).HasColumnType("TIMESTAMP").HasDefaultValueSql("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP").ValueGeneratedOnAddOrUpdate().IsConcurrencyToken(true);
             //.IsRowVersion() impliziert .ValueGeneratedOnAddOrUpdate() und .IsConcurrencyToken(true)
-            entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
+            entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").IsRequired(true).HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
         }
     }
 
@@ -260,7 +263,7 @@ namespace Gremlin.GremlinData.DBClasses
             //entity.HasKey(e => e.SubMarketCode);
             //entity.HasMany(p => p.Accounts).WithOne(d => d.SubMarket);  //already defined in class Account
             entity.Property(e => e.SubMarketCode).HasColumnType("Char(3)");
-            entity.Property(e => e.SubMarketDescription).HasColumnType("Varchar(1000)");
+            entity.Property(e => e.SubMarketDescription).HasColumnType("Varchar(1000)").IsRequired(true);
             
             entity.Property(e => e.DataCreationDate).HasColumnType("TIMESTAMP").HasDefaultValueSql("CURRENT_TIMESTAMP").ValueGeneratedOnAdd();
             entity.Property(e => e.DataValidFrom).HasColumnType("DATETIME").HasDefaultValueSql("CURRENT_TIMESTAMP").ValueGeneratedOnAdd();
@@ -271,7 +274,7 @@ namespace Gremlin.GremlinData.DBClasses
             //.HasDefaultValue("Active")  //Default-Wert wird nicht gesetzt?!? Bug in EF Core?
             entity.Property(e => e.DataModificationDate).HasColumnType("TIMESTAMP").HasDefaultValueSql("CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP").ValueGeneratedOnAddOrUpdate().IsConcurrencyToken(true);
             //.IsRowVersion() impliziert .ValueGeneratedOnAddOrUpdate() und .IsConcurrencyToken(true)
-            entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
+            entity.Property(e => e.DataModificationByUser).HasColumnType("TINYTEXT").IsRequired(true).HasDefaultValueSql("ON INSERT CURRENT_USER() ON UPDATE CURRENT_USER()");
         }
     }