diff --git a/CrmCodeGenerator.VSPackage/CrmCodeGenerator.VSPackagePackage.cs b/CrmCodeGenerator.VSPackage/CrmCodeGenerator.VSPackagePackage.cs
index f20c120..aa4bd42 100644
--- a/CrmCodeGenerator.VSPackage/CrmCodeGenerator.VSPackagePackage.cs
+++ b/CrmCodeGenerator.VSPackage/CrmCodeGenerator.VSPackagePackage.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Windows;
 using CrmPluginEntities;
 using CrmPluginRegExt.VSPackage.Dialogs;
@@ -18,6 +19,7 @@
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Yagasoft.Libraries.Common;
+using Task = System.Threading.Tasks.Task;
 
 #endregion
 
@@ -34,17 +36,17 @@ namespace CrmPluginRegExt.VSPackage
 	/// </summary>
 	// This attribute tells the PkgDef creation utility (CreatePkgDef.exe) that this class is
 		// a package.
-		[PackageRegistration(UseManagedResourcesOnly = true)]
+		[PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
 		// This attribute is used to register the information needed to show this package
 		// in the Help/About dialog of Visual Studio.
 		[InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)]
 		//this causes the class to load when VS starts [ProvideAutoLoad("ADFC4E64-0397-11D1-9F4E-00A0C911004F")]
-		[ProvideAutoLoad(VSConstants.UICONTEXT.SolutionHasSingleProject_string)]
-		[ProvideAutoLoad(VSConstants.UICONTEXT.SolutionHasMultipleProjects_string)]
+		//[ProvideAutoLoad(VSConstants.UICONTEXT.SolutionHasSingleProject_string)]
+		//[ProvideAutoLoad(VSConstants.UICONTEXT.SolutionHasMultipleProjects_string)]
 		// This attribute is needed to let the shell know that this package exposes some menus.
 		[ProvideMenuResource("Menus.ctmenu", 1)]
 		[Guid(GuidList.guidPluginRegExt_VSPackagePkgString)]
