diff --git a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs b/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs
index 72eb700..63d9951 100644
--- a/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs
+++ b/BismNormalizer/AlmToolkit/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.0.0.0")]
-[assembly: AssemblyFileVersion("5.0.0.0")]
+[assembly: AssemblyVersion("5.0.0.5")]
+[assembly: AssemblyFileVersion("5.0.0.5")]
diff --git a/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj b/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj
index 12ba628..0b12cae 100644
--- a/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj
+++ b/BismNormalizer/AlmToolkitSetup/AlmToolkitSetup.vdproj
@@ -1,4 +1,4 @@
-"DeployProject"
+"DeployProject"
 {
 "VSVersion" = "3:800"
 "ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}"
@@ -28,6 +28,12 @@
         "Entry"
         {
         "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12"
+        "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12"
         "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -40,12 +46,6 @@
         "Entry"
         {
         "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12"
-        "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_0182F649532C289AB58CA84091A3EF12"
         "OwnerKey" = "8:_3BA1BB04BE8689BEF79234210621C61F"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -286,6 +286,12 @@
         "Entry"
         {
         "MsmKey" = "8:_1B2251DD757994082D5D85D7C9A38F82"
+        "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_1B2251DD757994082D5D85D7C9A38F82"
         "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -297,12 +303,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_1B2251DD757994082D5D85D7C9A38F82"
-        "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_1BC4692718F94CD799480D14260E2A0D"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -514,6 +514,12 @@
         "Entry"
         {
         "MsmKey" = "8:_4126FF7CFF23C51CF812060FAEF25A8B"
+        "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_4126FF7CFF23C51CF812060FAEF25A8B"
         "OwnerKey" = "8:_7936400E6C154464B76D26251125123A"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -526,12 +532,6 @@
         "Entry"
         {
         "MsmKey" = "8:_4126FF7CFF23C51CF812060FAEF25A8B"
-        "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_4126FF7CFF23C51CF812060FAEF25A8B"
         "OwnerKey" = "8:_1B2251DD757994082D5D85D7C9A38F82"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -586,7 +586,7 @@
         "Entry"
         {
         "MsmKey" = "8:_45358853078CCAAEE2A91A8906056CBA"
-        "OwnerKey" = "8:_1B2251DD757994082D5D85D7C9A38F82"
+        "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -598,7 +598,7 @@
         "Entry"
         {
         "MsmKey" = "8:_45358853078CCAAEE2A91A8906056CBA"
-        "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
+        "OwnerKey" = "8:_1B2251DD757994082D5D85D7C9A38F82"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -958,6 +958,12 @@
         "Entry"
         {
         "MsmKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D"
+        "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D"
         "OwnerKey" = "8:_7936400E6C154464B76D26251125123A"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -969,12 +975,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D"
-        "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_738CADE5C72E4957B424B4876C213E89"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -1060,6 +1060,12 @@
         "Entry"
         {
         "MsmKey" = "8:_7C49A244BD86813B688A86097B64A4BB"
+        "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_7C49A244BD86813B688A86097B64A4BB"
         "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -1071,12 +1077,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_7C49A244BD86813B688A86097B64A4BB"
-        "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_7C66897615D04979AA00553FFBE9F869"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -1120,6 +1120,12 @@
         "Entry"
         {
         "MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979"
+        "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979"
         "OwnerKey" = "8:_7936400E6C154464B76D26251125123A"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -1132,12 +1138,6 @@
         "Entry"
         {
         "MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979"
-        "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_7FE319AF420BED1331D231C9E53A5979"
         "OwnerKey" = "8:_3BA1BB04BE8689BEF79234210621C61F"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -1216,7 +1216,7 @@
         "Entry"
         {
         "MsmKey" = "8:_8739CB29025E2803D7CB4F7DB8D81C86"
-        "OwnerKey" = "8:_6C32C0B25D537F51C10F96983F115068"
+        "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -1228,7 +1228,7 @@
         "Entry"
         {
         "MsmKey" = "8:_8739CB29025E2803D7CB4F7DB8D81C86"
-        "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
+        "OwnerKey" = "8:_6C32C0B25D537F51C10F96983F115068"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -1270,6 +1270,12 @@
         "Entry"
         {
         "MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC"
+        "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC"
         "OwnerKey" = "8:_7936400E6C154464B76D26251125123A"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -1281,12 +1287,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_8E074FE5AC5B455E0A4D2F176BA182EC"
-        "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_8E7031C309F44B62A6121024B815BC54"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -1294,7 +1294,7 @@
         "Entry"
         {
         "MsmKey" = "8:_8F22F57D649B23FCD9E63A0B6A908954"
-        "OwnerKey" = "8:_1B2251DD757994082D5D85D7C9A38F82"
+        "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -1306,7 +1306,7 @@
         "Entry"
         {
         "MsmKey" = "8:_8F22F57D649B23FCD9E63A0B6A908954"
-        "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
+        "OwnerKey" = "8:_1B2251DD757994082D5D85D7C9A38F82"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -1330,6 +1330,12 @@
         "Entry"
         {
         "MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA"
+        "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA"
         "OwnerKey" = "8:_7936400E6C154464B76D26251125123A"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -1341,12 +1347,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_90FAC219254FDDE26D273DDEF52262FA"
-        "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_93213405E7044D8389BE2C29A2EAFCD5"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -1654,6 +1654,12 @@
         "Entry"
         {
         "MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9"
+        "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9"
         "OwnerKey" = "8:_7936400E6C154464B76D26251125123A"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -1666,12 +1672,6 @@
         "Entry"
         {
         "MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9"
-        "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_BE16C201755759965787B7DDD5BFF7B9"
         "OwnerKey" = "8:_1B2251DD757994082D5D85D7C9A38F82"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -1714,6 +1714,12 @@
         "Entry"
         {
         "MsmKey" = "8:_C097D550A85D95BEFF69F1B452227F75"
+        "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C097D550A85D95BEFF69F1B452227F75"
         "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -1726,12 +1732,6 @@
         "Entry"
         {
         "MsmKey" = "8:_C097D550A85D95BEFF69F1B452227F75"
-        "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_C097D550A85D95BEFF69F1B452227F75"
         "OwnerKey" = "8:_1B2251DD757994082D5D85D7C9A38F82"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -2092,6 +2092,12 @@
         "Entry"
         {
         "MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F"
+        "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F"
         "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -2104,12 +2110,6 @@
         "Entry"
         {
         "MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F"
-        "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_E6C48E30804B563751F799BDB82D2D5F"
         "OwnerKey" = "8:_7344099411A9D2DBF4A784E3DE9EA77D"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -2176,6 +2176,12 @@
         "Entry"
         {
         "MsmKey" = "8:_EEEF3B4DA37D965DCA452A1E7B283C82"
+        "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_EEEF3B4DA37D965DCA452A1E7B283C82"
         "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -2187,12 +2193,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_EEEF3B4DA37D965DCA452A1E7B283C82"
-        "OwnerKey" = "8:_577232D49DA84949B3604BA695B35542"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_EF0C782C601F42DE8C7EF094FA4ED82E"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -2386,6 +2386,12 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_505B9CD6FBF318D5810A11D52DB3B890"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -2416,12 +2422,6 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_0020EC0A2900F50F0F5DCC3E7BBE4237"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_1B2251DD757994082D5D85D7C9A38F82"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -2452,12 +2452,6 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_8739CB29025E2803D7CB4F7DB8D81C86"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_A18F728D68B4678EDC562E2A27EC3E6A"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -2500,6 +2494,12 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_0182F649532C289AB58CA84091A3EF12"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_8F22F57D649B23FCD9E63A0B6A908954"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -2530,7 +2530,7 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_0182F649532C289AB58CA84091A3EF12"
+        "OwnerKey" = "8:_8739CB29025E2803D7CB4F7DB8D81C86"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -2645,7 +2645,7 @@
         "DisplayName" = "8:Release"
         "IsDebugOnly" = "11:FALSE"
         "IsReleaseOnly" = "11:TRUE"
-        "OutputFilename" = "8:Release\\AlmToolkitSetup.msi"
+        "OutputFilename" = "8:..\\BismNormalizer\\bin\\ReleaseObfusc\\AlmToolkitSetup.msi"
         "PackageFilesAs" = "3:2"
         "PackageFileSize" = "3:-2147483648"
         "CabType" = "3:1"
@@ -2692,7 +2692,7 @@
                 {
                 "Name" = "8:.NET Framework"
                 "Message" = "8:[VSDNETMSG]"
-                "FrameworkVersion" = "8:v4.6.1    "
+                "FrameworkVersion" = "8:v4.6.1           "
                 "AllowLaterVersions" = "11:FALSE"
                 "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=671728"
                 }
@@ -2704,7 +2704,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.0.0, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:BismNormalizer, Version=5.0.0.5, Culture=neutral, PublicKeyToken=aa6675aad991a644, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
                     "_0020EC0A2900F50F0F5DCC3E7BBE4237"
@@ -8921,15 +8921,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Power BI ALM Toolkit"
-        "ProductCode" = "8:{14D99D29-6C0C-4E72-9E66-454D65F58B60}"
-        "PackageCode" = "8:{5C1828A8-428F-4E3B-99F9-CDE1515268B4}"
+        "ProductCode" = "8:{75F627AF-BFD0-4C72-9375-3335EE9DD441}"
+        "PackageCode" = "8:{6DFF38CC-B106-4C2A-982A-D4EA8A44551E}"
         "UpgradeCode" = "8:{96819CFD-6462-4AD1-ADB4-7903F30ADB92}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:1.0.0"
+        "ProductVersion" = "8:5.0.0"
         "Manufacturer" = "8:Power BI ALM Toolkit"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
diff --git a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs
index e972e57..1e63128 100644
--- a/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs
+++ b/BismNormalizer/BismNormalizer.CommandLine/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.0.0.0")]
-[assembly: AssemblyFileVersion("5.0.0.0")]
+[assembly: AssemblyVersion("5.0.0.5")]
+[assembly: AssemblyFileVersion("5.0.0.5")]
diff --git a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs
index d2c2d05..83ce81d 100644
--- a/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs
+++ b/BismNormalizer/BismNormalizer.IconSetup/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.0.0.0")]
-[assembly: AssemblyFileVersion("5.0.0.0")]
+[assembly: AssemblyVersion("5.0.0.5")]
+[assembly: AssemblyFileVersion("5.0.0.5")]
diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe
index 7155614..948f3c4 100644
Binary files a/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe and b/BismNormalizer/BismNormalizer/BismNormalizer.IconSetup.exe differ
diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.exe b/BismNormalizer/BismNormalizer/BismNormalizer.exe
index 6fa249b..ac21f9c 100644
Binary files a/BismNormalizer/BismNormalizer/BismNormalizer.exe and b/BismNormalizer/BismNormalizer/BismNormalizer.exe differ
diff --git a/BismNormalizer/BismNormalizer/BismNormalizer.targets b/BismNormalizer/BismNormalizer/BismNormalizer.targets
index 76860bc..01bd2c0 100644
--- a/BismNormalizer/BismNormalizer/BismNormalizer.targets
+++ b/BismNormalizer/BismNormalizer/BismNormalizer.targets
@@ -19,9 +19,16 @@
     
      When do new release,
     - Increment version number in manifest file (if major increment, also InstalledProductRegistration [package object attribute])
+    - Increment version number in Setup project (3 digits only), and change ProductCode guid
+          *** Save all files!!! ***
+      
     - Run following command from BismNormalizer project root:
-        msbuild BismNormalizer.csproj /verbosity:m /target:Rebuild /property:Configuration=Release
-    - Take VSIX from \ReleaseObfusc folder
+          msbuild BismNormalizer.csproj /verbosity:m /target:Rebuild /property:Configuration=Release
+
+    - Reload changed files in VS, change configuration to Release, build ALMT setup project
+    - Change configuration back to Debug
+    - Take VSIX and AlmToolkitSetup.msi from \ReleaseObfusc folder
+          Test installer locally
 
   -->
 
@@ -182,6 +189,38 @@
         RemoveRoot="$(ObfuscDir)" 
         />
 
+    <ItemGroup>
+      <SetupProjFile Include="..\AlmToolkitSetup\AlmToolkitSetup.vdproj" />
+    </ItemGroup>
+
+    <Message Text=" " Importance="high" />
+    <Message Text="- About to point ALMT setup project at signed version of BismNormalizer.dll" Importance="high" />
+
+    <MSBuild.ExtensionPack.FileSystem.File TaskAction="Replace" 
+      TextEncoding="ASCII"
+      RegexPattern='"SourcePath" = "8:BismNormalizer.dll"' 
+      Replacement='"SourcePath" = "8:..\\BismNormalizer\\bin\\ReleaseObfusc\\BismNormalizer.dll"' 
+      Files="@(SetupProjFile)"/>
+    
+    <!--12/10/2019: building setup project from DevEnv can take forever and doesn't support build from MSBuild
+    <PropertyGroup>
+      <DevEnvExePath>$(ProgramFiles)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.com</DevEnvExePath>
+    </PropertyGroup>
+
+    <Message Text=" " Importance="high" />
+    <Message Text="- About to build ALMT setup project at $([System.DateTime]::Now)" Importance="high" />
+    
+    <Exec Command="&quot;$(DevEnvExePath)&quot; &quot;$(MSBuildProjectDirectory)\..\BismNormalizer.sln&quot; /Build &quot;Release|AnyCPU&quot; /Project &quot;$(MSBuildProjectDirectory)\..\AlmToolkitSetup\AlmToolkitSetup.vdproj&quot;"/>
+
+    <Message Text="- Finish build ALMT setup project at $([System.DateTime]::Now)" Importance="high" />
+    <Message Text=" " Importance="high" />
+    <Message Text="- About to copy AlmToolkitSetup.msi to $(ObfuscDir)" Importance="high" />
+    <Copy
+        SourceFiles="$(MSBuildProjectDirectory)\..\AlmToolkitSetup\Release\AlmToolkitSetup.msi"
+        DestinationFolder="$(ObfuscDir)"
+        />
+    -->
+
   </Target>
   
 </Project>
diff --git a/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs b/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs
index 3aa09e5..d952911 100644
--- a/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs
+++ b/BismNormalizer/BismNormalizer/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.0.0.0")]
-[assembly: AssemblyFileVersion("5.0.0.0")]
+[assembly: AssemblyVersion("5.0.0.5")]
+[assembly: AssemblyFileVersion("5.0.0.5")]
diff --git a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest b/BismNormalizer/BismNormalizer/source.extension.vsixmanifest
index 72dfaa5..866a281 100644
--- a/BismNormalizer/BismNormalizer/source.extension.vsixmanifest
+++ b/BismNormalizer/BismNormalizer/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="BismNormalizer.ea2aeb43-64a6-4dee-8816-099fb44513fa" Version="5.0.0.0" Language="en-US" Publisher="BISM Normalizer" />
+        <Identity Id="BismNormalizer.ea2aeb43-64a6-4dee-8816-099fb44513fa" Version="5.0.0.5" Language="en-US" Publisher="BISM Normalizer" />
         <DisplayName>BISM Normalizer</DisplayName>
         <Description xml:space="preserve">BISM Normalizer manages Analysis Services tabular models</Description>
         <MoreInfo>http://bism-normalizer.com/</MoreInfo>