diff --git a/src/Web/Program.cs b/src/Web/Program.cs
index 1abbbcd..3aa1551 100644
--- a/src/Web/Program.cs
+++ b/src/Web/Program.cs
@@ -6,12 +6,13 @@ using Microsoft.eShopWeb.Infrastructure.Identity;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System;
+using System.Threading.Tasks;
 
 namespace Microsoft.eShopWeb.Web
 {
     public class Program
     {
-        public static void Main(string[] args)
+        public async static Task Main(string[] args)
         {
             var host = CreateWebHostBuilder(args)
                         .Build();
@@ -23,11 +24,10 @@ namespace Microsoft.eShopWeb.Web
                 try
                 {
                     var catalogContext = services.GetRequiredService<CatalogContext>();
-                    CatalogContextSeed.SeedAsync(catalogContext, loggerFactory)
-            .Wait();
+                    await CatalogContextSeed.SeedAsync(catalogContext, loggerFactory);
 
                     var userManager = services.GetRequiredService<UserManager<ApplicationUser>>();
-                    AppIdentityDbContextSeed.SeedAsync(userManager).Wait();
+                    await AppIdentityDbContextSeed.SeedAsync(userManager);
                 }
                 catch (Exception ex)
                 {
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 2fd5e10..0b8d16e 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -5,6 +5,7 @@
     <RootNamespace>Microsoft.eShopWeb.Web</RootNamespace>
     <UserSecretsId>aspnet-Web2-1FA3F72E-E7E3-4360-9E49-1CCCD7FE85F7</UserSecretsId>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>