diff --git a/DLLs/SQL2019/Reference/FromASFolder/Microsoft.DataWarehouse.Interfaces.AS.DLL b/DLLs/SQL2019/Reference/FromASFolder/Microsoft.DataWarehouse.Interfaces.AS.DLL
new file mode 100644
index 0000000..6d95aeb
Binary files /dev/null and b/DLLs/SQL2019/Reference/FromASFolder/Microsoft.DataWarehouse.Interfaces.AS.DLL differ
diff --git a/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.Interfaces.DLL b/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.Interfaces.DLL
index 6d95aeb..793a465 100644
Binary files a/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.Interfaces.DLL and b/DLLs/SQL2019/Reference/Microsoft.DataWarehouse.Interfaces.DLL differ
diff --git a/SQL2019_VS2017_BidsHelper.csproj b/SQL2019_VS2017_BidsHelper.csproj
index 26a4363..d512f94 100644
--- a/SQL2019_VS2017_BidsHelper.csproj
+++ b/SQL2019_VS2017_BidsHelper.csproj
@@ -745,6 +745,17 @@
       <Aliases>asAlias</Aliases>
       <Private>False</Private>
     </Reference>
+    <Reference Include="Microsoft.DataWarehouse.Interfaces, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>DLLs\SQL2019\Reference\Microsoft.DataWarehouse.Interfaces.DLL</HintPath>
+      <Aliases>sharedDataWarehouseInterfaces</Aliases>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.DataWarehouse.Interfaces.AS, Version=15.2.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>DLLs\SQL2019\Reference\FromASFolder\Microsoft.DataWarehouse.Interfaces.AS.DLL</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Aliases>asDataWarehouseInterfaces</Aliases>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="Microsoft.DataWarehouse.RS, Version=15.1.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <SpecificVersion>True</SpecificVersion>
       <HintPath>DLLs\SQL2019\Reference\Microsoft.DataWarehouse.RS.dll</HintPath>
@@ -833,7 +844,7 @@
     <Reference Include="Microsoft.SqlServer.DlgGrid, Version=15.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <SpecificVersion>True</SpecificVersion>
       <HintPath>DLLs\SQL2019\Reference\Microsoft.SqlServer.DlgGrid.dll</HintPath>
-      <Private>False</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.SqlServer.Dts.Design, Version=15.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <SpecificVersion>True</SpecificVersion>
@@ -897,12 +908,6 @@
       <HintPath>DLLs\SQL2019\Reference\Microsoft.DataWarehouse.DLL</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Microsoft.DataWarehouse.Interfaces, Version=15.1.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>DLLs\SQL2019\Reference\Microsoft.DataWarehouse.Interfaces.DLL</HintPath>
-      <Private>False</Private>
-      <Aliases>sharedDataWarehouseInterfaces</Aliases>
-    </Reference>
     <Reference Include="Microsoft.DataWarehouse.VsIntegration">
       <HintPath>DLLs\SQL2019\Reference\Microsoft.DataWarehouse.VsIntegration.DLL</HintPath>
       <Private>False</Private>
diff --git a/SSIS/VariablesWindowPlugin.cs b/SSIS/VariablesWindowPlugin.cs
index 06c090b..995b84e 100644
--- a/SSIS/VariablesWindowPlugin.cs
+++ b/SSIS/VariablesWindowPlugin.cs
@@ -108,7 +108,19 @@ private void HookupVariablesWindow(Window GotFocus)
                         continue;
                     }
 
-                    IDesignerToolWindowService service = (IDesignerToolWindowService)designer.GetService(typeof(IDesignerToolWindowService));
+
+                    package.Log.Debug(designer.GetType().FullName + " from " + designer.GetType().Assembly.Location);
+                    package.Log.Debug(typeof(IDesignerToolWindowService).FullName + " from " + typeof(IDesignerToolWindowService).Assembly.Location);
+                    var obj = designer.GetService(typeof(IDesignerToolWindowService));
+                    if (obj != null)
+                        package.Log.Debug(obj.GetType().FullName + " from " + obj.GetType().Assembly.Location);
+                    else
+                        package.Log.Debug("obj is null");
+
+
+
+
+                    IDesignerToolWindowService service = designer.GetService(typeof(IDesignerToolWindowService)) as IDesignerToolWindowService;
                     if (service == null) continue;
                     IDesignerToolWindow toolWindow = service.GetToolWindow(new Guid(SSIS_VARIABLES_TOOL_WINDOW_KIND), 0);
                     if (toolWindow == null) continue;
@@ -190,7 +202,8 @@ private void HookupVariablesWindow(Window GotFocus)
             }
             catch (Exception ex)
             {
-                MessageBox.Show(ex.Message + "\r\n\r\n" + ex.StackTrace, DefaultMessageBoxCaption, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                package.Log.Exception("Problem in HookupVariablesWindow", ex);
+                //MessageBox.Show(ex.Message + "\r\n\r\n" + ex.StackTrace, DefaultMessageBoxCaption, MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }