diff --git a/MagMan.Data.Tenant/DbModels/TableCount.cs b/MagMan.Data.Tenant/DbModels/TableCount.cs
index de964b6..152e4e6 100644
--- a/MagMan.Data.Tenant/DbModels/TableCount.cs
+++ b/MagMan.Data.Tenant/DbModels/TableCount.cs
@@ -16,7 +16,7 @@ namespace MagMan.Data.Tenant.DbModels
         #region Public Properties
 
         public int Count { get; set; }
-        public string TableName { get; set; }
+        public string TableName { get; set; } = "";
 
         #endregion Public Properties
     }
diff --git a/MagMan.Data.Tenant/MagManContext.cs b/MagMan.Data.Tenant/MagManContext.cs
index ce5d95d..5c2d3ae 100644
--- a/MagMan.Data.Tenant/MagManContext.cs
+++ b/MagMan.Data.Tenant/MagManContext.cs
@@ -17,7 +17,6 @@ namespace MagMan.Data.Tenant
 
         private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
 
-        private IConfiguration _configuration;
 
         #endregion Private Fields
 
@@ -27,11 +26,6 @@ namespace MagMan.Data.Tenant
         {
         }
 
-        public MagManContext(IConfiguration configuration)
-        {
-            _configuration = configuration;
-        }
-
         public MagManContext(DbContextOptions<MagManContext> options) : base(options)
         {
             try
@@ -49,12 +43,12 @@ namespace MagMan.Data.Tenant
 
         #region Public Properties
 
-        public virtual DbSet<ConfigModel> DbSetConfig { get; set; }
+        public virtual DbSet<ConfigModel> DbSetConfig { get; set; } = null!;
 
-        public virtual DbSet<ItemModel> DbSetItems { get; set; }
-        public virtual DbSet<MaterialModel> DbSetMaterials { get; set; }
-        public virtual DbSet<MovMagModel> DbSetMovMag { get; set; }
-        public virtual DbSet<PrintJobQueueModel> DbSetPrintJob { get; set; }
+        public virtual DbSet<ItemModel> DbSetItems { get; set; } = null!;
+        public virtual DbSet<MaterialModel> DbSetMaterials { get; set; } = null!;
+        public virtual DbSet<MovMagModel> DbSetMovMag { get; set; } = null!;     
+        public virtual DbSet<PrintJobQueueModel> DbSetPrintJob { get; set; } = null!;
 
 #if false
         public virtual DbSet<AnKeyValModel> DbSetKeyVal { get; set; }