diff --git a/DigitalData.UserManager.Domain/DigitalData.UserManager.Domain.csproj b/DigitalData.UserManager.Domain/DigitalData.UserManager.Domain.csproj
index 7e0408e..dfb96ee 100644
--- a/DigitalData.UserManager.Domain/DigitalData.UserManager.Domain.csproj
+++ b/DigitalData.UserManager.Domain/DigitalData.UserManager.Domain.csproj
@@ -2,8 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>net462;net7.0;net8.0;net9.0</TargetFrameworks>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
     <PackageId>UserManager.Domain</PackageId>
     <Version>3.1.0</Version>
     <Authors>Digital Data GmbH</Authors>
@@ -19,11 +17,13 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
+    <Nullable>disable</Nullable>
 	<ImplicitUsings>disable</ImplicitUsings>
 	<LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' != 'net462'">
+    <Nullable>enable</Nullable>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<LangVersion>latest</LangVersion>
   </PropertyGroup>
diff --git a/DigitalData.UserManager.Domain/Entities/BaseEntity.cs b/DigitalData.UserManager.Domain/Entities/BaseEntity.cs
index f5b57c4..d6bee29 100644
--- a/DigitalData.UserManager.Domain/Entities/BaseEntity.cs
+++ b/DigitalData.UserManager.Domain/Entities/BaseEntity.cs
@@ -17,7 +17,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [StringLength(50)]
         [Column("ADDED_WHO")]
         public string
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             AddedWho
@@ -26,7 +26,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [StringLength(50)]
         [Column("CHANGED_WHO")]
         public string
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             ChangedWho
diff --git a/DigitalData.UserManager.Domain/Entities/ClientUser.cs b/DigitalData.UserManager.Domain/Entities/ClientUser.cs
index d31e83c..58a575b 100644
--- a/DigitalData.UserManager.Domain/Entities/ClientUser.cs
+++ b/DigitalData.UserManager.Domain/Entities/ClientUser.cs
@@ -25,7 +25,7 @@ namespace DigitalData.UserManager.Domain.Entities
 
         [Column("COMMENT")]
         public string
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             Comment
@@ -34,7 +34,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [StringLength(50)]
         [Column("ADDED_WHO")]
         public string
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             AddedWho
diff --git a/DigitalData.UserManager.Domain/Entities/Group.cs b/DigitalData.UserManager.Domain/Entities/Group.cs
index 25878d7..b20051e 100644
--- a/DigitalData.UserManager.Domain/Entities/Group.cs
+++ b/DigitalData.UserManager.Domain/Entities/Group.cs
@@ -9,7 +9,7 @@ namespace DigitalData.UserManager.Domain.Entities
     {
         [StringLength(50)]
         public string
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
         Name { get; set; }
@@ -29,7 +29,7 @@ namespace DigitalData.UserManager.Domain.Entities
 
         [StringLength(200)]
         public string
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             Comment
diff --git a/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs b/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs
index 792558c..f9f136e 100644
--- a/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs
+++ b/DigitalData.UserManager.Domain/Entities/GroupOfUser.cs
@@ -16,21 +16,21 @@ namespace DigitalData.UserManager.Domain.Entities
 
         [StringLength(200)]
         public string
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             Comment { get; set; }
 
         [ForeignKey("UserId")]
         public virtual User
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             User { get; set; }
 
         [ForeignKey("GroupId")]
         public virtual Group
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             Group { get; set; }
diff --git a/DigitalData.UserManager.Domain/Entities/Module.cs b/DigitalData.UserManager.Domain/Entities/Module.cs
index 15a7073..e7dfa5c 100644
--- a/DigitalData.UserManager.Domain/Entities/Module.cs
+++ b/DigitalData.UserManager.Domain/Entities/Module.cs
@@ -13,7 +13,7 @@ namespace DigitalData.UserManager.Domain.Entities
 
         [StringLength(50)]
         public string
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             Name { get; set; }
@@ -21,7 +21,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [StringLength(20)]
         [Column("SHORT_NAME")]
         public string
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             ShortName { get; set; }
diff --git a/DigitalData.UserManager.Domain/Entities/ModuleOfUser.cs b/DigitalData.UserManager.Domain/Entities/ModuleOfUser.cs
index d8677dc..d320e05 100644
--- a/DigitalData.UserManager.Domain/Entities/ModuleOfUser.cs
+++ b/DigitalData.UserManager.Domain/Entities/ModuleOfUser.cs
@@ -22,7 +22,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("COMMENT")]
         [StringLength(200)]
         public string
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             Comment { get; set; }
@@ -30,7 +30,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("ADDED_WHO")]
         [StringLength(50)]
         public string
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             AddedWho { get; set; } = "DEFAULT";
@@ -38,21 +38,21 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("CHANGED_WHO")]
         [StringLength(50)]
         public string
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             ChangedWho { get; set; }
 
         [ForeignKey("UserId")]
         public virtual User
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             User { get; set; }
 
         [ForeignKey("ModuleId")]
         public virtual Module
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             Module { get; set; }
diff --git a/DigitalData.UserManager.Domain/Entities/User.cs b/DigitalData.UserManager.Domain/Entities/User.cs
index 64d2b06..dfc181b 100644
--- a/DigitalData.UserManager.Domain/Entities/User.cs
+++ b/DigitalData.UserManager.Domain/Entities/User.cs
@@ -10,7 +10,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("PRENAME")]
         [StringLength(50)]
         public string
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             Prename { get; set; }
@@ -18,7 +18,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("NAME")]
         [StringLength(50)]
         public string
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             Name { get; set; }
@@ -31,7 +31,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("SHORTNAME")]
         [StringLength(30)]
         public string
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             Shortname
@@ -40,7 +40,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("EMAIL")]
         [StringLength(100)]
         public string
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             Email { get; set; }
@@ -50,7 +50,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [StringLength(5)]
         [DefaultValue("de-DE")]
         public string
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             Language { get; set; }
@@ -58,7 +58,7 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("COMMENT")]
         [StringLength(500)]
         public string
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             Comment { get; set; }
diff --git a/DigitalData.UserManager.Domain/Entities/UserRep.cs b/DigitalData.UserManager.Domain/Entities/UserRep.cs
index cc3f6cf..ac73355 100644
--- a/DigitalData.UserManager.Domain/Entities/UserRep.cs
+++ b/DigitalData.UserManager.Domain/Entities/UserRep.cs
@@ -28,28 +28,28 @@ namespace DigitalData.UserManager.Domain.Entities
 
         [ForeignKey("UserId")]
         public virtual User
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             User { get; set; }
 
         [ForeignKey("RepGroupId")]
         public virtual Group
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             RepGroup { get; set; }
 
         [ForeignKey("GroupId")]
         public virtual Group
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             Group { get; set; }
 
         [ForeignKey("RepUserId")]
         public virtual User
-#if NET6_0_OR_GREATER
+#if NET7_0_OR_GREATER
             ?
 #endif
             RepUser { get; set; }