diff --git a/FoodsharingSiegen.Server/Data/FsContext.cs b/FoodsharingSiegen.Server/Data/FsContext.cs
index 86ecba6..1835ae1 100644
--- a/FoodsharingSiegen.Server/Data/FsContext.cs
+++ b/FoodsharingSiegen.Server/Data/FsContext.cs
@@ -8,69 +8,40 @@ namespace FoodsharingSiegen.Server.Data
     /// The fs context class (a. beging, 21.05.2022)
     /// </summary>
     /// <seealso cref="DbContext"/>
-    public class FsContext : DbContext
+    public sealed class FsContext : DbContext
     {
         #region Public Properties
 
         /// <summary>
         /// Gets or sets the value of the interactions (ab)
         /// </summary>
-        public DbSet<Interaction> Interactions { get; set; }
+        public DbSet<Interaction>? Interactions { get; set; }
 
         /// <summary>
         /// Gets or sets the value of the prospects (ab)
         /// </summary>
-        public DbSet<Prospect> Prospects { get; set; }
+        public DbSet<Prospect>? Prospects { get; set; }
 
         /// <summary>
         /// Gets or sets the value of the users (ab)
         /// </summary>
-        public DbSet<User> Users { get; set; }
+        public DbSet<User>? Users { get; set; }
 
         #endregion
 
         #region Setup/Teardown
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FsContext"/> class
-        /// </summary>
-        public FsContext() :
-            base()
-        {
-            OnCreated();
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="FsContext"/> class
         /// </summary>
         /// <param name="options">The options (ab)</param>
-        public FsContext(DbContextOptions<FsContext> options) :
-            base(options)
+        public FsContext(DbContextOptions<FsContext> options) : base(options)
         {
-            OnCreated();
+            Database.EnsureCreated();
         }
 
         #endregion
-
-        #region Override OnConfiguring
-
-        /// <summary>
-        /// Ons the configuring using the specified options builder (a. beging, 21.05.2022)
-        /// </summary>
-        /// <param name="optionsBuilder">The options builder</param>
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            if (!optionsBuilder.IsConfigured ||
-                (!optionsBuilder.Options.Extensions.OfType<RelationalOptionsExtension>().Any(ext => !string.IsNullOrEmpty(ext.ConnectionString) || ext.Connection != null) &&
-                 !optionsBuilder.Options.Extensions.Any(ext => !(ext is RelationalOptionsExtension) && !(ext is CoreOptionsExtension))))
-            {
-            }
-
-            base.OnConfiguring(optionsBuilder);
-        }
-
-        #endregion
-
+        
         #region Public Method HasChanges
 
         /// <summary>
@@ -79,19 +50,7 @@ namespace FoodsharingSiegen.Server.Data
         /// <returns>The bool</returns>
         public bool HasChanges()
         {
-            return ChangeTracker.Entries().Any(e => e.State == Microsoft.EntityFrameworkCore.EntityState.Added || e.State == Microsoft.EntityFrameworkCore.EntityState.Modified || e.State == Microsoft.EntityFrameworkCore.EntityState.Deleted);
-        }
-
-        #endregion
-
-        #region Private Method OnCreated
-
-        /// <summary>
-        /// Ons the created (a. beging, 21.05.2022)
-        /// </summary>
-        private void OnCreated()
-        {
-            // Database.EnsureCreated();
+            return ChangeTracker.Entries().Any(e => e.State is EntityState.Added or EntityState.Modified or EntityState.Deleted);
         }
 
         #endregion