diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/SqlDatabaseMetaDataRetriever.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/SqlDatabaseMetaDataRetriever.cs
index 658234b0..dac3faf5 100644
--- a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/SqlDatabaseMetaDataRetriever.cs
+++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/SqlDatabaseMetaDataRetriever.cs
@@ -135,6 +135,8 @@ namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql
         {
             string sql;
 
+            var t = databaseConnector.GetType();
+
             if (databaseConnector.GetType() == typeof(MSSqlDatabaseConnector))
             {
                 sql = @"
@@ -151,157 +153,166 @@ if exists (select * from dbo.sysobjects
 drop table [dbo].[tblUpdate]
 
 CREATE TABLE [dbo].[tblCons] (
-        [ID] int NOT NULL IDENTITY(1,1),
-        [ConstantID] varchar(128) NOT NULL PRIMARY KEY,
-        [PositionID] int NOT NULL,
-        [ParentID] varchar(128),
-        [LastChange] datetime NOT NULL,
-        [Name] varchar(128) NOT NULL,
-        [Type] varchar(32) NOT NULL,
-        [Expanded] bit NOT NULL,
-        [AutomaticResize] bit DEFAULT ((1)) NOT NULL,
-        [CacheBitmaps] bit NOT NULL,
-        [Colors] varchar(32) NOT NULL,
-        [ConnectToConsole] bit NOT NULL,
-        [Connected] bit NOT NULL,
-        [Description] varchar(1024),
-        [DisableCursorBlinking] bit NOT NULL,
-        [DisableCursorShadow] bit NOT NULL,
-        [DisableFullWindowDrag] bit NOT NULL,
-        [DisableMenuAnimations] bit NOT NULL,
-        [DisplayThemes] bit NOT NULL,
-        [DisplayWallpaper] bit NOT NULL,
-        [Domain] varchar(512),
-        [EnableDesktopComposition] bit NOT NULL,
-        [EnableFontSmoothing] bit NOT NULL,
-        [ExtApp] varchar(256),
-        [Favorite] tinyint NOT NULL,
-        [Hostname] varchar(512),
-        [ICAEncryptionStrength] varchar(32) NOT NULL,
-        [Icon] varchar(128) NOT NULL,
-        [LoadBalanceInfo] varchar(1024),
-        [MacAddress] varchar(32),
-        [OpeningCommand] varchar(512),
-        [Panel] varchar(128) NOT NULL,
-        [Password] varchar(1024),
-        [Port] int NOT NULL,
-        [PostExtApp] varchar(256),
-        [PreExtApp] varchar(256),
-        [Protocol] varchar(32) NOT NULL,
-        [PuttySession] varchar(128),
-        [RDGatewayDomain] varchar(512),
-        [RDGatewayHostname] varchar(512),
-        [RDGatewayPassword] varchar(1024),
-        [RDGatewayUsageMethod] varchar(32) NOT NULL,
-        [RDGatewayUseConnectionCredentials] varchar(32) NOT NULL,
-        [RDGatewayUsername] varchar(512),
-        [RDPAlertIdleTimeout] bit NOT NULL,
-        [RDPAuthenticationLevel] varchar(32) NOT NULL,
-        [RDPMinutesToIdleTimeout] int NOT NULL,
-        [RdpVersion] varchar(10),
-        [RedirectAudioCapture] bit DEFAULT ((0)) NOT NULL,
-        [RedirectClipboard] bit DEFAULT ((0)) NOT NULL,
-        [RedirectDiskDrives] bit NOT NULL,
-        [RedirectKeys] bit NOT NULL,
-        [RedirectPorts] bit NOT NULL,
-        [RedirectPrinters] bit NOT NULL,
-        [RedirectSmartCards] bit NOT NULL,
-        [RedirectSound] varchar(64) NOT NULL,
-        [RenderingEngine] varchar(16),
-        [Resolution] varchar(32) NOT NULL,
-        [SSHOptions] varchar(1024) NOT NULL,
-        [SSHTunnelConnectionName] varchar(128) NOT NULL,
-        [SoundQuality] varchar(20) NOT NULL,
-        [UseCredSsp] bit NOT NULL,
-        [UseEnhancedMode] bit DEFAULT ((0)),
-        [UseVmId] bit,
-        [UserField] varchar(256),
-        [Username] varchar(512),
-        [VNCAuthMode] varchar(10),
-        [VNCColors] varchar(10),
-        [VNCCompression] varchar(10),
-        [VNCEncoding] varchar(20),
-        [VNCProxyIP] varchar(128),
-        [VNCProxyPassword] varchar(1024),
-        [VNCProxyPort] int,
-        [VNCProxyType] varchar(20),
-        [VNCProxyUsername] varchar(512),
-        [VNCSmartSizeMode] varchar(20),
-        [VNCViewOnly] bit NOT NULL,
-        [VmId] varchar(100),
-        [InheritAutomaticResize] bit DEFAULT ((0)) NOT NULL,
-        [InheritCacheBitmaps] bit NOT NULL,
-        [InheritColors] bit NOT NULL,
-        [InheritDescription] bit NOT NULL,
-        [InheritDisableCursorBlinking] bit NOT NULL,
-        [InheritDisableCursorShadow] bit NOT NULL,
-        [InheritDisableFullWindowDrag] bit NOT NULL,
-        [InheritDisableMenuAnimations] bit NOT NULL,
-        [InheritDisplayThemes] bit NOT NULL,
-        [InheritDisplayWallpaper] bit NOT NULL,
-        [InheritDomain] bit NOT NULL,
-        [InheritEnableDesktopComposition] bit NOT NULL,
-        [InheritEnableFontSmoothing] bit NOT NULL,
-        [InheritExtApp] bit NOT NULL,
-        [InheritFavorite] bit NOT NULL,
-        [InheritICAEncryptionStrength] bit NOT NULL,
-        [InheritIcon] bit NOT NULL,
-        [InheritLoadBalanceInfo] bit DEFAULT ((0)) NOT NULL,
-        [InheritMacAddress] bit NOT NULL,
-        [InheritOpeningCommand] bit NOT NULL,
-        [InheritPanel] bit NOT NULL,
-        [InheritPassword] bit NOT NULL,
-        [InheritPort] bit NOT NULL,
-        [InheritPostExtApp] bit NOT NULL,
-        [InheritPreExtApp] bit NOT NULL,
-        [InheritProtocol] bit NOT NULL,
-        [InheritPuttySession] bit NOT NULL,
-        [InheritRDGatewayDomain] bit NOT NULL,
-        [InheritRDGatewayHostname] bit NOT NULL,
-        [InheritRDGatewayPassword] bit NOT NULL,
-        [InheritRDGatewayUsageMethod] bit NOT NULL,
-        [InheritRDGatewayUseConnectionCredentials] bit NOT NULL,
-        [InheritRDGatewayUsername] bit NOT NULL,
-        [InheritRDPAlertIdleTimeout] bit NOT NULL,
-        [InheritRDPAuthenticationLevel] bit NOT NULL,
-        [InheritRDPMinutesToIdleTimeout] bit NOT NULL,
-        [InheritRdpVersion] bit DEFAULT ((0)) NOT NULL,
-        [InheritRedirectAudioCapture] bit DEFAULT ((0)) NOT NULL,
-        [InheritRedirectClipboard] bit DEFAULT ((0)) NOT NULL,
-        [InheritRedirectDiskDrives] bit NOT NULL,
-        [InheritRedirectKeys] bit NOT NULL,
-        [InheritRedirectPorts] bit NOT NULL,
-        [InheritRedirectPrinters] bit NOT NULL,
-        [InheritRedirectSmartCards] bit NOT NULL,
-        [InheritRedirectSound] bit NOT NULL,
-        [InheritRenderingEngine] bit NOT NULL,
-        [InheritResolution] bit NOT NULL,
-        [InheritSSHOptions] bit NOT NULL,
-        [InheritSSHTunnelConnectionName] bit NOT NULL,
-        [InheritSoundQuality] bit NOT NULL,
-        [InheritUseConsoleSession] bit NOT NULL,
-        [InheritUseCredSsp] bit NOT NULL,
-        [InheritUseEnhancedMode] bit DEFAULT ((0)),
-        [InheritUseVmId] bit,
-        [InheritUserField] bit NOT NULL,
-        [InheritUsername] bit NOT NULL,
-        [InheritVNCAuthMode] bit NOT NULL,
-        [InheritVNCColors] bit NOT NULL,
-        [InheritVNCCompression] bit NOT NULL,
-        [InheritVNCEncoding] bit NOT NULL,
-        [InheritVNCProxyIP] bit NOT NULL,
-        [InheritVNCProxyPassword] bit NOT NULL,
-        [InheritVNCProxyPort] bit NOT NULL,
-        [InheritVNCProxyType] bit NOT NULL,
-        [InheritVNCProxyUsername] bit NOT NULL,
-        [InheritVNCSmartSizeMode] bit NOT NULL,
-        [InheritVNCViewOnly] bit NOT NULL,
-        [InheritVmId] bit,
-        [StartProgram] varchar(512),
-        [StartProgramWorkDir] varchar(512),
-        [InheritExternalCredentialProvider] bit DEFAULT ((0)) NOT NULL,
-        [InheritUseRCG] bit DEFAULT ((0)) NOT NULL,
-        [InheritUserViaAPI] bit DEFAULT ((0)) NOT NULL,
+    [ID] int NOT NULL IDENTITY(1,1),
+    [ConstantID] varchar(128) NOT NULL PRIMARY KEY,
+    [PositionID] int NOT NULL,
+    [ParentID] varchar(128),
+    [LastChange] datetime NOT NULL,
+    [Name] varchar(128) NOT NULL,
+    [Type] varchar(32) NOT NULL,
+    [Expanded] bit NOT NULL,
+    [AutomaticResize] bit NOT NULL DEFAULT 1,
+    [CacheBitmaps] bit NOT NULL,
+    [Colors] varchar(32) NOT NULL,
+    [ConnectToConsole] bit NOT NULL,
+    [Connected] bit NOT NULL,
+    [Description] varchar(1024),
+    [DisableCursorBlinking] bit NOT NULL,
+    [DisableCursorShadow] bit NOT NULL,
+    [DisableFullWindowDrag] bit NOT NULL,
+    [DisableMenuAnimations] bit NOT NULL,
+    [DisplayThemes] bit NOT NULL,
+    [DisplayWallpaper] bit NOT NULL,
+    [Domain] varchar(512),
+    [EnableDesktopComposition] bit NOT NULL,
+    [EnableFontSmoothing] bit NOT NULL,
+    [ExtApp] varchar(256),
+    [Favorite] tinyint NOT NULL,
+    [Hostname] varchar(512),
+    [Icon] varchar(128) NOT NULL,
+    [LoadBalanceInfo] varchar(1024),
+    [MacAddress] varchar(32),
+    [OpeningCommand] varchar(512),
+    [Panel] varchar(128) NOT NULL,
+    [Password] varchar(1024),
+    [Port] int NOT NULL,
+    [PostExtApp] varchar(256),
+    [PreExtApp] varchar(256),
+    [Protocol] varchar(32) NOT NULL,
+    [PuttySession] varchar(128),
+    [RDGatewayDomain] varchar(512),
+    [RDGatewayHostname] varchar(512),
+    [RDGatewayPassword] varchar(1024),
+    [RDGatewayUsageMethod] varchar(32) NOT NULL,
+    [RDGatewayUseConnectionCredentials] varchar(32) NOT NULL,
+    [RDGatewayUsername] varchar(512),
+    [RDPAlertIdleTimeout] bit NOT NULL,
+    [RDPAuthenticationLevel] varchar(32) NOT NULL,
+    [RDPMinutesToIdleTimeout] int NOT NULL,
+    [RdpVersion] varchar(10) NULL,
+    [RedirectAudioCapture] bit NOT NULL DEFAULT 0,
+    [RedirectClipboard] bit NOT NULL DEFAULT 0,
+    [RedirectDiskDrives] bit NOT NULL,
+    [RedirectKeys] bit NOT NULL,
+    [RedirectPorts] bit NOT NULL,
+    [RedirectPrinters] bit NOT NULL,
+    [RedirectSmartCards] bit NOT NULL,
+    [RedirectSound] varchar(64) NOT NULL,
+    [RenderingEngine] varchar(16) NULL,
+    [Resolution] varchar(32) NOT NULL,
+    [SSHOptions] varchar(1024) NOT NULL,
+    [SSHTunnelConnectionName] varchar(128) NOT NULL,
+    [SoundQuality] varchar(20) NOT NULL,
+    [UseCredSsp] bit NOT NULL,
+    [UseEnhancedMode] bit DEFAULT 0,
+    [UseVmId] bit DEFAULT 0,
+    [UserField] varchar(256) NULL,
+    [Username] varchar(512) NULL,
+    [VNCAuthMode] varchar(10) NULL,
+    [VNCColors] varchar(10) NULL,
+    [VNCCompression] varchar(10) NULL,
+    [VNCEncoding] varchar(20) NULL,
+    [VNCProxyIP] varchar(128) NULL,
+    [VNCProxyPassword] varchar(1024) NULL,
+    [VNCProxyPort] int NULL,
+    [VNCProxyType] varchar(20) NULL,
+    [VNCProxyUsername] varchar(512) NULL,
+    [VNCSmartSizeMode] varchar(20) NULL,
+    [VNCViewOnly] bit NOT NULL,
+    [VmId] varchar(100) NULL,
+    [ICAEncryptionStrength] varchar(32) NOT NULL,
+    [InheritAutomaticResize] bit NOT NULL DEFAULT 0,
+    [InheritCacheBitmaps] bit NOT NULL,
+    [InheritColors] bit NOT NULL,
+    [InheritDescription] bit NOT NULL,
+    [InheritDisableCursorBlinking] bit NOT NULL,
+    [InheritDisableCursorShadow] bit NOT NULL,
+    [InheritDisableFullWindowDrag] bit NOT NULL,
+    [InheritDisableMenuAnimations] bit NOT NULL,
+    [InheritDisplayThemes] bit NOT NULL,
+    [InheritDisplayWallpaper] bit NOT NULL,
+    [InheritDomain] bit NOT NULL,
+    [InheritEnableDesktopComposition] bit NOT NULL,
+    [InheritEnableFontSmoothing] bit NOT NULL,
+    [InheritExtApp] bit NOT NULL,
+    [InheritFavorite] bit NOT NULL,
+    [InheritICAEncryptionStrength] bit NOT NULL,
+    [InheritIcon] bit NOT NULL,
+    [InheritLoadBalanceInfo] bit NOT NULL DEFAULT 0,
+    [InheritMacAddress] bit NOT NULL,
+    [InheritOpeningCommand] bit NOT NULL,
+    [InheritPanel] bit NOT NULL,
+    [InheritPassword] bit NOT NULL,
+    [InheritPort] bit NOT NULL,
+    [InheritPostExtApp] bit NOT NULL,
+    [InheritPreExtApp] bit NOT NULL,
+    [InheritProtocol] bit NOT NULL,
+    [InheritPuttySession] bit NOT NULL,
+    [InheritRDGatewayDomain] bit NOT NULL,
+    [InheritRDGatewayHostname] bit NOT NULL,
+    [InheritRDGatewayPassword] bit NOT NULL,
+    [InheritRDGatewayUsageMethod] bit NOT NULL,
+    [InheritRDGatewayUseConnectionCredentials] bit NOT NULL,
+    [InheritRDGatewayExternalCredentialProvider] bit NOT NULL DEFAULT 0,
+    [InheritRDGatewayUsername] bit NOT NULL,
+    [InheritRDGatewayUserViaAPI] bit NOT NULL DEFAULT 0,
+    [InheritRDPAlertIdleTimeout] bit NOT NULL,
+    [InheritRDPAuthenticationLevel] bit NOT NULL,
+    [InheritRDPMinutesToIdleTimeout] bit NOT NULL,
+    [InheritRdpVersion] bit NOT NULL DEFAULT 0,
+    [InheritRedirectAudioCapture] bit NOT NULL DEFAULT 0,
+    [InheritRedirectClipboard] bit NOT NULL DEFAULT 0,
+    [InheritRedirectDiskDrives] bit NOT NULL,
+    [InheritRedirectKeys] bit NOT NULL,
+    [InheritRedirectPorts] bit NOT NULL,
+    [InheritRedirectPrinters] bit NOT NULL,
+    [InheritRedirectSmartCards] bit NOT NULL,
+    [InheritRedirectSound] bit NOT NULL,
+    [InheritRenderingEngine] bit NOT NULL,
+    [InheritResolution] bit NOT NULL,
+    [InheritSSHOptions] bit NOT NULL,
+    [InheritSSHTunnelConnectionName] bit NOT NULL,
+    [InheritSoundQuality] bit NOT NULL,
+    [InheritUseConsoleSession] bit NOT NULL,
+    [InheritUseCredSsp] bit NOT NULL,
+    [InheritUseRestrictedAdmin] bit NOT NULL,
+    [InheritUseRCG] bit NOT NULL,
+    [InheritExternalCredentialProvider] bit NOT NULL DEFAULT 0,
+    [InheritUserViaAPI] bit NOT NULL DEFAULT 0,
+    [UseRestrictedAdmin] bit NOT NULL,
+    [UseRCG] bit NOT NULL,
+    [InheritUseEnhancedMode] bit NOT NULL DEFAULT 0,
+    [InheritUseVmId] bit,
+    [InheritUserField] bit NOT NULL,
+    [InheritUsername] bit NOT NULL,
+    [InheritVNCAuthMode] bit NOT NULL,
+    [InheritVNCColors] bit NOT NULL,
+    [InheritVNCCompression] bit NOT NULL,
+    [InheritVNCEncoding] bit NOT NULL,
+    [InheritVNCProxyIP] bit NOT NULL,
+    [InheritVNCProxyPassword] bit NOT NULL,
+    [InheritVNCProxyPort] bit NOT NULL,
+    [InheritVNCProxyType] bit NOT NULL,
+    [InheritVNCProxyUsername] bit NOT NULL,
+    [InheritVNCSmartSizeMode] bit NOT NULL,
+    [InheritVNCViewOnly] bit NOT NULL,
+    [InheritVmId] bit NOT NULL DEFAULT 0,
+    [StartProgram] varchar(512) NULL,
+    [StartProgramWorkDir] varchar(512) NULL,
+    [EC2Region] varchar(32) NULL,
+    [EC2InstanceId] varchar(32) NULL,
+    [ExternalCredentialProvider] varchar(256) NULL,
+    [ExternalAddressProvider] varchar(256) NULL,
 ) ON [PRIMARY]
 
 CREATE TABLE [dbo].[tblRoot] (
@@ -364,6 +375,7 @@ CREATE TABLE `tblCons` (
     `ExtApp` varchar(256) DEFAULT NULL,
     `Favorite` tinyint(1) NOT NULL,
     `Hostname` varchar(512) DEFAULT NULL,
+    `Icon` varchar(128) NOT NULL,
     `LoadBalanceInfo` varchar(1024) DEFAULT NULL,
     `MacAddress` varchar(32) DEFAULT NULL,
     `OpeningCommand` varchar(512) DEFAULT NULL,
@@ -398,8 +410,8 @@ CREATE TABLE `tblCons` (
     `SSHTunnelConnectionName` varchar(128) NOT NULL,
     `SoundQuality` varchar(20) NOT NULL,
     `UseCredSsp` tinyint(1) NOT NULL,
-    `UseEnhancedMode` tinyint(1) DEFAULT NULL,
-    `UseVmId` tinyint(1) DEFAULT NULL,
+    `UseEnhancedMode` tinyint(1) DEFAULT 0,
+    `UseVmId` tinyint(1) DEFAULT 0,
     `UserField` varchar(256) DEFAULT NULL,
     `Username` varchar(512) DEFAULT NULL,
     `VNCAuthMode` varchar(10) DEFAULT NULL,
@@ -415,7 +427,6 @@ CREATE TABLE `tblCons` (
     `VNCViewOnly` tinyint(1) NOT NULL,
     `VmId` varchar(512) DEFAULT NULL,
     `ICAEncryptionStrength` varchar(32) NOT NULL,
-    `Icon` varchar(128) NOT NULL,
     `InheritAutomaticResize` tinyint(1) NOT NULL DEFAULT 0,
     `InheritCacheBitmaps` tinyint(1) NOT NULL,
     `InheritColors` tinyint(1) NOT NULL,
@@ -448,7 +459,9 @@ CREATE TABLE `tblCons` (
     `InheritRDGatewayPassword` tinyint(1) NOT NULL,
     `InheritRDGatewayUsageMethod` tinyint(1) NOT NULL,
     `InheritRDGatewayUseConnectionCredentials` tinyint(1) NOT NULL,
+    `InheritRDGatewayExternalCredentialProvider` tinyint(1) NOT NULL DEFAULT 0,
     `InheritRDGatewayUsername` tinyint(1) NOT NULL,
+    `InheritRDGatewayUserViaAPI` tinyint(1) NOT NULL DEFAULT 0,
     `InheritRDPAlertIdleTimeout` tinyint(1) NOT NULL,
     `InheritRDPAuthenticationLevel` tinyint(1) NOT NULL,
     `InheritRDPMinutesToIdleTimeout` tinyint(1) NOT NULL,
@@ -470,6 +483,8 @@ CREATE TABLE `tblCons` (
     `InheritUseCredSsp` tinyint(1) NOT NULL,
     `InheritUseRestrictedAdmin` tinyint(1) NOT NULL,
     `InheritUseRCG` tinyint(1) NOT NULL,
+    `InheritExternalCredentialProvider` tinyint(1) NOT NULL DEFAULT 0,
+    `InheritUserViaAPI` tinyint(1) NOT NULL DEFAULT 0,
     `UseRestrictedAdmin` tinyint(1) NOT NULL,
     `UseRCG` tinyint(1) NOT NULL,
     `InheritUseEnhancedMode` tinyint(1) DEFAULT NULL,
@@ -487,11 +502,13 @@ CREATE TABLE `tblCons` (
     `InheritVNCProxyUsername` tinyint(1) NOT NULL,
     `InheritVNCSmartSizeMode` tinyint(1) NOT NULL,
     `InheritVNCViewOnly` tinyint(1) NOT NULL,
-    `InheritVmId` tinyint(1) DEFAULT NULL,
+    `InheritVmId` tinyint(1) DEFAULT 0,
     `StartProgram` varchar(512) DEFAULT NULL,
     `StartProgramWorkDir` varchar(512) DEFAULT NULL,
-    `InheritExternalCredentialProvider` tinyint(1) NOT NULL DEFAULT 0,
-    `InheritUserViaAPI` tinyint(1) NOT NULL DEFAULT 0,
+    `EC2Region` varchar(32) DEFAULT NULL,
+    `EC2InstanceId` varchar(32) DEFAULT NULL,
+    `ExternalCredentialProvider` varchar(256) DEFAULT NULL,
+    `ExternalAddressProvider` varchar(256) DEFAULT NULL,
     PRIMARY KEY (`ConstantID`),
     UNIQUE KEY `ID_UNIQUE` (`ID`),
     UNIQUE KEY `ConstantID_UNIQUE` (`ConstantID`)
diff --git a/mRemoteNG/Config/Serializers/Versioning/SqlVersion28To29Upgrader.cs b/mRemoteNG/Config/Serializers/Versioning/SqlVersion28To29Upgrader.cs
index 898551ca..55c9368f 100644
--- a/mRemoteNG/Config/Serializers/Versioning/SqlVersion28To29Upgrader.cs
+++ b/mRemoteNG/Config/Serializers/Versioning/SqlVersion28To29Upgrader.cs
@@ -31,24 +31,36 @@ namespace mRemoteNG.Config.Serializers.Versioning
 
             // MYSQL
             const string mySqlAlter = @"
-ALTER TABLE tblCons ADD COLUMN
-    OpeningCommand VARCHAR(512) DEFAULT NULL,
-    InheritExternalCredentialProvider bit NOT NULL DEFAULT 0,
-    InheritUseRCG bit NOT NULL DEFAULT 0,
-    InheritUserViaAPI bit NOT NULL DEFAULT 0;
-ALTER TABLE tblRoot CHANGE COLUMN ConfVersion ConfVersion VARCHAR(15) NOT NULL;";
+ALTER TABLE tblCons ADD COLUMN `OpeningCommand` varchar(512) DEFAULT NULL;
+ALTER TABLE tblCons ADD COLUMN `InheritRDGatewayExternalCredentialProvider` tinyint(1) NOT NULL DEFAULT 0;
+ALTER TABLE tblCons ADD COLUMN `InheritRDGatewayUserViaAPI` tinyint(1) NOT NULL DEFAULT 0;
+ALTER TABLE tblCons ADD COLUMN `InheritExternalCredentialProvider` tinyint(1) NOT NULL DEFAULT 0;
+ALTER TABLE tblCons ADD COLUMN `InheritUseRCG` tinyint(1) NOT NULL DEFAULT 0;
+ALTER TABLE tblCons ADD COLUMN `InheritUserViaAPI` tinyint(1) NOT NULL DEFAULT 0;
+ALTER TABLE tblCons ADD COLUMN `EC2Region` varchar(32) DEFAULT NULL;
+ALTER TABLE tblCons ADD COLUMN `EC2InstanceId` varchar(32) DEFAULT NULL;
+ALTER TABLE tblCons ADD COLUMN `ExternalCredentialProvider` varchar(256) DEFAULT NULL;
+ALTER TABLE tblCons ADD COLUMN `ExternalAddressProvider` varchar(256) DEFAULT NULL;
+ALTER TABLE tblRoot CHANGE COLUMN ConfVersion ConfVersion VARCHAR(15) NOT NULL;
+";
 
             const string mySqlUpdate = @"UPDATE tblRoot SET ConfVersion=?;";
 
             // MS-SQL
-            const string msSqlAlter1 = @"
-ALTER TABLE tblCons ADD 
-    InheritExternalCredentialProvider bit NOT NULL DEFAULT 0,
-    InheritUseRCG bit NOT NULL DEFAULT 0,
-    InheritUserViaAPI bit NOT NULL DEFAULT 0;
+            const string msSqlAlter = @"
+ALTER TABLE tblCons ADD OpeningCommand VARCHAR(512) DEFAULT NULL;
+ALTER TABLE tblCons ADD InheritRDGatewayExternalCredentialProvider bit NOT NULL DEFAULT 0;
+ALTER TABLE tblCons ADD InheritRDGatewayUserViaAPI bit NOT NULL DEFAULT 0;
+ALTER TABLE tblCons ADD InheritExternalCredentialProvider bit NOT NULL DEFAULT 0;
+ALTER TABLE tblCons ADD InheritUseRCG bit NOT NULL DEFAULT 0;
+ALTER TABLE tblCons ADD InheritUserViaAPI bit NOT NULL DEFAULT 0;
+ALTER TABLE tblCons ADD EC2Region] varchar(32) NULL;
+ALTER TABLE tblCons ADD [EC2InstanceId] varchar(32) NULL;
+ALTER TABLE tblCons ADD [ExternalCredentialProvider] varchar(256) NULL;
+ALTER TABLE tblCons ADD [ExternalAddressProvider] varchar(256) NULL;
+
+ALTER TABLE tblRoot ALTER COLUMN ConfVersion VARCHAR(15);
 ";
-            const string msSqlAlter2 = @"
-ALTER TABLE tblRoot ALTER COLUMN ConfVersion VARCHAR(15)";
 
             const string msSqlUpdate = @"UPDATE tblRoot SET ConfVersion=@confVersion;";
 
@@ -57,10 +69,7 @@ ALTER TABLE tblRoot ALTER COLUMN ConfVersion VARCHAR(15)";
                 DbCommand dbCommand;
                 if (_databaseConnector.GetType() == typeof(MSSqlDatabaseConnector))
                 {
-                    dbCommand = _databaseConnector.DbCommand(msSqlAlter1);
-                    dbCommand.Transaction = sqlTran;
-                    dbCommand.ExecuteNonQuery();
-                    dbCommand = _databaseConnector.DbCommand(msSqlAlter2);
+                    dbCommand = _databaseConnector.DbCommand(msSqlAlter);
                     dbCommand.Transaction = sqlTran;
                     dbCommand.ExecuteNonQuery();
                     dbCommand = _databaseConnector.DbCommand(msSqlUpdate);