diff --git a/src/DigitalData.UserManager.Domain/Entities/BaseEntity.cs b/src/DigitalData.UserManager.Domain/Entities/BaseEntity.cs
index 6426dcc..8fa172a 100644
--- a/src/DigitalData.UserManager.Domain/Entities/BaseEntity.cs
+++ b/src/DigitalData.UserManager.Domain/Entities/BaseEntity.cs
@@ -17,7 +17,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [StringLength(50)]
         [Column("ADDED_WHO")]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             AddedWho { get; set; }
@@ -25,7 +25,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [StringLength(50)]
         [Column("CHANGED_WHO")]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             ChangedWho { get; set; }
diff --git a/src/DigitalData.UserManager.Domain/Entities/ClientUser.cs b/src/DigitalData.UserManager.Domain/Entities/ClientUser.cs
index 43eeafc..8e3fe1e 100644
--- a/src/DigitalData.UserManager.Domain/Entities/ClientUser.cs
+++ b/src/DigitalData.UserManager.Domain/Entities/ClientUser.cs
@@ -25,7 +25,7 @@ namespace DigitalData.UserManager.Domain.Entities
 
         [Column("COMMENT")]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Comment { get; set; }
@@ -33,7 +33,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [StringLength(50)]
         [Column("ADDED_WHO")]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             AddedWho { get; set; }
diff --git a/src/DigitalData.UserManager.Domain/Entities/Group.cs b/src/DigitalData.UserManager.Domain/Entities/Group.cs
index 743244f..479be32 100644
--- a/src/DigitalData.UserManager.Domain/Entities/Group.cs
+++ b/src/DigitalData.UserManager.Domain/Entities/Group.cs
@@ -9,7 +9,7 @@ namespace DigitalData.UserManager.Domain.Entities
     {
         [StringLength(50)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
         Name { get; set; }
@@ -29,7 +29,7 @@ namespace DigitalData.UserManager.Domain.Entities
 
         [StringLength(200)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Comment { get; set; }
diff --git a/src/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs b/src/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs
index 5987aec..8c335e0 100644
--- a/src/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs
+++ b/src/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs
@@ -16,21 +16,21 @@ namespace DigitalData.UserManager.Domain.Entities
 
         [StringLength(200)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Comment { get; set; }
 
         [ForeignKey("UserId")]
         public virtual User
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             User { get; set; }
 
         [ForeignKey("GroupId")]
         public virtual Group
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Group { get; set; }
diff --git a/src/DigitalData.UserManager.Domain/Entities/Module.cs b/src/DigitalData.UserManager.Domain/Entities/Module.cs
index b63e350..fa1ec3e 100644
--- a/src/DigitalData.UserManager.Domain/Entities/Module.cs
+++ b/src/DigitalData.UserManager.Domain/Entities/Module.cs
@@ -13,7 +13,7 @@ namespace DigitalData.UserManager.Domain.Entities
 
         [StringLength(50)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Name { get; set; }
@@ -21,7 +21,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [StringLength(20)]
         [Column("SHORT_NAME")]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             ShortName { get; set; }
diff --git a/src/DigitalData.UserManager.Domain/Entities/ModuleOfUser.cs b/src/DigitalData.UserManager.Domain/Entities/ModuleOfUser.cs
index 4b169d2..71778c6 100644
--- a/src/DigitalData.UserManager.Domain/Entities/ModuleOfUser.cs
+++ b/src/DigitalData.UserManager.Domain/Entities/ModuleOfUser.cs
@@ -22,7 +22,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("COMMENT")]
         [StringLength(200)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Comment { get; set; }
@@ -30,7 +30,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("ADDED_WHO")]
         [StringLength(50)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             AddedWho { get; set; } = "DEFAULT";
@@ -38,21 +38,21 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("CHANGED_WHO")]
         [StringLength(50)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             ChangedWho { get; set; }
 
         [ForeignKey("UserId")]
         public virtual User
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             User { get; set; }
 
         [ForeignKey("ModuleId")]
         public virtual Module
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Module { get; set; }
diff --git a/src/DigitalData.UserManager.Domain/Entities/User.cs b/src/DigitalData.UserManager.Domain/Entities/User.cs
index 078a815..0e7d22b 100644
--- a/src/DigitalData.UserManager.Domain/Entities/User.cs
+++ b/src/DigitalData.UserManager.Domain/Entities/User.cs
@@ -13,7 +13,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("PRENAME")]
         [StringLength(50)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Prename { get; set; }
@@ -21,7 +21,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("NAME")]
         [StringLength(50)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Name { get; set; }
@@ -30,7 +30,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("USERNAME")]
         [StringLength(50)]
         public
-#if NET7_0_OR_GREATER
+#if NET
             required
 #endif
             string Username { get; set; }
@@ -38,7 +38,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("SHORTNAME")]
         [StringLength(30)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Shortname
@@ -47,7 +47,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("EMAIL")]
         [StringLength(100)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Email { get; set; }
@@ -57,7 +57,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [StringLength(5)]
         [DefaultValue("de-DE")]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Language { get; set; }
@@ -65,7 +65,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("COMMENT")]
         [StringLength(500)]
         public string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Comment { get; set; }
@@ -78,7 +78,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [StringLength(10)]
         [DefaultValue("dd.MM.yyyy")]
         public
-#if NET7_0_OR_GREATER
+#if NET
             required
 #endif
             string DateFormat { get; set; }
@@ -92,7 +92,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [StringLength(30)]
         [DefaultValue("NONE")]
         public
-#if NET7_0_OR_GREATER
+#if NET
             required
 #endif
             string GeneralViewer { get; set; }
@@ -107,7 +107,7 @@ namespace DigitalData.UserManager.Domain.Entities
 
         [Column("DELETED_WHEN")]
         public DateTime
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             DeletedWhen { get; set; }
@@ -115,11 +115,11 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("DELETED_WHO")]
         [StringLength(50)]
         public
-#if NET7_0_OR_GREATER
+#if NET
             required
 #endif
             string
-#if NET7_0_OR_GREATER
+#if NET
             ?
 # endif
             DeletedWho { get; set; }
diff --git a/src/DigitalData.UserManager.Domain/Entities/UserRep.cs b/src/DigitalData.UserManager.Domain/Entities/UserRep.cs
index 1f391d5..d549d46 100644
--- a/src/DigitalData.UserManager.Domain/Entities/UserRep.cs
+++ b/src/DigitalData.UserManager.Domain/Entities/UserRep.cs
@@ -28,28 +28,28 @@ namespace DigitalData.UserManager.Domain.Entities
 
         [ForeignKey("UserId")]
         public virtual User
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             User { get; set; }
 
         [ForeignKey("RepGroupId")]
         public virtual Group
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             RepGroup { get; set; }
 
         [ForeignKey("GroupId")]
         public virtual Group
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             Group { get; set; }
 
         [ForeignKey("RepUserId")]
         public virtual User
-#if NET7_0_OR_GREATER
+#if NET
             ?
 #endif
             RepUser { get; set; }