diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/AbpDeskConsoleDemoModule.cs b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/AbpDeskConsoleDemoModule.cs
index 49af835047..466cc5c7e8 100644
--- a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/AbpDeskConsoleDemoModule.cs
+++ b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk/ConsoleDemo/AbpDeskConsoleDemoModule.cs
@@ -16,10 +16,12 @@ namespace AbpDesk.ConsoleDemo
         {
             var configuration = BuildConfiguration();
 
+            //Configure DbConnectionOptions by configuration file (appsettings.json)
             services.Configure<DbConnectionOptions>(configuration);
 
             services.Configure<AbpDbContextOptions>(options =>
             {
+                //Configures all dbcontextes to use Sql Server with calculated connection string
                 options.Configure(context =>
                 {
                     context.DbContextOptions.UseSqlServer(context.ConnectionString);
diff --git a/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskDbContext.cs b/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskDbContext.cs
index d1b569a17d..e22dc2d1e4 100644
--- a/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskDbContext.cs
+++ b/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskDbContext.cs
@@ -16,6 +16,8 @@ namespace AbpDesk.EntityFrameworkCore
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
+            //TODO: Use different classes to map each entity type?
+
             modelBuilder.Entity<Ticket>(builder =>
             {
                 builder.ToTable("DskTickets");
diff --git a/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskEntityFrameworkCoreModule.cs b/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskEntityFrameworkCoreModule.cs
index 8dce8ac522..bd7fabdd18 100644
--- a/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskEntityFrameworkCoreModule.cs
+++ b/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk/EntityFrameworkCore/AbpDeskEntityFrameworkCoreModule.cs
@@ -9,9 +9,10 @@ namespace AbpDesk.EntityFrameworkCore
     {
         public override void ConfigureServices(IServiceCollection services)
         {
-            services.AddAssemblyOf<AbpDeskEntityFrameworkCoreModule>();
             services.AddAbpDbContext<AbpDeskDbContext>();
-            services.AddDefaultEfCoreRepositories<AbpDeskDbContext>(); //TODO: Move this into AddAbpDbContext as option
+            services.AddDefaultEfCoreRepositories<AbpDeskDbContext>(); //TODO: Move this into AddAbpDbContext as an option
+
+            services.AddAssemblyOf<AbpDeskEntityFrameworkCoreModule>();
         }
     }
 }
diff --git a/src/AbpDesk/AbpDesk.UI/AbpDeskWebAppModule.cs b/src/AbpDesk/AbpDesk.UI/AbpDeskWebAppModule.cs
index de74eadf15..0aa9edcea6 100644
--- a/src/AbpDesk/AbpDesk.UI/AbpDeskWebAppModule.cs
+++ b/src/AbpDesk/AbpDesk.UI/AbpDeskWebAppModule.cs
@@ -1,8 +1,6 @@
-using System.IO;
-using AbpDesk.EntityFrameworkCore;
+using AbpDesk.EntityFrameworkCore;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -25,23 +23,22 @@ namespace AbpDesk
         {
             var hostingEnvironment = services.GetSingletonInstance<IHostingEnvironment>();
 
+            //TODO: This code is pretty similar to AbpDeskConsoleDemoModule, so use a common code!
+
             var configuration = BuildConfiguration(hostingEnvironment);
 
+            //Configure DbConnectionOptions by configuration file (appsettings.json)
             services.Configure<DbConnectionOptions>(configuration);
 
             services.Configure<AbpDbContextOptions>(options =>
             {
+                //Configures all dbcontextes to use Sql Server with calculated connection string
                 options.Configure(context =>
                 {
                     context.DbContextOptions.UseSqlServer(context.ConnectionString);
                 });
             });
 
-            services.AddDbContext<AbpDeskDbContext>(options =>
-            {
-                options.UseSqlServer("Server=localhost;Database=AbpDesk;Trusted_Connection=True;");
-            });
-
             services.AddMvc();
         }