-	public sealed class CrmPluginRegExt_VSPackagePackage : Package, IVsSolutionEvents3
+	public sealed class CrmPluginRegExt_VSPackagePackage : AsyncPackage, IVsSolutionEvents3
 	{
 		/// <summary>
 		///     Default constructor of the package.
@@ -67,8 +69,10 @@ public CrmPluginRegExt_VSPackagePackage()
 		///     Initialization of the package; this method is called right after the package is sited, so this is the place
 		///     where you can put all the initialization code that rely on services provided by VisualStudio.
 		/// </summary>
-		protected override void Initialize()
+		protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
 		{
+			await JoinableTaskFactory.SwitchToMainThreadAsync(DisposalToken);
+
 			AssemblyHelpers.RedirectAssembly("Microsoft.Xrm.Sdk", new Version("9.0.0.0"), "31bf3856ad364e35");
 			AssemblyHelpers.RedirectAssembly("Microsoft.Xrm.Sdk.Deployment", new Version("9.0.0.0"), "31bf3856ad364e35");
 			AssemblyHelpers.RedirectAssembly("Microsoft.Xrm.Tooling.Connector", new Version("4.0.0.0"), "31bf3856ad364e35");
@@ -77,34 +81,76 @@ protected override void Initialize()
 			AssemblyHelpers.RedirectAssembly("Newtonsoft.Json", new Version("10.0.0.0"), "30ad4fe6b2a6aeed");
 			
 			Debug.WriteLine(string.Format(CultureInfo.CurrentCulture, "Entering Initialize() of: {0}", ToString()));
-			base.Initialize();
+			await base.InitializeAsync(cancellationToken, progress);
 
 			// Add our command handlers for menu (commands must exist in the .vsct file)
-			var mcs = GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
-
-			if (null != mcs)
+			if (await GetServiceAsync(typeof (IMenuCommandService)) is OleMenuCommandService mcs)
 			{
 				var registerCmd = new CommandID(GuidList.guidPluginRegExt_VSPackageCmdSet,
 					(int)PkgCmdIDList.cmdidRegisterModifyPlugin);
-				var registerItem = new MenuCommand(RegisterModifyPluginCallback, registerCmd);
+				var registerItem = new MenuCommand(
+					async (o, e) =>
+						  {
+							  try
+							  {
+								  await RegisterModifyPluginCallbackAsync(o, e);
+							  }
+							  catch (Exception ex)
+							  {
+								  MessageBox.Show(ex.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+							  }
+						  }, registerCmd);
 				mcs.AddCommand(registerItem);
 
 				var updateCmd = new CommandID(GuidList.guidPluginRegExt_VSPackageCmdSet, (int)PkgCmdIDList.cmdidUpdatePlugin);
-				var updateItem = new MenuCommand(UpdatePluginCallback, updateCmd);
+				var updateItem = new MenuCommand(
+					async (o, e) =>
+						  {
+							  try
+							  {
+								  await UpdatePluginCallbackAsync(o, e);
+							  }
+							  catch (Exception ex)
+							  {
+								  MessageBox.Show(ex.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+							  }
+						  }, updateCmd);
 				mcs.AddCommand(updateItem);
 
 				var multiRegisterCmd = new CommandID(GuidList.guidPluginRegExt_VSPackageCmdSet,
 					(int)PkgCmdIDList.cmdidMultiRegisterModifyPlugin);
-				var multiRegisterItem = new MenuCommand(RegisterModifyPluginCallback, multiRegisterCmd);
+				var multiRegisterItem = new MenuCommand(
+					async (o, e) =>
+						  {
+							  try
+							  {
+								  await RegisterModifyPluginCallbackAsync(o, e);
+							  }
+							  catch (Exception ex)
+							  {
+								  MessageBox.Show(ex.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+							  }
+						  }, multiRegisterCmd);
 				mcs.AddCommand(multiRegisterItem);
 
 				var multiUpdateCmd = new CommandID(GuidList.guidPluginRegExt_VSPackageCmdSet,
 					(int)PkgCmdIDList.cmdidMultiUpdatePlugin);
-				var multiUpdateItem = new MenuCommand(UpdatePluginCallback, multiUpdateCmd);
+				var multiUpdateItem = new MenuCommand(
+					async (o, e) =>
+						  {
+							  try
+							  {
+								  await UpdatePluginCallbackAsync(o, e);
+							  }
+							  catch (Exception ex)
+							  {
+								  MessageBox.Show(ex.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+							  }
+						  }, multiUpdateCmd);
 				mcs.AddCommand(multiUpdateItem);
 			}
 
-			AdviseSolutionEvents();
+			await AdviseSolutionEventsAsync();
 		}
 
 		protected override void Dispose(bool disposing)
@@ -117,16 +163,24 @@ protected override void Dispose(bool disposing)
 		private IVsSolution solution = null;
 		private uint _handleCookie;
 
-		private void AdviseSolutionEvents()
+		private async Task AdviseSolutionEventsAsync()
 		{
+			await JoinableTaskFactory.SwitchToMainThreadAsync(DisposalToken);
+
 			UnadviseSolutionEvents();
 
-			solution = GetService(typeof(SVsSolution)) as IVsSolution;
-			solution?.AdviseSolutionEvents(this, out _handleCookie);
+			solution = await GetServiceAsync(typeof (SVsSolution)) as IVsSolution;
+
+			if (solution != null)
+			{
+				solution.AdviseSolutionEvents(this, out _handleCookie);
+			}
 		}
 
 		private void UnadviseSolutionEvents()
 		{
+			ThreadHelper.ThrowIfNotOnUIThread();
+
 			if (solution != null)
 			{
 				if (_handleCookie != uint.MaxValue)
@@ -146,8 +200,10 @@ private void UnadviseSolutionEvents()
 		///     See the Initialize method to see how the menu item is associated to this function using
 		///     the OleMenuCommandService service and the MenuCommand class.
 		/// </summary>
-		private void RegisterModifyPluginCallback(object sender, EventArgs args)
+		private async Task RegisterModifyPluginCallbackAsync(object sender, EventArgs args)
 		{
+			await JoinableTaskFactory.SwitchToMainThreadAsync(DisposalToken);
+
 			try
 			{
 				var session = Math.Abs(DateTime.Now.ToString(CultureInfo.CurrentCulture).GetHashCode());
@@ -163,7 +219,7 @@ private void RegisterModifyPluginCallback(object sender, EventArgs args)
 				foreach (var project in selected)
 				{
 					Status.Update($">>> Processing project: {DteHelper.GetProjectName(project)} <<<");
-					RegisterModifyPlugin(project);
+					await RegisterModifyPluginAsync(project);
 					Status.Update($"^^^ Finished processing project: {DteHelper.GetProjectName(project)} ^^^");
 				}
 
@@ -190,15 +246,17 @@ private void RegisterModifyPluginCallback(object sender, EventArgs args)
 			}
 		}
 
-		private void RegisterModifyPlugin(Project project)
+		private async Task RegisterModifyPluginAsync(Project project)
 		{
 			DteHelper.SetCurrentProject(project);
-			var regWindow = new Login(GetService(typeof(SDTE)) as DTE2);
+			var regWindow = new Login(await GetServiceAsync(typeof(SDTE)) as DTE2);
 			regWindow.ShowModal();
 		}
 
-		private void UpdatePluginCallback(object sender, EventArgs args)
+		private async Task UpdatePluginCallbackAsync(object sender, EventArgs args)
 		{
+			await JoinableTaskFactory.SwitchToMainThreadAsync(DisposalToken);
+
 			try
 			{
 				var session = Math.Abs(DateTime.Now.ToString(CultureInfo.CurrentCulture).GetHashCode());
@@ -212,7 +270,7 @@ private void UpdatePluginCallback(object sender, EventArgs args)
 				foreach (var project in DteHelper.GetSelectedProjects())
 				{
 					Status.Update($">>> Processing project: {DteHelper.GetProjectName(project)} <<<");
-					UpdatePlugin(project);
+					await UpdatePluginAsync(project);
 					Status.Update($"^^^ Finished processing project: {DteHelper.GetProjectName(project)} ^^^");
 				}
 
@@ -239,7 +297,7 @@ private void UpdatePluginCallback(object sender, EventArgs args)
 			}
 		}
 
-		private void UpdatePlugin(Project project)
+		private async Task UpdatePluginAsync(Project project)
 		{
 			DteHelper.SetCurrentProject(project);
 
@@ -249,7 +307,7 @@ private void UpdatePlugin(Project project)
 			// if no connection info, then it's a new run
 			if (settings.ConnectionString.IsEmpty())
 			{
-				RegisterModifyPlugin(project);
+				await RegisterModifyPluginAsync(project);
 			}
 			else
 			{
@@ -287,7 +345,7 @@ private void UpdatePlugin(Project project)
 				else
 				{
 					// else open dialogue
-					RegisterModifyPlugin(project);
+					await RegisterModifyPluginAsync(project);
 				}
 			}
 		}
diff --git a/CrmCodeGenerator.VSPackage/CrmPluginRegExt.VSPackage.csproj b/CrmCodeGenerator.VSPackage/CrmPluginRegExt.VSPackage.csproj
index 6653605..3adb4b8 100644
--- a/CrmCodeGenerator.VSPackage/CrmPluginRegExt.VSPackage.csproj
+++ b/CrmCodeGenerator.VSPackage/CrmPluginRegExt.VSPackage.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <Import Project="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.2.9.4\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.2.9.4\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props')" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
@@ -75,16 +76,24 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\lib\CrmPluginEntities.dll</HintPath>
     </Reference>
-    <Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\EnvDTE.8.0.2\lib\net10\EnvDTE.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="envdte100, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+    <Reference Include="EnvDTE100, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\EnvDTE100.10.0.3\lib\net20\EnvDTE100.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\EnvDTE80.8.0.3\lib\net10\EnvDTE80.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="EnvDTE90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\EnvDTE90.9.0.3\lib\net10\EnvDTE90.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="EnvDTE90a, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\EnvDTE90a.9.0.3\lib\net10\EnvDTE90a.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.Crm.Sdk.Proxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -241,87 +250,188 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\Microsoft.VisualStudio.CommandBars.8.0.0.1\lib\net10\Microsoft.VisualStudio.CommandBars.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.ComponentModelHost.15.0.26228\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.CoreUtility.15.0.26228\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Debugger.Engine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Debugger.Engine.15.0.26228\lib\net45\Microsoft.VisualStudio.Debugger.Engine.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Debugger.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Debugger.Interop.10.0.10.0.30320\lib\net20\Microsoft.VisualStudio.Debugger.Interop.10.0.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Debugger.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Debugger.Interop.11.0.11.0.50728\lib\net20\Microsoft.VisualStudio.Debugger.Interop.11.0.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Debugger.Interop.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Debugger.Interop.12.0.12.0.21006\lib\net20\Microsoft.VisualStudio.Debugger.Interop.12.0.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Debugger.Interop.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Debugger.Interop.14.0.14.3.25408\lib\net20\Microsoft.VisualStudio.Debugger.Interop.14.0.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Debugger.Interop.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Debugger.Interop.15.0.15.0.26228\lib\Microsoft.VisualStudio.Debugger.Interop.15.0.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Debugger.InteropA, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\Microsoft.VisualStudio.Debugger.InteropA.9.0.21023\lib\net10\Microsoft.VisualStudio.Debugger.InteropA.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Designer.Interfaces, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\Microsoft.VisualStudio.Designer.Interfaces.1.1.4323\lib\net11\Microsoft.VisualStudio.Designer.Interfaces.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.GraphModel, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\VSSDK.GraphModel.11.0.4\lib\net45\Microsoft.VisualStudio.GraphModel.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="Microsoft.VisualStudio.DpiAwareness, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.DpiAwareness.6.0.28727\lib\net46\Microsoft.VisualStudio.DpiAwareness.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Editor, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Editor.15.0.26228\lib\net45\Microsoft.VisualStudio.Editor.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.ImageCatalog, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.ImageCatalog.15.0.26228\lib\net45\Microsoft.VisualStudio.ImageCatalog.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Imaging, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Imaging.15.0.26228\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime.14.3.26930\lib\net20\Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Language.Intellisense, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Language.Intellisense.15.0.26228\lib\net45\Microsoft.VisualStudio.Language.Intellisense.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Language.NavigateTo.Interfaces.15.0.26228\lib\net45\Microsoft.VisualStudio.Language.NavigateTo.Interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Language.StandardClassification, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Language.StandardClassification.15.0.26228\lib\net45\Microsoft.VisualStudio.Language.StandardClassification.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\VSSDK.OLE.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
-      <Private>True</Private>
-      <Private>False</Private>
+      <HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6071\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Services.Client, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Services.InteractiveClient.14.95.3\lib\net45\Microsoft.VisualStudio.Services.Client.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.VisualStudio.Package.LanguageService.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Package.LanguageService.15.0.15.0.26228\lib\Microsoft.VisualStudio.Package.LanguageService.15.0.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Services.Common, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Services.Client.14.95.3\lib\net45\Microsoft.VisualStudio.Services.Common.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.VisualStudio.ProjectAggregator, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.ProjectAggregator.8.0.50728\lib\net20\Microsoft.VisualStudio.ProjectAggregator.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Services.WebApi, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.VisualStudio.Services.Client.14.95.3\lib\net45\Microsoft.VisualStudio.Services.WebApi.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.VisualStudio.Setup.Configuration.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Setup.Configuration.Interop.1.16.30\lib\net35\Microsoft.VisualStudio.Setup.Configuration.Interop.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\VSSDK.Shell.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.12.0.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="Microsoft.VisualStudio.Shell.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.15.0.15.0.26228\lib\Microsoft.VisualStudio.Shell.15.0.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\VSSDK.Shell.Immutable.10.10.0.4\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
-      <Private>True</Private>
-      <Private>False</Private>
+    <Reference Include="Microsoft.VisualStudio.Shell.Design, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Design.15.0.26228\lib\net45\Microsoft.VisualStudio.Shell.Design.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\VSSDK.Shell.Immutable.11.11.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
-      <Private>True</Private>
-      <Private>False</Private>
+    <Reference Include="Microsoft.VisualStudio.Shell.Embeddable, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Embeddable.15.0.26228\lib\net45\Microsoft.VisualStudio.Shell.Embeddable.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\VSSDK.Shell.Immutable.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath>
-      <Private>True</Private>
-      <Private>False</Private>
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26228\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\VSSDK.Shell.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
-      <Private>True</Private>
-      <Private>False</Private>
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6072\lib\net11\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30320\lib\net20\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61031\lib\net20\Microsoft.VisualStudio.Shell.Interop.11.0.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30111\lib\net20\Microsoft.VisualStudio.Shell.Interop.12.0.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.12.1.DesignTime, Version=12.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.12.1.DesignTime.12.1.30329.0\lib\net20\Microsoft.VisualStudio.Shell.Interop.12.1.DesignTime.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime.14.3.26929\lib\net20\Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime.15.0.26201\lib\Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\VSSDK.Shell.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
-      <Private>True</Private>
-      <Private>False</Private>
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50728\lib\net11\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\VSSDK.Shell.Interop.9.9.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
-      <Private>True</Private>
-      <Private>False</Private>
+      <HintPath>..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TaskRunnerExplorer.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.TaskRunnerExplorer.14.0.14.0.0\lib\net40\Microsoft.VisualStudio.TaskRunnerExplorer.14.0.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Text.Data, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Text.Data.15.0.26228\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Text.Logic, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Text.Logic.15.0.26228\lib\net45\Microsoft.VisualStudio.Text.Logic.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Text.UI, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Text.UI.15.0.26228\lib\net45\Microsoft.VisualStudio.Text.UI.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Text.UI.Wpf.15.0.26228\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\VSSDK.TextManager.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
-      <Private>True</Private>
-      <Private>False</Private>
+      <HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6071\lib\net11\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TextManager.Interop.12.1.DesignTime, Version=12.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.12.1.DesignTime.12.1.30330\lib\net20\Microsoft.VisualStudio.TextManager.Interop.12.1.DesignTime.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <HintPath>..\packages\VSSDK.TextManager.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
-      <Private>True</Private>
-      <Private>False</Private>
+      <HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50728\lib\net11\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TextTemplating.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.TextTemplating.15.0.15.0.26228\lib\net45\Microsoft.VisualStudio.TextTemplating.15.0.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TextTemplating.Interfaces.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.TextTemplating.Interfaces.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.TextTemplating.Interfaces.10.0.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TextTemplating.Interfaces.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.TextTemplating.Interfaces.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.TextTemplating.Interfaces.11.0.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Threading, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\VSSDK.Threading.12.0.4\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="Microsoft.VisualStudio.TextTemplating.Interfaces.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.TextTemplating.Interfaces.15.0.15.0.26228\lib\net45\Microsoft.VisualStudio.TextTemplating.Interfaces.15.0.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TextTemplating.VSHost.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.TextTemplating.VSHost.15.0.15.0.26228\lib\Microsoft.VisualStudio.TextTemplating.VSHost.15.0.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Threading, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Threading.15.0.240\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Utilities.15.0.26228\lib\net46\Microsoft.VisualStudio.Utilities.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Validation, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Validation.15.0.82\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Web.BrowserLink.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.VisualStudio.Web.BrowserLink.12.0.12.0.0\lib\net40\Microsoft.VisualStudio.Web.BrowserLink.12.0.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.1.7.0.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Xrm.Client, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Yagasoft.Libraries.EnhancedOrgService.5.3.2\lib\net462\Microsoft.Xrm.Client.dll</HintPath>
+      <HintPath>..\packages\Yagasoft.Libraries.EnhancedOrgService.6.1.4\lib\net462\Microsoft.Xrm.Client.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Xrm.Sdk, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.25\lib\net462\Microsoft.Xrm.Sdk.dll</HintPath>
@@ -341,9 +451,17 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\stdole.7.0.3302\lib\net10\stdole.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Activities" />
     <Reference Include="System.Activities.Presentation" />
+    <Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
@@ -384,6 +502,38 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="UIAutomationTypes" />
+    <Reference Include="VSLangProj, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\VSLangProj.7.0.3301\lib\net10\VSLangProj.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="VSLangProj100, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\VSLangProj100.10.0.30320\lib\net20\VSLangProj100.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="VSLangProj110, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\VSLangProj110.11.0.61031\lib\net20\VSLangProj110.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="VSLangProj140, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\VSLangProj140.14.0.25030\lib\net20\VSLangProj140.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="VSLangProj150, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\VSLangProj150.15.0.26229\lib\net20\VSLangProj150.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="VSLangProj2, Version=7.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\VSLangProj2.7.0.5001\lib\net11\VSLangProj2.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="VSLangProj80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\VSLangProj80.8.0.50728\lib\net11\VSLangProj80.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="VSLangProj90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\VSLangProj90.9.0.30730\lib\net10\VSLangProj90.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="Xceed.Wpf.AvalonDock, Version=2.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
       <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
@@ -409,23 +559,14 @@
       <HintPath>..\packages\Extended.Wpf.Toolkit.2.8\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Yagasoft.Libraries.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d99f90f6e31ed2df, processorArchitecture=MSIL">
-      <HintPath>..\packages\Yagasoft.Libraries.Common.2.4.5\lib\net462\Yagasoft.Libraries.Common.dll</HintPath>
+    <Reference Include="Yagasoft.Libraries.Common, Version=3.3.3.0, Culture=neutral, PublicKeyToken=d99f90f6e31ed2df, processorArchitecture=MSIL">
+      <HintPath>..\packages\Yagasoft.Libraries.Common.3.4.1\lib\net462\Yagasoft.Libraries.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Yagasoft.Libraries.EnhancedOrgService, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d99f90f6e31ed2df, processorArchitecture=MSIL">
-      <HintPath>..\packages\Yagasoft.Libraries.EnhancedOrgService.5.3.2\lib\net462\Yagasoft.Libraries.EnhancedOrgService.dll</HintPath>
+    <Reference Include="Yagasoft.Libraries.EnhancedOrgService, Version=6.1.3.0, Culture=neutral, PublicKeyToken=d99f90f6e31ed2df, processorArchitecture=MSIL">
+      <HintPath>..\packages\Yagasoft.Libraries.EnhancedOrgService.6.1.4\lib\net462\Yagasoft.Libraries.EnhancedOrgService.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <COMReference Include="Microsoft.VisualStudio.CommandBars">
-      <Guid>{1CBA492E-7263-47BB-87FE-639000619B15}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
     <COMReference Include="stdole">
       <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
       <VersionMajor>2</VersionMajor>
@@ -591,6 +732,14 @@
   <ItemGroup>
     <Folder Include="Scripts\" />
   </ItemGroup>
+  <ItemGroup>
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.2.9.4\analyzers\dotnet\cs\Microsoft.CodeAnalysis.BannedApiAnalyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.2.9.4\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.BannedApiAnalyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.3.14\analyzers\cs\Microsoft.VisualStudio.SDK.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.3.14\analyzers\cs\Microsoft.VisualStudio.SDK.Analyzers.dll" />
+    <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.3.52\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.3.52\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.dll" />
+  </ItemGroup>
   <PropertyGroup>
     <UseCodebase>true</UseCodebase>
   </PropertyGroup>
@@ -602,7 +751,14 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Microsoft.TeamFoundationServer.ExtendedClient.14.95.3\build\Microsoft.TeamFoundationServer.ExtendedClient.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.TeamFoundationServer.ExtendedClient.14.95.3\build\Microsoft.TeamFoundationServer.ExtendedClient.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.2.9.4\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.BannedApiAnalyzers.2.9.4\build\Microsoft.CodeAnalysis.BannedApiAnalyzers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.27\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.27\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.3.52\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.3.52\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.3.14\build\Microsoft.VisualStudio.SDK.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.3.14\build\Microsoft.VisualStudio.SDK.Analyzers.targets'))" />
   </Target>
+  <Import Project="..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.27\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.27\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" />
+  <Import Project="..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.3.52\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Threading.Analyzers.16.3.52\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
+  <Import Project="..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.3.14\build\Microsoft.VisualStudio.SDK.Analyzers.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SDK.Analyzers.16.3.14\build\Microsoft.VisualStudio.SDK.Analyzers.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/CrmCodeGenerator.VSPackage/Dialogs/Login.xaml b/CrmCodeGenerator.VSPackage/Dialogs/Login.xaml
index 06d37f7..96d0b36 100644
--- a/CrmCodeGenerator.VSPackage/Dialogs/Login.xaml
+++ b/CrmCodeGenerator.VSPackage/Dialogs/Login.xaml
@@ -1,8 +1,8 @@
 <ui:DialogWindow
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:vs_shell="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.12.0"
-    xmlns:ui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.12.0"
+    xmlns:vs_shell="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
+    xmlns:ui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
     xmlns:control="clr-namespace:CrmCodeGenerator.Controls;assembly=CrmCodeGenerator.Controls"
     xmlns:converter="clr-namespace:CrmPluginRegExt.VSPackage.Dialogs.Converters"
     xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
diff --git a/CrmCodeGenerator.VSPackage/Dialogs/Login.xaml.cs b/CrmCodeGenerator.VSPackage/Dialogs/Login.xaml.cs
index f60bdc3..b1e4be5 100644
--- a/CrmCodeGenerator.VSPackage/Dialogs/Login.xaml.cs
+++ b/CrmCodeGenerator.VSPackage/Dialogs/Login.xaml.cs
@@ -39,7 +39,7 @@ public partial class Login : INotifyPropertyChanged
 	{
 		#region Properties
 
-		private const string WindowTitle = "Plugin Registration Extension v2.2.4";
+		private const string WindowTitle = "Plugin Registration Extension v2.3.1";
 
 		private Settings settings;
 		private readonly SettingsArray settingsArray;
diff --git a/CrmCodeGenerator.VSPackage/Helpers/ConnectionHelper.cs b/CrmCodeGenerator.VSPackage/Helpers/ConnectionHelper.cs
index 11199ac..62162c5 100644
--- a/CrmCodeGenerator.VSPackage/Helpers/ConnectionHelper.cs
+++ b/CrmCodeGenerator.VSPackage/Helpers/ConnectionHelper.cs
@@ -79,11 +79,25 @@ internal static IEnhancedOrgService GetConnection(string connectionString, bool
 					Status.Update($"Creating connection to CRM ... ");
 					Status.Update($"Connection String:" + $" '{CrmHelpers.SecureConnectionString(connectionString)}'.");
 
-					service = EnhancedServiceHelper.GetPoolCaching(connectionString, 1,
-						new CachingParams { CacheScope = CacheScope.Service })
-						.GetService(5);
-					CacheHelpers.AddToMemCache(memKey, service);
-						
+					service = EnhancedServiceHelper.GetCachingPoolingService(
+						new ServiceParams
+						{
+							ConnectionParams =
+								new ConnectionParams
+								{
+									ConnectionString = connectionString
+								},
+							PoolParams =
+								new PoolParams
+								{
+									PoolSize = 5,
+									DequeueTimeout = TimeSpan.FromSeconds(20)
+								},
+							CachingParams = new CachingParams { CacheScope = CacheScope.Service },
+							OperationHistoryLimit = 1
+						});
+					CacheHelpers.AddToMemCache(memKey, service, DateTime.Now.AddYears(1));
+					
 					Status.Update($"Created connection.");
 
 					return service;
diff --git a/CrmCodeGenerator.VSPackage/Properties/AssemblyInfo.cs b/CrmCodeGenerator.VSPackage/Properties/AssemblyInfo.cs
index 1959e82..267bb44 100644
--- a/CrmCodeGenerator.VSPackage/Properties/AssemblyInfo.cs
+++ b/CrmCodeGenerator.VSPackage/Properties/AssemblyInfo.cs
@@ -30,8 +30,8 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.2.4.0")]
-[assembly: AssemblyFileVersion("2.2.4.0")]
+[assembly: AssemblyVersion("2.3.1.0")]
+[assembly: AssemblyFileVersion("2.3.1.0")]
 
 
 [assembly: ProvideBindingRedirection(AssemblyName = "Microsoft.Xrm.Sdk",
@@ -57,3 +57,7 @@
 [assembly: ProvideBindingRedirection(AssemblyName = "Newtonsoft.Json",
 	CodeBase = @"$PackageFolder$\Newtonsoft.Json.dll",
 	OldVersionLowerBound = "0.0.0.0", OldVersionUpperBound = "10.0.0.0")]
+
+[assembly: ProvideBindingRedirection(AssemblyName = "Yagasoft.Libraries.Common",
+	CodeBase = @"$PackageFolder$\Yagasoft.Libraries.Common.dll",
+	OldVersionLowerBound = "0.0.0.0", OldVersionUpperBound = "3.0.0.0")]
diff --git a/CrmCodeGenerator.VSPackage/packages.config b/CrmCodeGenerator.VSPackage/packages.config
index 87ded73..b2452e4 100644
--- a/CrmCodeGenerator.VSPackage/packages.config
+++ b/CrmCodeGenerator.VSPackage/packages.config
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="EnvDTE" version="8.0.2" targetFramework="net462" />
+  <package id="EnvDTE100" version="10.0.3" targetFramework="net462" />
+  <package id="EnvDTE80" version="8.0.3" targetFramework="net462" />
+  <package id="EnvDTE90" version="9.0.3" targetFramework="net462" />
+  <package id="EnvDTE90a" version="9.0.3" targetFramework="net462" />
   <package id="Extended.Wpf.Toolkit" version="2.8" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.2" targetFramework="net452" />
+  <package id="Microsoft.CodeAnalysis.BannedApiAnalyzers" version="2.9.4" targetFramework="net462" developmentDependency="true" />
   <package id="Microsoft.CrmSdk.CoreAssemblies" version="9.0.2.25" targetFramework="net462" />
   <package id="Microsoft.CrmSdk.Deployment" version="9.0.2.25" targetFramework="net462" />
   <package id="Microsoft.CrmSdk.Workflow" version="9.0.2.25" targetFramework="net462" />
@@ -11,33 +17,81 @@
   <package id="Microsoft.Rest.ClientRuntime" version="2.3.20" targetFramework="net462" />
   <package id="Microsoft.TeamFoundationServer.Client" version="14.95.3" targetFramework="net452" />
   <package id="Microsoft.TeamFoundationServer.ExtendedClient" version="14.95.3" targetFramework="net452" />
+  <package id="Microsoft.VisualStudio.CommandBars" version="8.0.0.1" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.ComponentModelHost" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Debugger.Engine" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Debugger.Interop.10.0" version="10.0.30320" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Debugger.Interop.11.0" version="11.0.50728" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Debugger.Interop.12.0" version="12.0.21006" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Debugger.Interop.14.0" version="14.3.25408" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Debugger.Interop.15.0" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Debugger.InteropA" version="9.0.21023" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Designer.Interfaces" version="1.1.4323" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.DpiAwareness" version="6.0.28727" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Editor" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.ImageCatalog" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Imaging" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" version="14.3.26930" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Language.Intellisense" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Language.StandardClassification" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6071" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Package.LanguageService.15.0" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.ProjectAggregator" version="8.0.50728" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.SDK" version="15.0.1" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.SDK.Analyzers" version="16.3.14" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.SDK.EmbedInteropTypes" version="15.0.27" targetFramework="net462" />
   <package id="Microsoft.VisualStudio.Services.Client" version="14.95.3" targetFramework="net452" />
   <package id="Microsoft.VisualStudio.Services.InteractiveClient" version="14.95.3" targetFramework="net452" />
+  <package id="Microsoft.VisualStudio.Setup.Configuration.Interop" version="1.16.30" targetFramework="net462" developmentDependency="true" />
+  <package id="Microsoft.VisualStudio.Shell.15.0" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Shell.Design" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Shell.Embeddable" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6072" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.10.0" version="10.0.30320" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.11.0" version="11.0.61031" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.12.0" version="12.0.30111" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.12.1.DesignTime" version="12.1.30329.0" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" version="14.3.26929" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.15.0.DesignTime" version="15.0.26201" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50728" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.TaskRunnerExplorer.14.0" version="14.0.0" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Text.Data" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Text.Logic" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Text.UI" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Text.UI.Wpf" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6071" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.TextManager.Interop.12.1.DesignTime" version="12.1.30330" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50728" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.TextTemplating.15.0" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.TextTemplating.Interfaces.10.0" version="10.0.30319" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.TextTemplating.Interfaces.11.0" version="11.0.50727" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.TextTemplating.Interfaces.15.0" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.TextTemplating.VSHost.15.0" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Threading" version="15.0.240" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Threading.Analyzers" version="16.3.52" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26228" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Validation" version="15.0.82" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Web.BrowserLink.12.0" version="12.0.0" targetFramework="net462" />
+  <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net462" />
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.7.0.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net462" />
-  <package id="nuget-bot.Microsoft.VisualStudio.Services.Common" version="12.0.21005.1" targetFramework="net45" />
+  <package id="stdole" version="7.0.3302" targetFramework="net462" />
+  <package id="System.Collections.Immutable" version="1.3.1" targetFramework="net462" />
+  <package id="System.ComponentModel.Composition" version="4.5.0" targetFramework="net462" />
   <package id="System.IdentityModel.Tokens.Jwt" version="4.0.0" targetFramework="net452" />
-  <package id="VSSDK.DTE" version="7.0.4" targetFramework="net452" />
-  <package id="VSSDK.GraphModel" version="11.0.4" targetFramework="net452" />
-  <package id="VSSDK.IDE" version="7.0.4" targetFramework="net452" />
-  <package id="VSSDK.IDE.10" version="10.0.4" targetFramework="net452" />
-  <package id="VSSDK.IDE.11" version="11.0.4" targetFramework="net452" />
-  <package id="VSSDK.IDE.12" version="12.0.4" targetFramework="net452" />
-  <package id="VSSDK.IDE.8" version="8.0.4" targetFramework="net452" />
-  <package id="VSSDK.IDE.9" version="9.0.4" targetFramework="net452" />
-  <package id="VSSDK.OLE.Interop" version="7.0.4" targetFramework="net452" />
-  <package id="VSSDK.Shell.12" version="12.0.4" targetFramework="net452" />
-  <package id="VSSDK.Shell.Immutable.10" version="10.0.4" targetFramework="net452" />
-  <package id="VSSDK.Shell.Immutable.11" version="11.0.4" targetFramework="net452" />
-  <package id="VSSDK.Shell.Immutable.12" version="12.0.4" targetFramework="net452" />
-  <package id="VSSDK.Shell.Interop" version="7.0.4" targetFramework="net452" />
-  <package id="VSSDK.Shell.Interop.8" version="8.0.4" targetFramework="net452" />
-  <package id="VSSDK.Shell.Interop.9" version="9.0.4" targetFramework="net452" />
-  <package id="VSSDK.TextManager.Interop" version="7.0.4" targetFramework="net452" />
-  <package id="VSSDK.TextManager.Interop.8" version="8.0.4" targetFramework="net452" />
-  <package id="VSSDK.Threading" version="12.0.4" targetFramework="net452" />
-  <package id="VSSDK.Threading.12" version="12.0.4" targetFramework="net452" />
+  <package id="VSLangProj" version="7.0.3301" targetFramework="net462" />
+  <package id="VSLangProj100" version="10.0.30320" targetFramework="net462" />
+  <package id="VSLangProj110" version="11.0.61031" targetFramework="net462" />
+  <package id="VSLangProj140" version="14.0.25030" targetFramework="net462" />
+  <package id="VSLangProj150" version="15.0.26229" targetFramework="net462" />
+  <package id="VSLangProj2" version="7.0.5001" targetFramework="net462" />
+  <package id="VSLangProj80" version="8.0.50728" targetFramework="net462" />
+  <package id="VSLangProj90" version="9.0.30730" targetFramework="net462" />
   <package id="WindowsAzure.ServiceBus" version="2.5.1.0" targetFramework="net452" />
-  <package id="Yagasoft.Libraries.Common" version="2.4.5" targetFramework="net462" developmentDependency="true" />
-  <package id="Yagasoft.Libraries.EnhancedOrgService" version="5.3.2" targetFramework="net462" developmentDependency="true" />
+  <package id="Yagasoft.Libraries.Common" version="3.4.1" targetFramework="net462" developmentDependency="true" />
+  <package id="Yagasoft.Libraries.EnhancedOrgService" version="6.1.4" targetFramework="net462" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/CrmCodeGenerator.VSPackage/source.extension.vsixmanifest b/CrmCodeGenerator.VSPackage/source.extension.vsixmanifest
index 16b145f..76ff157 100644
--- a/CrmCodeGenerator.VSPackage/source.extension.vsixmanifest
+++ b/CrmCodeGenerator.VSPackage/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="CrmPluginRegExt" Version="2.2.4" Language="en-US" Publisher="Ahmed Elsawalhy (Yagasoft.com)" />
+        <Identity Id="CrmPluginRegExt" Version="2.3.1" Language="en-US" Publisher="Ahmed Elsawalhy (Yagasoft.com)" />
         <DisplayName>Dynamics CRM - Plugin Registration Extension</DisplayName>
         <Description xml:space="preserve">Visual Studio extension that reduces the hassle of using the official plugin tool, so it is much easier and faster to update plugins.</Description>
         <MoreInfo>https://marketplace.visualstudio.com/items?itemName=Yagasoft.CrmPluginRegExt</MoreInfo>
@@ -12,7 +12,7 @@
         <Tags>dynamics,crm,plugin,register</Tags>
     </Metadata>
     <Installation InstalledByMsi="false">
-        <InstallationTarget Version="[12.0,)" Id="Microsoft.VisualStudio.Pro" />
+        <InstallationTarget Version="[15.0,)" Id="Microsoft.VisualStudio.Pro" />
     </Installation>
     <Dependencies>
         <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
diff --git a/README.md b/README.md
index 8eacc3f..13becaa 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![Join the chat at https://gitter.im/yagasoft/DynamicsCrm-PluginRegExtension](https://badges.gitter.im/yagasoft/DynamicsCrm-PluginRegExtension.svg)](https://gitter.im/yagasoft/DynamicsCrm-PluginRegExtension?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-### Version: 2.2.4
+### Version: 2.3.1
 ---
 
 A Visual Studio extension that reduces the hassle of using the official plugin tool, so it is much easier and faster to update plugins.
@@ -23,6 +23,9 @@ A Visual Studio extension that reduces the hassle of using the official plugin t
 
 ## Changes
 
+#### _v2.3.1 (2021-10-04)_
++ Improved: upgraded to VS Async API
++ Fixed: non-existent entities in settings persisting, causing error with 'generate cached'
 #### _v2.2.4 (2021-04-29)_
 + Improved: connection readiness performance
 #### _v2.2.3 (2020-12-08)_