diff --git a/Gopkg.lock b/Gopkg.lock
index fb0040be651f..6184486af758 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -124,12 +124,6 @@
   revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
   version = "v1.2.0"
 
-[[projects]]
-  name = "github.com/satori/uuid"
-  packages = ["."]
-  revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
-  version = "v1.2.0"
-
 [[projects]]
   name = "github.com/shopspring/decimal"
   packages = ["."]
@@ -227,6 +221,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "6be643bc5015514e89d484bc9603903c8af565628b9c8f8ab7bf9dcb2e60be2b"
+  inputs-digest = "5e51ba405ce99f3a95f60553bdd1bdf8a9eecf637914d0dd24a22b2932e51900"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/profiles/2017-03-09/compute/mgmt/compute/models.go b/profiles/2017-03-09/compute/mgmt/compute/models.go
index d19ddf0fa2fc..84594a263636 100644
--- a/profiles/2017-03-09/compute/mgmt/compute/models.go
+++ b/profiles/2017-03-09/compute/mgmt/compute/models.go
@@ -30,17 +30,49 @@ func NewAvailabilitySetsClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewAvailabilitySetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type VirtualMachineExtensionsClient = original.VirtualMachineExtensionsClient
 
-type BaseClient = original.BaseClient
+func NewVirtualMachineExtensionsClient(subscriptionID string) VirtualMachineExtensionsClient {
+	return original.NewVirtualMachineExtensionsClient(subscriptionID)
+}
+func NewVirtualMachineExtensionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineExtensionsClient {
+	return original.NewVirtualMachineExtensionsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type VirtualMachineSizesClient = original.VirtualMachineSizesClient
+
+func NewVirtualMachineSizesClient(subscriptionID string) VirtualMachineSizesClient {
+	return original.NewVirtualMachineSizesClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewVirtualMachineSizesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineSizesClient {
+	return original.NewVirtualMachineSizesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type VirtualMachineImagesClient = original.VirtualMachineImagesClient
+
+func NewVirtualMachineImagesClient(subscriptionID string) VirtualMachineImagesClient {
+	return original.NewVirtualMachineImagesClient(subscriptionID)
+}
+func NewVirtualMachineImagesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineImagesClient {
+	return original.NewVirtualMachineImagesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type UsageClient = original.UsageClient
+
+func NewUsageClient(subscriptionID string) UsageClient {
+	return original.NewUsageClient(subscriptionID)
+}
+func NewUsageClientWithBaseURI(baseURI string, subscriptionID string) UsageClient {
+	return original.NewUsageClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type VirtualMachineScaleSetVMsClient = original.VirtualMachineScaleSetVMsClient
+
+func NewVirtualMachineScaleSetVMsClient(subscriptionID string) VirtualMachineScaleSetVMsClient {
+	return original.NewVirtualMachineScaleSetVMsClient(subscriptionID)
+}
+func NewVirtualMachineScaleSetVMsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetVMsClient {
+	return original.NewVirtualMachineScaleSetVMsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type CachingTypes = original.CachingTypes
@@ -387,13 +419,13 @@ type VirtualMachineStatusCodeCount = original.VirtualMachineStatusCodeCount
 type WindowsConfiguration = original.WindowsConfiguration
 type WinRMConfiguration = original.WinRMConfiguration
 type WinRMListener = original.WinRMListener
-type UsageClient = original.UsageClient
+type VirtualMachineScaleSetsClient = original.VirtualMachineScaleSetsClient
 
-func NewUsageClient(subscriptionID string) UsageClient {
-	return original.NewUsageClient(subscriptionID)
+func NewVirtualMachineScaleSetsClient(subscriptionID string) VirtualMachineScaleSetsClient {
+	return original.NewVirtualMachineScaleSetsClient(subscriptionID)
 }
-func NewUsageClientWithBaseURI(baseURI string, subscriptionID string) UsageClient {
-	return original.NewUsageClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualMachineScaleSetsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetsClient {
+	return original.NewVirtualMachineScaleSetsClientWithBaseURI(baseURI, subscriptionID)
 }
 func UserAgent() string {
 	return original.UserAgent() + " profiles/2017-03-09"
@@ -411,22 +443,17 @@ func NewVirtualMachineExtensionImagesClientWithBaseURI(baseURI string, subscript
 	return original.NewVirtualMachineExtensionImagesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualMachineExtensionsClient = original.VirtualMachineExtensionsClient
-
-func NewVirtualMachineExtensionsClient(subscriptionID string) VirtualMachineExtensionsClient {
-	return original.NewVirtualMachineExtensionsClient(subscriptionID)
-}
-func NewVirtualMachineExtensionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineExtensionsClient {
-	return original.NewVirtualMachineExtensionsClientWithBaseURI(baseURI, subscriptionID)
-}
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-type VirtualMachineImagesClient = original.VirtualMachineImagesClient
+type BaseClient = original.BaseClient
 
-func NewVirtualMachineImagesClient(subscriptionID string) VirtualMachineImagesClient {
-	return original.NewVirtualMachineImagesClient(subscriptionID)
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewVirtualMachineImagesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineImagesClient {
-	return original.NewVirtualMachineImagesClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
 type VirtualMachinesClient = original.VirtualMachinesClient
@@ -437,30 +464,3 @@ func NewVirtualMachinesClient(subscriptionID string) VirtualMachinesClient {
 func NewVirtualMachinesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachinesClient {
 	return original.NewVirtualMachinesClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type VirtualMachineScaleSetsClient = original.VirtualMachineScaleSetsClient
-
-func NewVirtualMachineScaleSetsClient(subscriptionID string) VirtualMachineScaleSetsClient {
-	return original.NewVirtualMachineScaleSetsClient(subscriptionID)
-}
-func NewVirtualMachineScaleSetsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetsClient {
-	return original.NewVirtualMachineScaleSetsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type VirtualMachineScaleSetVMsClient = original.VirtualMachineScaleSetVMsClient
-
-func NewVirtualMachineScaleSetVMsClient(subscriptionID string) VirtualMachineScaleSetVMsClient {
-	return original.NewVirtualMachineScaleSetVMsClient(subscriptionID)
-}
-func NewVirtualMachineScaleSetVMsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetVMsClient {
-	return original.NewVirtualMachineScaleSetVMsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type VirtualMachineSizesClient = original.VirtualMachineSizesClient
-
-func NewVirtualMachineSizesClient(subscriptionID string) VirtualMachineSizesClient {
-	return original.NewVirtualMachineSizesClient(subscriptionID)
-}
-func NewVirtualMachineSizesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineSizesClient {
-	return original.NewVirtualMachineSizesClientWithBaseURI(baseURI, subscriptionID)
-}
diff --git a/profiles/2017-03-09/keyvault/keyvault/models.go b/profiles/2017-03-09/keyvault/keyvault/models.go
index 128129485b79..a1b78d00cf59 100644
--- a/profiles/2017-03-09/keyvault/keyvault/models.go
+++ b/profiles/2017-03-09/keyvault/keyvault/models.go
@@ -21,15 +21,6 @@ package keyvault
 
 import original "github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault"
 
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithoutDefaults() BaseClient {
-	return original.NewWithoutDefaults()
-}
-
 type ActionType = original.ActionType
 
 const (
@@ -250,3 +241,12 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithoutDefaults() BaseClient {
+	return original.NewWithoutDefaults()
+}
diff --git a/profiles/2017-03-09/keyvault/mgmt/keyvault/models.go b/profiles/2017-03-09/keyvault/mgmt/keyvault/models.go
index aeea84a55293..280341643da9 100644
--- a/profiles/2017-03-09/keyvault/mgmt/keyvault/models.go
+++ b/profiles/2017-03-09/keyvault/mgmt/keyvault/models.go
@@ -21,17 +21,22 @@ package keyvault
 
 import original "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type OperationsClient = original.OperationsClient
 
-type BaseClient = original.BaseClient
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type VaultsClient = original.VaultsClient
+
+func NewVaultsClient(subscriptionID string) VaultsClient {
+	return original.NewVaultsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewVaultsClientWithBaseURI(baseURI string, subscriptionID string) VaultsClient {
+	return original.NewVaultsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccessPolicyUpdateKind = original.AccessPolicyUpdateKind
@@ -200,26 +205,23 @@ type VaultPatchParameters = original.VaultPatchParameters
 type VaultPatchProperties = original.VaultPatchProperties
 type VaultProperties = original.VaultProperties
 type VaultsPurgeDeletedFuture = original.VaultsPurgeDeletedFuture
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 
-type VaultsClient = original.VaultsClient
-
-func NewVaultsClient(subscriptionID string) VaultsClient {
-	return original.NewVaultsClient(subscriptionID)
-}
-func NewVaultsClientWithBaseURI(baseURI string, subscriptionID string) VaultsClient {
-	return original.NewVaultsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/2017-03-09"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/2017-03-09/network/mgmt/network/models.go b/profiles/2017-03-09/network/mgmt/network/models.go
index 4c5049df65ba..d75e2518704f 100644
--- a/profiles/2017-03-09/network/mgmt/network/models.go
+++ b/profiles/2017-03-09/network/mgmt/network/models.go
@@ -21,62 +21,58 @@ package network
 
 import original "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2015-06-15/network"
 
-type ApplicationGatewaysClient = original.ApplicationGatewaysClient
+type PublicIPAddressesClient = original.PublicIPAddressesClient
 
-func NewApplicationGatewaysClient(subscriptionID string) ApplicationGatewaysClient {
-	return original.NewApplicationGatewaysClient(subscriptionID)
+func NewPublicIPAddressesClient(subscriptionID string) PublicIPAddressesClient {
+	return original.NewPublicIPAddressesClient(subscriptionID)
 }
-func NewApplicationGatewaysClientWithBaseURI(baseURI string, subscriptionID string) ApplicationGatewaysClient {
-	return original.NewApplicationGatewaysClientWithBaseURI(baseURI, subscriptionID)
+func NewPublicIPAddressesClientWithBaseURI(baseURI string, subscriptionID string) PublicIPAddressesClient {
+	return original.NewPublicIPAddressesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type ExpressRouteServiceProvidersClient = original.ExpressRouteServiceProvidersClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewExpressRouteServiceProvidersClient(subscriptionID string) ExpressRouteServiceProvidersClient {
+	return original.NewExpressRouteServiceProvidersClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewExpressRouteServiceProvidersClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteServiceProvidersClient {
+	return original.NewExpressRouteServiceProvidersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ExpressRouteCircuitAuthorizationsClient = original.ExpressRouteCircuitAuthorizationsClient
+type SubnetsClient = original.SubnetsClient
 
-func NewExpressRouteCircuitAuthorizationsClient(subscriptionID string) ExpressRouteCircuitAuthorizationsClient {
-	return original.NewExpressRouteCircuitAuthorizationsClient(subscriptionID)
+func NewSubnetsClient(subscriptionID string) SubnetsClient {
+	return original.NewSubnetsClient(subscriptionID)
 }
-func NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitAuthorizationsClient {
-	return original.NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI, subscriptionID)
+func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsClient {
+	return original.NewSubnetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ExpressRouteCircuitPeeringsClient = original.ExpressRouteCircuitPeeringsClient
+type UsagesClient = original.UsagesClient
 
-func NewExpressRouteCircuitPeeringsClient(subscriptionID string) ExpressRouteCircuitPeeringsClient {
-	return original.NewExpressRouteCircuitPeeringsClient(subscriptionID)
+func NewUsagesClient(subscriptionID string) UsagesClient {
+	return original.NewUsagesClient(subscriptionID)
 }
-func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitPeeringsClient {
-	return original.NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI, subscriptionID)
+func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
+	return original.NewUsagesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ExpressRouteCircuitsClient = original.ExpressRouteCircuitsClient
+type VirtualNetworkGatewayConnectionsClient = original.VirtualNetworkGatewayConnectionsClient
 
-func NewExpressRouteCircuitsClient(subscriptionID string) ExpressRouteCircuitsClient {
-	return original.NewExpressRouteCircuitsClient(subscriptionID)
+func NewVirtualNetworkGatewayConnectionsClient(subscriptionID string) VirtualNetworkGatewayConnectionsClient {
+	return original.NewVirtualNetworkGatewayConnectionsClient(subscriptionID)
 }
-func NewExpressRouteCircuitsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitsClient {
-	return original.NewExpressRouteCircuitsClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewayConnectionsClient {
+	return original.NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ExpressRouteServiceProvidersClient = original.ExpressRouteServiceProvidersClient
+type ExpressRouteCircuitAuthorizationsClient = original.ExpressRouteCircuitAuthorizationsClient
 
-func NewExpressRouteServiceProvidersClient(subscriptionID string) ExpressRouteServiceProvidersClient {
-	return original.NewExpressRouteServiceProvidersClient(subscriptionID)
+func NewExpressRouteCircuitAuthorizationsClient(subscriptionID string) ExpressRouteCircuitAuthorizationsClient {
+	return original.NewExpressRouteCircuitAuthorizationsClient(subscriptionID)
 }
-func NewExpressRouteServiceProvidersClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteServiceProvidersClient {
-	return original.NewExpressRouteServiceProvidersClientWithBaseURI(baseURI, subscriptionID)
+func NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitAuthorizationsClient {
+	return original.NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type InterfacesClient = original.InterfacesClient
@@ -97,15 +93,6 @@ func NewLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) Lo
 	return original.NewLoadBalancersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LocalNetworkGatewaysClient = original.LocalNetworkGatewaysClient
-
-func NewLocalNetworkGatewaysClient(subscriptionID string) LocalNetworkGatewaysClient {
-	return original.NewLocalNetworkGatewaysClient(subscriptionID)
-}
-func NewLocalNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) LocalNetworkGatewaysClient {
-	return original.NewLocalNetworkGatewaysClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type ApplicationGatewayCookieBasedAffinity = original.ApplicationGatewayCookieBasedAffinity
 
 const (
@@ -653,98 +640,111 @@ type VpnClientRevokedCertificate = original.VpnClientRevokedCertificate
 type VpnClientRevokedCertificatePropertiesFormat = original.VpnClientRevokedCertificatePropertiesFormat
 type VpnClientRootCertificate = original.VpnClientRootCertificate
 type VpnClientRootCertificatePropertiesFormat = original.VpnClientRootCertificatePropertiesFormat
-type PublicIPAddressesClient = original.PublicIPAddressesClient
+type ExpressRouteCircuitPeeringsClient = original.ExpressRouteCircuitPeeringsClient
 
-func NewPublicIPAddressesClient(subscriptionID string) PublicIPAddressesClient {
-	return original.NewPublicIPAddressesClient(subscriptionID)
+func NewExpressRouteCircuitPeeringsClient(subscriptionID string) ExpressRouteCircuitPeeringsClient {
+	return original.NewExpressRouteCircuitPeeringsClient(subscriptionID)
 }
-func NewPublicIPAddressesClientWithBaseURI(baseURI string, subscriptionID string) PublicIPAddressesClient {
-	return original.NewPublicIPAddressesClientWithBaseURI(baseURI, subscriptionID)
+func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitPeeringsClient {
+	return original.NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type RoutesClient = original.RoutesClient
+type VirtualNetworksClient = original.VirtualNetworksClient
 
-func NewRoutesClient(subscriptionID string) RoutesClient {
-	return original.NewRoutesClient(subscriptionID)
+func NewVirtualNetworksClient(subscriptionID string) VirtualNetworksClient {
+	return original.NewVirtualNetworksClient(subscriptionID)
 }
-func NewRoutesClientWithBaseURI(baseURI string, subscriptionID string) RoutesClient {
-	return original.NewRoutesClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualNetworksClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksClient {
+	return original.NewVirtualNetworksClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/2017-03-09"
+}
+func Version() string {
+	return original.Version()
 }
 
-type RouteTablesClient = original.RouteTablesClient
+type ExpressRouteCircuitsClient = original.ExpressRouteCircuitsClient
 
-func NewRouteTablesClient(subscriptionID string) RouteTablesClient {
-	return original.NewRouteTablesClient(subscriptionID)
+func NewExpressRouteCircuitsClient(subscriptionID string) ExpressRouteCircuitsClient {
+	return original.NewExpressRouteCircuitsClient(subscriptionID)
 }
-func NewRouteTablesClientWithBaseURI(baseURI string, subscriptionID string) RouteTablesClient {
-	return original.NewRouteTablesClientWithBaseURI(baseURI, subscriptionID)
+func NewExpressRouteCircuitsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitsClient {
+	return original.NewExpressRouteCircuitsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SecurityGroupsClient = original.SecurityGroupsClient
+type ApplicationGatewaysClient = original.ApplicationGatewaysClient
 
-func NewSecurityGroupsClient(subscriptionID string) SecurityGroupsClient {
-	return original.NewSecurityGroupsClient(subscriptionID)
+func NewApplicationGatewaysClient(subscriptionID string) ApplicationGatewaysClient {
+	return original.NewApplicationGatewaysClient(subscriptionID)
 }
-func NewSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) SecurityGroupsClient {
-	return original.NewSecurityGroupsClientWithBaseURI(baseURI, subscriptionID)
+func NewApplicationGatewaysClientWithBaseURI(baseURI string, subscriptionID string) ApplicationGatewaysClient {
+	return original.NewApplicationGatewaysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SecurityRulesClient = original.SecurityRulesClient
+type LocalNetworkGatewaysClient = original.LocalNetworkGatewaysClient
 
-func NewSecurityRulesClient(subscriptionID string) SecurityRulesClient {
-	return original.NewSecurityRulesClient(subscriptionID)
+func NewLocalNetworkGatewaysClient(subscriptionID string) LocalNetworkGatewaysClient {
+	return original.NewLocalNetworkGatewaysClient(subscriptionID)
 }
-func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) SecurityRulesClient {
-	return original.NewSecurityRulesClientWithBaseURI(baseURI, subscriptionID)
+func NewLocalNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) LocalNetworkGatewaysClient {
+	return original.NewLocalNetworkGatewaysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SubnetsClient = original.SubnetsClient
+type VirtualNetworkGatewaysClient = original.VirtualNetworkGatewaysClient
 
-func NewSubnetsClient(subscriptionID string) SubnetsClient {
-	return original.NewSubnetsClient(subscriptionID)
+func NewVirtualNetworkGatewaysClient(subscriptionID string) VirtualNetworkGatewaysClient {
+	return original.NewVirtualNetworkGatewaysClient(subscriptionID)
 }
-func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsClient {
-	return original.NewSubnetsClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewaysClient {
+	return original.NewVirtualNetworkGatewaysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UsagesClient = original.UsagesClient
+type SecurityRulesClient = original.SecurityRulesClient
 
-func NewUsagesClient(subscriptionID string) UsagesClient {
-	return original.NewUsagesClient(subscriptionID)
+func NewSecurityRulesClient(subscriptionID string) SecurityRulesClient {
+	return original.NewSecurityRulesClient(subscriptionID)
 }
-func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
-	return original.NewUsagesClientWithBaseURI(baseURI, subscriptionID)
+func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) SecurityRulesClient {
+	return original.NewSecurityRulesClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/2017-03-09"
+
+type RoutesClient = original.RoutesClient
+
+func NewRoutesClient(subscriptionID string) RoutesClient {
+	return original.NewRoutesClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewRoutesClientWithBaseURI(baseURI string, subscriptionID string) RoutesClient {
+	return original.NewRoutesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualNetworkGatewayConnectionsClient = original.VirtualNetworkGatewayConnectionsClient
+type RouteTablesClient = original.RouteTablesClient
 
-func NewVirtualNetworkGatewayConnectionsClient(subscriptionID string) VirtualNetworkGatewayConnectionsClient {
-	return original.NewVirtualNetworkGatewayConnectionsClient(subscriptionID)
+func NewRouteTablesClient(subscriptionID string) RouteTablesClient {
+	return original.NewRouteTablesClient(subscriptionID)
 }
-func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewayConnectionsClient {
-	return original.NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI, subscriptionID)
+func NewRouteTablesClientWithBaseURI(baseURI string, subscriptionID string) RouteTablesClient {
+	return original.NewRouteTablesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualNetworkGatewaysClient = original.VirtualNetworkGatewaysClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewVirtualNetworkGatewaysClient(subscriptionID string) VirtualNetworkGatewaysClient {
-	return original.NewVirtualNetworkGatewaysClient(subscriptionID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewVirtualNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewaysClient {
-	return original.NewVirtualNetworkGatewaysClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualNetworksClient = original.VirtualNetworksClient
+type SecurityGroupsClient = original.SecurityGroupsClient
 
-func NewVirtualNetworksClient(subscriptionID string) VirtualNetworksClient {
-	return original.NewVirtualNetworksClient(subscriptionID)
+func NewSecurityGroupsClient(subscriptionID string) SecurityGroupsClient {
+	return original.NewSecurityGroupsClient(subscriptionID)
 }
-func NewVirtualNetworksClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksClient {
-	return original.NewVirtualNetworksClientWithBaseURI(baseURI, subscriptionID)
+func NewSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) SecurityGroupsClient {
+	return original.NewSecurityGroupsClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/2017-03-09/resources/mgmt/features/models.go b/profiles/2017-03-09/resources/mgmt/features/models.go
index 1a14e171db04..6883cf88380b 100644
--- a/profiles/2017-03-09/resources/mgmt/features/models.go
+++ b/profiles/2017-03-09/resources/mgmt/features/models.go
@@ -21,19 +21,6 @@ package features
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2015-12-01/features"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type Client = original.Client
 
 func NewClient(subscriptionID string) Client {
@@ -55,3 +42,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/2017-03-09/resources/mgmt/links/models.go b/profiles/2017-03-09/resources/mgmt/links/models.go
index 7b8d7f0c65c6..0d2239c724ff 100644
--- a/profiles/2017-03-09/resources/mgmt/links/models.go
+++ b/profiles/2017-03-09/resources/mgmt/links/models.go
@@ -21,17 +21,13 @@ package links
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-09-01/links"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type ResourceLinksClient = original.ResourceLinksClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewResourceLinksClient(subscriptionID string) ResourceLinksClient {
+	return original.NewResourceLinksClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewResourceLinksClientWithBaseURI(baseURI string, subscriptionID string) ResourceLinksClient {
+	return original.NewResourceLinksClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type Filter = original.Filter
@@ -50,17 +46,23 @@ type ResourceLinkProperties = original.ResourceLinkProperties
 type ResourceLinkResult = original.ResourceLinkResult
 type ResourceLinkResultIterator = original.ResourceLinkResultIterator
 type ResourceLinkResultPage = original.ResourceLinkResultPage
-type ResourceLinksClient = original.ResourceLinksClient
 
-func NewResourceLinksClient(subscriptionID string) ResourceLinksClient {
-	return original.NewResourceLinksClient(subscriptionID)
-}
-func NewResourceLinksClientWithBaseURI(baseURI string, subscriptionID string) ResourceLinksClient {
-	return original.NewResourceLinksClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/2017-03-09"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/2017-03-09/resources/mgmt/locks/models.go b/profiles/2017-03-09/resources/mgmt/locks/models.go
index 5b4579a1f069..3c65e6320e33 100644
--- a/profiles/2017-03-09/resources/mgmt/locks/models.go
+++ b/profiles/2017-03-09/resources/mgmt/locks/models.go
@@ -21,19 +21,6 @@ package locks
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2015-01-01/locks"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type ManagementLocksClient = original.ManagementLocksClient
 
 func NewManagementLocksClient(subscriptionID string) ManagementLocksClient {
@@ -67,3 +54,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/2017-03-09/resources/mgmt/policy/models.go b/profiles/2017-03-09/resources/mgmt/policy/models.go
index bdd2016bb4c0..43f567d13948 100644
--- a/profiles/2017-03-09/resources/mgmt/policy/models.go
+++ b/profiles/2017-03-09/resources/mgmt/policy/models.go
@@ -21,28 +21,6 @@ package policy
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2015-10-01-preview/policy"
 
-type AssignmentsClient = original.AssignmentsClient
-
-func NewAssignmentsClient(subscriptionID string) AssignmentsClient {
-	return original.NewAssignmentsClient(subscriptionID)
-}
-func NewAssignmentsClientWithBaseURI(baseURI string, subscriptionID string) AssignmentsClient {
-	return original.NewAssignmentsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type DefinitionsClient = original.DefinitionsClient
 
 func NewDefinitionsClient(subscriptionID string) DefinitionsClient {
@@ -81,3 +59,25 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
+
+type AssignmentsClient = original.AssignmentsClient
+
+func NewAssignmentsClient(subscriptionID string) AssignmentsClient {
+	return original.NewAssignmentsClient(subscriptionID)
+}
+func NewAssignmentsClientWithBaseURI(baseURI string, subscriptionID string) AssignmentsClient {
+	return original.NewAssignmentsClientWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/2017-03-09/resources/mgmt/resources/models.go b/profiles/2017-03-09/resources/mgmt/resources/models.go
index 2f78dee98a65..7500b24dd3cb 100644
--- a/profiles/2017-03-09/resources/mgmt/resources/models.go
+++ b/profiles/2017-03-09/resources/mgmt/resources/models.go
@@ -21,44 +21,22 @@ package resources
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-02-01/resources"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type DeploymentOperationsClient = original.DeploymentOperationsClient
-
-func NewDeploymentOperationsClient(subscriptionID string) DeploymentOperationsClient {
-	return original.NewDeploymentOperationsClient(subscriptionID)
-}
-func NewDeploymentOperationsClientWithBaseURI(baseURI string, subscriptionID string) DeploymentOperationsClient {
-	return original.NewDeploymentOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type DeploymentsClient = original.DeploymentsClient
+type TagsClient = original.TagsClient
 
-func NewDeploymentsClient(subscriptionID string) DeploymentsClient {
-	return original.NewDeploymentsClient(subscriptionID)
+func NewTagsClient(subscriptionID string) TagsClient {
+	return original.NewTagsClient(subscriptionID)
 }
-func NewDeploymentsClientWithBaseURI(baseURI string, subscriptionID string) DeploymentsClient {
-	return original.NewDeploymentsClientWithBaseURI(baseURI, subscriptionID)
+func NewTagsClientWithBaseURI(baseURI string, subscriptionID string) TagsClient {
+	return original.NewTagsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type GroupsClient = original.GroupsClient
+type Client = original.Client
 
-func NewGroupsClient(subscriptionID string) GroupsClient {
-	return original.NewGroupsClient(subscriptionID)
+func NewClient(subscriptionID string) Client {
+	return original.NewClient(subscriptionID)
 }
-func NewGroupsClientWithBaseURI(baseURI string, subscriptionID string) GroupsClient {
-	return original.NewGroupsClientWithBaseURI(baseURI, subscriptionID)
+func NewClientWithBaseURI(baseURI string, subscriptionID string) Client {
+	return original.NewClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type DeploymentMode = original.DeploymentMode
@@ -143,35 +121,59 @@ type TagValue = original.TagValue
 type TargetResource = original.TargetResource
 type TemplateLink = original.TemplateLink
 type UpdateFuture = original.UpdateFuture
-type ProvidersClient = original.ProvidersClient
 
-func NewProvidersClient(subscriptionID string) ProvidersClient {
-	return original.NewProvidersClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/2017-03-09"
 }
-func NewProvidersClientWithBaseURI(baseURI string, subscriptionID string) ProvidersClient {
-	return original.NewProvidersClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type Client = original.Client
+type DeploymentOperationsClient = original.DeploymentOperationsClient
 
-func NewClient(subscriptionID string) Client {
-	return original.NewClient(subscriptionID)
+func NewDeploymentOperationsClient(subscriptionID string) DeploymentOperationsClient {
+	return original.NewDeploymentOperationsClient(subscriptionID)
 }
-func NewClientWithBaseURI(baseURI string, subscriptionID string) Client {
-	return original.NewClientWithBaseURI(baseURI, subscriptionID)
+func NewDeploymentOperationsClientWithBaseURI(baseURI string, subscriptionID string) DeploymentOperationsClient {
+	return original.NewDeploymentOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TagsClient = original.TagsClient
+type DeploymentsClient = original.DeploymentsClient
 
-func NewTagsClient(subscriptionID string) TagsClient {
-	return original.NewTagsClient(subscriptionID)
+func NewDeploymentsClient(subscriptionID string) DeploymentsClient {
+	return original.NewDeploymentsClient(subscriptionID)
 }
-func NewTagsClientWithBaseURI(baseURI string, subscriptionID string) TagsClient {
-	return original.NewTagsClientWithBaseURI(baseURI, subscriptionID)
+func NewDeploymentsClientWithBaseURI(baseURI string, subscriptionID string) DeploymentsClient {
+	return original.NewDeploymentsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/2017-03-09"
+
+type GroupsClient = original.GroupsClient
+
+func NewGroupsClient(subscriptionID string) GroupsClient {
+	return original.NewGroupsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewGroupsClientWithBaseURI(baseURI string, subscriptionID string) GroupsClient {
+	return original.NewGroupsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ProvidersClient = original.ProvidersClient
+
+func NewProvidersClient(subscriptionID string) ProvidersClient {
+	return original.NewProvidersClient(subscriptionID)
+}
+func NewProvidersClientWithBaseURI(baseURI string, subscriptionID string) ProvidersClient {
+	return original.NewProvidersClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/2017-03-09/resources/mgmt/subscriptions/models.go b/profiles/2017-03-09/resources/mgmt/subscriptions/models.go
index 5aea29bb4155..ccb3b9e6b145 100644
--- a/profiles/2017-03-09/resources/mgmt/subscriptions/models.go
+++ b/profiles/2017-03-09/resources/mgmt/subscriptions/models.go
@@ -21,17 +21,13 @@ package subscriptions
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-06-01/subscriptions"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type TenantsClient = original.TenantsClient
 
-func New() BaseClient {
-	return original.New()
+func NewTenantsClient() TenantsClient {
+	return original.NewTenantsClient()
 }
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
+func NewTenantsClientWithBaseURI(baseURI string) TenantsClient {
+	return original.NewTenantsClientWithBaseURI(baseURI)
 }
 
 type SpendingLimit = original.SpendingLimit
@@ -79,18 +75,22 @@ func NewClient() Client {
 func NewClientWithBaseURI(baseURI string) Client {
 	return original.NewClientWithBaseURI(baseURI)
 }
-
-type TenantsClient = original.TenantsClient
-
-func NewTenantsClient() TenantsClient {
-	return original.NewTenantsClient()
-}
-func NewTenantsClientWithBaseURI(baseURI string) TenantsClient {
-	return original.NewTenantsClientWithBaseURI(baseURI)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/2017-03-09"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
diff --git a/profiles/2017-03-09/storage/mgmt/storage/models.go b/profiles/2017-03-09/storage/mgmt/storage/models.go
index af4a335b800a..b5085353efaa 100644
--- a/profiles/2017-03-09/storage/mgmt/storage/models.go
+++ b/profiles/2017-03-09/storage/mgmt/storage/models.go
@@ -21,26 +21,13 @@ package storage
 
 import original "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2016-01-01/storage"
 
-type AccountsClient = original.AccountsClient
-
-func NewAccountsClient(subscriptionID string) AccountsClient {
-	return original.NewAccountsClient(subscriptionID)
-}
-func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
-	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type UsageClient = original.UsageClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewUsageClient(subscriptionID string) UsageClient {
+	return original.NewUsageClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewUsageClientWithBaseURI(baseURI string, subscriptionID string) UsageClient {
+	return original.NewUsageClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccessTier = original.AccessTier
@@ -173,17 +160,32 @@ type Sku = original.Sku
 type Usage = original.Usage
 type UsageListResult = original.UsageListResult
 type UsageName = original.UsageName
-type UsageClient = original.UsageClient
 
-func NewUsageClient(subscriptionID string) UsageClient {
-	return original.NewUsageClient(subscriptionID)
-}
-func NewUsageClientWithBaseURI(baseURI string, subscriptionID string) UsageClient {
-	return original.NewUsageClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/2017-03-09"
 }
 func Version() string {
 	return original.Version()
 }
+
+type AccountsClient = original.AccountsClient
+
+func NewAccountsClient(subscriptionID string) AccountsClient {
+	return original.NewAccountsClient(subscriptionID)
+}
+func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
+	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/advisor/mgmt/advisor/models.go b/profiles/latest/advisor/mgmt/advisor/models.go
index af00e5fa4e42..7cd63fdf7b1b 100644
--- a/profiles/latest/advisor/mgmt/advisor/models.go
+++ b/profiles/latest/advisor/mgmt/advisor/models.go
@@ -21,17 +21,13 @@ package advisor
 
 import original "github.com/Azure/azure-sdk-for-go/services/advisor/mgmt/2017-04-19/advisor"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ConfigurationsClient = original.ConfigurationsClient
@@ -104,13 +100,21 @@ type SuppressionContractListResult = original.SuppressionContractListResult
 type SuppressionContractListResultIterator = original.SuppressionContractListResultIterator
 type SuppressionContractListResultPage = original.SuppressionContractListResultPage
 type SuppressionProperties = original.SuppressionProperties
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
+}
+
+type SuppressionsClient = original.SuppressionsClient
+
+func NewSuppressionsClient(subscriptionID string) SuppressionsClient {
+	return original.NewSuppressionsClient(subscriptionID)
+}
+func NewSuppressionsClientWithBaseURI(baseURI string, subscriptionID string) SuppressionsClient {
+	return original.NewSuppressionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type RecommendationsClient = original.RecommendationsClient
@@ -122,17 +126,15 @@ func NewRecommendationsClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewRecommendationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SuppressionsClient = original.SuppressionsClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewSuppressionsClient(subscriptionID string) SuppressionsClient {
-	return original.NewSuppressionsClient(subscriptionID)
-}
-func NewSuppressionsClientWithBaseURI(baseURI string, subscriptionID string) SuppressionsClient {
-	return original.NewSuppressionsClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/analysisservices/mgmt/analysisservices/models.go b/profiles/latest/analysisservices/mgmt/analysisservices/models.go
index f889a884df1c..dc50227365a6 100644
--- a/profiles/latest/analysisservices/mgmt/analysisservices/models.go
+++ b/profiles/latest/analysisservices/mgmt/analysisservices/models.go
@@ -21,17 +21,22 @@ package analysisservices
 
 import original "github.com/Azure/azure-sdk-for-go/services/analysisservices/mgmt/2017-08-01/analysisservices"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type OperationsClient = original.OperationsClient
 
-type BaseClient = original.BaseClient
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type ServersClient = original.ServersClient
+
+func NewServersClient(subscriptionID string) ServersClient {
+	return original.NewServersClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersClient {
+	return original.NewServersClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ConnectionMode = original.ConnectionMode
@@ -140,26 +145,23 @@ type ServerUpdateParameters = original.ServerUpdateParameters
 type SkuDetailsForExistingResource = original.SkuDetailsForExistingResource
 type SkuEnumerationForExistingResourceResult = original.SkuEnumerationForExistingResourceResult
 type SkuEnumerationForNewResourceResult = original.SkuEnumerationForNewResourceResult
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 
-type ServersClient = original.ServersClient
-
-func NewServersClient(subscriptionID string) ServersClient {
-	return original.NewServersClient(subscriptionID)
-}
-func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersClient {
-	return original.NewServersClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/apimanagement/mgmt/apimanagement/models.go b/profiles/latest/apimanagement/mgmt/apimanagement/models.go
index c723b081beaf..ac2acbf3b177 100644
--- a/profiles/latest/apimanagement/mgmt/apimanagement/models.go
+++ b/profiles/latest/apimanagement/mgmt/apimanagement/models.go
@@ -21,157 +21,94 @@ package apimanagement
 
 import original "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2017-03-01/apimanagement"
 
-type APIClient = original.APIClient
-
-func NewAPIClient(subscriptionID string) APIClient {
-	return original.NewAPIClient(subscriptionID)
-}
-func NewAPIClientWithBaseURI(baseURI string, subscriptionID string) APIClient {
-	return original.NewAPIClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type APIDiagnosticClient = original.APIDiagnosticClient
-
-func NewAPIDiagnosticClient(subscriptionID string) APIDiagnosticClient {
-	return original.NewAPIDiagnosticClient(subscriptionID)
-}
-func NewAPIDiagnosticClientWithBaseURI(baseURI string, subscriptionID string) APIDiagnosticClient {
-	return original.NewAPIDiagnosticClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type APIDiagnosticLoggerClient = original.APIDiagnosticLoggerClient
-
-func NewAPIDiagnosticLoggerClient(subscriptionID string) APIDiagnosticLoggerClient {
-	return original.NewAPIDiagnosticLoggerClient(subscriptionID)
-}
-func NewAPIDiagnosticLoggerClientWithBaseURI(baseURI string, subscriptionID string) APIDiagnosticLoggerClient {
-	return original.NewAPIDiagnosticLoggerClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type APIExportClient = original.APIExportClient
-
-func NewAPIExportClient(subscriptionID string) APIExportClient {
-	return original.NewAPIExportClient(subscriptionID)
-}
-func NewAPIExportClientWithBaseURI(baseURI string, subscriptionID string) APIExportClient {
-	return original.NewAPIExportClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type APIIssuAttachmentClient = original.APIIssuAttachmentClient
-
-func NewAPIIssuAttachmentClient(subscriptionID string) APIIssuAttachmentClient {
-	return original.NewAPIIssuAttachmentClient(subscriptionID)
-}
-func NewAPIIssuAttachmentClientWithBaseURI(baseURI string, subscriptionID string) APIIssuAttachmentClient {
-	return original.NewAPIIssuAttachmentClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type APIIssuCommentClient = original.APIIssuCommentClient
-
-func NewAPIIssuCommentClient(subscriptionID string) APIIssuCommentClient {
-	return original.NewAPIIssuCommentClient(subscriptionID)
-}
-func NewAPIIssuCommentClientWithBaseURI(baseURI string, subscriptionID string) APIIssuCommentClient {
-	return original.NewAPIIssuCommentClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type APIIssueClient = original.APIIssueClient
-
-func NewAPIIssueClient(subscriptionID string) APIIssueClient {
-	return original.NewAPIIssueClient(subscriptionID)
-}
-func NewAPIIssueClientWithBaseURI(baseURI string, subscriptionID string) APIIssueClient {
-	return original.NewAPIIssueClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type APIIssueAttachmentClient = original.APIIssueAttachmentClient
+type BackendClient = original.BackendClient
 
-func NewAPIIssueAttachmentClient(subscriptionID string) APIIssueAttachmentClient {
-	return original.NewAPIIssueAttachmentClient(subscriptionID)
+func NewBackendClient(subscriptionID string) BackendClient {
+	return original.NewBackendClient(subscriptionID)
 }
-func NewAPIIssueAttachmentClientWithBaseURI(baseURI string, subscriptionID string) APIIssueAttachmentClient {
-	return original.NewAPIIssueAttachmentClientWithBaseURI(baseURI, subscriptionID)
+func NewBackendClientWithBaseURI(baseURI string, subscriptionID string) BackendClient {
+	return original.NewBackendClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIIssueAttachmentsClient = original.APIIssueAttachmentsClient
+type ServiceClient = original.ServiceClient
 
-func NewAPIIssueAttachmentsClient(subscriptionID string) APIIssueAttachmentsClient {
-	return original.NewAPIIssueAttachmentsClient(subscriptionID)
+func NewServiceClient(subscriptionID string) ServiceClient {
+	return original.NewServiceClient(subscriptionID)
 }
-func NewAPIIssueAttachmentsClientWithBaseURI(baseURI string, subscriptionID string) APIIssueAttachmentsClient {
-	return original.NewAPIIssueAttachmentsClientWithBaseURI(baseURI, subscriptionID)
+func NewServiceClientWithBaseURI(baseURI string, subscriptionID string) ServiceClient {
+	return original.NewServiceClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIIssueCommentClient = original.APIIssueCommentClient
+type RegionsClient = original.RegionsClient
 
-func NewAPIIssueCommentClient(subscriptionID string) APIIssueCommentClient {
-	return original.NewAPIIssueCommentClient(subscriptionID)
+func NewRegionsClient(subscriptionID string) RegionsClient {
+	return original.NewRegionsClient(subscriptionID)
 }
-func NewAPIIssueCommentClientWithBaseURI(baseURI string, subscriptionID string) APIIssueCommentClient {
-	return original.NewAPIIssueCommentClientWithBaseURI(baseURI, subscriptionID)
+func NewRegionsClientWithBaseURI(baseURI string, subscriptionID string) RegionsClient {
+	return original.NewRegionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIIssueCommentsClient = original.APIIssueCommentsClient
+type OperationsClient = original.OperationsClient
 
-func NewAPIIssueCommentsClient(subscriptionID string) APIIssueCommentsClient {
-	return original.NewAPIIssueCommentsClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewAPIIssueCommentsClientWithBaseURI(baseURI string, subscriptionID string) APIIssueCommentsClient {
-	return original.NewAPIIssueCommentsClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIIssuesClient = original.APIIssuesClient
+type UserGroupClient = original.UserGroupClient
 
-func NewAPIIssuesClient(subscriptionID string) APIIssuesClient {
-	return original.NewAPIIssuesClient(subscriptionID)
+func NewUserGroupClient(subscriptionID string) UserGroupClient {
+	return original.NewUserGroupClient(subscriptionID)
 }
-func NewAPIIssuesClientWithBaseURI(baseURI string, subscriptionID string) APIIssuesClient {
-	return original.NewAPIIssuesClientWithBaseURI(baseURI, subscriptionID)
+func NewUserGroupClientWithBaseURI(baseURI string, subscriptionID string) UserGroupClient {
+	return original.NewUserGroupClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIOperationClient = original.APIOperationClient
+type ProductAPIClient = original.ProductAPIClient
 
-func NewAPIOperationClient(subscriptionID string) APIOperationClient {
-	return original.NewAPIOperationClient(subscriptionID)
+func NewProductAPIClient(subscriptionID string) ProductAPIClient {
+	return original.NewProductAPIClient(subscriptionID)
 }
-func NewAPIOperationClientWithBaseURI(baseURI string, subscriptionID string) APIOperationClient {
-	return original.NewAPIOperationClientWithBaseURI(baseURI, subscriptionID)
+func NewProductAPIClientWithBaseURI(baseURI string, subscriptionID string) ProductAPIClient {
+	return original.NewProductAPIClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIOperationPolicyClient = original.APIOperationPolicyClient
+type SignUpSettingsClient = original.SignUpSettingsClient
 
-func NewAPIOperationPolicyClient(subscriptionID string) APIOperationPolicyClient {
-	return original.NewAPIOperationPolicyClient(subscriptionID)
+func NewSignUpSettingsClient(subscriptionID string) SignUpSettingsClient {
+	return original.NewSignUpSettingsClient(subscriptionID)
 }
-func NewAPIOperationPolicyClientWithBaseURI(baseURI string, subscriptionID string) APIOperationPolicyClient {
-	return original.NewAPIOperationPolicyClientWithBaseURI(baseURI, subscriptionID)
+func NewSignUpSettingsClientWithBaseURI(baseURI string, subscriptionID string) SignUpSettingsClient {
+	return original.NewSignUpSettingsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIPolicyClient = original.APIPolicyClient
+type APIIssuCommentClient = original.APIIssuCommentClient
 
-func NewAPIPolicyClient(subscriptionID string) APIPolicyClient {
-	return original.NewAPIPolicyClient(subscriptionID)
+func NewAPIIssuCommentClient(subscriptionID string) APIIssuCommentClient {
+	return original.NewAPIIssuCommentClient(subscriptionID)
 }
-func NewAPIPolicyClientWithBaseURI(baseURI string, subscriptionID string) APIPolicyClient {
-	return original.NewAPIPolicyClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIIssuCommentClientWithBaseURI(baseURI string, subscriptionID string) APIIssuCommentClient {
+	return original.NewAPIIssuCommentClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIProductClient = original.APIProductClient
+type APIDiagnosticClient = original.APIDiagnosticClient
 
-func NewAPIProductClient(subscriptionID string) APIProductClient {
-	return original.NewAPIProductClient(subscriptionID)
+func NewAPIDiagnosticClient(subscriptionID string) APIDiagnosticClient {
+	return original.NewAPIDiagnosticClient(subscriptionID)
 }
-func NewAPIProductClientWithBaseURI(baseURI string, subscriptionID string) APIProductClient {
-	return original.NewAPIProductClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIDiagnosticClientWithBaseURI(baseURI string, subscriptionID string) APIDiagnosticClient {
+	return original.NewAPIDiagnosticClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIReleaseClient = original.APIReleaseClient
+type PropertyClient = original.PropertyClient
 
-func NewAPIReleaseClient(subscriptionID string) APIReleaseClient {
-	return original.NewAPIReleaseClient(subscriptionID)
+func NewPropertyClient(subscriptionID string) PropertyClient {
+	return original.NewPropertyClient(subscriptionID)
 }
-func NewAPIReleaseClientWithBaseURI(baseURI string, subscriptionID string) APIReleaseClient {
-	return original.NewAPIReleaseClientWithBaseURI(baseURI, subscriptionID)
+func NewPropertyClientWithBaseURI(baseURI string, subscriptionID string) PropertyClient {
+	return original.NewPropertyClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type APIRevisionsClient = original.APIRevisionsClient
@@ -183,134 +120,112 @@ func NewAPIRevisionsClientWithBaseURI(baseURI string, subscriptionID string) API
 	return original.NewAPIRevisionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APISchemaClient = original.APISchemaClient
-
-func NewAPISchemaClient(subscriptionID string) APISchemaClient {
-	return original.NewAPISchemaClient(subscriptionID)
-}
-func NewAPISchemaClientWithBaseURI(baseURI string, subscriptionID string) APISchemaClient {
-	return original.NewAPISchemaClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type APIVersionSetClient = original.APIVersionSetClient
-
-func NewAPIVersionSetClient(subscriptionID string) APIVersionSetClient {
-	return original.NewAPIVersionSetClient(subscriptionID)
-}
-func NewAPIVersionSetClientWithBaseURI(baseURI string, subscriptionID string) APIVersionSetClient {
-	return original.NewAPIVersionSetClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type AuthorizationServerClient = original.AuthorizationServerClient
+type OperationClient = original.OperationClient
 
-func NewAuthorizationServerClient(subscriptionID string) AuthorizationServerClient {
-	return original.NewAuthorizationServerClient(subscriptionID)
+func NewOperationClient(subscriptionID string) OperationClient {
+	return original.NewOperationClient(subscriptionID)
 }
-func NewAuthorizationServerClientWithBaseURI(baseURI string, subscriptionID string) AuthorizationServerClient {
-	return original.NewAuthorizationServerClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationClientWithBaseURI(baseURI string, subscriptionID string) OperationClient {
+	return original.NewOperationClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type BackendClient = original.BackendClient
+type TenantConfigurationClient = original.TenantConfigurationClient
 
-func NewBackendClient(subscriptionID string) BackendClient {
-	return original.NewBackendClient(subscriptionID)
+func NewTenantConfigurationClient(subscriptionID string) TenantConfigurationClient {
+	return original.NewTenantConfigurationClient(subscriptionID)
 }
-func NewBackendClientWithBaseURI(baseURI string, subscriptionID string) BackendClient {
-	return original.NewBackendClientWithBaseURI(baseURI, subscriptionID)
+func NewTenantConfigurationClientWithBaseURI(baseURI string, subscriptionID string) TenantConfigurationClient {
+	return original.NewTenantConfigurationClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CertificateClient = original.CertificateClient
+type APIIssuAttachmentClient = original.APIIssuAttachmentClient
 
-func NewCertificateClient(subscriptionID string) CertificateClient {
-	return original.NewCertificateClient(subscriptionID)
+func NewAPIIssuAttachmentClient(subscriptionID string) APIIssuAttachmentClient {
+	return original.NewAPIIssuAttachmentClient(subscriptionID)
 }
-func NewCertificateClientWithBaseURI(baseURI string, subscriptionID string) CertificateClient {
-	return original.NewCertificateClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIIssuAttachmentClientWithBaseURI(baseURI string, subscriptionID string) APIIssuAttachmentClient {
+	return original.NewAPIIssuAttachmentClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type APIIssueAttachmentsClient = original.APIIssueAttachmentsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewAPIIssueAttachmentsClient(subscriptionID string) APIIssueAttachmentsClient {
+	return original.NewAPIIssueAttachmentsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewAPIIssueAttachmentsClientWithBaseURI(baseURI string, subscriptionID string) APIIssueAttachmentsClient {
+	return original.NewAPIIssueAttachmentsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DelegationSettingsClient = original.DelegationSettingsClient
+type PolicySnippetsClient = original.PolicySnippetsClient
 
-func NewDelegationSettingsClient(subscriptionID string) DelegationSettingsClient {
-	return original.NewDelegationSettingsClient(subscriptionID)
+func NewPolicySnippetsClient(subscriptionID string) PolicySnippetsClient {
+	return original.NewPolicySnippetsClient(subscriptionID)
 }
-func NewDelegationSettingsClientWithBaseURI(baseURI string, subscriptionID string) DelegationSettingsClient {
-	return original.NewDelegationSettingsClientWithBaseURI(baseURI, subscriptionID)
+func NewPolicySnippetsClientWithBaseURI(baseURI string, subscriptionID string) PolicySnippetsClient {
+	return original.NewPolicySnippetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DiagnosticClient = original.DiagnosticClient
+type AuthorizationServerClient = original.AuthorizationServerClient
 
-func NewDiagnosticClient(subscriptionID string) DiagnosticClient {
-	return original.NewDiagnosticClient(subscriptionID)
+func NewAuthorizationServerClient(subscriptionID string) AuthorizationServerClient {
+	return original.NewAuthorizationServerClient(subscriptionID)
 }
-func NewDiagnosticClientWithBaseURI(baseURI string, subscriptionID string) DiagnosticClient {
-	return original.NewDiagnosticClientWithBaseURI(baseURI, subscriptionID)
+func NewAuthorizationServerClientWithBaseURI(baseURI string, subscriptionID string) AuthorizationServerClient {
+	return original.NewAuthorizationServerClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DiagnosticLoggerClient = original.DiagnosticLoggerClient
+type IdentityProviderClient = original.IdentityProviderClient
 
-func NewDiagnosticLoggerClient(subscriptionID string) DiagnosticLoggerClient {
-	return original.NewDiagnosticLoggerClient(subscriptionID)
+func NewIdentityProviderClient(subscriptionID string) IdentityProviderClient {
+	return original.NewIdentityProviderClient(subscriptionID)
 }
-func NewDiagnosticLoggerClientWithBaseURI(baseURI string, subscriptionID string) DiagnosticLoggerClient {
-	return original.NewDiagnosticLoggerClientWithBaseURI(baseURI, subscriptionID)
+func NewIdentityProviderClientWithBaseURI(baseURI string, subscriptionID string) IdentityProviderClient {
+	return original.NewIdentityProviderClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type EmailTemplateClient = original.EmailTemplateClient
+type APIIssueClient = original.APIIssueClient
 
-func NewEmailTemplateClient(subscriptionID string) EmailTemplateClient {
-	return original.NewEmailTemplateClient(subscriptionID)
+func NewAPIIssueClient(subscriptionID string) APIIssueClient {
+	return original.NewAPIIssueClient(subscriptionID)
 }
-func NewEmailTemplateClientWithBaseURI(baseURI string, subscriptionID string) EmailTemplateClient {
-	return original.NewEmailTemplateClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIIssueClientWithBaseURI(baseURI string, subscriptionID string) APIIssueClient {
+	return original.NewAPIIssueClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type GroupClient = original.GroupClient
+type UserSubscriptionClient = original.UserSubscriptionClient
 
-func NewGroupClient(subscriptionID string) GroupClient {
-	return original.NewGroupClient(subscriptionID)
+func NewUserSubscriptionClient(subscriptionID string) UserSubscriptionClient {
+	return original.NewUserSubscriptionClient(subscriptionID)
 }
-func NewGroupClientWithBaseURI(baseURI string, subscriptionID string) GroupClient {
-	return original.NewGroupClientWithBaseURI(baseURI, subscriptionID)
+func NewUserSubscriptionClientWithBaseURI(baseURI string, subscriptionID string) UserSubscriptionClient {
+	return original.NewUserSubscriptionClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type GroupUserClient = original.GroupUserClient
+type UserIdentitiesClient = original.UserIdentitiesClient
 
-func NewGroupUserClient(subscriptionID string) GroupUserClient {
-	return original.NewGroupUserClient(subscriptionID)
+func NewUserIdentitiesClient(subscriptionID string) UserIdentitiesClient {
+	return original.NewUserIdentitiesClient(subscriptionID)
 }
-func NewGroupUserClientWithBaseURI(baseURI string, subscriptionID string) GroupUserClient {
-	return original.NewGroupUserClientWithBaseURI(baseURI, subscriptionID)
+func NewUserIdentitiesClientWithBaseURI(baseURI string, subscriptionID string) UserIdentitiesClient {
+	return original.NewUserIdentitiesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type IdentityProviderClient = original.IdentityProviderClient
+type TenantAccessClient = original.TenantAccessClient
 
-func NewIdentityProviderClient(subscriptionID string) IdentityProviderClient {
-	return original.NewIdentityProviderClient(subscriptionID)
+func NewTenantAccessClient(subscriptionID string) TenantAccessClient {
+	return original.NewTenantAccessClient(subscriptionID)
 }
-func NewIdentityProviderClientWithBaseURI(baseURI string, subscriptionID string) IdentityProviderClient {
-	return original.NewIdentityProviderClientWithBaseURI(baseURI, subscriptionID)
+func NewTenantAccessClientWithBaseURI(baseURI string, subscriptionID string) TenantAccessClient {
+	return original.NewTenantAccessClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LoggerClient = original.LoggerClient
+type ProductClient = original.ProductClient
 
-func NewLoggerClient(subscriptionID string) LoggerClient {
-	return original.NewLoggerClient(subscriptionID)
+func NewProductClient(subscriptionID string) ProductClient {
+	return original.NewProductClient(subscriptionID)
 }
-func NewLoggerClientWithBaseURI(baseURI string, subscriptionID string) LoggerClient {
-	return original.NewLoggerClientWithBaseURI(baseURI, subscriptionID)
+func NewProductClientWithBaseURI(baseURI string, subscriptionID string) ProductClient {
+	return original.NewProductClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type APIType = original.APIType
@@ -980,13 +895,22 @@ type UserUpdateParameters = original.UserUpdateParameters
 type UserUpdateParametersProperties = original.UserUpdateParametersProperties
 type VirtualNetworkConfiguration = original.VirtualNetworkConfiguration
 type X509CertificateName = original.X509CertificateName
-type NetworkStatusClient = original.NetworkStatusClient
+type ProductGroupClient = original.ProductGroupClient
 
-func NewNetworkStatusClient(subscriptionID string) NetworkStatusClient {
-	return original.NewNetworkStatusClient(subscriptionID)
+func NewProductGroupClient(subscriptionID string) ProductGroupClient {
+	return original.NewProductGroupClient(subscriptionID)
 }
-func NewNetworkStatusClientWithBaseURI(baseURI string, subscriptionID string) NetworkStatusClient {
-	return original.NewNetworkStatusClientWithBaseURI(baseURI, subscriptionID)
+func NewProductGroupClientWithBaseURI(baseURI string, subscriptionID string) ProductGroupClient {
+	return original.NewProductGroupClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type EmailTemplateClient = original.EmailTemplateClient
+
+func NewEmailTemplateClient(subscriptionID string) EmailTemplateClient {
+	return original.NewEmailTemplateClient(subscriptionID)
+}
+func NewEmailTemplateClientWithBaseURI(baseURI string, subscriptionID string) EmailTemplateClient {
+	return original.NewEmailTemplateClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type NotificationClient = original.NotificationClient
@@ -998,15 +922,6 @@ func NewNotificationClientWithBaseURI(baseURI string, subscriptionID string) Not
 	return original.NewNotificationClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type NotificationRecipientEmailClient = original.NotificationRecipientEmailClient
-
-func NewNotificationRecipientEmailClient(subscriptionID string) NotificationRecipientEmailClient {
-	return original.NewNotificationRecipientEmailClient(subscriptionID)
-}
-func NewNotificationRecipientEmailClientWithBaseURI(baseURI string, subscriptionID string) NotificationRecipientEmailClient {
-	return original.NewNotificationRecipientEmailClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type NotificationRecipientUserClient = original.NotificationRecipientUserClient
 
 func NewNotificationRecipientUserClient(subscriptionID string) NotificationRecipientUserClient {
@@ -1016,6 +931,48 @@ func NewNotificationRecipientUserClientWithBaseURI(baseURI string, subscriptionI
 	return original.NewNotificationRecipientUserClientWithBaseURI(baseURI, subscriptionID)
 }
 
+type APIDiagnosticLoggerClient = original.APIDiagnosticLoggerClient
+
+func NewAPIDiagnosticLoggerClient(subscriptionID string) APIDiagnosticLoggerClient {
+	return original.NewAPIDiagnosticLoggerClient(subscriptionID)
+}
+func NewAPIDiagnosticLoggerClientWithBaseURI(baseURI string, subscriptionID string) APIDiagnosticLoggerClient {
+	return original.NewAPIDiagnosticLoggerClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type TagClient = original.TagClient
+
+func NewTagClient(subscriptionID string) TagClient {
+	return original.NewTagClient(subscriptionID)
+}
+func NewTagClientWithBaseURI(baseURI string, subscriptionID string) TagClient {
+	return original.NewTagClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
+}
+func Version() string {
+	return original.Version()
+}
+
+type DiagnosticClient = original.DiagnosticClient
+
+func NewDiagnosticClient(subscriptionID string) DiagnosticClient {
+	return original.NewDiagnosticClient(subscriptionID)
+}
+func NewDiagnosticClientWithBaseURI(baseURI string, subscriptionID string) DiagnosticClient {
+	return original.NewDiagnosticClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type APIIssuesClient = original.APIIssuesClient
+
+func NewAPIIssuesClient(subscriptionID string) APIIssuesClient {
+	return original.NewAPIIssuesClient(subscriptionID)
+}
+func NewAPIIssuesClientWithBaseURI(baseURI string, subscriptionID string) APIIssuesClient {
+	return original.NewAPIIssuesClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type OpenIDConnectProviderClient = original.OpenIDConnectProviderClient
 
 func NewOpenIDConnectProviderClient(subscriptionID string) OpenIDConnectProviderClient {
@@ -1025,76 +982,121 @@ func NewOpenIDConnectProviderClientWithBaseURI(baseURI string, subscriptionID st
 	return original.NewOpenIDConnectProviderClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type OperationClient = original.OperationClient
+type QuotaByCounterKeysClient = original.QuotaByCounterKeysClient
 
-func NewOperationClient(subscriptionID string) OperationClient {
-	return original.NewOperationClient(subscriptionID)
+func NewQuotaByCounterKeysClient(subscriptionID string) QuotaByCounterKeysClient {
+	return original.NewQuotaByCounterKeysClient(subscriptionID)
 }
-func NewOperationClientWithBaseURI(baseURI string, subscriptionID string) OperationClient {
-	return original.NewOperationClientWithBaseURI(baseURI, subscriptionID)
+func NewQuotaByCounterKeysClientWithBaseURI(baseURI string, subscriptionID string) QuotaByCounterKeysClient {
+	return original.NewQuotaByCounterKeysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type OperationsClient = original.OperationsClient
+type SubscriptionClient = original.SubscriptionClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewSubscriptionClient(subscriptionID string) SubscriptionClient {
+	return original.NewSubscriptionClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewSubscriptionClientWithBaseURI(baseURI string, subscriptionID string) SubscriptionClient {
+	return original.NewSubscriptionClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type PolicyClient = original.PolicyClient
+type DelegationSettingsClient = original.DelegationSettingsClient
 
-func NewPolicyClient(subscriptionID string) PolicyClient {
-	return original.NewPolicyClient(subscriptionID)
+func NewDelegationSettingsClient(subscriptionID string) DelegationSettingsClient {
+	return original.NewDelegationSettingsClient(subscriptionID)
+}
+func NewDelegationSettingsClientWithBaseURI(baseURI string, subscriptionID string) DelegationSettingsClient {
+	return original.NewDelegationSettingsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type LoggerClient = original.LoggerClient
+
+func NewLoggerClient(subscriptionID string) LoggerClient {
+	return original.NewLoggerClient(subscriptionID)
+}
+func NewLoggerClientWithBaseURI(baseURI string, subscriptionID string) LoggerClient {
+	return original.NewLoggerClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type APIOperationPolicyClient = original.APIOperationPolicyClient
+
+func NewAPIOperationPolicyClient(subscriptionID string) APIOperationPolicyClient {
+	return original.NewAPIOperationPolicyClient(subscriptionID)
+}
+func NewAPIOperationPolicyClientWithBaseURI(baseURI string, subscriptionID string) APIOperationPolicyClient {
+	return original.NewAPIOperationPolicyClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type CertificateClient = original.CertificateClient
+
+func NewCertificateClient(subscriptionID string) CertificateClient {
+	return original.NewCertificateClient(subscriptionID)
+}
+func NewCertificateClientWithBaseURI(baseURI string, subscriptionID string) CertificateClient {
+	return original.NewCertificateClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type APIPolicyClient = original.APIPolicyClient
+
+func NewAPIPolicyClient(subscriptionID string) APIPolicyClient {
+	return original.NewAPIPolicyClient(subscriptionID)
+}
+func NewAPIPolicyClientWithBaseURI(baseURI string, subscriptionID string) APIPolicyClient {
+	return original.NewAPIPolicyClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ReportsClient = original.ReportsClient
+
+func NewReportsClient(subscriptionID string) ReportsClient {
+	return original.NewReportsClient(subscriptionID)
 }
-func NewPolicyClientWithBaseURI(baseURI string, subscriptionID string) PolicyClient {
-	return original.NewPolicyClientWithBaseURI(baseURI, subscriptionID)
+func NewReportsClientWithBaseURI(baseURI string, subscriptionID string) ReportsClient {
+	return original.NewReportsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type PolicySnippetsClient = original.PolicySnippetsClient
+type APIProductClient = original.APIProductClient
 
-func NewPolicySnippetsClient(subscriptionID string) PolicySnippetsClient {
-	return original.NewPolicySnippetsClient(subscriptionID)
+func NewAPIProductClient(subscriptionID string) APIProductClient {
+	return original.NewAPIProductClient(subscriptionID)
 }
-func NewPolicySnippetsClientWithBaseURI(baseURI string, subscriptionID string) PolicySnippetsClient {
-	return original.NewPolicySnippetsClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIProductClientWithBaseURI(baseURI string, subscriptionID string) APIProductClient {
+	return original.NewAPIProductClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProductClient = original.ProductClient
+type APIIssueCommentsClient = original.APIIssueCommentsClient
 
-func NewProductClient(subscriptionID string) ProductClient {
-	return original.NewProductClient(subscriptionID)
+func NewAPIIssueCommentsClient(subscriptionID string) APIIssueCommentsClient {
+	return original.NewAPIIssueCommentsClient(subscriptionID)
 }
-func NewProductClientWithBaseURI(baseURI string, subscriptionID string) ProductClient {
-	return original.NewProductClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIIssueCommentsClientWithBaseURI(baseURI string, subscriptionID string) APIIssueCommentsClient {
+	return original.NewAPIIssueCommentsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProductAPIClient = original.ProductAPIClient
+type APIIssueAttachmentClient = original.APIIssueAttachmentClient
 
-func NewProductAPIClient(subscriptionID string) ProductAPIClient {
-	return original.NewProductAPIClient(subscriptionID)
+func NewAPIIssueAttachmentClient(subscriptionID string) APIIssueAttachmentClient {
+	return original.NewAPIIssueAttachmentClient(subscriptionID)
 }
-func NewProductAPIClientWithBaseURI(baseURI string, subscriptionID string) ProductAPIClient {
-	return original.NewProductAPIClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIIssueAttachmentClientWithBaseURI(baseURI string, subscriptionID string) APIIssueAttachmentClient {
+	return original.NewAPIIssueAttachmentClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProductGroupClient = original.ProductGroupClient
+type APISchemaClient = original.APISchemaClient
 
-func NewProductGroupClient(subscriptionID string) ProductGroupClient {
-	return original.NewProductGroupClient(subscriptionID)
+func NewAPISchemaClient(subscriptionID string) APISchemaClient {
+	return original.NewAPISchemaClient(subscriptionID)
 }
-func NewProductGroupClientWithBaseURI(baseURI string, subscriptionID string) ProductGroupClient {
-	return original.NewProductGroupClientWithBaseURI(baseURI, subscriptionID)
+func NewAPISchemaClientWithBaseURI(baseURI string, subscriptionID string) APISchemaClient {
+	return original.NewAPISchemaClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProductPolicyClient = original.ProductPolicyClient
+type APIIssueCommentClient = original.APIIssueCommentClient
 
-func NewProductPolicyClient(subscriptionID string) ProductPolicyClient {
-	return original.NewProductPolicyClient(subscriptionID)
+func NewAPIIssueCommentClient(subscriptionID string) APIIssueCommentClient {
+	return original.NewAPIIssueCommentClient(subscriptionID)
 }
-func NewProductPolicyClientWithBaseURI(baseURI string, subscriptionID string) ProductPolicyClient {
-	return original.NewProductPolicyClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIIssueCommentClientWithBaseURI(baseURI string, subscriptionID string) APIIssueCommentClient {
+	return original.NewAPIIssueCommentClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ProductSubscriptionsClient = original.ProductSubscriptionsClient
@@ -1106,179 +1108,177 @@ func NewProductSubscriptionsClientWithBaseURI(baseURI string, subscriptionID str
 	return original.NewProductSubscriptionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type PropertyClient = original.PropertyClient
+type TagResourceClient = original.TagResourceClient
 
-func NewPropertyClient(subscriptionID string) PropertyClient {
-	return original.NewPropertyClient(subscriptionID)
+func NewTagResourceClient(subscriptionID string) TagResourceClient {
+	return original.NewTagResourceClient(subscriptionID)
 }
-func NewPropertyClientWithBaseURI(baseURI string, subscriptionID string) PropertyClient {
-	return original.NewPropertyClientWithBaseURI(baseURI, subscriptionID)
+func NewTagResourceClientWithBaseURI(baseURI string, subscriptionID string) TagResourceClient {
+	return original.NewTagResourceClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type QuotaByCounterKeysClient = original.QuotaByCounterKeysClient
+type APIVersionSetClient = original.APIVersionSetClient
 
-func NewQuotaByCounterKeysClient(subscriptionID string) QuotaByCounterKeysClient {
-	return original.NewQuotaByCounterKeysClient(subscriptionID)
+func NewAPIVersionSetClient(subscriptionID string) APIVersionSetClient {
+	return original.NewAPIVersionSetClient(subscriptionID)
 }
-func NewQuotaByCounterKeysClientWithBaseURI(baseURI string, subscriptionID string) QuotaByCounterKeysClient {
-	return original.NewQuotaByCounterKeysClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIVersionSetClientWithBaseURI(baseURI string, subscriptionID string) APIVersionSetClient {
+	return original.NewAPIVersionSetClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type QuotaByPeriodKeysClient = original.QuotaByPeriodKeysClient
+type SignInSettingsClient = original.SignInSettingsClient
 
-func NewQuotaByPeriodKeysClient(subscriptionID string) QuotaByPeriodKeysClient {
-	return original.NewQuotaByPeriodKeysClient(subscriptionID)
+func NewSignInSettingsClient(subscriptionID string) SignInSettingsClient {
+	return original.NewSignInSettingsClient(subscriptionID)
 }
-func NewQuotaByPeriodKeysClientWithBaseURI(baseURI string, subscriptionID string) QuotaByPeriodKeysClient {
-	return original.NewQuotaByPeriodKeysClientWithBaseURI(baseURI, subscriptionID)
+func NewSignInSettingsClientWithBaseURI(baseURI string, subscriptionID string) SignInSettingsClient {
+	return original.NewSignInSettingsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type RegionsClient = original.RegionsClient
+type GroupUserClient = original.GroupUserClient
 
-func NewRegionsClient(subscriptionID string) RegionsClient {
-	return original.NewRegionsClient(subscriptionID)
+func NewGroupUserClient(subscriptionID string) GroupUserClient {
+	return original.NewGroupUserClient(subscriptionID)
 }
-func NewRegionsClientWithBaseURI(baseURI string, subscriptionID string) RegionsClient {
-	return original.NewRegionsClientWithBaseURI(baseURI, subscriptionID)
+func NewGroupUserClientWithBaseURI(baseURI string, subscriptionID string) GroupUserClient {
+	return original.NewGroupUserClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ReportsClient = original.ReportsClient
+type APIReleaseClient = original.APIReleaseClient
 
-func NewReportsClient(subscriptionID string) ReportsClient {
-	return original.NewReportsClient(subscriptionID)
+func NewAPIReleaseClient(subscriptionID string) APIReleaseClient {
+	return original.NewAPIReleaseClient(subscriptionID)
 }
-func NewReportsClientWithBaseURI(baseURI string, subscriptionID string) ReportsClient {
-	return original.NewReportsClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIReleaseClientWithBaseURI(baseURI string, subscriptionID string) APIReleaseClient {
+	return original.NewAPIReleaseClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ServiceClient = original.ServiceClient
+type APIExportClient = original.APIExportClient
 
-func NewServiceClient(subscriptionID string) ServiceClient {
-	return original.NewServiceClient(subscriptionID)
+func NewAPIExportClient(subscriptionID string) APIExportClient {
+	return original.NewAPIExportClient(subscriptionID)
 }
-func NewServiceClientWithBaseURI(baseURI string, subscriptionID string) ServiceClient {
-	return original.NewServiceClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIExportClientWithBaseURI(baseURI string, subscriptionID string) APIExportClient {
+	return original.NewAPIExportClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SignInSettingsClient = original.SignInSettingsClient
+type GroupClient = original.GroupClient
 
-func NewSignInSettingsClient(subscriptionID string) SignInSettingsClient {
-	return original.NewSignInSettingsClient(subscriptionID)
+func NewGroupClient(subscriptionID string) GroupClient {
+	return original.NewGroupClient(subscriptionID)
 }
-func NewSignInSettingsClientWithBaseURI(baseURI string, subscriptionID string) SignInSettingsClient {
-	return original.NewSignInSettingsClientWithBaseURI(baseURI, subscriptionID)
+func NewGroupClientWithBaseURI(baseURI string, subscriptionID string) GroupClient {
+	return original.NewGroupClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SignUpSettingsClient = original.SignUpSettingsClient
+type APIClient = original.APIClient
 
-func NewSignUpSettingsClient(subscriptionID string) SignUpSettingsClient {
-	return original.NewSignUpSettingsClient(subscriptionID)
+func NewAPIClient(subscriptionID string) APIClient {
+	return original.NewAPIClient(subscriptionID)
 }
-func NewSignUpSettingsClientWithBaseURI(baseURI string, subscriptionID string) SignUpSettingsClient {
-	return original.NewSignUpSettingsClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIClientWithBaseURI(baseURI string, subscriptionID string) APIClient {
+	return original.NewAPIClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SubscriptionClient = original.SubscriptionClient
+type TenantAccessGitClient = original.TenantAccessGitClient
 
-func NewSubscriptionClient(subscriptionID string) SubscriptionClient {
-	return original.NewSubscriptionClient(subscriptionID)
+func NewTenantAccessGitClient(subscriptionID string) TenantAccessGitClient {
+	return original.NewTenantAccessGitClient(subscriptionID)
 }
-func NewSubscriptionClientWithBaseURI(baseURI string, subscriptionID string) SubscriptionClient {
-	return original.NewSubscriptionClientWithBaseURI(baseURI, subscriptionID)
+func NewTenantAccessGitClientWithBaseURI(baseURI string, subscriptionID string) TenantAccessGitClient {
+	return original.NewTenantAccessGitClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TagClient = original.TagClient
+type UserClient = original.UserClient
 
-func NewTagClient(subscriptionID string) TagClient {
-	return original.NewTagClient(subscriptionID)
+func NewUserClient(subscriptionID string) UserClient {
+	return original.NewUserClient(subscriptionID)
 }
-func NewTagClientWithBaseURI(baseURI string, subscriptionID string) TagClient {
-	return original.NewTagClientWithBaseURI(baseURI, subscriptionID)
+func NewUserClientWithBaseURI(baseURI string, subscriptionID string) UserClient {
+	return original.NewUserClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TagDescriptionClient = original.TagDescriptionClient
+type ProductPolicyClient = original.ProductPolicyClient
 
-func NewTagDescriptionClient(subscriptionID string) TagDescriptionClient {
-	return original.NewTagDescriptionClient(subscriptionID)
+func NewProductPolicyClient(subscriptionID string) ProductPolicyClient {
+	return original.NewProductPolicyClient(subscriptionID)
 }
-func NewTagDescriptionClientWithBaseURI(baseURI string, subscriptionID string) TagDescriptionClient {
-	return original.NewTagDescriptionClientWithBaseURI(baseURI, subscriptionID)
+func NewProductPolicyClientWithBaseURI(baseURI string, subscriptionID string) ProductPolicyClient {
+	return original.NewProductPolicyClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TagResourceClient = original.TagResourceClient
+type DiagnosticLoggerClient = original.DiagnosticLoggerClient
 
-func NewTagResourceClient(subscriptionID string) TagResourceClient {
-	return original.NewTagResourceClient(subscriptionID)
+func NewDiagnosticLoggerClient(subscriptionID string) DiagnosticLoggerClient {
+	return original.NewDiagnosticLoggerClient(subscriptionID)
 }
-func NewTagResourceClientWithBaseURI(baseURI string, subscriptionID string) TagResourceClient {
-	return original.NewTagResourceClientWithBaseURI(baseURI, subscriptionID)
+func NewDiagnosticLoggerClientWithBaseURI(baseURI string, subscriptionID string) DiagnosticLoggerClient {
+	return original.NewDiagnosticLoggerClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TenantAccessClient = original.TenantAccessClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewTenantAccessClient(subscriptionID string) TenantAccessClient {
-	return original.NewTenantAccessClient(subscriptionID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewTenantAccessClientWithBaseURI(baseURI string, subscriptionID string) TenantAccessClient {
-	return original.NewTenantAccessClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
-type TenantAccessGitClient = original.TenantAccessGitClient
+type NotificationRecipientEmailClient = original.NotificationRecipientEmailClient
 
-func NewTenantAccessGitClient(subscriptionID string) TenantAccessGitClient {
-	return original.NewTenantAccessGitClient(subscriptionID)
+func NewNotificationRecipientEmailClient(subscriptionID string) NotificationRecipientEmailClient {
+	return original.NewNotificationRecipientEmailClient(subscriptionID)
 }
-func NewTenantAccessGitClientWithBaseURI(baseURI string, subscriptionID string) TenantAccessGitClient {
-	return original.NewTenantAccessGitClientWithBaseURI(baseURI, subscriptionID)
+func NewNotificationRecipientEmailClientWithBaseURI(baseURI string, subscriptionID string) NotificationRecipientEmailClient {
+	return original.NewNotificationRecipientEmailClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TenantConfigurationClient = original.TenantConfigurationClient
+type APIOperationClient = original.APIOperationClient
 
-func NewTenantConfigurationClient(subscriptionID string) TenantConfigurationClient {
-	return original.NewTenantConfigurationClient(subscriptionID)
+func NewAPIOperationClient(subscriptionID string) APIOperationClient {
+	return original.NewAPIOperationClient(subscriptionID)
 }
-func NewTenantConfigurationClientWithBaseURI(baseURI string, subscriptionID string) TenantConfigurationClient {
-	return original.NewTenantConfigurationClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIOperationClientWithBaseURI(baseURI string, subscriptionID string) APIOperationClient {
+	return original.NewAPIOperationClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UserClient = original.UserClient
+type PolicyClient = original.PolicyClient
 
-func NewUserClient(subscriptionID string) UserClient {
-	return original.NewUserClient(subscriptionID)
+func NewPolicyClient(subscriptionID string) PolicyClient {
+	return original.NewPolicyClient(subscriptionID)
 }
-func NewUserClientWithBaseURI(baseURI string, subscriptionID string) UserClient {
-	return original.NewUserClientWithBaseURI(baseURI, subscriptionID)
+func NewPolicyClientWithBaseURI(baseURI string, subscriptionID string) PolicyClient {
+	return original.NewPolicyClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UserGroupClient = original.UserGroupClient
+type QuotaByPeriodKeysClient = original.QuotaByPeriodKeysClient
 
-func NewUserGroupClient(subscriptionID string) UserGroupClient {
-	return original.NewUserGroupClient(subscriptionID)
+func NewQuotaByPeriodKeysClient(subscriptionID string) QuotaByPeriodKeysClient {
+	return original.NewQuotaByPeriodKeysClient(subscriptionID)
 }
-func NewUserGroupClientWithBaseURI(baseURI string, subscriptionID string) UserGroupClient {
-	return original.NewUserGroupClientWithBaseURI(baseURI, subscriptionID)
+func NewQuotaByPeriodKeysClientWithBaseURI(baseURI string, subscriptionID string) QuotaByPeriodKeysClient {
+	return original.NewQuotaByPeriodKeysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UserIdentitiesClient = original.UserIdentitiesClient
+type TagDescriptionClient = original.TagDescriptionClient
 
-func NewUserIdentitiesClient(subscriptionID string) UserIdentitiesClient {
-	return original.NewUserIdentitiesClient(subscriptionID)
+func NewTagDescriptionClient(subscriptionID string) TagDescriptionClient {
+	return original.NewTagDescriptionClient(subscriptionID)
 }
-func NewUserIdentitiesClientWithBaseURI(baseURI string, subscriptionID string) UserIdentitiesClient {
-	return original.NewUserIdentitiesClientWithBaseURI(baseURI, subscriptionID)
+func NewTagDescriptionClientWithBaseURI(baseURI string, subscriptionID string) TagDescriptionClient {
+	return original.NewTagDescriptionClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UserSubscriptionClient = original.UserSubscriptionClient
+type NetworkStatusClient = original.NetworkStatusClient
 
-func NewUserSubscriptionClient(subscriptionID string) UserSubscriptionClient {
-	return original.NewUserSubscriptionClient(subscriptionID)
-}
-func NewUserSubscriptionClientWithBaseURI(baseURI string, subscriptionID string) UserSubscriptionClient {
-	return original.NewUserSubscriptionClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+func NewNetworkStatusClient(subscriptionID string) NetworkStatusClient {
+	return original.NewNetworkStatusClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewNetworkStatusClientWithBaseURI(baseURI string, subscriptionID string) NetworkStatusClient {
+	return original.NewNetworkStatusClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/appinsights/mgmt/insights/models.go b/profiles/latest/appinsights/mgmt/insights/models.go
index b03125da5024..ad360bf0de2e 100644
--- a/profiles/latest/appinsights/mgmt/insights/models.go
+++ b/profiles/latest/appinsights/mgmt/insights/models.go
@@ -21,107 +21,67 @@ package insights
 
 import original "github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights"
 
-type AnalyticsItemClient = original.AnalyticsItemClient
-
-func NewAnalyticsItemClient(subscriptionID string) AnalyticsItemClient {
-	return original.NewAnalyticsItemClient(subscriptionID)
-}
-func NewAnalyticsItemClientWithBaseURI(baseURI string, subscriptionID string) AnalyticsItemClient {
-	return original.NewAnalyticsItemClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type AnnotationsClient = original.AnnotationsClient
-
-func NewAnnotationsClient(subscriptionID string) AnnotationsClient {
-	return original.NewAnnotationsClient(subscriptionID)
-}
-func NewAnnotationsClientWithBaseURI(baseURI string, subscriptionID string) AnnotationsClient {
-	return original.NewAnnotationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type APIKeysClient = original.APIKeysClient
-
-func NewAPIKeysClient(subscriptionID string) APIKeysClient {
-	return original.NewAPIKeysClient(subscriptionID)
-}
-func NewAPIKeysClientWithBaseURI(baseURI string, subscriptionID string) APIKeysClient {
-	return original.NewAPIKeysClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type ComponentAvailableFeaturesClient = original.ComponentAvailableFeaturesClient
+type ComponentQuotaStatusClient = original.ComponentQuotaStatusClient
 
-func NewComponentAvailableFeaturesClient(subscriptionID string) ComponentAvailableFeaturesClient {
-	return original.NewComponentAvailableFeaturesClient(subscriptionID)
+func NewComponentQuotaStatusClient(subscriptionID string) ComponentQuotaStatusClient {
+	return original.NewComponentQuotaStatusClient(subscriptionID)
 }
-func NewComponentAvailableFeaturesClientWithBaseURI(baseURI string, subscriptionID string) ComponentAvailableFeaturesClient {
-	return original.NewComponentAvailableFeaturesClientWithBaseURI(baseURI, subscriptionID)
+func NewComponentQuotaStatusClientWithBaseURI(baseURI string, subscriptionID string) ComponentQuotaStatusClient {
+	return original.NewComponentQuotaStatusClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ComponentCurrentBillingFeaturesClient = original.ComponentCurrentBillingFeaturesClient
+type OperationsClient = original.OperationsClient
 
-func NewComponentCurrentBillingFeaturesClient(subscriptionID string) ComponentCurrentBillingFeaturesClient {
-	return original.NewComponentCurrentBillingFeaturesClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewComponentCurrentBillingFeaturesClientWithBaseURI(baseURI string, subscriptionID string) ComponentCurrentBillingFeaturesClient {
-	return original.NewComponentCurrentBillingFeaturesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ComponentFeatureCapabilitiesClient = original.ComponentFeatureCapabilitiesClient
+type ComponentsClient = original.ComponentsClient
 
-func NewComponentFeatureCapabilitiesClient(subscriptionID string) ComponentFeatureCapabilitiesClient {
-	return original.NewComponentFeatureCapabilitiesClient(subscriptionID)
+func NewComponentsClient(subscriptionID string) ComponentsClient {
+	return original.NewComponentsClient(subscriptionID)
 }
-func NewComponentFeatureCapabilitiesClientWithBaseURI(baseURI string, subscriptionID string) ComponentFeatureCapabilitiesClient {
-	return original.NewComponentFeatureCapabilitiesClientWithBaseURI(baseURI, subscriptionID)
+func NewComponentsClientWithBaseURI(baseURI string, subscriptionID string) ComponentsClient {
+	return original.NewComponentsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ComponentQuotaStatusClient = original.ComponentQuotaStatusClient
+type WorkbooksClient = original.WorkbooksClient
 
-func NewComponentQuotaStatusClient(subscriptionID string) ComponentQuotaStatusClient {
-	return original.NewComponentQuotaStatusClient(subscriptionID)
+func NewWorkbooksClient(subscriptionID string) WorkbooksClient {
+	return original.NewWorkbooksClient(subscriptionID)
 }
-func NewComponentQuotaStatusClientWithBaseURI(baseURI string, subscriptionID string) ComponentQuotaStatusClient {
-	return original.NewComponentQuotaStatusClientWithBaseURI(baseURI, subscriptionID)
+func NewWorkbooksClientWithBaseURI(baseURI string, subscriptionID string) WorkbooksClient {
+	return original.NewWorkbooksClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ComponentsClient = original.ComponentsClient
+type WebTestLocationsClient = original.WebTestLocationsClient
 
-func NewComponentsClient(subscriptionID string) ComponentsClient {
-	return original.NewComponentsClient(subscriptionID)
+func NewWebTestLocationsClient(subscriptionID string) WebTestLocationsClient {
+	return original.NewWebTestLocationsClient(subscriptionID)
 }
-func NewComponentsClientWithBaseURI(baseURI string, subscriptionID string) ComponentsClient {
-	return original.NewComponentsClientWithBaseURI(baseURI, subscriptionID)
+func NewWebTestLocationsClientWithBaseURI(baseURI string, subscriptionID string) WebTestLocationsClient {
+	return original.NewWebTestLocationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ExportConfigurationsClient = original.ExportConfigurationsClient
+type WorkbookClient = original.WorkbookClient
 
-func NewExportConfigurationsClient(subscriptionID string) ExportConfigurationsClient {
-	return original.NewExportConfigurationsClient(subscriptionID)
+func NewWorkbookClient(subscriptionID string) WorkbookClient {
+	return original.NewWorkbookClient(subscriptionID)
 }
-func NewExportConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) ExportConfigurationsClient {
-	return original.NewExportConfigurationsClientWithBaseURI(baseURI, subscriptionID)
+func NewWorkbookClientWithBaseURI(baseURI string, subscriptionID string) WorkbookClient {
+	return original.NewWorkbookClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type FavoriteClient = original.FavoriteClient
+type AnnotationsClient = original.AnnotationsClient
 
-func NewFavoriteClient(subscriptionID string) FavoriteClient {
-	return original.NewFavoriteClient(subscriptionID)
+func NewAnnotationsClient(subscriptionID string) AnnotationsClient {
+	return original.NewAnnotationsClient(subscriptionID)
 }
-func NewFavoriteClientWithBaseURI(baseURI string, subscriptionID string) FavoriteClient {
-	return original.NewFavoriteClientWithBaseURI(baseURI, subscriptionID)
+func NewAnnotationsClientWithBaseURI(baseURI string, subscriptionID string) AnnotationsClient {
+	return original.NewAnnotationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type FavoritesClient = original.FavoritesClient
@@ -351,13 +311,28 @@ type Workbooks = original.Workbooks
 type WorkItemConfiguration = original.WorkItemConfiguration
 type WorkItemConfigurationError = original.WorkItemConfigurationError
 type WorkItemCreateConfiguration = original.WorkItemCreateConfiguration
-type OperationsClient = original.OperationsClient
+type ComponentFeatureCapabilitiesClient = original.ComponentFeatureCapabilitiesClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewComponentFeatureCapabilitiesClient(subscriptionID string) ComponentFeatureCapabilitiesClient {
+	return original.NewComponentFeatureCapabilitiesClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewComponentFeatureCapabilitiesClientWithBaseURI(baseURI string, subscriptionID string) ComponentFeatureCapabilitiesClient {
+	return original.NewComponentFeatureCapabilitiesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ExportConfigurationsClient = original.ExportConfigurationsClient
+
+func NewExportConfigurationsClient(subscriptionID string) ExportConfigurationsClient {
+	return original.NewExportConfigurationsClient(subscriptionID)
+}
+func NewExportConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) ExportConfigurationsClient {
+	return original.NewExportConfigurationsClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
+}
+func Version() string {
+	return original.Version()
 }
 
 type ProactiveDetectionConfigurationsClient = original.ProactiveDetectionConfigurationsClient
@@ -368,20 +343,23 @@ func NewProactiveDetectionConfigurationsClient(subscriptionID string) ProactiveD
 func NewProactiveDetectionConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) ProactiveDetectionConfigurationsClient {
 	return original.NewProactiveDetectionConfigurationsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+type WorkItemConfigurationsClient = original.WorkItemConfigurationsClient
+
+func NewWorkItemConfigurationsClient(subscriptionID string) WorkItemConfigurationsClient {
+	return original.NewWorkItemConfigurationsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWorkItemConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) WorkItemConfigurationsClient {
+	return original.NewWorkItemConfigurationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type WebTestLocationsClient = original.WebTestLocationsClient
+type AnalyticsItemClient = original.AnalyticsItemClient
 
-func NewWebTestLocationsClient(subscriptionID string) WebTestLocationsClient {
-	return original.NewWebTestLocationsClient(subscriptionID)
+func NewAnalyticsItemClient(subscriptionID string) AnalyticsItemClient {
+	return original.NewAnalyticsItemClient(subscriptionID)
 }
-func NewWebTestLocationsClientWithBaseURI(baseURI string, subscriptionID string) WebTestLocationsClient {
-	return original.NewWebTestLocationsClientWithBaseURI(baseURI, subscriptionID)
+func NewAnalyticsItemClientWithBaseURI(baseURI string, subscriptionID string) AnalyticsItemClient {
+	return original.NewAnalyticsItemClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type WebTestsClient = original.WebTestsClient
@@ -393,29 +371,51 @@ func NewWebTestsClientWithBaseURI(baseURI string, subscriptionID string) WebTest
 	return original.NewWebTestsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type WorkbookClient = original.WorkbookClient
+type APIKeysClient = original.APIKeysClient
 
-func NewWorkbookClient(subscriptionID string) WorkbookClient {
-	return original.NewWorkbookClient(subscriptionID)
+func NewAPIKeysClient(subscriptionID string) APIKeysClient {
+	return original.NewAPIKeysClient(subscriptionID)
 }
-func NewWorkbookClientWithBaseURI(baseURI string, subscriptionID string) WorkbookClient {
-	return original.NewWorkbookClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIKeysClientWithBaseURI(baseURI string, subscriptionID string) APIKeysClient {
+	return original.NewAPIKeysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type WorkbooksClient = original.WorkbooksClient
+type ComponentCurrentBillingFeaturesClient = original.ComponentCurrentBillingFeaturesClient
 
-func NewWorkbooksClient(subscriptionID string) WorkbooksClient {
-	return original.NewWorkbooksClient(subscriptionID)
+func NewComponentCurrentBillingFeaturesClient(subscriptionID string) ComponentCurrentBillingFeaturesClient {
+	return original.NewComponentCurrentBillingFeaturesClient(subscriptionID)
 }
-func NewWorkbooksClientWithBaseURI(baseURI string, subscriptionID string) WorkbooksClient {
-	return original.NewWorkbooksClientWithBaseURI(baseURI, subscriptionID)
+func NewComponentCurrentBillingFeaturesClientWithBaseURI(baseURI string, subscriptionID string) ComponentCurrentBillingFeaturesClient {
+	return original.NewComponentCurrentBillingFeaturesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type WorkItemConfigurationsClient = original.WorkItemConfigurationsClient
+type ComponentAvailableFeaturesClient = original.ComponentAvailableFeaturesClient
 
-func NewWorkItemConfigurationsClient(subscriptionID string) WorkItemConfigurationsClient {
-	return original.NewWorkItemConfigurationsClient(subscriptionID)
+func NewComponentAvailableFeaturesClient(subscriptionID string) ComponentAvailableFeaturesClient {
+	return original.NewComponentAvailableFeaturesClient(subscriptionID)
 }
-func NewWorkItemConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) WorkItemConfigurationsClient {
-	return original.NewWorkItemConfigurationsClientWithBaseURI(baseURI, subscriptionID)
+func NewComponentAvailableFeaturesClientWithBaseURI(baseURI string, subscriptionID string) ComponentAvailableFeaturesClient {
+	return original.NewComponentAvailableFeaturesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
+
+type FavoriteClient = original.FavoriteClient
+
+func NewFavoriteClient(subscriptionID string) FavoriteClient {
+	return original.NewFavoriteClient(subscriptionID)
+}
+func NewFavoriteClientWithBaseURI(baseURI string, subscriptionID string) FavoriteClient {
+	return original.NewFavoriteClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/authorization/mgmt/authorization/models.go b/profiles/latest/authorization/mgmt/authorization/models.go
index 5667864794d5..b46912b1f70a 100644
--- a/profiles/latest/authorization/mgmt/authorization/models.go
+++ b/profiles/latest/authorization/mgmt/authorization/models.go
@@ -21,26 +21,31 @@ package authorization
 
 import original "github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2015-07-01/authorization"
 
-type ClassicAdministratorsClient = original.ClassicAdministratorsClient
+type RoleDefinitionsClient = original.RoleDefinitionsClient
 
-func NewClassicAdministratorsClient(subscriptionID string) ClassicAdministratorsClient {
-	return original.NewClassicAdministratorsClient(subscriptionID)
+func NewRoleDefinitionsClient(subscriptionID string) RoleDefinitionsClient {
+	return original.NewRoleDefinitionsClient(subscriptionID)
 }
-func NewClassicAdministratorsClientWithBaseURI(baseURI string, subscriptionID string) ClassicAdministratorsClient {
-	return original.NewClassicAdministratorsClientWithBaseURI(baseURI, subscriptionID)
+func NewRoleDefinitionsClientWithBaseURI(baseURI string, subscriptionID string) RoleDefinitionsClient {
+	return original.NewRoleDefinitionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type RoleAssignmentsClient = original.RoleAssignmentsClient
 
-type BaseClient = original.BaseClient
+func NewRoleAssignmentsClient(subscriptionID string) RoleAssignmentsClient {
+	return original.NewRoleAssignmentsClient(subscriptionID)
+}
+func NewRoleAssignmentsClientWithBaseURI(baseURI string, subscriptionID string) RoleAssignmentsClient {
+	return original.NewRoleAssignmentsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type ProviderOperationsMetadataClient = original.ProviderOperationsMetadataClient
+
+func NewProviderOperationsMetadataClient(subscriptionID string) ProviderOperationsMetadataClient {
+	return original.NewProviderOperationsMetadataClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewProviderOperationsMetadataClientWithBaseURI(baseURI string, subscriptionID string) ProviderOperationsMetadataClient {
+	return original.NewProviderOperationsMetadataClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ClassicAdministrator = original.ClassicAdministrator
@@ -72,44 +77,39 @@ type RoleDefinitionListResult = original.RoleDefinitionListResult
 type RoleDefinitionListResultIterator = original.RoleDefinitionListResultIterator
 type RoleDefinitionListResultPage = original.RoleDefinitionListResultPage
 type RoleDefinitionProperties = original.RoleDefinitionProperties
-type PermissionsClient = original.PermissionsClient
+type ClassicAdministratorsClient = original.ClassicAdministratorsClient
 
-func NewPermissionsClient(subscriptionID string) PermissionsClient {
-	return original.NewPermissionsClient(subscriptionID)
+func NewClassicAdministratorsClient(subscriptionID string) ClassicAdministratorsClient {
+	return original.NewClassicAdministratorsClient(subscriptionID)
 }
-func NewPermissionsClientWithBaseURI(baseURI string, subscriptionID string) PermissionsClient {
-	return original.NewPermissionsClientWithBaseURI(baseURI, subscriptionID)
+func NewClassicAdministratorsClientWithBaseURI(baseURI string, subscriptionID string) ClassicAdministratorsClient {
+	return original.NewClassicAdministratorsClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type ProviderOperationsMetadataClient = original.ProviderOperationsMetadataClient
-
-func NewProviderOperationsMetadataClient(subscriptionID string) ProviderOperationsMetadataClient {
-	return original.NewProviderOperationsMetadataClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewProviderOperationsMetadataClientWithBaseURI(baseURI string, subscriptionID string) ProviderOperationsMetadataClient {
-	return original.NewProviderOperationsMetadataClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type RoleAssignmentsClient = original.RoleAssignmentsClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewRoleAssignmentsClient(subscriptionID string) RoleAssignmentsClient {
-	return original.NewRoleAssignmentsClient(subscriptionID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewRoleAssignmentsClientWithBaseURI(baseURI string, subscriptionID string) RoleAssignmentsClient {
-	return original.NewRoleAssignmentsClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
-type RoleDefinitionsClient = original.RoleDefinitionsClient
+type PermissionsClient = original.PermissionsClient
 
-func NewRoleDefinitionsClient(subscriptionID string) RoleDefinitionsClient {
-	return original.NewRoleDefinitionsClient(subscriptionID)
-}
-func NewRoleDefinitionsClientWithBaseURI(baseURI string, subscriptionID string) RoleDefinitionsClient {
-	return original.NewRoleDefinitionsClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+func NewPermissionsClient(subscriptionID string) PermissionsClient {
+	return original.NewPermissionsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewPermissionsClientWithBaseURI(baseURI string, subscriptionID string) PermissionsClient {
+	return original.NewPermissionsClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/automation/mgmt/automation/models.go b/profiles/latest/automation/mgmt/automation/models.go
index d2df1d0ffe16..f9d419ebbcb8 100644
--- a/profiles/latest/automation/mgmt/automation/models.go
+++ b/profiles/latest/automation/mgmt/automation/models.go
@@ -21,62 +21,31 @@ package automation
 
 import original "github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation"
 
-type AccountClient = original.AccountClient
-
-func NewAccountClient(subscriptionID string) AccountClient {
-	return original.NewAccountClient(subscriptionID)
-}
-func NewAccountClientWithBaseURI(baseURI string, subscriptionID string) AccountClient {
-	return original.NewAccountClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ActivityClient = original.ActivityClient
-
-func NewActivityClient(subscriptionID string) ActivityClient {
-	return original.NewActivityClient(subscriptionID)
-}
-func NewActivityClientWithBaseURI(baseURI string, subscriptionID string) ActivityClient {
-	return original.NewActivityClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type AgentRegistrationInformationClient = original.AgentRegistrationInformationClient
-
-func NewAgentRegistrationInformationClient(subscriptionID string) AgentRegistrationInformationClient {
-	return original.NewAgentRegistrationInformationClient(subscriptionID)
-}
-func NewAgentRegistrationInformationClientWithBaseURI(baseURI string, subscriptionID string) AgentRegistrationInformationClient {
-	return original.NewAgentRegistrationInformationClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type CertificateClient = original.CertificateClient
+type JobStreamClient = original.JobStreamClient
 
-func NewCertificateClient(subscriptionID string) CertificateClient {
-	return original.NewCertificateClient(subscriptionID)
+func NewJobStreamClient(subscriptionID string) JobStreamClient {
+	return original.NewJobStreamClient(subscriptionID)
 }
-func NewCertificateClientWithBaseURI(baseURI string, subscriptionID string) CertificateClient {
-	return original.NewCertificateClientWithBaseURI(baseURI, subscriptionID)
+func NewJobStreamClientWithBaseURI(baseURI string, subscriptionID string) JobStreamClient {
+	return original.NewJobStreamClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type DscNodeClient = original.DscNodeClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewDscNodeClient(subscriptionID string) DscNodeClient {
+	return original.NewDscNodeClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewDscNodeClientWithBaseURI(baseURI string, subscriptionID string) DscNodeClient {
+	return original.NewDscNodeClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ConnectionClient = original.ConnectionClient
+type OperationsClient = original.OperationsClient
 
-func NewConnectionClient(subscriptionID string) ConnectionClient {
-	return original.NewConnectionClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewConnectionClientWithBaseURI(baseURI string, subscriptionID string) ConnectionClient {
-	return original.NewConnectionClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ConnectionTypeClient = original.ConnectionTypeClient
@@ -88,31 +57,40 @@ func NewConnectionTypeClientWithBaseURI(baseURI string, subscriptionID string) C
 	return original.NewConnectionTypeClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CredentialClient = original.CredentialClient
+type UsagesClient = original.UsagesClient
 
-func NewCredentialClient(subscriptionID string) CredentialClient {
-	return original.NewCredentialClient(subscriptionID)
+func NewUsagesClient(subscriptionID string) UsagesClient {
+	return original.NewUsagesClient(subscriptionID)
 }
-func NewCredentialClientWithBaseURI(baseURI string, subscriptionID string) CredentialClient {
-	return original.NewCredentialClientWithBaseURI(baseURI, subscriptionID)
+func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
+	return original.NewUsagesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DscCompilationJobClient = original.DscCompilationJobClient
+type ScheduleClient = original.ScheduleClient
 
-func NewDscCompilationJobClient(subscriptionID string) DscCompilationJobClient {
-	return original.NewDscCompilationJobClient(subscriptionID)
+func NewScheduleClient(subscriptionID string) ScheduleClient {
+	return original.NewScheduleClient(subscriptionID)
 }
-func NewDscCompilationJobClientWithBaseURI(baseURI string, subscriptionID string) DscCompilationJobClient {
-	return original.NewDscCompilationJobClientWithBaseURI(baseURI, subscriptionID)
+func NewScheduleClientWithBaseURI(baseURI string, subscriptionID string) ScheduleClient {
+	return original.NewScheduleClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DscCompilationJobStreamClient = original.DscCompilationJobStreamClient
+type AgentRegistrationInformationClient = original.AgentRegistrationInformationClient
 
-func NewDscCompilationJobStreamClient(subscriptionID string) DscCompilationJobStreamClient {
-	return original.NewDscCompilationJobStreamClient(subscriptionID)
+func NewAgentRegistrationInformationClient(subscriptionID string) AgentRegistrationInformationClient {
+	return original.NewAgentRegistrationInformationClient(subscriptionID)
 }
-func NewDscCompilationJobStreamClientWithBaseURI(baseURI string, subscriptionID string) DscCompilationJobStreamClient {
-	return original.NewDscCompilationJobStreamClientWithBaseURI(baseURI, subscriptionID)
+func NewAgentRegistrationInformationClientWithBaseURI(baseURI string, subscriptionID string) AgentRegistrationInformationClient {
+	return original.NewAgentRegistrationInformationClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type WebhookClient = original.WebhookClient
+
+func NewWebhookClient(subscriptionID string) WebhookClient {
+	return original.NewWebhookClient(subscriptionID)
+}
+func NewWebhookClientWithBaseURI(baseURI string, subscriptionID string) WebhookClient {
+	return original.NewWebhookClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type DscConfigurationClient = original.DscConfigurationClient
@@ -124,85 +102,85 @@ func NewDscConfigurationClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewDscConfigurationClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DscNodeClient = original.DscNodeClient
+type NodeReportsClient = original.NodeReportsClient
 
-func NewDscNodeClient(subscriptionID string) DscNodeClient {
-	return original.NewDscNodeClient(subscriptionID)
+func NewNodeReportsClient(subscriptionID string) NodeReportsClient {
+	return original.NewNodeReportsClient(subscriptionID)
 }
-func NewDscNodeClientWithBaseURI(baseURI string, subscriptionID string) DscNodeClient {
-	return original.NewDscNodeClientWithBaseURI(baseURI, subscriptionID)
+func NewNodeReportsClientWithBaseURI(baseURI string, subscriptionID string) NodeReportsClient {
+	return original.NewNodeReportsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DscNodeConfigurationClient = original.DscNodeConfigurationClient
+type JobClient = original.JobClient
 
-func NewDscNodeConfigurationClient(subscriptionID string) DscNodeConfigurationClient {
-	return original.NewDscNodeConfigurationClient(subscriptionID)
+func NewJobClient(subscriptionID string) JobClient {
+	return original.NewJobClient(subscriptionID)
 }
-func NewDscNodeConfigurationClientWithBaseURI(baseURI string, subscriptionID string) DscNodeConfigurationClient {
-	return original.NewDscNodeConfigurationClientWithBaseURI(baseURI, subscriptionID)
+func NewJobClientWithBaseURI(baseURI string, subscriptionID string) JobClient {
+	return original.NewJobClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type FieldsClient = original.FieldsClient
+type DscCompilationJobClient = original.DscCompilationJobClient
 
-func NewFieldsClient(subscriptionID string) FieldsClient {
-	return original.NewFieldsClient(subscriptionID)
+func NewDscCompilationJobClient(subscriptionID string) DscCompilationJobClient {
+	return original.NewDscCompilationJobClient(subscriptionID)
 }
-func NewFieldsClientWithBaseURI(baseURI string, subscriptionID string) FieldsClient {
-	return original.NewFieldsClientWithBaseURI(baseURI, subscriptionID)
+func NewDscCompilationJobClientWithBaseURI(baseURI string, subscriptionID string) DscCompilationJobClient {
+	return original.NewDscCompilationJobClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type HybridRunbookWorkerGroupClient = original.HybridRunbookWorkerGroupClient
+type ModuleClient = original.ModuleClient
 
-func NewHybridRunbookWorkerGroupClient(subscriptionID string) HybridRunbookWorkerGroupClient {
-	return original.NewHybridRunbookWorkerGroupClient(subscriptionID)
+func NewModuleClient(subscriptionID string) ModuleClient {
+	return original.NewModuleClient(subscriptionID)
 }
-func NewHybridRunbookWorkerGroupClientWithBaseURI(baseURI string, subscriptionID string) HybridRunbookWorkerGroupClient {
-	return original.NewHybridRunbookWorkerGroupClientWithBaseURI(baseURI, subscriptionID)
+func NewModuleClientWithBaseURI(baseURI string, subscriptionID string) ModuleClient {
+	return original.NewModuleClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type JobClient = original.JobClient
+type AccountClient = original.AccountClient
 
-func NewJobClient(subscriptionID string) JobClient {
-	return original.NewJobClient(subscriptionID)
+func NewAccountClient(subscriptionID string) AccountClient {
+	return original.NewAccountClient(subscriptionID)
 }
-func NewJobClientWithBaseURI(baseURI string, subscriptionID string) JobClient {
-	return original.NewJobClientWithBaseURI(baseURI, subscriptionID)
+func NewAccountClientWithBaseURI(baseURI string, subscriptionID string) AccountClient {
+	return original.NewAccountClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type JobScheduleClient = original.JobScheduleClient
+type StatisticsClient = original.StatisticsClient
 
-func NewJobScheduleClient(subscriptionID string) JobScheduleClient {
-	return original.NewJobScheduleClient(subscriptionID)
+func NewStatisticsClient(subscriptionID string) StatisticsClient {
+	return original.NewStatisticsClient(subscriptionID)
 }
-func NewJobScheduleClientWithBaseURI(baseURI string, subscriptionID string) JobScheduleClient {
-	return original.NewJobScheduleClientWithBaseURI(baseURI, subscriptionID)
+func NewStatisticsClientWithBaseURI(baseURI string, subscriptionID string) StatisticsClient {
+	return original.NewStatisticsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type JobStreamClient = original.JobStreamClient
+type RunbookDraftClient = original.RunbookDraftClient
 
-func NewJobStreamClient(subscriptionID string) JobStreamClient {
-	return original.NewJobStreamClient(subscriptionID)
+func NewRunbookDraftClient(subscriptionID string) RunbookDraftClient {
+	return original.NewRunbookDraftClient(subscriptionID)
 }
-func NewJobStreamClientWithBaseURI(baseURI string, subscriptionID string) JobStreamClient {
-	return original.NewJobStreamClientWithBaseURI(baseURI, subscriptionID)
+func NewRunbookDraftClientWithBaseURI(baseURI string, subscriptionID string) RunbookDraftClient {
+	return original.NewRunbookDraftClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type KeysClient = original.KeysClient
+type ObjectDataTypesClient = original.ObjectDataTypesClient
 
-func NewKeysClient(subscriptionID string) KeysClient {
-	return original.NewKeysClient(subscriptionID)
+func NewObjectDataTypesClient(subscriptionID string) ObjectDataTypesClient {
+	return original.NewObjectDataTypesClient(subscriptionID)
 }
-func NewKeysClientWithBaseURI(baseURI string, subscriptionID string) KeysClient {
-	return original.NewKeysClientWithBaseURI(baseURI, subscriptionID)
+func NewObjectDataTypesClientWithBaseURI(baseURI string, subscriptionID string) ObjectDataTypesClient {
+	return original.NewObjectDataTypesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LinkedWorkspaceClient = original.LinkedWorkspaceClient
+type ActivityClient = original.ActivityClient
 
-func NewLinkedWorkspaceClient(subscriptionID string) LinkedWorkspaceClient {
-	return original.NewLinkedWorkspaceClient(subscriptionID)
+func NewActivityClient(subscriptionID string) ActivityClient {
+	return original.NewActivityClient(subscriptionID)
 }
-func NewLinkedWorkspaceClientWithBaseURI(baseURI string, subscriptionID string) LinkedWorkspaceClient {
-	return original.NewLinkedWorkspaceClientWithBaseURI(baseURI, subscriptionID)
+func NewActivityClientWithBaseURI(baseURI string, subscriptionID string) ActivityClient {
+	return original.NewActivityClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccountState = original.AccountState
@@ -695,40 +673,28 @@ type WebhookListResultPage = original.WebhookListResultPage
 type WebhookProperties = original.WebhookProperties
 type WebhookUpdateParameters = original.WebhookUpdateParameters
 type WebhookUpdateProperties = original.WebhookUpdateProperties
-type ModuleClient = original.ModuleClient
-
-func NewModuleClient(subscriptionID string) ModuleClient {
-	return original.NewModuleClient(subscriptionID)
-}
-func NewModuleClientWithBaseURI(baseURI string, subscriptionID string) ModuleClient {
-	return original.NewModuleClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type NodeReportsClient = original.NodeReportsClient
+type JobScheduleClient = original.JobScheduleClient
 
-func NewNodeReportsClient(subscriptionID string) NodeReportsClient {
-	return original.NewNodeReportsClient(subscriptionID)
+func NewJobScheduleClient(subscriptionID string) JobScheduleClient {
+	return original.NewJobScheduleClient(subscriptionID)
 }
-func NewNodeReportsClientWithBaseURI(baseURI string, subscriptionID string) NodeReportsClient {
-	return original.NewNodeReportsClientWithBaseURI(baseURI, subscriptionID)
+func NewJobScheduleClientWithBaseURI(baseURI string, subscriptionID string) JobScheduleClient {
+	return original.NewJobScheduleClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type ObjectDataTypesClient = original.ObjectDataTypesClient
-
-func NewObjectDataTypesClient(subscriptionID string) ObjectDataTypesClient {
-	return original.NewObjectDataTypesClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewObjectDataTypesClientWithBaseURI(baseURI string, subscriptionID string) ObjectDataTypesClient {
-	return original.NewObjectDataTypesClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type OperationsClient = original.OperationsClient
+type DscCompilationJobStreamClient = original.DscCompilationJobStreamClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewDscCompilationJobStreamClient(subscriptionID string) DscCompilationJobStreamClient {
+	return original.NewDscCompilationJobStreamClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewDscCompilationJobStreamClientWithBaseURI(baseURI string, subscriptionID string) DscCompilationJobStreamClient {
+	return original.NewDscCompilationJobStreamClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type RunbookClient = original.RunbookClient
@@ -740,31 +706,40 @@ func NewRunbookClientWithBaseURI(baseURI string, subscriptionID string) RunbookC
 	return original.NewRunbookClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type RunbookDraftClient = original.RunbookDraftClient
+type FieldsClient = original.FieldsClient
 
-func NewRunbookDraftClient(subscriptionID string) RunbookDraftClient {
-	return original.NewRunbookDraftClient(subscriptionID)
+func NewFieldsClient(subscriptionID string) FieldsClient {
+	return original.NewFieldsClient(subscriptionID)
 }
-func NewRunbookDraftClientWithBaseURI(baseURI string, subscriptionID string) RunbookDraftClient {
-	return original.NewRunbookDraftClientWithBaseURI(baseURI, subscriptionID)
+func NewFieldsClientWithBaseURI(baseURI string, subscriptionID string) FieldsClient {
+	return original.NewFieldsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ScheduleClient = original.ScheduleClient
+type CertificateClient = original.CertificateClient
 
-func NewScheduleClient(subscriptionID string) ScheduleClient {
-	return original.NewScheduleClient(subscriptionID)
+func NewCertificateClient(subscriptionID string) CertificateClient {
+	return original.NewCertificateClient(subscriptionID)
 }
-func NewScheduleClientWithBaseURI(baseURI string, subscriptionID string) ScheduleClient {
-	return original.NewScheduleClientWithBaseURI(baseURI, subscriptionID)
+func NewCertificateClientWithBaseURI(baseURI string, subscriptionID string) CertificateClient {
+	return original.NewCertificateClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type StatisticsClient = original.StatisticsClient
+type VariableClient = original.VariableClient
 
-func NewStatisticsClient(subscriptionID string) StatisticsClient {
-	return original.NewStatisticsClient(subscriptionID)
+func NewVariableClient(subscriptionID string) VariableClient {
+	return original.NewVariableClient(subscriptionID)
 }
-func NewStatisticsClientWithBaseURI(baseURI string, subscriptionID string) StatisticsClient {
-	return original.NewStatisticsClientWithBaseURI(baseURI, subscriptionID)
+func NewVariableClientWithBaseURI(baseURI string, subscriptionID string) VariableClient {
+	return original.NewVariableClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ConnectionClient = original.ConnectionClient
+
+func NewConnectionClient(subscriptionID string) ConnectionClient {
+	return original.NewConnectionClient(subscriptionID)
+}
+func NewConnectionClientWithBaseURI(baseURI string, subscriptionID string) ConnectionClient {
+	return original.NewConnectionClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type TestJobClient = original.TestJobClient
@@ -776,44 +751,69 @@ func NewTestJobClientWithBaseURI(baseURI string, subscriptionID string) TestJobC
 	return original.NewTestJobClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TestJobStreamsClient = original.TestJobStreamsClient
+type KeysClient = original.KeysClient
 
-func NewTestJobStreamsClient(subscriptionID string) TestJobStreamsClient {
-	return original.NewTestJobStreamsClient(subscriptionID)
+func NewKeysClient(subscriptionID string) KeysClient {
+	return original.NewKeysClient(subscriptionID)
 }
-func NewTestJobStreamsClientWithBaseURI(baseURI string, subscriptionID string) TestJobStreamsClient {
-	return original.NewTestJobStreamsClientWithBaseURI(baseURI, subscriptionID)
+func NewKeysClientWithBaseURI(baseURI string, subscriptionID string) KeysClient {
+	return original.NewKeysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UsagesClient = original.UsagesClient
+type CredentialClient = original.CredentialClient
 
-func NewUsagesClient(subscriptionID string) UsagesClient {
-	return original.NewUsagesClient(subscriptionID)
+func NewCredentialClient(subscriptionID string) CredentialClient {
+	return original.NewCredentialClient(subscriptionID)
 }
-func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
-	return original.NewUsagesClientWithBaseURI(baseURI, subscriptionID)
+func NewCredentialClientWithBaseURI(baseURI string, subscriptionID string) CredentialClient {
+	return original.NewCredentialClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VariableClient = original.VariableClient
+type DscNodeConfigurationClient = original.DscNodeConfigurationClient
 
-func NewVariableClient(subscriptionID string) VariableClient {
-	return original.NewVariableClient(subscriptionID)
+func NewDscNodeConfigurationClient(subscriptionID string) DscNodeConfigurationClient {
+	return original.NewDscNodeConfigurationClient(subscriptionID)
 }
-func NewVariableClientWithBaseURI(baseURI string, subscriptionID string) VariableClient {
-	return original.NewVariableClientWithBaseURI(baseURI, subscriptionID)
+func NewDscNodeConfigurationClientWithBaseURI(baseURI string, subscriptionID string) DscNodeConfigurationClient {
+	return original.NewDscNodeConfigurationClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
-type WebhookClient = original.WebhookClient
+type HybridRunbookWorkerGroupClient = original.HybridRunbookWorkerGroupClient
 
-func NewWebhookClient(subscriptionID string) WebhookClient {
-	return original.NewWebhookClient(subscriptionID)
+func NewHybridRunbookWorkerGroupClient(subscriptionID string) HybridRunbookWorkerGroupClient {
+	return original.NewHybridRunbookWorkerGroupClient(subscriptionID)
 }
-func NewWebhookClientWithBaseURI(baseURI string, subscriptionID string) WebhookClient {
-	return original.NewWebhookClientWithBaseURI(baseURI, subscriptionID)
+func NewHybridRunbookWorkerGroupClientWithBaseURI(baseURI string, subscriptionID string) HybridRunbookWorkerGroupClient {
+	return original.NewHybridRunbookWorkerGroupClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type LinkedWorkspaceClient = original.LinkedWorkspaceClient
+
+func NewLinkedWorkspaceClient(subscriptionID string) LinkedWorkspaceClient {
+	return original.NewLinkedWorkspaceClient(subscriptionID)
+}
+func NewLinkedWorkspaceClientWithBaseURI(baseURI string, subscriptionID string) LinkedWorkspaceClient {
+	return original.NewLinkedWorkspaceClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type TestJobStreamsClient = original.TestJobStreamsClient
+
+func NewTestJobStreamsClient(subscriptionID string) TestJobStreamsClient {
+	return original.NewTestJobStreamsClient(subscriptionID)
+}
+func NewTestJobStreamsClientWithBaseURI(baseURI string, subscriptionID string) TestJobStreamsClient {
+	return original.NewTestJobStreamsClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/azsadmin/mgmt/fabric/models.go b/profiles/latest/azsadmin/mgmt/fabric/models.go
index 8a5a38775752..65219e0c4f01 100644
--- a/profiles/latest/azsadmin/mgmt/fabric/models.go
+++ b/profiles/latest/azsadmin/mgmt/fabric/models.go
@@ -21,17 +21,22 @@ package fabric
 
 import original "github.com/Azure/azure-sdk-for-go/services/azsadmin/mgmt/2016-05-01/fabric"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type StoragePoolsClient = original.StoragePoolsClient
 
-type BaseClient = original.BaseClient
+func NewStoragePoolsClient(subscriptionID string) StoragePoolsClient {
+	return original.NewStoragePoolsClient(subscriptionID)
+}
+func NewStoragePoolsClientWithBaseURI(baseURI string, subscriptionID string) StoragePoolsClient {
+	return original.NewStoragePoolsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type VolumesClient = original.VolumesClient
+
+func NewVolumesClient(subscriptionID string) VolumesClient {
+	return original.NewVolumesClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewVolumesClientWithBaseURI(baseURI string, subscriptionID string) VolumesClient {
+	return original.NewVolumesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ComputeFabricOperationsClient = original.ComputeFabricOperationsClient
@@ -43,49 +48,31 @@ func NewComputeFabricOperationsClientWithBaseURI(baseURI string, subscriptionID
 	return original.NewComputeFabricOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type EdgeGatewayPoolsClient = original.EdgeGatewayPoolsClient
-
-func NewEdgeGatewayPoolsClient(subscriptionID string) EdgeGatewayPoolsClient {
-	return original.NewEdgeGatewayPoolsClient(subscriptionID)
-}
-func NewEdgeGatewayPoolsClientWithBaseURI(baseURI string, subscriptionID string) EdgeGatewayPoolsClient {
-	return original.NewEdgeGatewayPoolsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type EdgeGatewaysClient = original.EdgeGatewaysClient
-
-func NewEdgeGatewaysClient(subscriptionID string) EdgeGatewaysClient {
-	return original.NewEdgeGatewaysClient(subscriptionID)
-}
-func NewEdgeGatewaysClientWithBaseURI(baseURI string, subscriptionID string) EdgeGatewaysClient {
-	return original.NewEdgeGatewaysClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type FileSharesClient = original.FileSharesClient
+type InfraRolesClient = original.InfraRolesClient
 
-func NewFileSharesClient(subscriptionID string) FileSharesClient {
-	return original.NewFileSharesClient(subscriptionID)
+func NewInfraRolesClient(subscriptionID string) InfraRolesClient {
+	return original.NewInfraRolesClient(subscriptionID)
 }
-func NewFileSharesClientWithBaseURI(baseURI string, subscriptionID string) FileSharesClient {
-	return original.NewFileSharesClientWithBaseURI(baseURI, subscriptionID)
+func NewInfraRolesClientWithBaseURI(baseURI string, subscriptionID string) InfraRolesClient {
+	return original.NewInfraRolesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type InfraRoleInstancesClient = original.InfraRoleInstancesClient
+type LocationsClient = original.LocationsClient
 
-func NewInfraRoleInstancesClient(subscriptionID string) InfraRoleInstancesClient {
-	return original.NewInfraRoleInstancesClient(subscriptionID)
+func NewLocationsClient(subscriptionID string) LocationsClient {
+	return original.NewLocationsClient(subscriptionID)
 }
-func NewInfraRoleInstancesClientWithBaseURI(baseURI string, subscriptionID string) InfraRoleInstancesClient {
-	return original.NewInfraRoleInstancesClientWithBaseURI(baseURI, subscriptionID)
+func NewLocationsClientWithBaseURI(baseURI string, subscriptionID string) LocationsClient {
+	return original.NewLocationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type InfraRolesClient = original.InfraRolesClient
+type StorageSystemsClient = original.StorageSystemsClient
 
-func NewInfraRolesClient(subscriptionID string) InfraRolesClient {
-	return original.NewInfraRolesClient(subscriptionID)
+func NewStorageSystemsClient(subscriptionID string) StorageSystemsClient {
+	return original.NewStorageSystemsClient(subscriptionID)
 }
-func NewInfraRolesClientWithBaseURI(baseURI string, subscriptionID string) InfraRolesClient {
-	return original.NewInfraRolesClientWithBaseURI(baseURI, subscriptionID)
+func NewStorageSystemsClientWithBaseURI(baseURI string, subscriptionID string) StorageSystemsClient {
+	return original.NewStorageSystemsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type IPPoolsClient = original.IPPoolsClient
@@ -97,13 +84,22 @@ func NewIPPoolsClientWithBaseURI(baseURI string, subscriptionID string) IPPoolsC
 	return original.NewIPPoolsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LocationsClient = original.LocationsClient
+type FileSharesClient = original.FileSharesClient
 
-func NewLocationsClient(subscriptionID string) LocationsClient {
-	return original.NewLocationsClient(subscriptionID)
+func NewFileSharesClient(subscriptionID string) FileSharesClient {
+	return original.NewFileSharesClient(subscriptionID)
 }
-func NewLocationsClientWithBaseURI(baseURI string, subscriptionID string) LocationsClient {
-	return original.NewLocationsClientWithBaseURI(baseURI, subscriptionID)
+func NewFileSharesClientWithBaseURI(baseURI string, subscriptionID string) FileSharesClient {
+	return original.NewFileSharesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type EdgeGatewaysClient = original.EdgeGatewaysClient
+
+func NewEdgeGatewaysClient(subscriptionID string) EdgeGatewaysClient {
+	return original.NewEdgeGatewaysClient(subscriptionID)
+}
+func NewEdgeGatewaysClientWithBaseURI(baseURI string, subscriptionID string) EdgeGatewaysClient {
+	return original.NewEdgeGatewaysClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type LogicalNetworksClient = original.LogicalNetworksClient
@@ -115,24 +111,6 @@ func NewLogicalNetworksClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewLogicalNetworksClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LogicalSubnetsClient = original.LogicalSubnetsClient
-
-func NewLogicalSubnetsClient(subscriptionID string) LogicalSubnetsClient {
-	return original.NewLogicalSubnetsClient(subscriptionID)
-}
-func NewLogicalSubnetsClientWithBaseURI(baseURI string, subscriptionID string) LogicalSubnetsClient {
-	return original.NewLogicalSubnetsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type MacAddressPoolsClient = original.MacAddressPoolsClient
-
-func NewMacAddressPoolsClient(subscriptionID string) MacAddressPoolsClient {
-	return original.NewMacAddressPoolsClient(subscriptionID)
-}
-func NewMacAddressPoolsClientWithBaseURI(baseURI string, subscriptionID string) MacAddressPoolsClient {
-	return original.NewMacAddressPoolsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type InfraRoleInstanceState = original.InfraRoleInstanceState
 
 const (
@@ -290,6 +268,15 @@ type VolumeList = original.VolumeList
 type VolumeListIterator = original.VolumeListIterator
 type VolumeListPage = original.VolumeListPage
 type VolumeModel = original.VolumeModel
+type ScaleUnitNodesClient = original.ScaleUnitNodesClient
+
+func NewScaleUnitNodesClient(subscriptionID string) ScaleUnitNodesClient {
+	return original.NewScaleUnitNodesClient(subscriptionID)
+}
+func NewScaleUnitNodesClientWithBaseURI(baseURI string, subscriptionID string) ScaleUnitNodesClient {
+	return original.NewScaleUnitNodesClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type NetworkFabricOperationsClient = original.NetworkFabricOperationsClient
 
 func NewNetworkFabricOperationsClient(subscriptionID string) NetworkFabricOperationsClient {
@@ -298,23 +285,20 @@ func NewNetworkFabricOperationsClient(subscriptionID string) NetworkFabricOperat
 func NewNetworkFabricOperationsClientWithBaseURI(baseURI string, subscriptionID string) NetworkFabricOperationsClient {
 	return original.NewNetworkFabricOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type ScaleUnitNodesClient = original.ScaleUnitNodesClient
-
-func NewScaleUnitNodesClient(subscriptionID string) ScaleUnitNodesClient {
-	return original.NewScaleUnitNodesClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewScaleUnitNodesClientWithBaseURI(baseURI string, subscriptionID string) ScaleUnitNodesClient {
-	return original.NewScaleUnitNodesClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type ScaleUnitsClient = original.ScaleUnitsClient
+type LogicalSubnetsClient = original.LogicalSubnetsClient
 
-func NewScaleUnitsClient(subscriptionID string) ScaleUnitsClient {
-	return original.NewScaleUnitsClient(subscriptionID)
+func NewLogicalSubnetsClient(subscriptionID string) LogicalSubnetsClient {
+	return original.NewLogicalSubnetsClient(subscriptionID)
 }
-func NewScaleUnitsClientWithBaseURI(baseURI string, subscriptionID string) ScaleUnitsClient {
-	return original.NewScaleUnitsClientWithBaseURI(baseURI, subscriptionID)
+func NewLogicalSubnetsClientWithBaseURI(baseURI string, subscriptionID string) LogicalSubnetsClient {
+	return original.NewLogicalSubnetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type SlbMuxInstancesClient = original.SlbMuxInstancesClient
@@ -326,35 +310,51 @@ func NewSlbMuxInstancesClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewSlbMuxInstancesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type StoragePoolsClient = original.StoragePoolsClient
+type ScaleUnitsClient = original.ScaleUnitsClient
 
-func NewStoragePoolsClient(subscriptionID string) StoragePoolsClient {
-	return original.NewStoragePoolsClient(subscriptionID)
+func NewScaleUnitsClient(subscriptionID string) ScaleUnitsClient {
+	return original.NewScaleUnitsClient(subscriptionID)
 }
-func NewStoragePoolsClientWithBaseURI(baseURI string, subscriptionID string) StoragePoolsClient {
-	return original.NewStoragePoolsClientWithBaseURI(baseURI, subscriptionID)
+func NewScaleUnitsClientWithBaseURI(baseURI string, subscriptionID string) ScaleUnitsClient {
+	return original.NewScaleUnitsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type StorageSystemsClient = original.StorageSystemsClient
+type MacAddressPoolsClient = original.MacAddressPoolsClient
 
-func NewStorageSystemsClient(subscriptionID string) StorageSystemsClient {
-	return original.NewStorageSystemsClient(subscriptionID)
+func NewMacAddressPoolsClient(subscriptionID string) MacAddressPoolsClient {
+	return original.NewMacAddressPoolsClient(subscriptionID)
 }
-func NewStorageSystemsClientWithBaseURI(baseURI string, subscriptionID string) StorageSystemsClient {
-	return original.NewStorageSystemsClientWithBaseURI(baseURI, subscriptionID)
+func NewMacAddressPoolsClientWithBaseURI(baseURI string, subscriptionID string) MacAddressPoolsClient {
+	return original.NewMacAddressPoolsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
-type VolumesClient = original.VolumesClient
+type EdgeGatewayPoolsClient = original.EdgeGatewayPoolsClient
 
-func NewVolumesClient(subscriptionID string) VolumesClient {
-	return original.NewVolumesClient(subscriptionID)
+func NewEdgeGatewayPoolsClient(subscriptionID string) EdgeGatewayPoolsClient {
+	return original.NewEdgeGatewayPoolsClient(subscriptionID)
 }
-func NewVolumesClientWithBaseURI(baseURI string, subscriptionID string) VolumesClient {
-	return original.NewVolumesClientWithBaseURI(baseURI, subscriptionID)
+func NewEdgeGatewayPoolsClientWithBaseURI(baseURI string, subscriptionID string) EdgeGatewayPoolsClient {
+	return original.NewEdgeGatewayPoolsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type InfraRoleInstancesClient = original.InfraRoleInstancesClient
+
+func NewInfraRoleInstancesClient(subscriptionID string) InfraRoleInstancesClient {
+	return original.NewInfraRoleInstancesClient(subscriptionID)
+}
+func NewInfraRoleInstancesClientWithBaseURI(baseURI string, subscriptionID string) InfraRoleInstancesClient {
+	return original.NewInfraRoleInstancesClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/azsadmin/mgmt/infrastructureinsights/models.go b/profiles/latest/azsadmin/mgmt/infrastructureinsights/models.go
index e98b89df46e8..92c600a08f51 100644
--- a/profiles/latest/azsadmin/mgmt/infrastructureinsights/models.go
+++ b/profiles/latest/azsadmin/mgmt/infrastructureinsights/models.go
@@ -21,26 +21,31 @@ package infrastructureinsights
 
 import original "github.com/Azure/azure-sdk-for-go/services/azsadmin/mgmt/2016-05-01/infrastructureinsights"
 
-type AlertsClient = original.AlertsClient
+type ServiceHealthsClient = original.ServiceHealthsClient
 
-func NewAlertsClient(subscriptionID string) AlertsClient {
-	return original.NewAlertsClient(subscriptionID)
+func NewServiceHealthsClient(subscriptionID string) ServiceHealthsClient {
+	return original.NewServiceHealthsClient(subscriptionID)
 }
-func NewAlertsClientWithBaseURI(baseURI string, subscriptionID string) AlertsClient {
-	return original.NewAlertsClientWithBaseURI(baseURI, subscriptionID)
+func NewServiceHealthsClientWithBaseURI(baseURI string, subscriptionID string) ServiceHealthsClient {
+	return original.NewServiceHealthsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type RegionHealthsClient = original.RegionHealthsClient
 
-type BaseClient = original.BaseClient
+func NewRegionHealthsClient(subscriptionID string) RegionHealthsClient {
+	return original.NewRegionHealthsClient(subscriptionID)
+}
+func NewRegionHealthsClientWithBaseURI(baseURI string, subscriptionID string) RegionHealthsClient {
+	return original.NewRegionHealthsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type AlertsClient = original.AlertsClient
+
+func NewAlertsClient(subscriptionID string) AlertsClient {
+	return original.NewAlertsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewAlertsClientWithBaseURI(baseURI string, subscriptionID string) AlertsClient {
+	return original.NewAlertsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type MetricsSourceType = original.MetricsSourceType
@@ -96,13 +101,12 @@ type ServiceHealthListIterator = original.ServiceHealthListIterator
 type ServiceHealthListPage = original.ServiceHealthListPage
 type ServiceHealthModel = original.ServiceHealthModel
 type UsageMetrics = original.UsageMetrics
-type RegionHealthsClient = original.RegionHealthsClient
 
-func NewRegionHealthsClient(subscriptionID string) RegionHealthsClient {
-	return original.NewRegionHealthsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewRegionHealthsClientWithBaseURI(baseURI string, subscriptionID string) RegionHealthsClient {
-	return original.NewRegionHealthsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
 type ResourceHealthsClient = original.ResourceHealthsClient
@@ -114,17 +118,15 @@ func NewResourceHealthsClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewResourceHealthsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ServiceHealthsClient = original.ServiceHealthsClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewServiceHealthsClient(subscriptionID string) ServiceHealthsClient {
-	return original.NewServiceHealthsClient(subscriptionID)
-}
-func NewServiceHealthsClientWithBaseURI(baseURI string, subscriptionID string) ServiceHealthsClient {
-	return original.NewServiceHealthsClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/batch/batch/models.go b/profiles/latest/batch/batch/models.go
index 887ad6d86287..82d81e0aefda 100644
--- a/profiles/latest/batch/batch/models.go
+++ b/profiles/latest/batch/batch/models.go
@@ -21,53 +21,13 @@ package batch
 
 import original "github.com/Azure/azure-sdk-for-go/services/batch/2018-03-01.6.1/batch"
 
-type AccountClient = original.AccountClient
-
-func NewAccountClient() AccountClient {
-	return original.NewAccountClient()
-}
-func NewAccountClientWithBaseURI(baseURI string) AccountClient {
-	return original.NewAccountClientWithBaseURI(baseURI)
-}
-
-type ApplicationClient = original.ApplicationClient
-
-func NewApplicationClient() ApplicationClient {
-	return original.NewApplicationClient()
-}
-func NewApplicationClientWithBaseURI(baseURI string) ApplicationClient {
-	return original.NewApplicationClientWithBaseURI(baseURI)
-}
-
-type CertificateClient = original.CertificateClient
-
-func NewCertificateClient() CertificateClient {
-	return original.NewCertificateClient()
-}
-func NewCertificateClientWithBaseURI(baseURI string) CertificateClient {
-	return original.NewCertificateClientWithBaseURI(baseURI)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
-}
-
-type ComputeNodeClient = original.ComputeNodeClient
+type JobClient = original.JobClient
 
-func NewComputeNodeClient() ComputeNodeClient {
-	return original.NewComputeNodeClient()
+func NewJobClient() JobClient {
+	return original.NewJobClient()
 }
-func NewComputeNodeClientWithBaseURI(baseURI string) ComputeNodeClient {
-	return original.NewComputeNodeClientWithBaseURI(baseURI)
+func NewJobClientWithBaseURI(baseURI string) JobClient {
+	return original.NewJobClientWithBaseURI(baseURI)
 }
 
 type FileClient = original.FileClient
@@ -79,22 +39,22 @@ func NewFileClientWithBaseURI(baseURI string) FileClient {
 	return original.NewFileClientWithBaseURI(baseURI)
 }
 
-type JobClient = original.JobClient
+type ApplicationClient = original.ApplicationClient
 
-func NewJobClient() JobClient {
-	return original.NewJobClient()
+func NewApplicationClient() ApplicationClient {
+	return original.NewApplicationClient()
 }
-func NewJobClientWithBaseURI(baseURI string) JobClient {
-	return original.NewJobClientWithBaseURI(baseURI)
+func NewApplicationClientWithBaseURI(baseURI string) ApplicationClient {
+	return original.NewApplicationClientWithBaseURI(baseURI)
 }
 
-type JobScheduleClient = original.JobScheduleClient
+type AccountClient = original.AccountClient
 
-func NewJobScheduleClient() JobScheduleClient {
-	return original.NewJobScheduleClient()
+func NewAccountClient() AccountClient {
+	return original.NewAccountClient()
 }
-func NewJobScheduleClientWithBaseURI(baseURI string) JobScheduleClient {
-	return original.NewJobScheduleClientWithBaseURI(baseURI)
+func NewAccountClientWithBaseURI(baseURI string) AccountClient {
+	return original.NewAccountClientWithBaseURI(baseURI)
 }
 
 type AccessScope = original.AccessScope
@@ -723,13 +683,28 @@ type UserAccount = original.UserAccount
 type UserIdentity = original.UserIdentity
 type VirtualMachineConfiguration = original.VirtualMachineConfiguration
 type WindowsConfiguration = original.WindowsConfiguration
-type PoolClient = original.PoolClient
+type ComputeNodeClient = original.ComputeNodeClient
 
-func NewPoolClient() PoolClient {
-	return original.NewPoolClient()
+func NewComputeNodeClient() ComputeNodeClient {
+	return original.NewComputeNodeClient()
 }
-func NewPoolClientWithBaseURI(baseURI string) PoolClient {
-	return original.NewPoolClientWithBaseURI(baseURI)
+func NewComputeNodeClientWithBaseURI(baseURI string) ComputeNodeClient {
+	return original.NewComputeNodeClientWithBaseURI(baseURI)
+}
+
+type JobScheduleClient = original.JobScheduleClient
+
+func NewJobScheduleClient() JobScheduleClient {
+	return original.NewJobScheduleClient()
+}
+func NewJobScheduleClientWithBaseURI(baseURI string) JobScheduleClient {
+	return original.NewJobScheduleClientWithBaseURI(baseURI)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
+}
+func Version() string {
+	return original.Version()
 }
 
 type TaskClient = original.TaskClient
@@ -740,9 +715,34 @@ func NewTaskClient() TaskClient {
 func NewTaskClientWithBaseURI(baseURI string) TaskClient {
 	return original.NewTaskClientWithBaseURI(baseURI)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+type CertificateClient = original.CertificateClient
+
+func NewCertificateClient() CertificateClient {
+	return original.NewCertificateClient()
 }
-func Version() string {
-	return original.Version()
+func NewCertificateClientWithBaseURI(baseURI string) CertificateClient {
+	return original.NewCertificateClientWithBaseURI(baseURI)
+}
+
+type PoolClient = original.PoolClient
+
+func NewPoolClient() PoolClient {
+	return original.NewPoolClient()
+}
+func NewPoolClientWithBaseURI(baseURI string) PoolClient {
+	return original.NewPoolClientWithBaseURI(baseURI)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
 }
diff --git a/profiles/latest/batch/mgmt/batch/models.go b/profiles/latest/batch/mgmt/batch/models.go
index 093ded8f1f9a..90e51205483c 100644
--- a/profiles/latest/batch/mgmt/batch/models.go
+++ b/profiles/latest/batch/mgmt/batch/models.go
@@ -21,13 +21,22 @@ package batch
 
 import original "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2017-09-01/batch"
 
-type AccountClient = original.AccountClient
+type LocationClient = original.LocationClient
 
-func NewAccountClient(subscriptionID string) AccountClient {
-	return original.NewAccountClient(subscriptionID)
+func NewLocationClient(subscriptionID string) LocationClient {
+	return original.NewLocationClient(subscriptionID)
 }
-func NewAccountClientWithBaseURI(baseURI string, subscriptionID string) AccountClient {
-	return original.NewAccountClientWithBaseURI(baseURI, subscriptionID)
+func NewLocationClientWithBaseURI(baseURI string, subscriptionID string) LocationClient {
+	return original.NewLocationClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type OperationsClient = original.OperationsClient
+
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ApplicationClient = original.ApplicationClient
@@ -39,6 +48,15 @@ func NewApplicationClientWithBaseURI(baseURI string, subscriptionID string) Appl
 	return original.NewApplicationClientWithBaseURI(baseURI, subscriptionID)
 }
 
+type AccountClient = original.AccountClient
+
+func NewAccountClient(subscriptionID string) AccountClient {
+	return original.NewAccountClient(subscriptionID)
+}
+func NewAccountClientWithBaseURI(baseURI string, subscriptionID string) AccountClient {
+	return original.NewAccountClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type ApplicationPackageClient = original.ApplicationPackageClient
 
 func NewApplicationPackageClient(subscriptionID string) ApplicationPackageClient {
@@ -48,37 +66,6 @@ func NewApplicationPackageClientWithBaseURI(baseURI string, subscriptionID strin
 	return original.NewApplicationPackageClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CertificateClient = original.CertificateClient
-
-func NewCertificateClient(subscriptionID string) CertificateClient {
-	return original.NewCertificateClient(subscriptionID)
-}
-func NewCertificateClientWithBaseURI(baseURI string, subscriptionID string) CertificateClient {
-	return original.NewCertificateClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type LocationClient = original.LocationClient
-
-func NewLocationClient(subscriptionID string) LocationClient {
-	return original.NewLocationClient(subscriptionID)
-}
-func NewLocationClientWithBaseURI(baseURI string, subscriptionID string) LocationClient {
-	return original.NewLocationClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type AccountKeyType = original.AccountKeyType
 
 const (
@@ -393,13 +380,21 @@ type UserAccount = original.UserAccount
 type UserIdentity = original.UserIdentity
 type VirtualMachineConfiguration = original.VirtualMachineConfiguration
 type WindowsConfiguration = original.WindowsConfiguration
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
+}
+
+type CertificateClient = original.CertificateClient
+
+func NewCertificateClient(subscriptionID string) CertificateClient {
+	return original.NewCertificateClient(subscriptionID)
+}
+func NewCertificateClientWithBaseURI(baseURI string, subscriptionID string) CertificateClient {
+	return original.NewCertificateClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type PoolClient = original.PoolClient
@@ -410,9 +405,16 @@ func NewPoolClient(subscriptionID string) PoolClient {
 func NewPoolClientWithBaseURI(baseURI string, subscriptionID string) PoolClient {
 	return original.NewPoolClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/batchai/mgmt/batchai/models.go b/profiles/latest/batchai/mgmt/batchai/models.go
index a06a7f7a6d5e..ced3e521f40e 100644
--- a/profiles/latest/batchai/mgmt/batchai/models.go
+++ b/profiles/latest/batchai/mgmt/batchai/models.go
@@ -21,26 +21,31 @@ package batchai
 
 import original "github.com/Azure/azure-sdk-for-go/services/batchai/mgmt/2018-03-01/batchai"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type OperationsClient = original.OperationsClient
 
-type BaseClient = original.BaseClient
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type UsageClient = original.UsageClient
+
+func NewUsageClient(subscriptionID string) UsageClient {
+	return original.NewUsageClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewUsageClientWithBaseURI(baseURI string, subscriptionID string) UsageClient {
+	return original.NewUsageClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ClustersClient = original.ClustersClient
+type JobsClient = original.JobsClient
 
-func NewClustersClient(subscriptionID string) ClustersClient {
-	return original.NewClustersClient(subscriptionID)
+func NewJobsClient(subscriptionID string) JobsClient {
+	return original.NewJobsClient(subscriptionID)
 }
-func NewClustersClientWithBaseURI(baseURI string, subscriptionID string) ClustersClient {
-	return original.NewClustersClientWithBaseURI(baseURI, subscriptionID)
+func NewJobsClientWithBaseURI(baseURI string, subscriptionID string) JobsClient {
+	return original.NewJobsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type FileServersClient = original.FileServersClient
@@ -52,15 +57,6 @@ func NewFileServersClientWithBaseURI(baseURI string, subscriptionID string) File
 	return original.NewFileServersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type JobsClient = original.JobsClient
-
-func NewJobsClient(subscriptionID string) JobsClient {
-	return original.NewJobsClient(subscriptionID)
-}
-func NewJobsClientWithBaseURI(baseURI string, subscriptionID string) JobsClient {
-	return original.NewJobsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type AllocationState = original.AllocationState
 
 const (
@@ -295,26 +291,32 @@ type Usage = original.Usage
 type UsageName = original.UsageName
 type UserAccountSettings = original.UserAccountSettings
 type VirtualMachineConfiguration = original.VirtualMachineConfiguration
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type UsageClient = original.UsageClient
+type ClustersClient = original.ClustersClient
 
-func NewUsageClient(subscriptionID string) UsageClient {
-	return original.NewUsageClient(subscriptionID)
+func NewClustersClient(subscriptionID string) ClustersClient {
+	return original.NewClustersClient(subscriptionID)
 }
-func NewUsageClientWithBaseURI(baseURI string, subscriptionID string) UsageClient {
-	return original.NewUsageClientWithBaseURI(baseURI, subscriptionID)
+func NewClustersClientWithBaseURI(baseURI string, subscriptionID string) ClustersClient {
+	return original.NewClustersClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/cognitiveservices/computervision/models.go b/profiles/latest/cognitiveservices/computervision/models.go
index 7f236b16f387..d4e4ee258ef1 100644
--- a/profiles/latest/cognitiveservices/computervision/models.go
+++ b/profiles/latest/cognitiveservices/computervision/models.go
@@ -21,15 +21,6 @@ package computervision
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/computervision"
 
-type BaseClient = original.BaseClient
-
-func New(azureRegion AzureRegions) BaseClient {
-	return original.New(azureRegion)
-}
-func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
-	return original.NewWithoutDefaults(azureRegion)
-}
-
 type AzureRegions = original.AzureRegions
 
 const (
@@ -219,3 +210,12 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type BaseClient = original.BaseClient
+
+func New(azureRegion AzureRegions) BaseClient {
+	return original.New(azureRegion)
+}
+func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
+	return original.NewWithoutDefaults(azureRegion)
+}
diff --git a/profiles/latest/cognitiveservices/contentmoderator/models.go b/profiles/latest/cognitiveservices/contentmoderator/models.go
index ed847008b311..aee5289a8ce4 100644
--- a/profiles/latest/cognitiveservices/contentmoderator/models.go
+++ b/profiles/latest/cognitiveservices/contentmoderator/models.go
@@ -21,19 +21,10 @@ package contentmoderator
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/contentmoderator"
 
-type BaseClient = original.BaseClient
-
-func New(baseURL AzureRegionBaseURL) BaseClient {
-	return original.New(baseURL)
-}
-func NewWithoutDefaults(baseURL AzureRegionBaseURL) BaseClient {
-	return original.NewWithoutDefaults(baseURL)
-}
-
-type ImageModerationClient = original.ImageModerationClient
+type ListManagementImageListsClient = original.ListManagementImageListsClient
 
-func NewImageModerationClient(baseURL AzureRegionBaseURL) ImageModerationClient {
-	return original.NewImageModerationClient(baseURL)
+func NewListManagementImageListsClient(baseURL AzureRegionBaseURL) ListManagementImageListsClient {
+	return original.NewListManagementImageListsClient(baseURL)
 }
 
 type ListManagementImageClient = original.ListManagementImageClient
@@ -42,10 +33,10 @@ func NewListManagementImageClient(baseURL AzureRegionBaseURL) ListManagementImag
 	return original.NewListManagementImageClient(baseURL)
 }
 
-type ListManagementImageListsClient = original.ListManagementImageListsClient
+type ListManagementTermListsClient = original.ListManagementTermListsClient
 
-func NewListManagementImageListsClient(baseURL AzureRegionBaseURL) ListManagementImageListsClient {
-	return original.NewListManagementImageListsClient(baseURL)
+func NewListManagementTermListsClient(baseURL AzureRegionBaseURL) ListManagementTermListsClient {
+	return original.NewListManagementTermListsClient(baseURL)
 }
 
 type ListManagementTermClient = original.ListManagementTermClient
@@ -54,12 +45,6 @@ func NewListManagementTermClient(baseURL AzureRegionBaseURL) ListManagementTermC
 	return original.NewListManagementTermClient(baseURL)
 }
 
-type ListManagementTermListsClient = original.ListManagementTermListsClient
-
-func NewListManagementTermListsClient(baseURL AzureRegionBaseURL) ListManagementTermListsClient {
-	return original.NewListManagementTermListsClient(baseURL)
-}
-
 type AzureRegionBaseURL = original.AzureRegionBaseURL
 
 const (
@@ -171,20 +156,35 @@ type TranscriptModerationBodyItemTermsItem = original.TranscriptModerationBodyIt
 type VideoFrameBodyItem = original.VideoFrameBodyItem
 type VideoFrameBodyItemMetadataItem = original.VideoFrameBodyItemMetadataItem
 type VideoFrameBodyItemReviewerResultTagsItem = original.VideoFrameBodyItemReviewerResultTagsItem
-type ReviewsClient = original.ReviewsClient
-
-func NewReviewsClient(baseURL AzureRegionBaseURL) ReviewsClient {
-	return original.NewReviewsClient(baseURL)
-}
-
 type TextModerationClient = original.TextModerationClient
 
 func NewTextModerationClient(baseURL AzureRegionBaseURL) TextModerationClient {
 	return original.NewTextModerationClient(baseURL)
 }
+
+type ImageModerationClient = original.ImageModerationClient
+
+func NewImageModerationClient(baseURL AzureRegionBaseURL) ImageModerationClient {
+	return original.NewImageModerationClient(baseURL)
+}
+
+type ReviewsClient = original.ReviewsClient
+
+func NewReviewsClient(baseURL AzureRegionBaseURL) ReviewsClient {
+	return original.NewReviewsClient(baseURL)
+}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
 func Version() string {
 	return original.Version()
 }
+
+type BaseClient = original.BaseClient
+
+func New(baseURL AzureRegionBaseURL) BaseClient {
+	return original.New(baseURL)
+}
+func NewWithoutDefaults(baseURL AzureRegionBaseURL) BaseClient {
+	return original.NewWithoutDefaults(baseURL)
+}
diff --git a/profiles/latest/cognitiveservices/customsearch/models.go b/profiles/latest/cognitiveservices/customsearch/models.go
index ec5417112f52..cd001f1b6049 100644
--- a/profiles/latest/cognitiveservices/customsearch/models.go
+++ b/profiles/latest/cognitiveservices/customsearch/models.go
@@ -21,19 +21,6 @@ package customsearch
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/customsearch"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
-}
-
 type CustomInstanceClient = original.CustomInstanceClient
 
 func NewCustomInstanceClient() CustomInstanceClient {
@@ -150,3 +137,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
diff --git a/profiles/latest/cognitiveservices/entitysearch/models.go b/profiles/latest/cognitiveservices/entitysearch/models.go
index 41a1976a3285..0b95c288378d 100644
--- a/profiles/latest/cognitiveservices/entitysearch/models.go
+++ b/profiles/latest/cognitiveservices/entitysearch/models.go
@@ -21,28 +21,6 @@ package entitysearch
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/entitysearch"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
-}
-
-type EntitiesClient = original.EntitiesClient
-
-func NewEntitiesClient() EntitiesClient {
-	return original.NewEntitiesClient()
-}
-func NewEntitiesClientWithBaseURI(baseURI string) EntitiesClient {
-	return original.NewEntitiesClientWithBaseURI(baseURI)
-}
-
 type AnswerType = original.AnswerType
 
 const (
@@ -312,3 +290,25 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type EntitiesClient = original.EntitiesClient
+
+func NewEntitiesClient() EntitiesClient {
+	return original.NewEntitiesClient()
+}
+func NewEntitiesClientWithBaseURI(baseURI string) EntitiesClient {
+	return original.NewEntitiesClientWithBaseURI(baseURI)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
diff --git a/profiles/latest/cognitiveservices/face/models.go b/profiles/latest/cognitiveservices/face/models.go
index 5bc2433fde3a..d330800f1d5d 100644
--- a/profiles/latest/cognitiveservices/face/models.go
+++ b/profiles/latest/cognitiveservices/face/models.go
@@ -21,13 +21,16 @@ package face
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/face"
 
-type BaseClient = original.BaseClient
+type PersonGroupPersonClient = original.PersonGroupPersonClient
 
-func New(azureRegion AzureRegions) BaseClient {
-	return original.New(azureRegion)
+func NewPersonGroupPersonClient(azureRegion AzureRegions) PersonGroupPersonClient {
+	return original.NewPersonGroupPersonClient(azureRegion)
 }
-func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
-	return original.NewWithoutDefaults(azureRegion)
+
+type PersonGroupClient = original.PersonGroupClient
+
+func NewPersonGroupClient(azureRegion AzureRegions) PersonGroupClient {
+	return original.NewPersonGroupClient(azureRegion)
 }
 
 type Client = original.Client
@@ -36,12 +39,6 @@ func NewClient(azureRegion AzureRegions) Client {
 	return original.NewClient(azureRegion)
 }
 
-type ListClient = original.ListClient
-
-func NewListClient(azureRegion AzureRegions) ListClient {
-	return original.NewListClient(azureRegion)
-}
-
 type AccessoryType = original.AccessoryType
 
 const (
@@ -242,20 +239,25 @@ type UpdatePersonFaceRequest = original.UpdatePersonFaceRequest
 type VerifyFaceToFaceRequest = original.VerifyFaceToFaceRequest
 type VerifyFaceToPersonRequest = original.VerifyFaceToPersonRequest
 type VerifyResult = original.VerifyResult
-type PersonGroupClient = original.PersonGroupClient
-
-func NewPersonGroupClient(azureRegion AzureRegions) PersonGroupClient {
-	return original.NewPersonGroupClient(azureRegion)
-}
-
-type PersonGroupPersonClient = original.PersonGroupPersonClient
 
-func NewPersonGroupPersonClient(azureRegion AzureRegions) PersonGroupPersonClient {
-	return original.NewPersonGroupPersonClient(azureRegion)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
 func Version() string {
 	return original.Version()
 }
+
+type ListClient = original.ListClient
+
+func NewListClient(azureRegion AzureRegions) ListClient {
+	return original.NewListClient(azureRegion)
+}
+
+type BaseClient = original.BaseClient
+
+func New(azureRegion AzureRegions) BaseClient {
+	return original.New(azureRegion)
+}
+func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
+	return original.NewWithoutDefaults(azureRegion)
+}
diff --git a/profiles/latest/cognitiveservices/imagesearch/models.go b/profiles/latest/cognitiveservices/imagesearch/models.go
index 97df3a369b1a..a8aab8cfdcaf 100644
--- a/profiles/latest/cognitiveservices/imagesearch/models.go
+++ b/profiles/latest/cognitiveservices/imagesearch/models.go
@@ -21,28 +21,6 @@ package imagesearch
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/imagesearch"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
-}
-
-type ImagesClient = original.ImagesClient
-
-func NewImagesClient() ImagesClient {
-	return original.NewImagesClient()
-}
-func NewImagesClientWithBaseURI(baseURI string) ImagesClient {
-	return original.NewImagesClientWithBaseURI(baseURI)
-}
-
 type Currency = original.Currency
 
 const (
@@ -525,3 +503,25 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type ImagesClient = original.ImagesClient
+
+func NewImagesClient() ImagesClient {
+	return original.NewImagesClient()
+}
+func NewImagesClientWithBaseURI(baseURI string) ImagesClient {
+	return original.NewImagesClientWithBaseURI(baseURI)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
diff --git a/profiles/latest/cognitiveservices/luis/programmatic/models.go b/profiles/latest/cognitiveservices/luis/programmatic/models.go
index 33ea94c2f187..25e5e8b9fe17 100644
--- a/profiles/latest/cognitiveservices/luis/programmatic/models.go
+++ b/profiles/latest/cognitiveservices/luis/programmatic/models.go
@@ -21,27 +21,6 @@ package programmatic
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v2.0/luis/programmatic"
 
-type AppsClient = original.AppsClient
-
-func NewAppsClient(azureRegion AzureRegions) AppsClient {
-	return original.NewAppsClient(azureRegion)
-}
-
-type BaseClient = original.BaseClient
-
-func New(azureRegion AzureRegions) BaseClient {
-	return original.New(azureRegion)
-}
-func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
-	return original.NewWithoutDefaults(azureRegion)
-}
-
-type ExamplesClient = original.ExamplesClient
-
-func NewExamplesClient(azureRegion AzureRegions) ExamplesClient {
-	return original.NewExamplesClient(azureRegion)
-}
-
 type FeaturesClient = original.FeaturesClient
 
 func NewFeaturesClient(azureRegion AzureRegions) FeaturesClient {
@@ -54,6 +33,18 @@ func NewModelClient(azureRegion AzureRegions) ModelClient {
 	return original.NewModelClient(azureRegion)
 }
 
+type VersionsClient = original.VersionsClient
+
+func NewVersionsClient(azureRegion AzureRegions) VersionsClient {
+	return original.NewVersionsClient(azureRegion)
+}
+
+type AppsClient = original.AppsClient
+
+func NewAppsClient(azureRegion AzureRegions) AppsClient {
+	return original.NewAppsClient(azureRegion)
+}
+
 type AzureRegions = original.AzureRegions
 
 const (
@@ -294,6 +285,29 @@ type UUID = original.UUID
 type VersionInfo = original.VersionInfo
 type WordListBaseUpdateObject = original.WordListBaseUpdateObject
 type WordListObject = original.WordListObject
+
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
+}
+func Version() string {
+	return original.Version()
+}
+
+type ExamplesClient = original.ExamplesClient
+
+func NewExamplesClient(azureRegion AzureRegions) ExamplesClient {
+	return original.NewExamplesClient(azureRegion)
+}
+
+type BaseClient = original.BaseClient
+
+func New(azureRegion AzureRegions) BaseClient {
+	return original.New(azureRegion)
+}
+func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
+	return original.NewWithoutDefaults(azureRegion)
+}
+
 type PermissionsClient = original.PermissionsClient
 
 func NewPermissionsClient(azureRegion AzureRegions) PermissionsClient {
@@ -305,15 +319,3 @@ type TrainClient = original.TrainClient
 func NewTrainClient(azureRegion AzureRegions) TrainClient {
 	return original.NewTrainClient(azureRegion)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
-}
-func Version() string {
-	return original.Version()
-}
-
-type VersionsClient = original.VersionsClient
-
-func NewVersionsClient(azureRegion AzureRegions) VersionsClient {
-	return original.NewVersionsClient(azureRegion)
-}
diff --git a/profiles/latest/cognitiveservices/luis/runtime/models.go b/profiles/latest/cognitiveservices/luis/runtime/models.go
index d3f170454b00..9c93a14fe018 100644
--- a/profiles/latest/cognitiveservices/luis/runtime/models.go
+++ b/profiles/latest/cognitiveservices/luis/runtime/models.go
@@ -21,15 +21,6 @@ package runtime
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v2.0/luis/runtime"
 
-type BaseClient = original.BaseClient
-
-func New(azureRegion AzureRegions) BaseClient {
-	return original.New(azureRegion)
-}
-func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
-	return original.NewWithoutDefaults(azureRegion)
-}
-
 type AzureRegions = original.AzureRegions
 
 const (
@@ -59,14 +50,25 @@ type EntityWithResolution = original.EntityWithResolution
 type EntityWithScore = original.EntityWithScore
 type IntentModel = original.IntentModel
 type LuisResult = original.LuisResult
-type PredictionClient = original.PredictionClient
 
-func NewPredictionClient(azureRegion AzureRegions) PredictionClient {
-	return original.NewPredictionClient(azureRegion)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
 func Version() string {
 	return original.Version()
 }
+
+type PredictionClient = original.PredictionClient
+
+func NewPredictionClient(azureRegion AzureRegions) PredictionClient {
+	return original.NewPredictionClient(azureRegion)
+}
+
+type BaseClient = original.BaseClient
+
+func New(azureRegion AzureRegions) BaseClient {
+	return original.New(azureRegion)
+}
+func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
+	return original.NewWithoutDefaults(azureRegion)
+}
diff --git a/profiles/latest/cognitiveservices/mgmt/cognitiveservices/models.go b/profiles/latest/cognitiveservices/mgmt/cognitiveservices/models.go
index 13d4b20a885b..b8bf6ea9bdea 100644
--- a/profiles/latest/cognitiveservices/mgmt/cognitiveservices/models.go
+++ b/profiles/latest/cognitiveservices/mgmt/cognitiveservices/models.go
@@ -21,13 +21,13 @@ package cognitiveservices
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/mgmt/2017-04-18/cognitiveservices"
 
-type AccountsClient = original.AccountsClient
+type OperationsClient = original.OperationsClient
 
-func NewAccountsClient(subscriptionID string) AccountsClient {
-	return original.NewAccountsClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
-	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type CheckSkuAvailabilityClient = original.CheckSkuAvailabilityClient
@@ -39,19 +39,6 @@ func NewCheckSkuAvailabilityClientWithBaseURI(baseURI string, subscriptionID str
 	return original.NewCheckSkuAvailabilityClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type KeyName = original.KeyName
 
 const (
@@ -220,15 +207,6 @@ type ResourceSkusResultPage = original.ResourceSkusResultPage
 type Sku = original.Sku
 type Usage = original.Usage
 type UsagesResult = original.UsagesResult
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type ResourceSkusClient = original.ResourceSkusClient
 
 func NewResourceSkusClient(subscriptionID string) ResourceSkusClient {
@@ -243,3 +221,25 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type AccountsClient = original.AccountsClient
+
+func NewAccountsClient(subscriptionID string) AccountsClient {
+	return original.NewAccountsClient(subscriptionID)
+}
+func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
+	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/cognitiveservices/newssearch/models.go b/profiles/latest/cognitiveservices/newssearch/models.go
index 5c5e10e3d747..c28938829257 100644
--- a/profiles/latest/cognitiveservices/newssearch/models.go
+++ b/profiles/latest/cognitiveservices/newssearch/models.go
@@ -21,19 +21,6 @@ package newssearch
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/newssearch"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
-}
-
 type ErrorCode = original.ErrorCode
 
 const (
@@ -158,6 +145,14 @@ type BasicThing = original.BasicThing
 type Thing = original.Thing
 type TrendingTopics = original.TrendingTopics
 type VideoObject = original.VideoObject
+
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
+}
+func Version() string {
+	return original.Version()
+}
+
 type NewsClient = original.NewsClient
 
 func NewNewsClient() NewsClient {
@@ -166,9 +161,16 @@ func NewNewsClient() NewsClient {
 func NewNewsClientWithBaseURI(baseURI string) NewsClient {
 	return original.NewNewsClientWithBaseURI(baseURI)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
 }
diff --git a/profiles/latest/cognitiveservices/spellcheck/models.go b/profiles/latest/cognitiveservices/spellcheck/models.go
index 117467087b52..093cf3adf840 100644
--- a/profiles/latest/cognitiveservices/spellcheck/models.go
+++ b/profiles/latest/cognitiveservices/spellcheck/models.go
@@ -21,19 +21,6 @@ package spellcheck
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/spellcheck"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
-}
-
 type ActionType = original.ActionType
 
 const (
@@ -126,3 +113,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
diff --git a/profiles/latest/cognitiveservices/textanalytics/models.go b/profiles/latest/cognitiveservices/textanalytics/models.go
index 2ec44e219203..792061823083 100644
--- a/profiles/latest/cognitiveservices/textanalytics/models.go
+++ b/profiles/latest/cognitiveservices/textanalytics/models.go
@@ -21,15 +21,6 @@ package textanalytics
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v2.0/textanalytics"
 
-type BaseClient = original.BaseClient
-
-func New(azureRegion AzureRegions) BaseClient {
-	return original.New(azureRegion)
-}
-func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
-	return original.NewWithoutDefaults(azureRegion)
-}
-
 type AzureRegions = original.AzureRegions
 
 const (
@@ -72,3 +63,12 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type BaseClient = original.BaseClient
+
+func New(azureRegion AzureRegions) BaseClient {
+	return original.New(azureRegion)
+}
+func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
+	return original.NewWithoutDefaults(azureRegion)
+}
diff --git a/profiles/latest/cognitiveservices/videosearch/models.go b/profiles/latest/cognitiveservices/videosearch/models.go
index fa81407bc62b..dd134b187f84 100644
--- a/profiles/latest/cognitiveservices/videosearch/models.go
+++ b/profiles/latest/cognitiveservices/videosearch/models.go
@@ -21,17 +21,13 @@ package videosearch
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/videosearch"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type VideosClient = original.VideosClient
 
-func New() BaseClient {
-	return original.New()
+func NewVideosClient() VideosClient {
+	return original.NewVideosClient()
 }
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
+func NewVideosClientWithBaseURI(baseURI string) VideosClient {
+	return original.NewVideosClientWithBaseURI(baseURI)
 }
 
 type ErrorCode = original.ErrorCode
@@ -226,11 +222,15 @@ func Version() string {
 	return original.Version()
 }
 
-type VideosClient = original.VideosClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewVideosClient() VideosClient {
-	return original.NewVideosClient()
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
 }
-func NewVideosClientWithBaseURI(baseURI string) VideosClient {
-	return original.NewVideosClientWithBaseURI(baseURI)
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
 }
diff --git a/profiles/latest/cognitiveservices/websearch/models.go b/profiles/latest/cognitiveservices/websearch/models.go
index 942f9a3b7c1f..5774aa528573 100644
--- a/profiles/latest/cognitiveservices/websearch/models.go
+++ b/profiles/latest/cognitiveservices/websearch/models.go
@@ -21,19 +21,6 @@ package websearch
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/websearch"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
-}
-
 type AnswerType = original.AnswerType
 
 const (
@@ -228,3 +215,16 @@ func NewWebClient() WebClient {
 func NewWebClientWithBaseURI(baseURI string) WebClient {
 	return original.NewWebClientWithBaseURI(baseURI)
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
diff --git a/profiles/latest/compute/mgmt/compute/models.go b/profiles/latest/compute/mgmt/compute/models.go
index eafa5bed3f9e..f64e311cfb3d 100644
--- a/profiles/latest/compute/mgmt/compute/models.go
+++ b/profiles/latest/compute/mgmt/compute/models.go
@@ -30,53 +30,94 @@ func NewAvailabilitySetsClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewAvailabilitySetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type VirtualMachineExtensionsClient = original.VirtualMachineExtensionsClient
 
-type BaseClient = original.BaseClient
+func NewVirtualMachineExtensionsClient(subscriptionID string) VirtualMachineExtensionsClient {
+	return original.NewVirtualMachineExtensionsClient(subscriptionID)
+}
+func NewVirtualMachineExtensionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineExtensionsClient {
+	return original.NewVirtualMachineExtensionsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type LogAnalyticsClient = original.LogAnalyticsClient
+
+func NewLogAnalyticsClient(subscriptionID string) LogAnalyticsClient {
+	return original.NewLogAnalyticsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewLogAnalyticsClientWithBaseURI(baseURI string, subscriptionID string) LogAnalyticsClient {
+	return original.NewLogAnalyticsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ContainerServicesClient = original.ContainerServicesClient
+type OperationsClient = original.OperationsClient
 
-func NewContainerServicesClient(subscriptionID string) ContainerServicesClient {
-	return original.NewContainerServicesClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewContainerServicesClientWithBaseURI(baseURI string, subscriptionID string) ContainerServicesClient {
-	return original.NewContainerServicesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DisksClient = original.DisksClient
+type VirtualMachineRunCommandsClient = original.VirtualMachineRunCommandsClient
 
-func NewDisksClient(subscriptionID string) DisksClient {
-	return original.NewDisksClient(subscriptionID)
+func NewVirtualMachineRunCommandsClient(subscriptionID string) VirtualMachineRunCommandsClient {
+	return original.NewVirtualMachineRunCommandsClient(subscriptionID)
 }
-func NewDisksClientWithBaseURI(baseURI string, subscriptionID string) DisksClient {
-	return original.NewDisksClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualMachineRunCommandsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineRunCommandsClient {
+	return original.NewVirtualMachineRunCommandsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ImagesClient = original.ImagesClient
+type VirtualMachineSizesClient = original.VirtualMachineSizesClient
 
-func NewImagesClient(subscriptionID string) ImagesClient {
-	return original.NewImagesClient(subscriptionID)
+func NewVirtualMachineSizesClient(subscriptionID string) VirtualMachineSizesClient {
+	return original.NewVirtualMachineSizesClient(subscriptionID)
 }
-func NewImagesClientWithBaseURI(baseURI string, subscriptionID string) ImagesClient {
-	return original.NewImagesClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualMachineSizesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineSizesClient {
+	return original.NewVirtualMachineSizesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LogAnalyticsClient = original.LogAnalyticsClient
+type VirtualMachineScaleSetRollingUpgradesClient = original.VirtualMachineScaleSetRollingUpgradesClient
 
-func NewLogAnalyticsClient(subscriptionID string) LogAnalyticsClient {
-	return original.NewLogAnalyticsClient(subscriptionID)
+func NewVirtualMachineScaleSetRollingUpgradesClient(subscriptionID string) VirtualMachineScaleSetRollingUpgradesClient {
+	return original.NewVirtualMachineScaleSetRollingUpgradesClient(subscriptionID)
 }
-func NewLogAnalyticsClientWithBaseURI(baseURI string, subscriptionID string) LogAnalyticsClient {
-	return original.NewLogAnalyticsClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualMachineScaleSetRollingUpgradesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetRollingUpgradesClient {
+	return original.NewVirtualMachineScaleSetRollingUpgradesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type VirtualMachineImagesClient = original.VirtualMachineImagesClient
+
+func NewVirtualMachineImagesClient(subscriptionID string) VirtualMachineImagesClient {
+	return original.NewVirtualMachineImagesClient(subscriptionID)
+}
+func NewVirtualMachineImagesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineImagesClient {
+	return original.NewVirtualMachineImagesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type UsageClient = original.UsageClient
+
+func NewUsageClient(subscriptionID string) UsageClient {
+	return original.NewUsageClient(subscriptionID)
+}
+func NewUsageClientWithBaseURI(baseURI string, subscriptionID string) UsageClient {
+	return original.NewUsageClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type VirtualMachineScaleSetVMsClient = original.VirtualMachineScaleSetVMsClient
+
+func NewVirtualMachineScaleSetVMsClient(subscriptionID string) VirtualMachineScaleSetVMsClient {
+	return original.NewVirtualMachineScaleSetVMsClient(subscriptionID)
+}
+func NewVirtualMachineScaleSetVMsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetVMsClient {
+	return original.NewVirtualMachineScaleSetVMsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ContainerServicesClient = original.ContainerServicesClient
+
+func NewContainerServicesClient(subscriptionID string) ContainerServicesClient {
+	return original.NewContainerServicesClient(subscriptionID)
+}
+func NewContainerServicesClientWithBaseURI(baseURI string, subscriptionID string) ContainerServicesClient {
+	return original.NewContainerServicesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccessLevel = original.AccessLevel
@@ -921,15 +962,6 @@ type VirtualMachineUpdate = original.VirtualMachineUpdate
 type WindowsConfiguration = original.WindowsConfiguration
 type WinRMConfiguration = original.WinRMConfiguration
 type WinRMListener = original.WinRMListener
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type ResourceSkusClient = original.ResourceSkusClient
 
 func NewResourceSkusClient(subscriptionID string) ResourceSkusClient {
@@ -939,22 +971,22 @@ func NewResourceSkusClientWithBaseURI(baseURI string, subscriptionID string) Res
 	return original.NewResourceSkusClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SnapshotsClient = original.SnapshotsClient
+type VirtualMachineScaleSetsClient = original.VirtualMachineScaleSetsClient
 
-func NewSnapshotsClient(subscriptionID string) SnapshotsClient {
-	return original.NewSnapshotsClient(subscriptionID)
+func NewVirtualMachineScaleSetsClient(subscriptionID string) VirtualMachineScaleSetsClient {
+	return original.NewVirtualMachineScaleSetsClient(subscriptionID)
 }
-func NewSnapshotsClientWithBaseURI(baseURI string, subscriptionID string) SnapshotsClient {
-	return original.NewSnapshotsClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualMachineScaleSetsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetsClient {
+	return original.NewVirtualMachineScaleSetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UsageClient = original.UsageClient
+type VirtualMachineScaleSetExtensionsClient = original.VirtualMachineScaleSetExtensionsClient
 
-func NewUsageClient(subscriptionID string) UsageClient {
-	return original.NewUsageClient(subscriptionID)
+func NewVirtualMachineScaleSetExtensionsClient(subscriptionID string) VirtualMachineScaleSetExtensionsClient {
+	return original.NewVirtualMachineScaleSetExtensionsClient(subscriptionID)
 }
-func NewUsageClientWithBaseURI(baseURI string, subscriptionID string) UsageClient {
-	return original.NewUsageClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualMachineScaleSetExtensionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetExtensionsClient {
+	return original.NewVirtualMachineScaleSetExtensionsClientWithBaseURI(baseURI, subscriptionID)
 }
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
@@ -972,83 +1004,51 @@ func NewVirtualMachineExtensionImagesClientWithBaseURI(baseURI string, subscript
 	return original.NewVirtualMachineExtensionImagesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualMachineExtensionsClient = original.VirtualMachineExtensionsClient
-
-func NewVirtualMachineExtensionsClient(subscriptionID string) VirtualMachineExtensionsClient {
-	return original.NewVirtualMachineExtensionsClient(subscriptionID)
-}
-func NewVirtualMachineExtensionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineExtensionsClient {
-	return original.NewVirtualMachineExtensionsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type VirtualMachineImagesClient = original.VirtualMachineImagesClient
-
-func NewVirtualMachineImagesClient(subscriptionID string) VirtualMachineImagesClient {
-	return original.NewVirtualMachineImagesClient(subscriptionID)
-}
-func NewVirtualMachineImagesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineImagesClient {
-	return original.NewVirtualMachineImagesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type VirtualMachineRunCommandsClient = original.VirtualMachineRunCommandsClient
-
-func NewVirtualMachineRunCommandsClient(subscriptionID string) VirtualMachineRunCommandsClient {
-	return original.NewVirtualMachineRunCommandsClient(subscriptionID)
-}
-func NewVirtualMachineRunCommandsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineRunCommandsClient {
-	return original.NewVirtualMachineRunCommandsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type VirtualMachinesClient = original.VirtualMachinesClient
+type SnapshotsClient = original.SnapshotsClient
 
-func NewVirtualMachinesClient(subscriptionID string) VirtualMachinesClient {
-	return original.NewVirtualMachinesClient(subscriptionID)
+func NewSnapshotsClient(subscriptionID string) SnapshotsClient {
+	return original.NewSnapshotsClient(subscriptionID)
 }
-func NewVirtualMachinesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachinesClient {
-	return original.NewVirtualMachinesClientWithBaseURI(baseURI, subscriptionID)
+func NewSnapshotsClientWithBaseURI(baseURI string, subscriptionID string) SnapshotsClient {
+	return original.NewSnapshotsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualMachineScaleSetExtensionsClient = original.VirtualMachineScaleSetExtensionsClient
+type ImagesClient = original.ImagesClient
 
-func NewVirtualMachineScaleSetExtensionsClient(subscriptionID string) VirtualMachineScaleSetExtensionsClient {
-	return original.NewVirtualMachineScaleSetExtensionsClient(subscriptionID)
+func NewImagesClient(subscriptionID string) ImagesClient {
+	return original.NewImagesClient(subscriptionID)
 }
-func NewVirtualMachineScaleSetExtensionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetExtensionsClient {
-	return original.NewVirtualMachineScaleSetExtensionsClientWithBaseURI(baseURI, subscriptionID)
+func NewImagesClientWithBaseURI(baseURI string, subscriptionID string) ImagesClient {
+	return original.NewImagesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualMachineScaleSetRollingUpgradesClient = original.VirtualMachineScaleSetRollingUpgradesClient
+type DisksClient = original.DisksClient
 
-func NewVirtualMachineScaleSetRollingUpgradesClient(subscriptionID string) VirtualMachineScaleSetRollingUpgradesClient {
-	return original.NewVirtualMachineScaleSetRollingUpgradesClient(subscriptionID)
+func NewDisksClient(subscriptionID string) DisksClient {
+	return original.NewDisksClient(subscriptionID)
 }
-func NewVirtualMachineScaleSetRollingUpgradesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetRollingUpgradesClient {
-	return original.NewVirtualMachineScaleSetRollingUpgradesClientWithBaseURI(baseURI, subscriptionID)
+func NewDisksClientWithBaseURI(baseURI string, subscriptionID string) DisksClient {
+	return original.NewDisksClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualMachineScaleSetsClient = original.VirtualMachineScaleSetsClient
-
-func NewVirtualMachineScaleSetsClient(subscriptionID string) VirtualMachineScaleSetsClient {
-	return original.NewVirtualMachineScaleSetsClient(subscriptionID)
-}
-func NewVirtualMachineScaleSetsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetsClient {
-	return original.NewVirtualMachineScaleSetsClientWithBaseURI(baseURI, subscriptionID)
-}
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-type VirtualMachineScaleSetVMsClient = original.VirtualMachineScaleSetVMsClient
+type BaseClient = original.BaseClient
 
-func NewVirtualMachineScaleSetVMsClient(subscriptionID string) VirtualMachineScaleSetVMsClient {
-	return original.NewVirtualMachineScaleSetVMsClient(subscriptionID)
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewVirtualMachineScaleSetVMsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetVMsClient {
-	return original.NewVirtualMachineScaleSetVMsClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualMachineSizesClient = original.VirtualMachineSizesClient
+type VirtualMachinesClient = original.VirtualMachinesClient
 
-func NewVirtualMachineSizesClient(subscriptionID string) VirtualMachineSizesClient {
-	return original.NewVirtualMachineSizesClient(subscriptionID)
+func NewVirtualMachinesClient(subscriptionID string) VirtualMachinesClient {
+	return original.NewVirtualMachinesClient(subscriptionID)
 }
-func NewVirtualMachineSizesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineSizesClient {
-	return original.NewVirtualMachineSizesClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualMachinesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachinesClient {
+	return original.NewVirtualMachinesClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/consumption/mgmt/consumption/models.go b/profiles/latest/consumption/mgmt/consumption/models.go
index 2b34643304d4..99bd45c693c2 100644
--- a/profiles/latest/consumption/mgmt/consumption/models.go
+++ b/profiles/latest/consumption/mgmt/consumption/models.go
@@ -21,17 +21,22 @@ package consumption
 
 import original "github.com/Azure/azure-sdk-for-go/services/consumption/mgmt/2017-11-30/consumption"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type OperationsClient = original.OperationsClient
 
-type BaseClient = original.BaseClient
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type ReservationsSummariesClient = original.ReservationsSummariesClient
+
+func NewReservationsSummariesClient(subscriptionID string) ReservationsSummariesClient {
+	return original.NewReservationsSummariesClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewReservationsSummariesClientWithBaseURI(baseURI string, subscriptionID string) ReservationsSummariesClient {
+	return original.NewReservationsSummariesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type Datagrain = original.Datagrain
@@ -65,44 +70,41 @@ type UsageDetailProperties = original.UsageDetailProperties
 type UsageDetailsListResult = original.UsageDetailsListResult
 type UsageDetailsListResultIterator = original.UsageDetailsListResultIterator
 type UsageDetailsListResultPage = original.UsageDetailsListResultPage
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type ReservationsDetailsClient = original.ReservationsDetailsClient
+type UsageDetailsClient = original.UsageDetailsClient
 
-func NewReservationsDetailsClient(subscriptionID string) ReservationsDetailsClient {
-	return original.NewReservationsDetailsClient(subscriptionID)
+func NewUsageDetailsClient(subscriptionID string) UsageDetailsClient {
+	return original.NewUsageDetailsClient(subscriptionID)
 }
-func NewReservationsDetailsClientWithBaseURI(baseURI string, subscriptionID string) ReservationsDetailsClient {
-	return original.NewReservationsDetailsClientWithBaseURI(baseURI, subscriptionID)
+func NewUsageDetailsClientWithBaseURI(baseURI string, subscriptionID string) UsageDetailsClient {
+	return original.NewUsageDetailsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ReservationsSummariesClient = original.ReservationsSummariesClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewReservationsSummariesClient(subscriptionID string) ReservationsSummariesClient {
-	return original.NewReservationsSummariesClient(subscriptionID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewReservationsSummariesClientWithBaseURI(baseURI string, subscriptionID string) ReservationsSummariesClient {
-	return original.NewReservationsSummariesClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
-type UsageDetailsClient = original.UsageDetailsClient
+type ReservationsDetailsClient = original.ReservationsDetailsClient
 
-func NewUsageDetailsClient(subscriptionID string) UsageDetailsClient {
-	return original.NewUsageDetailsClient(subscriptionID)
-}
-func NewUsageDetailsClientWithBaseURI(baseURI string, subscriptionID string) UsageDetailsClient {
-	return original.NewUsageDetailsClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+func NewReservationsDetailsClient(subscriptionID string) ReservationsDetailsClient {
+	return original.NewReservationsDetailsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewReservationsDetailsClientWithBaseURI(baseURI string, subscriptionID string) ReservationsDetailsClient {
+	return original.NewReservationsDetailsClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/containerregistry/mgmt/containerregistry/models.go b/profiles/latest/containerregistry/mgmt/containerregistry/models.go
index daa7d889af7f..98c58e7ddc68 100644
--- a/profiles/latest/containerregistry/mgmt/containerregistry/models.go
+++ b/profiles/latest/containerregistry/mgmt/containerregistry/models.go
@@ -21,17 +21,22 @@ package containerregistry
 
 import original "github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type OperationsClient = original.OperationsClient
 
-type BaseClient = original.BaseClient
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type ReplicationsClient = original.ReplicationsClient
+
+func NewReplicationsClient(subscriptionID string) ReplicationsClient {
+	return original.NewReplicationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewReplicationsClientWithBaseURI(baseURI string, subscriptionID string) ReplicationsClient {
+	return original.NewReplicationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type PasswordName = original.PasswordName
@@ -179,15 +184,6 @@ type WebhooksCreateFuture = original.WebhooksCreateFuture
 type WebhooksDeleteFuture = original.WebhooksDeleteFuture
 type WebhooksUpdateFuture = original.WebhooksUpdateFuture
 type WebhookUpdateParameters = original.WebhookUpdateParameters
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type RegistriesClient = original.RegistriesClient
 
 func NewRegistriesClient(subscriptionID string) RegistriesClient {
@@ -196,15 +192,6 @@ func NewRegistriesClient(subscriptionID string) RegistriesClient {
 func NewRegistriesClientWithBaseURI(baseURI string, subscriptionID string) RegistriesClient {
 	return original.NewRegistriesClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type ReplicationsClient = original.ReplicationsClient
-
-func NewReplicationsClient(subscriptionID string) ReplicationsClient {
-	return original.NewReplicationsClient(subscriptionID)
-}
-func NewReplicationsClientWithBaseURI(baseURI string, subscriptionID string) ReplicationsClient {
-	return original.NewReplicationsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
@@ -220,3 +207,16 @@ func NewWebhooksClient(subscriptionID string) WebhooksClient {
 func NewWebhooksClientWithBaseURI(baseURI string, subscriptionID string) WebhooksClient {
 	return original.NewWebhooksClientWithBaseURI(baseURI, subscriptionID)
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/containerservice/mgmt/containerservice/models.go b/profiles/latest/containerservice/mgmt/containerservice/models.go
index b1c9b79764d6..d2b0407933d1 100644
--- a/profiles/latest/containerservice/mgmt/containerservice/models.go
+++ b/profiles/latest/containerservice/mgmt/containerservice/models.go
@@ -21,17 +21,13 @@ package containerservice
 
 import original "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type ManagedClustersClient = original.ManagedClustersClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewManagedClustersClient(subscriptionID string) ManagedClustersClient {
+	return original.NewManagedClustersClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewManagedClustersClientWithBaseURI(baseURI string, subscriptionID string) ManagedClustersClient {
+	return original.NewManagedClustersClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ContainerServicesClient = original.ContainerServicesClient
@@ -43,15 +39,6 @@ func NewContainerServicesClientWithBaseURI(baseURI string, subscriptionID string
 	return original.NewContainerServicesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ManagedClustersClient = original.ManagedClustersClient
-
-func NewManagedClustersClient(subscriptionID string) ManagedClustersClient {
-	return original.NewManagedClustersClient(subscriptionID)
-}
-func NewManagedClustersClientWithBaseURI(baseURI string, subscriptionID string) ManagedClustersClient {
-	return original.NewManagedClustersClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type OrchestratorTypes = original.OrchestratorTypes
 
 const (
@@ -317,3 +304,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/cosmos-db/mgmt/documentdb/models.go b/profiles/latest/cosmos-db/mgmt/documentdb/models.go
index 206ecc0fb83d..f3188cf95d78 100644
--- a/profiles/latest/cosmos-db/mgmt/documentdb/models.go
+++ b/profiles/latest/cosmos-db/mgmt/documentdb/models.go
@@ -21,17 +21,22 @@ package documentdb
 
 import original "github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type CollectionPartitionClient = original.CollectionPartitionClient
 
-type BaseClient = original.BaseClient
+func NewCollectionPartitionClient(subscriptionID string) CollectionPartitionClient {
+	return original.NewCollectionPartitionClient(subscriptionID)
+}
+func NewCollectionPartitionClientWithBaseURI(baseURI string, subscriptionID string) CollectionPartitionClient {
+	return original.NewCollectionPartitionClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type OperationsClient = original.OperationsClient
+
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type CollectionClient = original.CollectionClient
@@ -43,22 +48,22 @@ func NewCollectionClientWithBaseURI(baseURI string, subscriptionID string) Colle
 	return original.NewCollectionClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CollectionPartitionClient = original.CollectionPartitionClient
+type PercentileClient = original.PercentileClient
 
-func NewCollectionPartitionClient(subscriptionID string) CollectionPartitionClient {
-	return original.NewCollectionPartitionClient(subscriptionID)
+func NewPercentileClient(subscriptionID string) PercentileClient {
+	return original.NewPercentileClient(subscriptionID)
 }
-func NewCollectionPartitionClientWithBaseURI(baseURI string, subscriptionID string) CollectionPartitionClient {
-	return original.NewCollectionPartitionClientWithBaseURI(baseURI, subscriptionID)
+func NewPercentileClientWithBaseURI(baseURI string, subscriptionID string) PercentileClient {
+	return original.NewPercentileClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CollectionPartitionRegionClient = original.CollectionPartitionRegionClient
+type PercentileSourceTargetClient = original.PercentileSourceTargetClient
 
-func NewCollectionPartitionRegionClient(subscriptionID string) CollectionPartitionRegionClient {
-	return original.NewCollectionPartitionRegionClient(subscriptionID)
+func NewPercentileSourceTargetClient(subscriptionID string) PercentileSourceTargetClient {
+	return original.NewPercentileSourceTargetClient(subscriptionID)
 }
-func NewCollectionPartitionRegionClientWithBaseURI(baseURI string, subscriptionID string) CollectionPartitionRegionClient {
-	return original.NewCollectionPartitionRegionClientWithBaseURI(baseURI, subscriptionID)
+func NewPercentileSourceTargetClientWithBaseURI(baseURI string, subscriptionID string) PercentileSourceTargetClient {
+	return original.NewPercentileSourceTargetClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type CollectionRegionClient = original.CollectionRegionClient
@@ -70,33 +75,6 @@ func NewCollectionRegionClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewCollectionRegionClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DatabaseClient = original.DatabaseClient
-
-func NewDatabaseClient(subscriptionID string) DatabaseClient {
-	return original.NewDatabaseClient(subscriptionID)
-}
-func NewDatabaseClientWithBaseURI(baseURI string, subscriptionID string) DatabaseClient {
-	return original.NewDatabaseClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type DatabaseAccountRegionClient = original.DatabaseAccountRegionClient
-
-func NewDatabaseAccountRegionClient(subscriptionID string) DatabaseAccountRegionClient {
-	return original.NewDatabaseAccountRegionClient(subscriptionID)
-}
-func NewDatabaseAccountRegionClientWithBaseURI(baseURI string, subscriptionID string) DatabaseAccountRegionClient {
-	return original.NewDatabaseAccountRegionClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type DatabaseAccountsClient = original.DatabaseAccountsClient
-
-func NewDatabaseAccountsClient(subscriptionID string) DatabaseAccountsClient {
-	return original.NewDatabaseAccountsClient(subscriptionID)
-}
-func NewDatabaseAccountsClientWithBaseURI(baseURI string, subscriptionID string) DatabaseAccountsClient {
-	return original.NewDatabaseAccountsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type DatabaseAccountKind = original.DatabaseAccountKind
 
 const (
@@ -221,22 +199,28 @@ type PercentileMetricValue = original.PercentileMetricValue
 type Resource = original.Resource
 type Usage = original.Usage
 type UsagesResult = original.UsagesResult
-type OperationsClient = original.OperationsClient
+type CollectionPartitionRegionClient = original.CollectionPartitionRegionClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewCollectionPartitionRegionClient(subscriptionID string) CollectionPartitionRegionClient {
+	return original.NewCollectionPartitionRegionClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewCollectionPartitionRegionClientWithBaseURI(baseURI string, subscriptionID string) CollectionPartitionRegionClient {
+	return original.NewCollectionPartitionRegionClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
+}
+func Version() string {
+	return original.Version()
 }
 
-type PartitionKeyRangeIDClient = original.PartitionKeyRangeIDClient
+type DatabaseClient = original.DatabaseClient
 
-func NewPartitionKeyRangeIDClient(subscriptionID string) PartitionKeyRangeIDClient {
-	return original.NewPartitionKeyRangeIDClient(subscriptionID)
+func NewDatabaseClient(subscriptionID string) DatabaseClient {
+	return original.NewDatabaseClient(subscriptionID)
 }
-func NewPartitionKeyRangeIDClientWithBaseURI(baseURI string, subscriptionID string) PartitionKeyRangeIDClient {
-	return original.NewPartitionKeyRangeIDClientWithBaseURI(baseURI, subscriptionID)
+func NewDatabaseClientWithBaseURI(baseURI string, subscriptionID string) DatabaseClient {
+	return original.NewDatabaseClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type PartitionKeyRangeIDRegionClient = original.PartitionKeyRangeIDRegionClient
@@ -248,22 +232,13 @@ func NewPartitionKeyRangeIDRegionClientWithBaseURI(baseURI string, subscriptionI
 	return original.NewPartitionKeyRangeIDRegionClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type PercentileClient = original.PercentileClient
-
-func NewPercentileClient(subscriptionID string) PercentileClient {
-	return original.NewPercentileClient(subscriptionID)
-}
-func NewPercentileClientWithBaseURI(baseURI string, subscriptionID string) PercentileClient {
-	return original.NewPercentileClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type PercentileSourceTargetClient = original.PercentileSourceTargetClient
+type PartitionKeyRangeIDClient = original.PartitionKeyRangeIDClient
 
-func NewPercentileSourceTargetClient(subscriptionID string) PercentileSourceTargetClient {
-	return original.NewPercentileSourceTargetClient(subscriptionID)
+func NewPartitionKeyRangeIDClient(subscriptionID string) PartitionKeyRangeIDClient {
+	return original.NewPartitionKeyRangeIDClient(subscriptionID)
 }
-func NewPercentileSourceTargetClientWithBaseURI(baseURI string, subscriptionID string) PercentileSourceTargetClient {
-	return original.NewPercentileSourceTargetClientWithBaseURI(baseURI, subscriptionID)
+func NewPartitionKeyRangeIDClientWithBaseURI(baseURI string, subscriptionID string) PartitionKeyRangeIDClient {
+	return original.NewPartitionKeyRangeIDClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type PercentileTargetClient = original.PercentileTargetClient
@@ -274,9 +249,34 @@ func NewPercentileTargetClient(subscriptionID string) PercentileTargetClient {
 func NewPercentileTargetClientWithBaseURI(baseURI string, subscriptionID string) PercentileTargetClient {
 	return original.NewPercentileTargetClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+type DatabaseAccountRegionClient = original.DatabaseAccountRegionClient
+
+func NewDatabaseAccountRegionClient(subscriptionID string) DatabaseAccountRegionClient {
+	return original.NewDatabaseAccountRegionClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewDatabaseAccountRegionClientWithBaseURI(baseURI string, subscriptionID string) DatabaseAccountRegionClient {
+	return original.NewDatabaseAccountRegionClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
+
+type DatabaseAccountsClient = original.DatabaseAccountsClient
+
+func NewDatabaseAccountsClient(subscriptionID string) DatabaseAccountsClient {
+	return original.NewDatabaseAccountsClient(subscriptionID)
+}
+func NewDatabaseAccountsClientWithBaseURI(baseURI string, subscriptionID string) DatabaseAccountsClient {
+	return original.NewDatabaseAccountsClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/customerinsights/mgmt/customerinsights/models.go b/profiles/latest/customerinsights/mgmt/customerinsights/models.go
index 7098688d241a..748430f4c66d 100644
--- a/profiles/latest/customerinsights/mgmt/customerinsights/models.go
+++ b/profiles/latest/customerinsights/mgmt/customerinsights/models.go
@@ -21,35 +21,31 @@ package customerinsights
 
 import original "github.com/Azure/azure-sdk-for-go/services/customerinsights/mgmt/2017-04-26/customerinsights"
 
-type AuthorizationPoliciesClient = original.AuthorizationPoliciesClient
+type ConnectorMappingsClient = original.ConnectorMappingsClient
 
-func NewAuthorizationPoliciesClient(subscriptionID string) AuthorizationPoliciesClient {
-	return original.NewAuthorizationPoliciesClient(subscriptionID)
+func NewConnectorMappingsClient(subscriptionID string) ConnectorMappingsClient {
+	return original.NewConnectorMappingsClient(subscriptionID)
 }
-func NewAuthorizationPoliciesClientWithBaseURI(baseURI string, subscriptionID string) AuthorizationPoliciesClient {
-	return original.NewAuthorizationPoliciesClientWithBaseURI(baseURI, subscriptionID)
+func NewConnectorMappingsClientWithBaseURI(baseURI string, subscriptionID string) ConnectorMappingsClient {
+	return original.NewConnectorMappingsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ConnectorMappingsClient = original.ConnectorMappingsClient
+type ViewsClient = original.ViewsClient
 
-func NewConnectorMappingsClient(subscriptionID string) ConnectorMappingsClient {
-	return original.NewConnectorMappingsClient(subscriptionID)
+func NewViewsClient(subscriptionID string) ViewsClient {
+	return original.NewViewsClient(subscriptionID)
 }
-func NewConnectorMappingsClientWithBaseURI(baseURI string, subscriptionID string) ConnectorMappingsClient {
-	return original.NewConnectorMappingsClientWithBaseURI(baseURI, subscriptionID)
+func NewViewsClientWithBaseURI(baseURI string, subscriptionID string) ViewsClient {
+	return original.NewViewsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ConnectorsClient = original.ConnectorsClient
@@ -61,31 +57,22 @@ func NewConnectorsClientWithBaseURI(baseURI string, subscriptionID string) Conne
 	return original.NewConnectorsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type HubsClient = original.HubsClient
-
-func NewHubsClient(subscriptionID string) HubsClient {
-	return original.NewHubsClient(subscriptionID)
-}
-func NewHubsClientWithBaseURI(baseURI string, subscriptionID string) HubsClient {
-	return original.NewHubsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ImagesClient = original.ImagesClient
+type RoleAssignmentsClient = original.RoleAssignmentsClient
 
-func NewImagesClient(subscriptionID string) ImagesClient {
-	return original.NewImagesClient(subscriptionID)
+func NewRoleAssignmentsClient(subscriptionID string) RoleAssignmentsClient {
+	return original.NewRoleAssignmentsClient(subscriptionID)
 }
-func NewImagesClientWithBaseURI(baseURI string, subscriptionID string) ImagesClient {
-	return original.NewImagesClientWithBaseURI(baseURI, subscriptionID)
+func NewRoleAssignmentsClientWithBaseURI(baseURI string, subscriptionID string) RoleAssignmentsClient {
+	return original.NewRoleAssignmentsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type InteractionsClient = original.InteractionsClient
+type RolesClient = original.RolesClient
 
-func NewInteractionsClient(subscriptionID string) InteractionsClient {
-	return original.NewInteractionsClient(subscriptionID)
+func NewRolesClient(subscriptionID string) RolesClient {
+	return original.NewRolesClient(subscriptionID)
 }
-func NewInteractionsClientWithBaseURI(baseURI string, subscriptionID string) InteractionsClient {
-	return original.NewInteractionsClientWithBaseURI(baseURI, subscriptionID)
+func NewRolesClientWithBaseURI(baseURI string, subscriptionID string) RolesClient {
+	return original.NewRolesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type KpiClient = original.KpiClient
@@ -97,13 +84,13 @@ func NewKpiClientWithBaseURI(baseURI string, subscriptionID string) KpiClient {
 	return original.NewKpiClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LinksClient = original.LinksClient
+type RelationshipsClient = original.RelationshipsClient
 
-func NewLinksClient(subscriptionID string) LinksClient {
-	return original.NewLinksClient(subscriptionID)
+func NewRelationshipsClient(subscriptionID string) RelationshipsClient {
+	return original.NewRelationshipsClient(subscriptionID)
 }
-func NewLinksClientWithBaseURI(baseURI string, subscriptionID string) LinksClient {
-	return original.NewLinksClientWithBaseURI(baseURI, subscriptionID)
+func NewRelationshipsClientWithBaseURI(baseURI string, subscriptionID string) RelationshipsClient {
+	return original.NewRelationshipsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type CalculationWindowTypes = original.CalculationWindowTypes
@@ -534,13 +521,37 @@ type WidgetTypeListResult = original.WidgetTypeListResult
 type WidgetTypeListResultIterator = original.WidgetTypeListResultIterator
 type WidgetTypeListResultPage = original.WidgetTypeListResultPage
 type WidgetTypeResourceFormat = original.WidgetTypeResourceFormat
-type OperationsClient = original.OperationsClient
+type ProfilesClient = original.ProfilesClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewProfilesClient(subscriptionID string) ProfilesClient {
+	return original.NewProfilesClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewProfilesClientWithBaseURI(baseURI string, subscriptionID string) ProfilesClient {
+	return original.NewProfilesClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
+}
+func Version() string {
+	return original.Version()
+}
+
+type AuthorizationPoliciesClient = original.AuthorizationPoliciesClient
+
+func NewAuthorizationPoliciesClient(subscriptionID string) AuthorizationPoliciesClient {
+	return original.NewAuthorizationPoliciesClient(subscriptionID)
+}
+func NewAuthorizationPoliciesClientWithBaseURI(baseURI string, subscriptionID string) AuthorizationPoliciesClient {
+	return original.NewAuthorizationPoliciesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type HubsClient = original.HubsClient
+
+func NewHubsClient(subscriptionID string) HubsClient {
+	return original.NewHubsClient(subscriptionID)
+}
+func NewHubsClientWithBaseURI(baseURI string, subscriptionID string) HubsClient {
+	return original.NewHubsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type PredictionsClient = original.PredictionsClient
@@ -552,15 +563,6 @@ func NewPredictionsClientWithBaseURI(baseURI string, subscriptionID string) Pred
 	return original.NewPredictionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProfilesClient = original.ProfilesClient
-
-func NewProfilesClient(subscriptionID string) ProfilesClient {
-	return original.NewProfilesClient(subscriptionID)
-}
-func NewProfilesClientWithBaseURI(baseURI string, subscriptionID string) ProfilesClient {
-	return original.NewProfilesClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type RelationshipLinksClient = original.RelationshipLinksClient
 
 func NewRelationshipLinksClient(subscriptionID string) RelationshipLinksClient {
@@ -570,46 +572,31 @@ func NewRelationshipLinksClientWithBaseURI(baseURI string, subscriptionID string
 	return original.NewRelationshipLinksClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type RelationshipsClient = original.RelationshipsClient
-
-func NewRelationshipsClient(subscriptionID string) RelationshipsClient {
-	return original.NewRelationshipsClient(subscriptionID)
-}
-func NewRelationshipsClientWithBaseURI(baseURI string, subscriptionID string) RelationshipsClient {
-	return original.NewRelationshipsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type RoleAssignmentsClient = original.RoleAssignmentsClient
+type ImagesClient = original.ImagesClient
 
-func NewRoleAssignmentsClient(subscriptionID string) RoleAssignmentsClient {
-	return original.NewRoleAssignmentsClient(subscriptionID)
+func NewImagesClient(subscriptionID string) ImagesClient {
+	return original.NewImagesClient(subscriptionID)
 }
-func NewRoleAssignmentsClientWithBaseURI(baseURI string, subscriptionID string) RoleAssignmentsClient {
-	return original.NewRoleAssignmentsClientWithBaseURI(baseURI, subscriptionID)
+func NewImagesClientWithBaseURI(baseURI string, subscriptionID string) ImagesClient {
+	return original.NewImagesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type RolesClient = original.RolesClient
+type InteractionsClient = original.InteractionsClient
 
-func NewRolesClient(subscriptionID string) RolesClient {
-	return original.NewRolesClient(subscriptionID)
-}
-func NewRolesClientWithBaseURI(baseURI string, subscriptionID string) RolesClient {
-	return original.NewRolesClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+func NewInteractionsClient(subscriptionID string) InteractionsClient {
+	return original.NewInteractionsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewInteractionsClientWithBaseURI(baseURI string, subscriptionID string) InteractionsClient {
+	return original.NewInteractionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ViewsClient = original.ViewsClient
+type LinksClient = original.LinksClient
 
-func NewViewsClient(subscriptionID string) ViewsClient {
-	return original.NewViewsClient(subscriptionID)
+func NewLinksClient(subscriptionID string) LinksClient {
+	return original.NewLinksClient(subscriptionID)
 }
-func NewViewsClientWithBaseURI(baseURI string, subscriptionID string) ViewsClient {
-	return original.NewViewsClientWithBaseURI(baseURI, subscriptionID)
+func NewLinksClientWithBaseURI(baseURI string, subscriptionID string) LinksClient {
+	return original.NewLinksClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type WidgetTypesClient = original.WidgetTypesClient
@@ -620,3 +607,16 @@ func NewWidgetTypesClient(subscriptionID string) WidgetTypesClient {
 func NewWidgetTypesClientWithBaseURI(baseURI string, subscriptionID string) WidgetTypesClient {
 	return original.NewWidgetTypesClientWithBaseURI(baseURI, subscriptionID)
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/datacatalog/mgmt/datacatalog/models.go b/profiles/latest/datacatalog/mgmt/datacatalog/models.go
index 95bfd42ebf1b..3c86a52675f9 100644
--- a/profiles/latest/datacatalog/mgmt/datacatalog/models.go
+++ b/profiles/latest/datacatalog/mgmt/datacatalog/models.go
@@ -21,15 +21,6 @@ package datacatalog
 
 import original "github.com/Azure/azure-sdk-for-go/services/datacatalog/mgmt/2016-03-30/datacatalog"
 
-type ADCCatalogsClient = original.ADCCatalogsClient
-
-func NewADCCatalogsClient(subscriptionID string, catalogName string) ADCCatalogsClient {
-	return original.NewADCCatalogsClient(subscriptionID, catalogName)
-}
-func NewADCCatalogsClientWithBaseURI(baseURI string, subscriptionID string, catalogName string) ADCCatalogsClient {
-	return original.NewADCCatalogsClientWithBaseURI(baseURI, subscriptionID, catalogName)
-}
-
 type ADCOperationsClient = original.ADCOperationsClient
 
 func NewADCOperationsClient(subscriptionID string, catalogName string) ADCOperationsClient {
@@ -39,19 +30,6 @@ func NewADCOperationsClientWithBaseURI(baseURI string, subscriptionID string, ca
 	return original.NewADCOperationsClientWithBaseURI(baseURI, subscriptionID, catalogName)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string, catalogName string) BaseClient {
-	return original.New(subscriptionID, catalogName)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string, catalogName string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID, catalogName)
-}
-
 type SkuType = original.SkuType
 
 const (
@@ -72,10 +50,30 @@ type OperationEntity = original.OperationEntity
 type OperationEntityListResult = original.OperationEntityListResult
 type Principals = original.Principals
 type Resource = original.Resource
+type ADCCatalogsClient = original.ADCCatalogsClient
 
+func NewADCCatalogsClient(subscriptionID string, catalogName string) ADCCatalogsClient {
+	return original.NewADCCatalogsClient(subscriptionID, catalogName)
+}
+func NewADCCatalogsClientWithBaseURI(baseURI string, subscriptionID string, catalogName string) ADCCatalogsClient {
+	return original.NewADCCatalogsClientWithBaseURI(baseURI, subscriptionID, catalogName)
+}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string, catalogName string) BaseClient {
+	return original.New(subscriptionID, catalogName)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string, catalogName string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID, catalogName)
+}
diff --git a/profiles/latest/datalake/analytics/catalog/models.go b/profiles/latest/datalake/analytics/catalog/models.go
index c1554cad5727..f09438920dcf 100644
--- a/profiles/latest/datalake/analytics/catalog/models.go
+++ b/profiles/latest/datalake/analytics/catalog/models.go
@@ -21,25 +21,6 @@ package catalog
 
 import original "github.com/Azure/azure-sdk-for-go/services/datalake/analytics/2016-11-01-preview/catalog"
 
-type Client = original.Client
-
-func NewClient() Client {
-	return original.NewClient()
-}
-
-const (
-	DefaultAdlaCatalogDNSSuffix = original.DefaultAdlaCatalogDNSSuffix
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithoutDefaults(adlaCatalogDNSSuffix string) BaseClient {
-	return original.NewWithoutDefaults(adlaCatalogDNSSuffix)
-}
-
 type ACLType = original.ACLType
 
 const (
@@ -169,3 +150,22 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type Client = original.Client
+
+func NewClient() Client {
+	return original.NewClient()
+}
+
+const (
+	DefaultAdlaCatalogDNSSuffix = original.DefaultAdlaCatalogDNSSuffix
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithoutDefaults(adlaCatalogDNSSuffix string) BaseClient {
+	return original.NewWithoutDefaults(adlaCatalogDNSSuffix)
+}
diff --git a/profiles/latest/datalake/analytics/job/models.go b/profiles/latest/datalake/analytics/job/models.go
index 1aacd5a5fa17..7a799ac99ed1 100644
--- a/profiles/latest/datalake/analytics/job/models.go
+++ b/profiles/latest/datalake/analytics/job/models.go
@@ -21,17 +21,10 @@ package job
 
 import original "github.com/Azure/azure-sdk-for-go/services/datalake/analytics/2016-11-01/job"
 
-const (
-	DefaultAdlaJobDNSSuffix = original.DefaultAdlaJobDNSSuffix
-)
-
-type BaseClient = original.BaseClient
+type PipelineClient = original.PipelineClient
 
-func New() BaseClient {
-	return original.New()
-}
-func NewWithoutDefaults(adlaJobDNSSuffix string) BaseClient {
-	return original.NewWithoutDefaults(adlaJobDNSSuffix)
+func NewPipelineClient() PipelineClient {
+	return original.NewPipelineClient()
 }
 
 type Client = original.Client
@@ -181,12 +174,6 @@ type StateAuditRecord = original.StateAuditRecord
 type Statistics = original.Statistics
 type StatisticsVertexStage = original.StatisticsVertexStage
 type USQLJobProperties = original.USQLJobProperties
-type PipelineClient = original.PipelineClient
-
-func NewPipelineClient() PipelineClient {
-	return original.NewPipelineClient()
-}
-
 type RecurrenceClient = original.RecurrenceClient
 
 func NewRecurrenceClient() RecurrenceClient {
@@ -198,3 +185,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultAdlaJobDNSSuffix = original.DefaultAdlaJobDNSSuffix
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithoutDefaults(adlaJobDNSSuffix string) BaseClient {
+	return original.NewWithoutDefaults(adlaJobDNSSuffix)
+}
diff --git a/profiles/latest/datalake/analytics/mgmt/account/models.go b/profiles/latest/datalake/analytics/mgmt/account/models.go
index 58fbd03d8545..9dd2ece1b895 100644
--- a/profiles/latest/datalake/analytics/mgmt/account/models.go
+++ b/profiles/latest/datalake/analytics/mgmt/account/models.go
@@ -21,26 +21,22 @@ package account
 
 import original "github.com/Azure/azure-sdk-for-go/services/datalake/analytics/mgmt/2016-11-01/account"
 
-type AccountsClient = original.AccountsClient
+type DataLakeStoreAccountsClient = original.DataLakeStoreAccountsClient
 
-func NewAccountsClient(subscriptionID string) AccountsClient {
-	return original.NewAccountsClient(subscriptionID)
+func NewDataLakeStoreAccountsClient(subscriptionID string) DataLakeStoreAccountsClient {
+	return original.NewDataLakeStoreAccountsClient(subscriptionID)
 }
-func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
-	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
+func NewDataLakeStoreAccountsClientWithBaseURI(baseURI string, subscriptionID string) DataLakeStoreAccountsClient {
+	return original.NewDataLakeStoreAccountsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ComputePoliciesClient = original.ComputePoliciesClient
@@ -52,24 +48,6 @@ func NewComputePoliciesClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewComputePoliciesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DataLakeStoreAccountsClient = original.DataLakeStoreAccountsClient
-
-func NewDataLakeStoreAccountsClient(subscriptionID string) DataLakeStoreAccountsClient {
-	return original.NewDataLakeStoreAccountsClient(subscriptionID)
-}
-func NewDataLakeStoreAccountsClientWithBaseURI(baseURI string, subscriptionID string) DataLakeStoreAccountsClient {
-	return original.NewDataLakeStoreAccountsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type FirewallRulesClient = original.FirewallRulesClient
-
-func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClient(subscriptionID)
-}
-func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type LocationsClient = original.LocationsClient
 
 func NewLocationsClient(subscriptionID string) LocationsClient {
@@ -262,13 +240,21 @@ type UpdateFirewallRuleWithAccountParameters = original.UpdateFirewallRuleWithAc
 type UpdateStorageAccountParameters = original.UpdateStorageAccountParameters
 type UpdateStorageAccountProperties = original.UpdateStorageAccountProperties
 type UpdateStorageAccountWithAccountParameters = original.UpdateStorageAccountWithAccountParameters
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
+}
+
+type FirewallRulesClient = original.FirewallRulesClient
+
+func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClient(subscriptionID)
+}
+func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type StorageAccountsClient = original.StorageAccountsClient
@@ -279,9 +265,25 @@ func NewStorageAccountsClient(subscriptionID string) StorageAccountsClient {
 func NewStorageAccountsClientWithBaseURI(baseURI string, subscriptionID string) StorageAccountsClient {
 	return original.NewStorageAccountsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+type AccountsClient = original.AccountsClient
+
+func NewAccountsClient(subscriptionID string) AccountsClient {
+	return original.NewAccountsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
+	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/datalake/store/filesystem/models.go b/profiles/latest/datalake/store/filesystem/models.go
index 1cd949b7c166..97b1a2da1997 100644
--- a/profiles/latest/datalake/store/filesystem/models.go
+++ b/profiles/latest/datalake/store/filesystem/models.go
@@ -21,25 +21,6 @@ package filesystem
 
 import original "github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem"
 
-const (
-	DefaultAdlsFileSystemDNSSuffix = original.DefaultAdlsFileSystemDNSSuffix
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithoutDefaults(adlsFileSystemDNSSuffix string) BaseClient {
-	return original.NewWithoutDefaults(adlsFileSystemDNSSuffix)
-}
-
-type Client = original.Client
-
-func NewClient() Client {
-	return original.NewClient()
-}
-
 type AppendModeType = original.AppendModeType
 
 const (
@@ -136,3 +117,22 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type Client = original.Client
+
+func NewClient() Client {
+	return original.NewClient()
+}
+
+const (
+	DefaultAdlsFileSystemDNSSuffix = original.DefaultAdlsFileSystemDNSSuffix
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithoutDefaults(adlsFileSystemDNSSuffix string) BaseClient {
+	return original.NewWithoutDefaults(adlsFileSystemDNSSuffix)
+}
diff --git a/profiles/latest/datalake/store/mgmt/account/models.go b/profiles/latest/datalake/store/mgmt/account/models.go
index d5913703d6e9..2d75c71b06d2 100644
--- a/profiles/latest/datalake/store/mgmt/account/models.go
+++ b/profiles/latest/datalake/store/mgmt/account/models.go
@@ -21,35 +21,13 @@ package account
 
 import original "github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account"
 
-type AccountsClient = original.AccountsClient
-
-func NewAccountsClient(subscriptionID string) AccountsClient {
-	return original.NewAccountsClient(subscriptionID)
-}
-func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
-	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type FirewallRulesClient = original.FirewallRulesClient
+type OperationsClient = original.OperationsClient
 
-func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type LocationsClient = original.LocationsClient
@@ -249,15 +227,6 @@ type UpdateKeyVaultMetaInfo = original.UpdateKeyVaultMetaInfo
 type UpdateTrustedIDProviderParameters = original.UpdateTrustedIDProviderParameters
 type UpdateTrustedIDProviderProperties = original.UpdateTrustedIDProviderProperties
 type UpdateTrustedIDProviderWithAccountParameters = original.UpdateTrustedIDProviderWithAccountParameters
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type TrustedIDProvidersClient = original.TrustedIDProvidersClient
 
 func NewTrustedIDProvidersClient(subscriptionID string) TrustedIDProvidersClient {
@@ -272,3 +241,34 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type FirewallRulesClient = original.FirewallRulesClient
+
+func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClient(subscriptionID)
+}
+func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type AccountsClient = original.AccountsClient
+
+func NewAccountsClient(subscriptionID string) AccountsClient {
+	return original.NewAccountsClient(subscriptionID)
+}
+func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
+	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/devtestlabs/mgmt/dtl/models.go b/profiles/latest/devtestlabs/mgmt/dtl/models.go
index 5778c6171444..e078dd455438 100644
--- a/profiles/latest/devtestlabs/mgmt/dtl/models.go
+++ b/profiles/latest/devtestlabs/mgmt/dtl/models.go
@@ -21,89 +21,94 @@ package dtl
 
 import original "github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2016-05-15/dtl"
 
-type ArmTemplatesClient = original.ArmTemplatesClient
+type OperationsClient = original.OperationsClient
 
-func NewArmTemplatesClient(subscriptionID string) ArmTemplatesClient {
-	return original.NewArmTemplatesClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewArmTemplatesClientWithBaseURI(baseURI string, subscriptionID string) ArmTemplatesClient {
-	return original.NewArmTemplatesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ArtifactsClient = original.ArtifactsClient
+type GlobalSchedulesClient = original.GlobalSchedulesClient
 
-func NewArtifactsClient(subscriptionID string) ArtifactsClient {
-	return original.NewArtifactsClient(subscriptionID)
+func NewGlobalSchedulesClient(subscriptionID string) GlobalSchedulesClient {
+	return original.NewGlobalSchedulesClient(subscriptionID)
 }
-func NewArtifactsClientWithBaseURI(baseURI string, subscriptionID string) ArtifactsClient {
-	return original.NewArtifactsClientWithBaseURI(baseURI, subscriptionID)
+func NewGlobalSchedulesClientWithBaseURI(baseURI string, subscriptionID string) GlobalSchedulesClient {
+	return original.NewGlobalSchedulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ArtifactSourcesClient = original.ArtifactSourcesClient
+type ProviderOperationsClient = original.ProviderOperationsClient
 
-func NewArtifactSourcesClient(subscriptionID string) ArtifactSourcesClient {
-	return original.NewArtifactSourcesClient(subscriptionID)
+func NewProviderOperationsClient(subscriptionID string) ProviderOperationsClient {
+	return original.NewProviderOperationsClient(subscriptionID)
 }
-func NewArtifactSourcesClientWithBaseURI(baseURI string, subscriptionID string) ArtifactSourcesClient {
-	return original.NewArtifactSourcesClientWithBaseURI(baseURI, subscriptionID)
+func NewProviderOperationsClientWithBaseURI(baseURI string, subscriptionID string) ProviderOperationsClient {
+	return original.NewProviderOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type NotificationChannelsClient = original.NotificationChannelsClient
 
-type BaseClient = original.BaseClient
+func NewNotificationChannelsClient(subscriptionID string) NotificationChannelsClient {
+	return original.NewNotificationChannelsClient(subscriptionID)
+}
+func NewNotificationChannelsClientWithBaseURI(baseURI string, subscriptionID string) NotificationChannelsClient {
+	return original.NewNotificationChannelsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type LabsClient = original.LabsClient
+
+func NewLabsClient(subscriptionID string) LabsClient {
+	return original.NewLabsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewLabsClientWithBaseURI(baseURI string, subscriptionID string) LabsClient {
+	return original.NewLabsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CostsClient = original.CostsClient
+type SecretsClient = original.SecretsClient
 
-func NewCostsClient(subscriptionID string) CostsClient {
-	return original.NewCostsClient(subscriptionID)
+func NewSecretsClient(subscriptionID string) SecretsClient {
+	return original.NewSecretsClient(subscriptionID)
 }
-func NewCostsClientWithBaseURI(baseURI string, subscriptionID string) CostsClient {
-	return original.NewCostsClientWithBaseURI(baseURI, subscriptionID)
+func NewSecretsClientWithBaseURI(baseURI string, subscriptionID string) SecretsClient {
+	return original.NewSecretsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CustomImagesClient = original.CustomImagesClient
+type UsersClient = original.UsersClient
 
-func NewCustomImagesClient(subscriptionID string) CustomImagesClient {
-	return original.NewCustomImagesClient(subscriptionID)
+func NewUsersClient(subscriptionID string) UsersClient {
+	return original.NewUsersClient(subscriptionID)
 }
-func NewCustomImagesClientWithBaseURI(baseURI string, subscriptionID string) CustomImagesClient {
-	return original.NewCustomImagesClientWithBaseURI(baseURI, subscriptionID)
+func NewUsersClientWithBaseURI(baseURI string, subscriptionID string) UsersClient {
+	return original.NewUsersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DisksClient = original.DisksClient
+type ArtifactsClient = original.ArtifactsClient
 
-func NewDisksClient(subscriptionID string) DisksClient {
-	return original.NewDisksClient(subscriptionID)
+func NewArtifactsClient(subscriptionID string) ArtifactsClient {
+	return original.NewArtifactsClient(subscriptionID)
 }
-func NewDisksClientWithBaseURI(baseURI string, subscriptionID string) DisksClient {
-	return original.NewDisksClientWithBaseURI(baseURI, subscriptionID)
+func NewArtifactsClientWithBaseURI(baseURI string, subscriptionID string) ArtifactsClient {
+	return original.NewArtifactsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type EnvironmentsClient = original.EnvironmentsClient
+type CostsClient = original.CostsClient
 
-func NewEnvironmentsClient(subscriptionID string) EnvironmentsClient {
-	return original.NewEnvironmentsClient(subscriptionID)
+func NewCostsClient(subscriptionID string) CostsClient {
+	return original.NewCostsClient(subscriptionID)
 }
-func NewEnvironmentsClientWithBaseURI(baseURI string, subscriptionID string) EnvironmentsClient {
-	return original.NewEnvironmentsClientWithBaseURI(baseURI, subscriptionID)
+func NewCostsClientWithBaseURI(baseURI string, subscriptionID string) CostsClient {
+	return original.NewCostsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type FormulasClient = original.FormulasClient
+type ServiceRunnersClient = original.ServiceRunnersClient
 
-func NewFormulasClient(subscriptionID string) FormulasClient {
-	return original.NewFormulasClient(subscriptionID)
+func NewServiceRunnersClient(subscriptionID string) ServiceRunnersClient {
+	return original.NewServiceRunnersClient(subscriptionID)
 }
-func NewFormulasClientWithBaseURI(baseURI string, subscriptionID string) FormulasClient {
-	return original.NewFormulasClientWithBaseURI(baseURI, subscriptionID)
+func NewServiceRunnersClientWithBaseURI(baseURI string, subscriptionID string) ServiceRunnersClient {
+	return original.NewServiceRunnersClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type GalleryImagesClient = original.GalleryImagesClient
@@ -115,24 +120,6 @@ func NewGalleryImagesClientWithBaseURI(baseURI string, subscriptionID string) Ga
 	return original.NewGalleryImagesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type GlobalSchedulesClient = original.GlobalSchedulesClient
-
-func NewGlobalSchedulesClient(subscriptionID string) GlobalSchedulesClient {
-	return original.NewGlobalSchedulesClient(subscriptionID)
-}
-func NewGlobalSchedulesClientWithBaseURI(baseURI string, subscriptionID string) GlobalSchedulesClient {
-	return original.NewGlobalSchedulesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type LabsClient = original.LabsClient
-
-func NewLabsClient(subscriptionID string) LabsClient {
-	return original.NewLabsClient(subscriptionID)
-}
-func NewLabsClientWithBaseURI(baseURI string, subscriptionID string) LabsClient {
-	return original.NewLabsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type CostThresholdStatus = original.CostThresholdStatus
 
 const (
@@ -658,31 +645,28 @@ type VirtualNetworksDeleteFuture = original.VirtualNetworksDeleteFuture
 type WeekDetails = original.WeekDetails
 type WeekDetailsFragment = original.WeekDetailsFragment
 type WindowsOsInfo = original.WindowsOsInfo
-type NotificationChannelsClient = original.NotificationChannelsClient
+type VirtualNetworksClient = original.VirtualNetworksClient
 
-func NewNotificationChannelsClient(subscriptionID string) NotificationChannelsClient {
-	return original.NewNotificationChannelsClient(subscriptionID)
+func NewVirtualNetworksClient(subscriptionID string) VirtualNetworksClient {
+	return original.NewVirtualNetworksClient(subscriptionID)
 }
-func NewNotificationChannelsClientWithBaseURI(baseURI string, subscriptionID string) NotificationChannelsClient {
-	return original.NewNotificationChannelsClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualNetworksClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksClient {
+	return original.NewVirtualNetworksClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type PoliciesClient = original.PoliciesClient
+type ArtifactSourcesClient = original.ArtifactSourcesClient
 
-func NewPoliciesClient(subscriptionID string) PoliciesClient {
-	return original.NewPoliciesClient(subscriptionID)
+func NewArtifactSourcesClient(subscriptionID string) ArtifactSourcesClient {
+	return original.NewArtifactSourcesClient(subscriptionID)
 }
-func NewPoliciesClientWithBaseURI(baseURI string, subscriptionID string) PoliciesClient {
-	return original.NewPoliciesClientWithBaseURI(baseURI, subscriptionID)
+func NewArtifactSourcesClientWithBaseURI(baseURI string, subscriptionID string) ArtifactSourcesClient {
+	return original.NewArtifactSourcesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type PolicySetsClient = original.PolicySetsClient
@@ -694,13 +678,22 @@ func NewPolicySetsClientWithBaseURI(baseURI string, subscriptionID string) Polic
 	return original.NewPolicySetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProviderOperationsClient = original.ProviderOperationsClient
+type ArmTemplatesClient = original.ArmTemplatesClient
 
-func NewProviderOperationsClient(subscriptionID string) ProviderOperationsClient {
-	return original.NewProviderOperationsClient(subscriptionID)
+func NewArmTemplatesClient(subscriptionID string) ArmTemplatesClient {
+	return original.NewArmTemplatesClient(subscriptionID)
 }
-func NewProviderOperationsClientWithBaseURI(baseURI string, subscriptionID string) ProviderOperationsClient {
-	return original.NewProviderOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewArmTemplatesClientWithBaseURI(baseURI string, subscriptionID string) ArmTemplatesClient {
+	return original.NewArmTemplatesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type VirtualMachineSchedulesClient = original.VirtualMachineSchedulesClient
+
+func NewVirtualMachineSchedulesClient(subscriptionID string) VirtualMachineSchedulesClient {
+	return original.NewVirtualMachineSchedulesClient(subscriptionID)
+}
+func NewVirtualMachineSchedulesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineSchedulesClient {
+	return original.NewVirtualMachineSchedulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type SchedulesClient = original.SchedulesClient
@@ -712,62 +705,69 @@ func NewSchedulesClientWithBaseURI(baseURI string, subscriptionID string) Schedu
 	return original.NewSchedulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SecretsClient = original.SecretsClient
+type PoliciesClient = original.PoliciesClient
 
-func NewSecretsClient(subscriptionID string) SecretsClient {
-	return original.NewSecretsClient(subscriptionID)
+func NewPoliciesClient(subscriptionID string) PoliciesClient {
+	return original.NewPoliciesClient(subscriptionID)
 }
-func NewSecretsClientWithBaseURI(baseURI string, subscriptionID string) SecretsClient {
-	return original.NewSecretsClientWithBaseURI(baseURI, subscriptionID)
+func NewPoliciesClientWithBaseURI(baseURI string, subscriptionID string) PoliciesClient {
+	return original.NewPoliciesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ServiceRunnersClient = original.ServiceRunnersClient
+type CustomImagesClient = original.CustomImagesClient
 
-func NewServiceRunnersClient(subscriptionID string) ServiceRunnersClient {
-	return original.NewServiceRunnersClient(subscriptionID)
+func NewCustomImagesClient(subscriptionID string) CustomImagesClient {
+	return original.NewCustomImagesClient(subscriptionID)
 }
-func NewServiceRunnersClientWithBaseURI(baseURI string, subscriptionID string) ServiceRunnersClient {
-	return original.NewServiceRunnersClientWithBaseURI(baseURI, subscriptionID)
+func NewCustomImagesClientWithBaseURI(baseURI string, subscriptionID string) CustomImagesClient {
+	return original.NewCustomImagesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UsersClient = original.UsersClient
+type DisksClient = original.DisksClient
 
-func NewUsersClient(subscriptionID string) UsersClient {
-	return original.NewUsersClient(subscriptionID)
+func NewDisksClient(subscriptionID string) DisksClient {
+	return original.NewDisksClient(subscriptionID)
 }
-func NewUsersClientWithBaseURI(baseURI string, subscriptionID string) UsersClient {
-	return original.NewUsersClientWithBaseURI(baseURI, subscriptionID)
+func NewDisksClientWithBaseURI(baseURI string, subscriptionID string) DisksClient {
+	return original.NewDisksClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+type EnvironmentsClient = original.EnvironmentsClient
+
+func NewEnvironmentsClient(subscriptionID string) EnvironmentsClient {
+	return original.NewEnvironmentsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewEnvironmentsClientWithBaseURI(baseURI string, subscriptionID string) EnvironmentsClient {
+	return original.NewEnvironmentsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualMachinesClient = original.VirtualMachinesClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewVirtualMachinesClient(subscriptionID string) VirtualMachinesClient {
-	return original.NewVirtualMachinesClient(subscriptionID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewVirtualMachinesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachinesClient {
-	return original.NewVirtualMachinesClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualMachineSchedulesClient = original.VirtualMachineSchedulesClient
+type FormulasClient = original.FormulasClient
 
-func NewVirtualMachineSchedulesClient(subscriptionID string) VirtualMachineSchedulesClient {
-	return original.NewVirtualMachineSchedulesClient(subscriptionID)
+func NewFormulasClient(subscriptionID string) FormulasClient {
+	return original.NewFormulasClient(subscriptionID)
 }
-func NewVirtualMachineSchedulesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineSchedulesClient {
-	return original.NewVirtualMachineSchedulesClientWithBaseURI(baseURI, subscriptionID)
+func NewFormulasClientWithBaseURI(baseURI string, subscriptionID string) FormulasClient {
+	return original.NewFormulasClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualNetworksClient = original.VirtualNetworksClient
+type VirtualMachinesClient = original.VirtualMachinesClient
 
-func NewVirtualNetworksClient(subscriptionID string) VirtualNetworksClient {
-	return original.NewVirtualNetworksClient(subscriptionID)
+func NewVirtualMachinesClient(subscriptionID string) VirtualMachinesClient {
+	return original.NewVirtualMachinesClient(subscriptionID)
 }
-func NewVirtualNetworksClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksClient {
-	return original.NewVirtualNetworksClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualMachinesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachinesClient {
+	return original.NewVirtualMachinesClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/dns/mgmt/dns/models.go b/profiles/latest/dns/mgmt/dns/models.go
index 62f38b53ea3e..814a50fb40ff 100644
--- a/profiles/latest/dns/mgmt/dns/models.go
+++ b/profiles/latest/dns/mgmt/dns/models.go
@@ -21,17 +21,13 @@ package dns
 
 import original "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2017-10-01/dns"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type RecordSetsClient = original.RecordSetsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewRecordSetsClient(subscriptionID string) RecordSetsClient {
+	return original.NewRecordSetsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewRecordSetsClientWithBaseURI(baseURI string, subscriptionID string) RecordSetsClient {
+	return original.NewRecordSetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type RecordType = original.RecordType
@@ -80,14 +76,7 @@ type ZoneListResultPage = original.ZoneListResultPage
 type ZoneProperties = original.ZoneProperties
 type ZonesDeleteFuture = original.ZonesDeleteFuture
 type ZoneUpdate = original.ZoneUpdate
-type RecordSetsClient = original.RecordSetsClient
 
-func NewRecordSetsClient(subscriptionID string) RecordSetsClient {
-	return original.NewRecordSetsClient(subscriptionID)
-}
-func NewRecordSetsClientWithBaseURI(baseURI string, subscriptionID string) RecordSetsClient {
-	return original.NewRecordSetsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
@@ -103,3 +92,16 @@ func NewZonesClient(subscriptionID string) ZonesClient {
 func NewZonesClientWithBaseURI(baseURI string, subscriptionID string) ZonesClient {
 	return original.NewZonesClientWithBaseURI(baseURI, subscriptionID)
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/domainservices/mgmt/aad/models.go b/profiles/latest/domainservices/mgmt/aad/models.go
index 2aacac63180e..1f713cebc024 100644
--- a/profiles/latest/domainservices/mgmt/aad/models.go
+++ b/profiles/latest/domainservices/mgmt/aad/models.go
@@ -21,37 +21,6 @@ package aad
 
 import original "github.com/Azure/azure-sdk-for-go/services/domainservices/mgmt/2017-01-01/aad"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type DomainServiceOperationsClient = original.DomainServiceOperationsClient
-
-func NewDomainServiceOperationsClient(subscriptionID string) DomainServiceOperationsClient {
-	return original.NewDomainServiceOperationsClient(subscriptionID)
-}
-func NewDomainServiceOperationsClientWithBaseURI(baseURI string, subscriptionID string) DomainServiceOperationsClient {
-	return original.NewDomainServiceOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type DomainServicesClient = original.DomainServicesClient
-
-func NewDomainServicesClient(subscriptionID string) DomainServicesClient {
-	return original.NewDomainServicesClient(subscriptionID)
-}
-func NewDomainServicesClientWithBaseURI(baseURI string, subscriptionID string) DomainServicesClient {
-	return original.NewDomainServicesClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type ExternalAccess = original.ExternalAccess
 
 const (
@@ -86,10 +55,39 @@ type OperationDisplayInfo = original.OperationDisplayInfo
 type OperationEntity = original.OperationEntity
 type OperationEntityListResult = original.OperationEntityListResult
 type Resource = original.Resource
+type DomainServiceOperationsClient = original.DomainServiceOperationsClient
 
+func NewDomainServiceOperationsClient(subscriptionID string) DomainServiceOperationsClient {
+	return original.NewDomainServiceOperationsClient(subscriptionID)
+}
+func NewDomainServiceOperationsClientWithBaseURI(baseURI string, subscriptionID string) DomainServiceOperationsClient {
+	return original.NewDomainServiceOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
 func Version() string {
 	return original.Version()
 }
+
+type DomainServicesClient = original.DomainServicesClient
+
+func NewDomainServicesClient(subscriptionID string) DomainServicesClient {
+	return original.NewDomainServicesClient(subscriptionID)
+}
+func NewDomainServicesClientWithBaseURI(baseURI string, subscriptionID string) DomainServicesClient {
+	return original.NewDomainServicesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/eventgrid/eventgrid/models.go b/profiles/latest/eventgrid/eventgrid/models.go
index 5a20a49f0762..ab3d7d84a1d0 100644
--- a/profiles/latest/eventgrid/eventgrid/models.go
+++ b/profiles/latest/eventgrid/eventgrid/models.go
@@ -21,15 +21,6 @@ package eventgrid
 
 import original "github.com/Azure/azure-sdk-for-go/services/eventgrid/2018-01-01/eventgrid"
 
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithoutDefaults() BaseClient {
-	return original.NewWithoutDefaults()
-}
-
 type ContainerRegistryEventActor = original.ContainerRegistryEventActor
 type ContainerRegistryEventData = original.ContainerRegistryEventData
 type ContainerRegistryEventRequest = original.ContainerRegistryEventRequest
@@ -62,3 +53,12 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithoutDefaults() BaseClient {
+	return original.NewWithoutDefaults()
+}
diff --git a/profiles/latest/eventgrid/mgmt/eventgrid/models.go b/profiles/latest/eventgrid/mgmt/eventgrid/models.go
index 66698283d9f4..49c2154e9d7c 100644
--- a/profiles/latest/eventgrid/mgmt/eventgrid/models.go
+++ b/profiles/latest/eventgrid/mgmt/eventgrid/models.go
@@ -21,26 +21,13 @@ package eventgrid
 
 import original "github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type EventSubscriptionsClient = original.EventSubscriptionsClient
+type OperationsClient = original.OperationsClient
 
-func NewEventSubscriptionsClient(subscriptionID string) EventSubscriptionsClient {
-	return original.NewEventSubscriptionsClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewEventSubscriptionsClientWithBaseURI(baseURI string, subscriptionID string) EventSubscriptionsClient {
-	return original.NewEventSubscriptionsClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type EndpointType = original.EndpointType
@@ -146,13 +133,12 @@ type TopicUpdateParameters = original.TopicUpdateParameters
 type TrackedResource = original.TrackedResource
 type WebHookEventSubscriptionDestination = original.WebHookEventSubscriptionDestination
 type WebHookEventSubscriptionDestinationProperties = original.WebHookEventSubscriptionDestinationProperties
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
 type TopicsClient = original.TopicsClient
@@ -164,6 +150,15 @@ func NewTopicsClientWithBaseURI(baseURI string, subscriptionID string) TopicsCli
 	return original.NewTopicsClientWithBaseURI(baseURI, subscriptionID)
 }
 
+type EventSubscriptionsClient = original.EventSubscriptionsClient
+
+func NewEventSubscriptionsClient(subscriptionID string) EventSubscriptionsClient {
+	return original.NewEventSubscriptionsClient(subscriptionID)
+}
+func NewEventSubscriptionsClientWithBaseURI(baseURI string, subscriptionID string) EventSubscriptionsClient {
+	return original.NewEventSubscriptionsClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type TopicTypesClient = original.TopicTypesClient
 
 func NewTopicTypesClient(subscriptionID string) TopicTypesClient {
@@ -172,9 +167,16 @@ func NewTopicTypesClient(subscriptionID string) TopicTypesClient {
 func NewTopicTypesClientWithBaseURI(baseURI string, subscriptionID string) TopicTypesClient {
 	return original.NewTopicTypesClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/eventhub/mgmt/eventhub/models.go b/profiles/latest/eventhub/mgmt/eventhub/models.go
index 5dc92256b9de..466f73fc5477 100644
--- a/profiles/latest/eventhub/mgmt/eventhub/models.go
+++ b/profiles/latest/eventhub/mgmt/eventhub/models.go
@@ -21,44 +21,40 @@ package eventhub
 
 import original "github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type RegionsClient = original.RegionsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewRegionsClient(subscriptionID string) RegionsClient {
+	return original.NewRegionsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewRegionsClientWithBaseURI(baseURI string, subscriptionID string) RegionsClient {
+	return original.NewRegionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ConsumerGroupsClient = original.ConsumerGroupsClient
+type OperationsClient = original.OperationsClient
 
-func NewConsumerGroupsClient(subscriptionID string) ConsumerGroupsClient {
-	return original.NewConsumerGroupsClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewConsumerGroupsClientWithBaseURI(baseURI string, subscriptionID string) ConsumerGroupsClient {
-	return original.NewConsumerGroupsClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DisasterRecoveryConfigsClient = original.DisasterRecoveryConfigsClient
+type NamespacesClient = original.NamespacesClient
 
-func NewDisasterRecoveryConfigsClient(subscriptionID string) DisasterRecoveryConfigsClient {
-	return original.NewDisasterRecoveryConfigsClient(subscriptionID)
+func NewNamespacesClient(subscriptionID string) NamespacesClient {
+	return original.NewNamespacesClient(subscriptionID)
 }
-func NewDisasterRecoveryConfigsClientWithBaseURI(baseURI string, subscriptionID string) DisasterRecoveryConfigsClient {
-	return original.NewDisasterRecoveryConfigsClientWithBaseURI(baseURI, subscriptionID)
+func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) NamespacesClient {
+	return original.NewNamespacesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type EventHubsClient = original.EventHubsClient
+type ConsumerGroupsClient = original.ConsumerGroupsClient
 
-func NewEventHubsClient(subscriptionID string) EventHubsClient {
-	return original.NewEventHubsClient(subscriptionID)
+func NewConsumerGroupsClient(subscriptionID string) ConsumerGroupsClient {
+	return original.NewConsumerGroupsClient(subscriptionID)
 }
-func NewEventHubsClientWithBaseURI(baseURI string, subscriptionID string) EventHubsClient {
-	return original.NewEventHubsClientWithBaseURI(baseURI, subscriptionID)
+func NewConsumerGroupsClientWithBaseURI(baseURI string, subscriptionID string) ConsumerGroupsClient {
+	return original.NewConsumerGroupsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccessRights = original.AccessRights
@@ -224,35 +220,41 @@ type RegenerateAccessKeyParameters = original.RegenerateAccessKeyParameters
 type Resource = original.Resource
 type Sku = original.Sku
 type TrackedResource = original.TrackedResource
-type NamespacesClient = original.NamespacesClient
 
-func NewNamespacesClient(subscriptionID string) NamespacesClient {
-	return original.NewNamespacesClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) NamespacesClient {
-	return original.NewNamespacesClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type OperationsClient = original.OperationsClient
+type DisasterRecoveryConfigsClient = original.DisasterRecoveryConfigsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewDisasterRecoveryConfigsClient(subscriptionID string) DisasterRecoveryConfigsClient {
+	return original.NewDisasterRecoveryConfigsClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewDisasterRecoveryConfigsClientWithBaseURI(baseURI string, subscriptionID string) DisasterRecoveryConfigsClient {
+	return original.NewDisasterRecoveryConfigsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type RegionsClient = original.RegionsClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewRegionsClient(subscriptionID string) RegionsClient {
-	return original.NewRegionsClient(subscriptionID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewRegionsClientWithBaseURI(baseURI string, subscriptionID string) RegionsClient {
-	return original.NewRegionsClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+type EventHubsClient = original.EventHubsClient
+
+func NewEventHubsClient(subscriptionID string) EventHubsClient {
+	return original.NewEventHubsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewEventHubsClientWithBaseURI(baseURI string, subscriptionID string) EventHubsClient {
+	return original.NewEventHubsClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/graphrbac/graphrbac/models.go b/profiles/latest/graphrbac/graphrbac/models.go
index 3503959ba5f1..1df964a62679 100644
--- a/profiles/latest/graphrbac/graphrbac/models.go
+++ b/profiles/latest/graphrbac/graphrbac/models.go
@@ -21,44 +21,22 @@ package graphrbac
 
 import original "github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac"
 
-type ApplicationsClient = original.ApplicationsClient
-
-func NewApplicationsClient(tenantID string) ApplicationsClient {
-	return original.NewApplicationsClient(tenantID)
-}
-func NewApplicationsClientWithBaseURI(baseURI string, tenantID string) ApplicationsClient {
-	return original.NewApplicationsClientWithBaseURI(baseURI, tenantID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(tenantID string) BaseClient {
-	return original.New(tenantID)
-}
-func NewWithBaseURI(baseURI string, tenantID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, tenantID)
-}
-
-type DomainsClient = original.DomainsClient
+type ObjectsClient = original.ObjectsClient
 
-func NewDomainsClient(tenantID string) DomainsClient {
-	return original.NewDomainsClient(tenantID)
+func NewObjectsClient(tenantID string) ObjectsClient {
+	return original.NewObjectsClient(tenantID)
 }
-func NewDomainsClientWithBaseURI(baseURI string, tenantID string) DomainsClient {
-	return original.NewDomainsClientWithBaseURI(baseURI, tenantID)
+func NewObjectsClientWithBaseURI(baseURI string, tenantID string) ObjectsClient {
+	return original.NewObjectsClientWithBaseURI(baseURI, tenantID)
 }
 
-type GroupsClient = original.GroupsClient
+type UsersClient = original.UsersClient
 
-func NewGroupsClient(tenantID string) GroupsClient {
-	return original.NewGroupsClient(tenantID)
+func NewUsersClient(tenantID string) UsersClient {
+	return original.NewUsersClient(tenantID)
 }
-func NewGroupsClientWithBaseURI(baseURI string, tenantID string) GroupsClient {
-	return original.NewGroupsClientWithBaseURI(baseURI, tenantID)
+func NewUsersClientWithBaseURI(baseURI string, tenantID string) UsersClient {
+	return original.NewUsersClientWithBaseURI(baseURI, tenantID)
 }
 
 type ObjectType = original.ObjectType
@@ -140,13 +118,28 @@ type UserListResult = original.UserListResult
 type UserListResultIterator = original.UserListResultIterator
 type UserListResultPage = original.UserListResultPage
 type UserUpdateParameters = original.UserUpdateParameters
-type ObjectsClient = original.ObjectsClient
+type ApplicationsClient = original.ApplicationsClient
 
-func NewObjectsClient(tenantID string) ObjectsClient {
-	return original.NewObjectsClient(tenantID)
+func NewApplicationsClient(tenantID string) ApplicationsClient {
+	return original.NewApplicationsClient(tenantID)
 }
-func NewObjectsClientWithBaseURI(baseURI string, tenantID string) ObjectsClient {
-	return original.NewObjectsClientWithBaseURI(baseURI, tenantID)
+func NewApplicationsClientWithBaseURI(baseURI string, tenantID string) ApplicationsClient {
+	return original.NewApplicationsClientWithBaseURI(baseURI, tenantID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
+}
+func Version() string {
+	return original.Version()
+}
+
+type DomainsClient = original.DomainsClient
+
+func NewDomainsClient(tenantID string) DomainsClient {
+	return original.NewDomainsClient(tenantID)
+}
+func NewDomainsClientWithBaseURI(baseURI string, tenantID string) DomainsClient {
+	return original.NewDomainsClientWithBaseURI(baseURI, tenantID)
 }
 
 type ServicePrincipalsClient = original.ServicePrincipalsClient
@@ -158,17 +151,24 @@ func NewServicePrincipalsClientWithBaseURI(baseURI string, tenantID string) Serv
 	return original.NewServicePrincipalsClientWithBaseURI(baseURI, tenantID)
 }
 
-type UsersClient = original.UsersClient
+type GroupsClient = original.GroupsClient
 
-func NewUsersClient(tenantID string) UsersClient {
-	return original.NewUsersClient(tenantID)
+func NewGroupsClient(tenantID string) GroupsClient {
+	return original.NewGroupsClient(tenantID)
 }
-func NewUsersClientWithBaseURI(baseURI string, tenantID string) UsersClient {
-	return original.NewUsersClientWithBaseURI(baseURI, tenantID)
+func NewGroupsClientWithBaseURI(baseURI string, tenantID string) GroupsClient {
+	return original.NewGroupsClientWithBaseURI(baseURI, tenantID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(tenantID string) BaseClient {
+	return original.New(tenantID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, tenantID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, tenantID)
 }
diff --git a/profiles/latest/iothub/mgmt/devices/models.go b/profiles/latest/iothub/mgmt/devices/models.go
index 524db4ece921..cb1e92fd5123 100644
--- a/profiles/latest/iothub/mgmt/devices/models.go
+++ b/profiles/latest/iothub/mgmt/devices/models.go
@@ -21,28 +21,6 @@ package devices
 
 import original "github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2017-07-01/devices"
 
-type CertificatesClient = original.CertificatesClient
-
-func NewCertificatesClient(subscriptionID string) CertificatesClient {
-	return original.NewCertificatesClient(subscriptionID)
-}
-func NewCertificatesClientWithBaseURI(baseURI string, subscriptionID string) CertificatesClient {
-	return original.NewCertificatesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type IotHubResourceClient = original.IotHubResourceClient
 
 func NewIotHubResourceClient(subscriptionID string) IotHubResourceClient {
@@ -52,6 +30,15 @@ func NewIotHubResourceClientWithBaseURI(baseURI string, subscriptionID string) I
 	return original.NewIotHubResourceClientWithBaseURI(baseURI, subscriptionID)
 }
 
+type OperationsClient = original.OperationsClient
+
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type AccessRights = original.AccessRights
 
 const (
@@ -269,17 +256,32 @@ type SharedAccessSignatureAuthorizationRuleListResult = original.SharedAccessSig
 type SharedAccessSignatureAuthorizationRuleListResultIterator = original.SharedAccessSignatureAuthorizationRuleListResultIterator
 type SharedAccessSignatureAuthorizationRuleListResultPage = original.SharedAccessSignatureAuthorizationRuleListResultPage
 type StorageEndpointProperties = original.StorageEndpointProperties
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
 func Version() string {
 	return original.Version()
 }
+
+type CertificatesClient = original.CertificatesClient
+
+func NewCertificatesClient(subscriptionID string) CertificatesClient {
+	return original.NewCertificatesClient(subscriptionID)
+}
+func NewCertificatesClientWithBaseURI(baseURI string, subscriptionID string) CertificatesClient {
+	return original.NewCertificatesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/keyvault/keyvault/models.go b/profiles/latest/keyvault/keyvault/models.go
index a6bd8eaa0874..e109567623a0 100644
--- a/profiles/latest/keyvault/keyvault/models.go
+++ b/profiles/latest/keyvault/keyvault/models.go
@@ -21,15 +21,6 @@ package keyvault
 
 import original "github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault"
 
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithoutDefaults() BaseClient {
-	return original.NewWithoutDefaults()
-}
-
 type ActionType = original.ActionType
 
 const (
@@ -250,3 +241,12 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithoutDefaults() BaseClient {
+	return original.NewWithoutDefaults()
+}
diff --git a/profiles/latest/keyvault/mgmt/keyvault/models.go b/profiles/latest/keyvault/mgmt/keyvault/models.go
index 8e375230d330..b00e63f36738 100644
--- a/profiles/latest/keyvault/mgmt/keyvault/models.go
+++ b/profiles/latest/keyvault/mgmt/keyvault/models.go
@@ -21,17 +21,22 @@ package keyvault
 
 import original "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type OperationsClient = original.OperationsClient
 
-type BaseClient = original.BaseClient
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type VaultsClient = original.VaultsClient
+
+func NewVaultsClient(subscriptionID string) VaultsClient {
+	return original.NewVaultsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewVaultsClientWithBaseURI(baseURI string, subscriptionID string) VaultsClient {
+	return original.NewVaultsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccessPolicyUpdateKind = original.AccessPolicyUpdateKind
@@ -200,26 +205,23 @@ type VaultPatchParameters = original.VaultPatchParameters
 type VaultPatchProperties = original.VaultPatchProperties
 type VaultProperties = original.VaultProperties
 type VaultsPurgeDeletedFuture = original.VaultsPurgeDeletedFuture
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 
-type VaultsClient = original.VaultsClient
-
-func NewVaultsClient(subscriptionID string) VaultsClient {
-	return original.NewVaultsClient(subscriptionID)
-}
-func NewVaultsClientWithBaseURI(baseURI string, subscriptionID string) VaultsClient {
-	return original.NewVaultsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/logic/mgmt/logic/models.go b/profiles/latest/logic/mgmt/logic/models.go
index 5e8db8e65a1b..d54b7239af4b 100644
--- a/profiles/latest/logic/mgmt/logic/models.go
+++ b/profiles/latest/logic/mgmt/logic/models.go
@@ -21,6 +21,15 @@ package logic
 
 import original "github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2016-06-01/logic"
 
+type WorkflowRunsClient = original.WorkflowRunsClient
+
+func NewWorkflowRunsClient(subscriptionID string) WorkflowRunsClient {
+	return original.NewWorkflowRunsClient(subscriptionID)
+}
+func NewWorkflowRunsClientWithBaseURI(baseURI string, subscriptionID string) WorkflowRunsClient {
+	return original.NewWorkflowRunsClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type AgreementsClient = original.AgreementsClient
 
 func NewAgreementsClient(subscriptionID string) AgreementsClient {
@@ -30,44 +39,58 @@ func NewAgreementsClientWithBaseURI(baseURI string, subscriptionID string) Agree
 	return original.NewAgreementsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CertificatesClient = original.CertificatesClient
+type SchemasClient = original.SchemasClient
 
-func NewCertificatesClient(subscriptionID string) CertificatesClient {
-	return original.NewCertificatesClient(subscriptionID)
+func NewSchemasClient(subscriptionID string) SchemasClient {
+	return original.NewSchemasClient(subscriptionID)
 }
-func NewCertificatesClientWithBaseURI(baseURI string, subscriptionID string) CertificatesClient {
-	return original.NewCertificatesClientWithBaseURI(baseURI, subscriptionID)
+func NewSchemasClientWithBaseURI(baseURI string, subscriptionID string) SchemasClient {
+	return original.NewSchemasClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type SessionsClient = original.SessionsClient
 
-type BaseClient = original.BaseClient
+func NewSessionsClient(subscriptionID string) SessionsClient {
+	return original.NewSessionsClient(subscriptionID)
+}
+func NewSessionsClientWithBaseURI(baseURI string, subscriptionID string) SessionsClient {
+	return original.NewSessionsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type WorkflowTriggersClient = original.WorkflowTriggersClient
+
+func NewWorkflowTriggersClient(subscriptionID string) WorkflowTriggersClient {
+	return original.NewWorkflowTriggersClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewWorkflowTriggersClientWithBaseURI(baseURI string, subscriptionID string) WorkflowTriggersClient {
+	return original.NewWorkflowTriggersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type IntegrationAccountsClient = original.IntegrationAccountsClient
+type WorkflowRunActionsClient = original.WorkflowRunActionsClient
 
-func NewIntegrationAccountsClient(subscriptionID string) IntegrationAccountsClient {
-	return original.NewIntegrationAccountsClient(subscriptionID)
+func NewWorkflowRunActionsClient(subscriptionID string) WorkflowRunActionsClient {
+	return original.NewWorkflowRunActionsClient(subscriptionID)
 }
-func NewIntegrationAccountsClientWithBaseURI(baseURI string, subscriptionID string) IntegrationAccountsClient {
-	return original.NewIntegrationAccountsClientWithBaseURI(baseURI, subscriptionID)
+func NewWorkflowRunActionsClientWithBaseURI(baseURI string, subscriptionID string) WorkflowRunActionsClient {
+	return original.NewWorkflowRunActionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type MapsClient = original.MapsClient
+type PartnersClient = original.PartnersClient
 
-func NewMapsClient(subscriptionID string) MapsClient {
-	return original.NewMapsClient(subscriptionID)
+func NewPartnersClient(subscriptionID string) PartnersClient {
+	return original.NewPartnersClient(subscriptionID)
 }
-func NewMapsClientWithBaseURI(baseURI string, subscriptionID string) MapsClient {
-	return original.NewMapsClientWithBaseURI(baseURI, subscriptionID)
+func NewPartnersClientWithBaseURI(baseURI string, subscriptionID string) PartnersClient {
+	return original.NewPartnersClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type WorkflowsClient = original.WorkflowsClient
+
+func NewWorkflowsClient(subscriptionID string) WorkflowsClient {
+	return original.NewWorkflowsClient(subscriptionID)
+}
+func NewWorkflowsClientWithBaseURI(baseURI string, subscriptionID string) WorkflowsClient {
+	return original.NewWorkflowsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AgreementType = original.AgreementType
@@ -636,31 +659,13 @@ type X12SchemaReference = original.X12SchemaReference
 type X12SecuritySettings = original.X12SecuritySettings
 type X12ValidationOverride = original.X12ValidationOverride
 type X12ValidationSettings = original.X12ValidationSettings
-type PartnersClient = original.PartnersClient
-
-func NewPartnersClient(subscriptionID string) PartnersClient {
-	return original.NewPartnersClient(subscriptionID)
-}
-func NewPartnersClientWithBaseURI(baseURI string, subscriptionID string) PartnersClient {
-	return original.NewPartnersClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type SchemasClient = original.SchemasClient
-
-func NewSchemasClient(subscriptionID string) SchemasClient {
-	return original.NewSchemasClient(subscriptionID)
-}
-func NewSchemasClientWithBaseURI(baseURI string, subscriptionID string) SchemasClient {
-	return original.NewSchemasClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type SessionsClient = original.SessionsClient
+type WorkflowVersionsClient = original.WorkflowVersionsClient
 
-func NewSessionsClient(subscriptionID string) SessionsClient {
-	return original.NewSessionsClient(subscriptionID)
+func NewWorkflowVersionsClient(subscriptionID string) WorkflowVersionsClient {
+	return original.NewWorkflowVersionsClient(subscriptionID)
 }
-func NewSessionsClientWithBaseURI(baseURI string, subscriptionID string) SessionsClient {
-	return original.NewSessionsClientWithBaseURI(baseURI, subscriptionID)
+func NewWorkflowVersionsClientWithBaseURI(baseURI string, subscriptionID string) WorkflowVersionsClient {
+	return original.NewWorkflowVersionsClientWithBaseURI(baseURI, subscriptionID)
 }
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
@@ -669,31 +674,13 @@ func Version() string {
 	return original.Version()
 }
 
-type WorkflowRunActionsClient = original.WorkflowRunActionsClient
-
-func NewWorkflowRunActionsClient(subscriptionID string) WorkflowRunActionsClient {
-	return original.NewWorkflowRunActionsClient(subscriptionID)
-}
-func NewWorkflowRunActionsClientWithBaseURI(baseURI string, subscriptionID string) WorkflowRunActionsClient {
-	return original.NewWorkflowRunActionsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type WorkflowRunsClient = original.WorkflowRunsClient
-
-func NewWorkflowRunsClient(subscriptionID string) WorkflowRunsClient {
-	return original.NewWorkflowRunsClient(subscriptionID)
-}
-func NewWorkflowRunsClientWithBaseURI(baseURI string, subscriptionID string) WorkflowRunsClient {
-	return original.NewWorkflowRunsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type WorkflowsClient = original.WorkflowsClient
+type CertificatesClient = original.CertificatesClient
 
-func NewWorkflowsClient(subscriptionID string) WorkflowsClient {
-	return original.NewWorkflowsClient(subscriptionID)
+func NewCertificatesClient(subscriptionID string) CertificatesClient {
+	return original.NewCertificatesClient(subscriptionID)
 }
-func NewWorkflowsClientWithBaseURI(baseURI string, subscriptionID string) WorkflowsClient {
-	return original.NewWorkflowsClientWithBaseURI(baseURI, subscriptionID)
+func NewCertificatesClientWithBaseURI(baseURI string, subscriptionID string) CertificatesClient {
+	return original.NewCertificatesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type WorkflowTriggerHistoriesClient = original.WorkflowTriggerHistoriesClient
@@ -705,20 +692,33 @@ func NewWorkflowTriggerHistoriesClientWithBaseURI(baseURI string, subscriptionID
 	return original.NewWorkflowTriggerHistoriesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type WorkflowTriggersClient = original.WorkflowTriggersClient
+type IntegrationAccountsClient = original.IntegrationAccountsClient
 
-func NewWorkflowTriggersClient(subscriptionID string) WorkflowTriggersClient {
-	return original.NewWorkflowTriggersClient(subscriptionID)
+func NewIntegrationAccountsClient(subscriptionID string) IntegrationAccountsClient {
+	return original.NewIntegrationAccountsClient(subscriptionID)
 }
-func NewWorkflowTriggersClientWithBaseURI(baseURI string, subscriptionID string) WorkflowTriggersClient {
-	return original.NewWorkflowTriggersClientWithBaseURI(baseURI, subscriptionID)
+func NewIntegrationAccountsClientWithBaseURI(baseURI string, subscriptionID string) IntegrationAccountsClient {
+	return original.NewIntegrationAccountsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type WorkflowVersionsClient = original.WorkflowVersionsClient
+type MapsClient = original.MapsClient
 
-func NewWorkflowVersionsClient(subscriptionID string) WorkflowVersionsClient {
-	return original.NewWorkflowVersionsClient(subscriptionID)
+func NewMapsClient(subscriptionID string) MapsClient {
+	return original.NewMapsClient(subscriptionID)
 }
-func NewWorkflowVersionsClientWithBaseURI(baseURI string, subscriptionID string) WorkflowVersionsClient {
-	return original.NewWorkflowVersionsClientWithBaseURI(baseURI, subscriptionID)
+func NewMapsClientWithBaseURI(baseURI string, subscriptionID string) MapsClient {
+	return original.NewMapsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/machinelearning/mgmt/webservices/models.go b/profiles/latest/machinelearning/mgmt/webservices/models.go
index 0c792644f662..9f0a148f3b80 100644
--- a/profiles/latest/machinelearning/mgmt/webservices/models.go
+++ b/profiles/latest/machinelearning/mgmt/webservices/models.go
@@ -21,17 +21,13 @@ package webservices
 
 import original "github.com/Azure/azure-sdk-for-go/services/machinelearning/mgmt/2017-01-01/webservices"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AssetType = original.AssetType
@@ -200,14 +196,7 @@ type ServiceInputOutputSpecification = original.ServiceInputOutputSpecification
 type StorageAccount = original.StorageAccount
 type TableSpecification = original.TableSpecification
 type WebService = original.WebService
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
@@ -215,6 +204,19 @@ func Version() string {
 	return original.Version()
 }
 
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
+
 type Client = original.Client
 
 func NewClient(subscriptionID string) Client {
diff --git a/profiles/latest/marketplaceordering/mgmt/marketplaceordering/models.go b/profiles/latest/marketplaceordering/mgmt/marketplaceordering/models.go
index fb8ddb756cca..23732070fd29 100644
--- a/profiles/latest/marketplaceordering/mgmt/marketplaceordering/models.go
+++ b/profiles/latest/marketplaceordering/mgmt/marketplaceordering/models.go
@@ -21,17 +21,13 @@ package marketplaceordering
 
 import original "github.com/Azure/azure-sdk-for-go/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type MarketplaceAgreementsClient = original.MarketplaceAgreementsClient
@@ -53,17 +49,23 @@ type OperationListResult = original.OperationListResult
 type OperationListResultIterator = original.OperationListResultIterator
 type OperationListResultPage = original.OperationListResultPage
 type Resource = original.Resource
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/mediaservices/mgmt/media/models.go b/profiles/latest/mediaservices/mgmt/media/models.go
index bea549e3fc8c..39daa9e734c1 100644
--- a/profiles/latest/mediaservices/mgmt/media/models.go
+++ b/profiles/latest/mediaservices/mgmt/media/models.go
@@ -21,17 +21,22 @@ package media
 
 import original "github.com/Azure/azure-sdk-for-go/services/mediaservices/mgmt/2015-10-01/media"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type ServiceClient = original.ServiceClient
 
-type BaseClient = original.BaseClient
+func NewServiceClient(subscriptionID string) ServiceClient {
+	return original.NewServiceClient(subscriptionID)
+}
+func NewServiceClientWithBaseURI(baseURI string, subscriptionID string) ServiceClient {
+	return original.NewServiceClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type OperationsClient = original.OperationsClient
+
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type EntityNameUnavailabilityReason = original.EntityNameUnavailabilityReason
@@ -83,26 +88,23 @@ type ServiceKeys = original.ServiceKeys
 type ServiceProperties = original.ServiceProperties
 type StorageAccount = original.StorageAccount
 type SyncStorageKeysInput = original.SyncStorageKeysInput
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 
-type ServiceClient = original.ServiceClient
-
-func NewServiceClient(subscriptionID string) ServiceClient {
-	return original.NewServiceClient(subscriptionID)
-}
-func NewServiceClientWithBaseURI(baseURI string, subscriptionID string) ServiceClient {
-	return original.NewServiceClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/mobileengagement/mgmt/mobileengagement/models.go b/profiles/latest/mobileengagement/mgmt/mobileengagement/models.go
index 8f08eb4beafe..97261101df55 100644
--- a/profiles/latest/mobileengagement/mgmt/mobileengagement/models.go
+++ b/profiles/latest/mobileengagement/mgmt/mobileengagement/models.go
@@ -21,46 +21,6 @@ package mobileengagement
 
 import original "github.com/Azure/azure-sdk-for-go/services/mobileengagement/mgmt/2014-12-01/mobileengagement"
 
-type AppCollectionsClient = original.AppCollectionsClient
-
-func NewAppCollectionsClient(subscriptionID string) AppCollectionsClient {
-	return original.NewAppCollectionsClient(subscriptionID)
-}
-func NewAppCollectionsClientWithBaseURI(baseURI string, subscriptionID string) AppCollectionsClient {
-	return original.NewAppCollectionsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type AppsClient = original.AppsClient
-
-func NewAppsClient(subscriptionID string) AppsClient {
-	return original.NewAppsClient(subscriptionID)
-}
-func NewAppsClientWithBaseURI(baseURI string, subscriptionID string) AppsClient {
-	return original.NewAppsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type CampaignsClient = original.CampaignsClient
-
-func NewCampaignsClient(subscriptionID string) CampaignsClient {
-	return original.NewCampaignsClient(subscriptionID)
-}
-func NewCampaignsClientWithBaseURI(baseURI string, subscriptionID string) CampaignsClient {
-	return original.NewCampaignsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type DevicesClient = original.DevicesClient
 
 func NewDevicesClient(subscriptionID string) DevicesClient {
@@ -70,6 +30,15 @@ func NewDevicesClientWithBaseURI(baseURI string, subscriptionID string) DevicesC
 	return original.NewDevicesClientWithBaseURI(baseURI, subscriptionID)
 }
 
+type ImportTasksClient = original.ImportTasksClient
+
+func NewImportTasksClient(subscriptionID string) ImportTasksClient {
+	return original.NewImportTasksClient(subscriptionID)
+}
+func NewImportTasksClientWithBaseURI(baseURI string, subscriptionID string) ImportTasksClient {
+	return original.NewImportTasksClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type ExportTasksClient = original.ExportTasksClient
 
 func NewExportTasksClient(subscriptionID string) ExportTasksClient {
@@ -79,13 +48,22 @@ func NewExportTasksClientWithBaseURI(baseURI string, subscriptionID string) Expo
 	return original.NewExportTasksClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ImportTasksClient = original.ImportTasksClient
+type AppCollectionsClient = original.AppCollectionsClient
 
-func NewImportTasksClient(subscriptionID string) ImportTasksClient {
-	return original.NewImportTasksClient(subscriptionID)
+func NewAppCollectionsClient(subscriptionID string) AppCollectionsClient {
+	return original.NewAppCollectionsClient(subscriptionID)
 }
-func NewImportTasksClientWithBaseURI(baseURI string, subscriptionID string) ImportTasksClient {
-	return original.NewImportTasksClientWithBaseURI(baseURI, subscriptionID)
+func NewAppCollectionsClientWithBaseURI(baseURI string, subscriptionID string) AppCollectionsClient {
+	return original.NewAppCollectionsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type AppsClient = original.AppsClient
+
+func NewAppsClient(subscriptionID string) AppsClient {
+	return original.NewAppsClient(subscriptionID)
+}
+func NewAppsClientWithBaseURI(baseURI string, subscriptionID string) AppsClient {
+	return original.NewAppsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AudienceOperators = original.AudienceOperators
@@ -408,6 +386,21 @@ type ScreenSizeCriterion = original.ScreenSizeCriterion
 type SegmentCriterion = original.SegmentCriterion
 type StringTagCriterion = original.StringTagCriterion
 type SupportedPlatformsListResult = original.SupportedPlatformsListResult
+type CampaignsClient = original.CampaignsClient
+
+func NewCampaignsClient(subscriptionID string) CampaignsClient {
+	return original.NewCampaignsClient(subscriptionID)
+}
+func NewCampaignsClientWithBaseURI(baseURI string, subscriptionID string) CampaignsClient {
+	return original.NewCampaignsClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
+}
+func Version() string {
+	return original.Version()
+}
+
 type SupportedPlatformsClient = original.SupportedPlatformsClient
 
 func NewSupportedPlatformsClient(subscriptionID string) SupportedPlatformsClient {
@@ -416,9 +409,16 @@ func NewSupportedPlatformsClient(subscriptionID string) SupportedPlatformsClient
 func NewSupportedPlatformsClientWithBaseURI(baseURI string, subscriptionID string) SupportedPlatformsClient {
 	return original.NewSupportedPlatformsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/mysql/mgmt/mysql/models.go b/profiles/latest/mysql/mgmt/mysql/models.go
index 181324731d9f..21bd1e2b3cd5 100644
--- a/profiles/latest/mysql/mgmt/mysql/models.go
+++ b/profiles/latest/mysql/mgmt/mysql/models.go
@@ -21,26 +21,13 @@ package mysql
 
 import original "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql"
 
-type CheckNameAvailabilityClient = original.CheckNameAvailabilityClient
-
-func NewCheckNameAvailabilityClient(subscriptionID string) CheckNameAvailabilityClient {
-	return original.NewCheckNameAvailabilityClient(subscriptionID)
-}
-func NewCheckNameAvailabilityClientWithBaseURI(baseURI string, subscriptionID string) CheckNameAvailabilityClient {
-	return original.NewCheckNameAvailabilityClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ConfigurationsClient = original.ConfigurationsClient
@@ -52,22 +39,13 @@ func NewConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) C
 	return original.NewConfigurationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DatabasesClient = original.DatabasesClient
-
-func NewDatabasesClient(subscriptionID string) DatabasesClient {
-	return original.NewDatabasesClient(subscriptionID)
-}
-func NewDatabasesClientWithBaseURI(baseURI string, subscriptionID string) DatabasesClient {
-	return original.NewDatabasesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type FirewallRulesClient = original.FirewallRulesClient
+type ServersClient = original.ServersClient
 
-func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClient(subscriptionID)
+func NewServersClient(subscriptionID string) ServersClient {
+	return original.NewServersClient(subscriptionID)
 }
-func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
+func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersClient {
+	return original.NewServersClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type LocationBasedPerformanceTierClient = original.LocationBasedPerformanceTierClient
@@ -79,15 +57,6 @@ func NewLocationBasedPerformanceTierClientWithBaseURI(baseURI string, subscripti
 	return original.NewLocationBasedPerformanceTierClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LogFilesClient = original.LogFilesClient
-
-func NewLogFilesClient(subscriptionID string) LogFilesClient {
-	return original.NewLogFilesClient(subscriptionID)
-}
-func NewLogFilesClientWithBaseURI(baseURI string, subscriptionID string) LogFilesClient {
-	return original.NewLogFilesClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type CreateMode = original.CreateMode
 
 const (
@@ -213,22 +182,13 @@ type ServerUpdateParametersProperties = original.ServerUpdateParametersPropertie
 type Sku = original.Sku
 type StorageProfile = original.StorageProfile
 type TrackedResource = original.TrackedResource
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ServersClient = original.ServersClient
+type DatabasesClient = original.DatabasesClient
 
-func NewServersClient(subscriptionID string) ServersClient {
-	return original.NewServersClient(subscriptionID)
+func NewDatabasesClient(subscriptionID string) DatabasesClient {
+	return original.NewDatabasesClient(subscriptionID)
 }
-func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersClient {
-	return original.NewServersClientWithBaseURI(baseURI, subscriptionID)
+func NewDatabasesClientWithBaseURI(baseURI string, subscriptionID string) DatabasesClient {
+	return original.NewDatabasesClientWithBaseURI(baseURI, subscriptionID)
 }
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
@@ -236,3 +196,43 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type FirewallRulesClient = original.FirewallRulesClient
+
+func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClient(subscriptionID)
+}
+func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type CheckNameAvailabilityClient = original.CheckNameAvailabilityClient
+
+func NewCheckNameAvailabilityClient(subscriptionID string) CheckNameAvailabilityClient {
+	return original.NewCheckNameAvailabilityClient(subscriptionID)
+}
+func NewCheckNameAvailabilityClientWithBaseURI(baseURI string, subscriptionID string) CheckNameAvailabilityClient {
+	return original.NewCheckNameAvailabilityClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type LogFilesClient = original.LogFilesClient
+
+func NewLogFilesClient(subscriptionID string) LogFilesClient {
+	return original.NewLogFilesClient(subscriptionID)
+}
+func NewLogFilesClientWithBaseURI(baseURI string, subscriptionID string) LogFilesClient {
+	return original.NewLogFilesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/network/mgmt/network/models.go b/profiles/latest/network/mgmt/network/models.go
index 02bcccc3af8a..1e319a91b64b 100644
--- a/profiles/latest/network/mgmt/network/models.go
+++ b/profiles/latest/network/mgmt/network/models.go
@@ -21,71 +21,67 @@ package network
 
 import original "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-01-01/network"
 
-type ApplicationGatewaysClient = original.ApplicationGatewaysClient
+type PublicIPAddressesClient = original.PublicIPAddressesClient
 
-func NewApplicationGatewaysClient(subscriptionID string) ApplicationGatewaysClient {
-	return original.NewApplicationGatewaysClient(subscriptionID)
+func NewPublicIPAddressesClient(subscriptionID string) PublicIPAddressesClient {
+	return original.NewPublicIPAddressesClient(subscriptionID)
 }
-func NewApplicationGatewaysClientWithBaseURI(baseURI string, subscriptionID string) ApplicationGatewaysClient {
-	return original.NewApplicationGatewaysClientWithBaseURI(baseURI, subscriptionID)
+func NewPublicIPAddressesClientWithBaseURI(baseURI string, subscriptionID string) PublicIPAddressesClient {
+	return original.NewPublicIPAddressesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ApplicationSecurityGroupsClient = original.ApplicationSecurityGroupsClient
+type ExpressRouteServiceProvidersClient = original.ExpressRouteServiceProvidersClient
 
-func NewApplicationSecurityGroupsClient(subscriptionID string) ApplicationSecurityGroupsClient {
-	return original.NewApplicationSecurityGroupsClient(subscriptionID)
+func NewExpressRouteServiceProvidersClient(subscriptionID string) ExpressRouteServiceProvidersClient {
+	return original.NewExpressRouteServiceProvidersClient(subscriptionID)
 }
-func NewApplicationSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) ApplicationSecurityGroupsClient {
-	return original.NewApplicationSecurityGroupsClientWithBaseURI(baseURI, subscriptionID)
+func NewExpressRouteServiceProvidersClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteServiceProvidersClient {
+	return original.NewExpressRouteServiceProvidersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type AvailableEndpointServicesClient = original.AvailableEndpointServicesClient
+type SubnetsClient = original.SubnetsClient
 
-func NewAvailableEndpointServicesClient(subscriptionID string) AvailableEndpointServicesClient {
-	return original.NewAvailableEndpointServicesClient(subscriptionID)
+func NewSubnetsClient(subscriptionID string) SubnetsClient {
+	return original.NewSubnetsClient(subscriptionID)
 }
-func NewAvailableEndpointServicesClientWithBaseURI(baseURI string, subscriptionID string) AvailableEndpointServicesClient {
-	return original.NewAvailableEndpointServicesClientWithBaseURI(baseURI, subscriptionID)
+func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsClient {
+	return original.NewSubnetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type BgpServiceCommunitiesClient = original.BgpServiceCommunitiesClient
+type OperationsClient = original.OperationsClient
 
-func NewBgpServiceCommunitiesClient(subscriptionID string) BgpServiceCommunitiesClient {
-	return original.NewBgpServiceCommunitiesClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewBgpServiceCommunitiesClientWithBaseURI(baseURI string, subscriptionID string) BgpServiceCommunitiesClient {
-	return original.NewBgpServiceCommunitiesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type InterfaceLoadBalancersClient = original.InterfaceLoadBalancersClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewInterfaceLoadBalancersClient(subscriptionID string) InterfaceLoadBalancersClient {
+	return original.NewInterfaceLoadBalancersClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewInterfaceLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) InterfaceLoadBalancersClient {
+	return original.NewInterfaceLoadBalancersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ConnectionMonitorsClient = original.ConnectionMonitorsClient
+type UsagesClient = original.UsagesClient
 
-func NewConnectionMonitorsClient(subscriptionID string) ConnectionMonitorsClient {
-	return original.NewConnectionMonitorsClient(subscriptionID)
+func NewUsagesClient(subscriptionID string) UsagesClient {
+	return original.NewUsagesClient(subscriptionID)
 }
-func NewConnectionMonitorsClientWithBaseURI(baseURI string, subscriptionID string) ConnectionMonitorsClient {
-	return original.NewConnectionMonitorsClientWithBaseURI(baseURI, subscriptionID)
+func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
+	return original.NewUsagesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DefaultSecurityRulesClient = original.DefaultSecurityRulesClient
+type VirtualNetworkGatewayConnectionsClient = original.VirtualNetworkGatewayConnectionsClient
 
-func NewDefaultSecurityRulesClient(subscriptionID string) DefaultSecurityRulesClient {
-	return original.NewDefaultSecurityRulesClient(subscriptionID)
+func NewVirtualNetworkGatewayConnectionsClient(subscriptionID string) VirtualNetworkGatewayConnectionsClient {
+	return original.NewVirtualNetworkGatewayConnectionsClient(subscriptionID)
 }
-func NewDefaultSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) DefaultSecurityRulesClient {
-	return original.NewDefaultSecurityRulesClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewayConnectionsClient {
+	return original.NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ExpressRouteCircuitAuthorizationsClient = original.ExpressRouteCircuitAuthorizationsClient
@@ -97,67 +93,22 @@ func NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI string, subsc
 	return original.NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ExpressRouteCircuitPeeringsClient = original.ExpressRouteCircuitPeeringsClient
-
-func NewExpressRouteCircuitPeeringsClient(subscriptionID string) ExpressRouteCircuitPeeringsClient {
-	return original.NewExpressRouteCircuitPeeringsClient(subscriptionID)
-}
-func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitPeeringsClient {
-	return original.NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ExpressRouteCircuitsClient = original.ExpressRouteCircuitsClient
-
-func NewExpressRouteCircuitsClient(subscriptionID string) ExpressRouteCircuitsClient {
-	return original.NewExpressRouteCircuitsClient(subscriptionID)
-}
-func NewExpressRouteCircuitsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitsClient {
-	return original.NewExpressRouteCircuitsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ExpressRouteServiceProvidersClient = original.ExpressRouteServiceProvidersClient
-
-func NewExpressRouteServiceProvidersClient(subscriptionID string) ExpressRouteServiceProvidersClient {
-	return original.NewExpressRouteServiceProvidersClient(subscriptionID)
-}
-func NewExpressRouteServiceProvidersClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteServiceProvidersClient {
-	return original.NewExpressRouteServiceProvidersClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type InboundNatRulesClient = original.InboundNatRulesClient
-
-func NewInboundNatRulesClient(subscriptionID string) InboundNatRulesClient {
-	return original.NewInboundNatRulesClient(subscriptionID)
-}
-func NewInboundNatRulesClientWithBaseURI(baseURI string, subscriptionID string) InboundNatRulesClient {
-	return original.NewInboundNatRulesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type InterfaceIPConfigurationsClient = original.InterfaceIPConfigurationsClient
-
-func NewInterfaceIPConfigurationsClient(subscriptionID string) InterfaceIPConfigurationsClient {
-	return original.NewInterfaceIPConfigurationsClient(subscriptionID)
-}
-func NewInterfaceIPConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) InterfaceIPConfigurationsClient {
-	return original.NewInterfaceIPConfigurationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type InterfaceLoadBalancersClient = original.InterfaceLoadBalancersClient
+type ConnectionMonitorsClient = original.ConnectionMonitorsClient
 
-func NewInterfaceLoadBalancersClient(subscriptionID string) InterfaceLoadBalancersClient {
-	return original.NewInterfaceLoadBalancersClient(subscriptionID)
+func NewConnectionMonitorsClient(subscriptionID string) ConnectionMonitorsClient {
+	return original.NewConnectionMonitorsClient(subscriptionID)
 }
-func NewInterfaceLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) InterfaceLoadBalancersClient {
-	return original.NewInterfaceLoadBalancersClientWithBaseURI(baseURI, subscriptionID)
+func NewConnectionMonitorsClientWithBaseURI(baseURI string, subscriptionID string) ConnectionMonitorsClient {
+	return original.NewConnectionMonitorsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type InterfacesClient = original.InterfacesClient
+type LoadBalancerLoadBalancingRulesClient = original.LoadBalancerLoadBalancingRulesClient
 
-func NewInterfacesClient(subscriptionID string) InterfacesClient {
-	return original.NewInterfacesClient(subscriptionID)
+func NewLoadBalancerLoadBalancingRulesClient(subscriptionID string) LoadBalancerLoadBalancingRulesClient {
+	return original.NewLoadBalancerLoadBalancingRulesClient(subscriptionID)
 }
-func NewInterfacesClientWithBaseURI(baseURI string, subscriptionID string) InterfacesClient {
-	return original.NewInterfacesClientWithBaseURI(baseURI, subscriptionID)
+func NewLoadBalancerLoadBalancingRulesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerLoadBalancingRulesClient {
+	return original.NewLoadBalancerLoadBalancingRulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type LoadBalancerBackendAddressPoolsClient = original.LoadBalancerBackendAddressPoolsClient
@@ -169,40 +120,31 @@ func NewLoadBalancerBackendAddressPoolsClientWithBaseURI(baseURI string, subscri
 	return original.NewLoadBalancerBackendAddressPoolsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LoadBalancerFrontendIPConfigurationsClient = original.LoadBalancerFrontendIPConfigurationsClient
-
-func NewLoadBalancerFrontendIPConfigurationsClient(subscriptionID string) LoadBalancerFrontendIPConfigurationsClient {
-	return original.NewLoadBalancerFrontendIPConfigurationsClient(subscriptionID)
-}
-func NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerFrontendIPConfigurationsClient {
-	return original.NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type LoadBalancerLoadBalancingRulesClient = original.LoadBalancerLoadBalancingRulesClient
+type VirtualNetworkPeeringsClient = original.VirtualNetworkPeeringsClient
 
-func NewLoadBalancerLoadBalancingRulesClient(subscriptionID string) LoadBalancerLoadBalancingRulesClient {
-	return original.NewLoadBalancerLoadBalancingRulesClient(subscriptionID)
+func NewVirtualNetworkPeeringsClient(subscriptionID string) VirtualNetworkPeeringsClient {
+	return original.NewVirtualNetworkPeeringsClient(subscriptionID)
 }
-func NewLoadBalancerLoadBalancingRulesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerLoadBalancingRulesClient {
-	return original.NewLoadBalancerLoadBalancingRulesClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualNetworkPeeringsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkPeeringsClient {
+	return original.NewVirtualNetworkPeeringsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LoadBalancerNetworkInterfacesClient = original.LoadBalancerNetworkInterfacesClient
+type ApplicationSecurityGroupsClient = original.ApplicationSecurityGroupsClient
 
-func NewLoadBalancerNetworkInterfacesClient(subscriptionID string) LoadBalancerNetworkInterfacesClient {
-	return original.NewLoadBalancerNetworkInterfacesClient(subscriptionID)
+func NewApplicationSecurityGroupsClient(subscriptionID string) ApplicationSecurityGroupsClient {
+	return original.NewApplicationSecurityGroupsClient(subscriptionID)
 }
-func NewLoadBalancerNetworkInterfacesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerNetworkInterfacesClient {
-	return original.NewLoadBalancerNetworkInterfacesClientWithBaseURI(baseURI, subscriptionID)
+func NewApplicationSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) ApplicationSecurityGroupsClient {
+	return original.NewApplicationSecurityGroupsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LoadBalancerProbesClient = original.LoadBalancerProbesClient
+type InterfacesClient = original.InterfacesClient
 
-func NewLoadBalancerProbesClient(subscriptionID string) LoadBalancerProbesClient {
-	return original.NewLoadBalancerProbesClient(subscriptionID)
+func NewInterfacesClient(subscriptionID string) InterfacesClient {
+	return original.NewInterfacesClient(subscriptionID)
 }
-func NewLoadBalancerProbesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerProbesClient {
-	return original.NewLoadBalancerProbesClientWithBaseURI(baseURI, subscriptionID)
+func NewInterfacesClientWithBaseURI(baseURI string, subscriptionID string) InterfacesClient {
+	return original.NewInterfacesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type LoadBalancersClient = original.LoadBalancersClient
@@ -214,15 +156,6 @@ func NewLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) Lo
 	return original.NewLoadBalancersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LocalNetworkGatewaysClient = original.LocalNetworkGatewaysClient
-
-func NewLocalNetworkGatewaysClient(subscriptionID string) LocalNetworkGatewaysClient {
-	return original.NewLocalNetworkGatewaysClient(subscriptionID)
-}
-func NewLocalNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) LocalNetworkGatewaysClient {
-	return original.NewLocalNetworkGatewaysClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type Access = original.Access
 
 const (
@@ -1522,31 +1455,49 @@ type WatchersGetVMSecurityRulesFuture = original.WatchersGetVMSecurityRulesFutur
 type WatchersListAvailableProvidersFuture = original.WatchersListAvailableProvidersFuture
 type WatchersSetFlowLogConfigurationFuture = original.WatchersSetFlowLogConfigurationFuture
 type WatchersVerifyIPFlowFuture = original.WatchersVerifyIPFlowFuture
-type OperationsClient = original.OperationsClient
+type InterfaceIPConfigurationsClient = original.InterfaceIPConfigurationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewInterfaceIPConfigurationsClient(subscriptionID string) InterfaceIPConfigurationsClient {
+	return original.NewInterfaceIPConfigurationsClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewInterfaceIPConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) InterfaceIPConfigurationsClient {
+	return original.NewInterfaceIPConfigurationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type PacketCapturesClient = original.PacketCapturesClient
+type LoadBalancerFrontendIPConfigurationsClient = original.LoadBalancerFrontendIPConfigurationsClient
 
-func NewPacketCapturesClient(subscriptionID string) PacketCapturesClient {
-	return original.NewPacketCapturesClient(subscriptionID)
+func NewLoadBalancerFrontendIPConfigurationsClient(subscriptionID string) LoadBalancerFrontendIPConfigurationsClient {
+	return original.NewLoadBalancerFrontendIPConfigurationsClient(subscriptionID)
 }
-func NewPacketCapturesClientWithBaseURI(baseURI string, subscriptionID string) PacketCapturesClient {
-	return original.NewPacketCapturesClientWithBaseURI(baseURI, subscriptionID)
+func NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerFrontendIPConfigurationsClient {
+	return original.NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type PublicIPAddressesClient = original.PublicIPAddressesClient
+type ExpressRouteCircuitPeeringsClient = original.ExpressRouteCircuitPeeringsClient
 
-func NewPublicIPAddressesClient(subscriptionID string) PublicIPAddressesClient {
-	return original.NewPublicIPAddressesClient(subscriptionID)
+func NewExpressRouteCircuitPeeringsClient(subscriptionID string) ExpressRouteCircuitPeeringsClient {
+	return original.NewExpressRouteCircuitPeeringsClient(subscriptionID)
 }
-func NewPublicIPAddressesClientWithBaseURI(baseURI string, subscriptionID string) PublicIPAddressesClient {
-	return original.NewPublicIPAddressesClientWithBaseURI(baseURI, subscriptionID)
+func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitPeeringsClient {
+	return original.NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type BgpServiceCommunitiesClient = original.BgpServiceCommunitiesClient
+
+func NewBgpServiceCommunitiesClient(subscriptionID string) BgpServiceCommunitiesClient {
+	return original.NewBgpServiceCommunitiesClient(subscriptionID)
+}
+func NewBgpServiceCommunitiesClientWithBaseURI(baseURI string, subscriptionID string) BgpServiceCommunitiesClient {
+	return original.NewBgpServiceCommunitiesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type VirtualNetworksClient = original.VirtualNetworksClient
+
+func NewVirtualNetworksClient(subscriptionID string) VirtualNetworksClient {
+	return original.NewVirtualNetworksClient(subscriptionID)
+}
+func NewVirtualNetworksClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksClient {
+	return original.NewVirtualNetworksClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type RouteFilterRulesClient = original.RouteFilterRulesClient
@@ -1557,83 +1508,74 @@ func NewRouteFilterRulesClient(subscriptionID string) RouteFilterRulesClient {
 func NewRouteFilterRulesClientWithBaseURI(baseURI string, subscriptionID string) RouteFilterRulesClient {
 	return original.NewRouteFilterRulesClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type RouteFiltersClient = original.RouteFiltersClient
-
-func NewRouteFiltersClient(subscriptionID string) RouteFiltersClient {
-	return original.NewRouteFiltersClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewRouteFiltersClientWithBaseURI(baseURI string, subscriptionID string) RouteFiltersClient {
-	return original.NewRouteFiltersClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type RoutesClient = original.RoutesClient
+type ExpressRouteCircuitsClient = original.ExpressRouteCircuitsClient
 
-func NewRoutesClient(subscriptionID string) RoutesClient {
-	return original.NewRoutesClient(subscriptionID)
+func NewExpressRouteCircuitsClient(subscriptionID string) ExpressRouteCircuitsClient {
+	return original.NewExpressRouteCircuitsClient(subscriptionID)
 }
-func NewRoutesClientWithBaseURI(baseURI string, subscriptionID string) RoutesClient {
-	return original.NewRoutesClientWithBaseURI(baseURI, subscriptionID)
+func NewExpressRouteCircuitsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitsClient {
+	return original.NewExpressRouteCircuitsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type RouteTablesClient = original.RouteTablesClient
+type PacketCapturesClient = original.PacketCapturesClient
 
-func NewRouteTablesClient(subscriptionID string) RouteTablesClient {
-	return original.NewRouteTablesClient(subscriptionID)
+func NewPacketCapturesClient(subscriptionID string) PacketCapturesClient {
+	return original.NewPacketCapturesClient(subscriptionID)
 }
-func NewRouteTablesClientWithBaseURI(baseURI string, subscriptionID string) RouteTablesClient {
-	return original.NewRouteTablesClientWithBaseURI(baseURI, subscriptionID)
+func NewPacketCapturesClientWithBaseURI(baseURI string, subscriptionID string) PacketCapturesClient {
+	return original.NewPacketCapturesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SecurityGroupsClient = original.SecurityGroupsClient
+type LoadBalancerProbesClient = original.LoadBalancerProbesClient
 
-func NewSecurityGroupsClient(subscriptionID string) SecurityGroupsClient {
-	return original.NewSecurityGroupsClient(subscriptionID)
+func NewLoadBalancerProbesClient(subscriptionID string) LoadBalancerProbesClient {
+	return original.NewLoadBalancerProbesClient(subscriptionID)
 }
-func NewSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) SecurityGroupsClient {
-	return original.NewSecurityGroupsClientWithBaseURI(baseURI, subscriptionID)
+func NewLoadBalancerProbesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerProbesClient {
+	return original.NewLoadBalancerProbesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SecurityRulesClient = original.SecurityRulesClient
+type ApplicationGatewaysClient = original.ApplicationGatewaysClient
 
-func NewSecurityRulesClient(subscriptionID string) SecurityRulesClient {
-	return original.NewSecurityRulesClient(subscriptionID)
+func NewApplicationGatewaysClient(subscriptionID string) ApplicationGatewaysClient {
+	return original.NewApplicationGatewaysClient(subscriptionID)
 }
-func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) SecurityRulesClient {
-	return original.NewSecurityRulesClientWithBaseURI(baseURI, subscriptionID)
+func NewApplicationGatewaysClientWithBaseURI(baseURI string, subscriptionID string) ApplicationGatewaysClient {
+	return original.NewApplicationGatewaysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SubnetsClient = original.SubnetsClient
+type LocalNetworkGatewaysClient = original.LocalNetworkGatewaysClient
 
-func NewSubnetsClient(subscriptionID string) SubnetsClient {
-	return original.NewSubnetsClient(subscriptionID)
+func NewLocalNetworkGatewaysClient(subscriptionID string) LocalNetworkGatewaysClient {
+	return original.NewLocalNetworkGatewaysClient(subscriptionID)
 }
-func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsClient {
-	return original.NewSubnetsClientWithBaseURI(baseURI, subscriptionID)
+func NewLocalNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) LocalNetworkGatewaysClient {
+	return original.NewLocalNetworkGatewaysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UsagesClient = original.UsagesClient
+type RouteFiltersClient = original.RouteFiltersClient
 
-func NewUsagesClient(subscriptionID string) UsagesClient {
-	return original.NewUsagesClient(subscriptionID)
-}
-func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
-	return original.NewUsagesClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+func NewRouteFiltersClient(subscriptionID string) RouteFiltersClient {
+	return original.NewRouteFiltersClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewRouteFiltersClientWithBaseURI(baseURI string, subscriptionID string) RouteFiltersClient {
+	return original.NewRouteFiltersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualNetworkGatewayConnectionsClient = original.VirtualNetworkGatewayConnectionsClient
+type InboundNatRulesClient = original.InboundNatRulesClient
 
-func NewVirtualNetworkGatewayConnectionsClient(subscriptionID string) VirtualNetworkGatewayConnectionsClient {
-	return original.NewVirtualNetworkGatewayConnectionsClient(subscriptionID)
+func NewInboundNatRulesClient(subscriptionID string) InboundNatRulesClient {
+	return original.NewInboundNatRulesClient(subscriptionID)
 }
-func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewayConnectionsClient {
-	return original.NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI, subscriptionID)
+func NewInboundNatRulesClientWithBaseURI(baseURI string, subscriptionID string) InboundNatRulesClient {
+	return original.NewInboundNatRulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type VirtualNetworkGatewaysClient = original.VirtualNetworkGatewaysClient
@@ -1645,22 +1587,22 @@ func NewVirtualNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID s
 	return original.NewVirtualNetworkGatewaysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualNetworkPeeringsClient = original.VirtualNetworkPeeringsClient
+type SecurityRulesClient = original.SecurityRulesClient
 
-func NewVirtualNetworkPeeringsClient(subscriptionID string) VirtualNetworkPeeringsClient {
-	return original.NewVirtualNetworkPeeringsClient(subscriptionID)
+func NewSecurityRulesClient(subscriptionID string) SecurityRulesClient {
+	return original.NewSecurityRulesClient(subscriptionID)
 }
-func NewVirtualNetworkPeeringsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkPeeringsClient {
-	return original.NewVirtualNetworkPeeringsClientWithBaseURI(baseURI, subscriptionID)
+func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) SecurityRulesClient {
+	return original.NewSecurityRulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualNetworksClient = original.VirtualNetworksClient
+type LoadBalancerNetworkInterfacesClient = original.LoadBalancerNetworkInterfacesClient
 
-func NewVirtualNetworksClient(subscriptionID string) VirtualNetworksClient {
-	return original.NewVirtualNetworksClient(subscriptionID)
+func NewLoadBalancerNetworkInterfacesClient(subscriptionID string) LoadBalancerNetworkInterfacesClient {
+	return original.NewLoadBalancerNetworkInterfacesClient(subscriptionID)
 }
-func NewVirtualNetworksClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksClient {
-	return original.NewVirtualNetworksClientWithBaseURI(baseURI, subscriptionID)
+func NewLoadBalancerNetworkInterfacesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerNetworkInterfacesClient {
+	return original.NewLoadBalancerNetworkInterfacesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type WatchersClient = original.WatchersClient
@@ -1671,3 +1613,61 @@ func NewWatchersClient(subscriptionID string) WatchersClient {
 func NewWatchersClientWithBaseURI(baseURI string, subscriptionID string) WatchersClient {
 	return original.NewWatchersClientWithBaseURI(baseURI, subscriptionID)
 }
+
+type RoutesClient = original.RoutesClient
+
+func NewRoutesClient(subscriptionID string) RoutesClient {
+	return original.NewRoutesClient(subscriptionID)
+}
+func NewRoutesClientWithBaseURI(baseURI string, subscriptionID string) RoutesClient {
+	return original.NewRoutesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type RouteTablesClient = original.RouteTablesClient
+
+func NewRouteTablesClient(subscriptionID string) RouteTablesClient {
+	return original.NewRouteTablesClient(subscriptionID)
+}
+func NewRouteTablesClientWithBaseURI(baseURI string, subscriptionID string) RouteTablesClient {
+	return original.NewRouteTablesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type DefaultSecurityRulesClient = original.DefaultSecurityRulesClient
+
+func NewDefaultSecurityRulesClient(subscriptionID string) DefaultSecurityRulesClient {
+	return original.NewDefaultSecurityRulesClient(subscriptionID)
+}
+func NewDefaultSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) DefaultSecurityRulesClient {
+	return original.NewDefaultSecurityRulesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
+
+type SecurityGroupsClient = original.SecurityGroupsClient
+
+func NewSecurityGroupsClient(subscriptionID string) SecurityGroupsClient {
+	return original.NewSecurityGroupsClient(subscriptionID)
+}
+func NewSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) SecurityGroupsClient {
+	return original.NewSecurityGroupsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type AvailableEndpointServicesClient = original.AvailableEndpointServicesClient
+
+func NewAvailableEndpointServicesClient(subscriptionID string) AvailableEndpointServicesClient {
+	return original.NewAvailableEndpointServicesClient(subscriptionID)
+}
+func NewAvailableEndpointServicesClientWithBaseURI(baseURI string, subscriptionID string) AvailableEndpointServicesClient {
+	return original.NewAvailableEndpointServicesClientWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/notificationhubs/mgmt/notificationhubs/models.go b/profiles/latest/notificationhubs/mgmt/notificationhubs/models.go
index cd9d720b61c8..3cd34c574eb3 100644
--- a/profiles/latest/notificationhubs/mgmt/notificationhubs/models.go
+++ b/profiles/latest/notificationhubs/mgmt/notificationhubs/models.go
@@ -21,26 +21,31 @@ package notificationhubs
 
 import original "github.com/Azure/azure-sdk-for-go/services/notificationhubs/mgmt/2017-04-01/notificationhubs"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type Client = original.Client
 
-type BaseClient = original.BaseClient
+func NewClient(subscriptionID string) Client {
+	return original.NewClient(subscriptionID)
+}
+func NewClientWithBaseURI(baseURI string, subscriptionID string) Client {
+	return original.NewClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type NameClient = original.NameClient
+
+func NewNameClient(subscriptionID string) NameClient {
+	return original.NewNameClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewNameClientWithBaseURI(baseURI string, subscriptionID string) NameClient {
+	return original.NewNameClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type HubsClient = original.HubsClient
+type NamespacesClient = original.NamespacesClient
 
-func NewHubsClient(subscriptionID string) HubsClient {
-	return original.NewHubsClient(subscriptionID)
+func NewNamespacesClient(subscriptionID string) NamespacesClient {
+	return original.NewNamespacesClient(subscriptionID)
 }
-func NewHubsClientWithBaseURI(baseURI string, subscriptionID string) HubsClient {
-	return original.NewHubsClientWithBaseURI(baseURI, subscriptionID)
+func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) NamespacesClient {
+	return original.NewNamespacesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccessRights = original.AccessRights
@@ -121,35 +126,32 @@ type Sku = original.Sku
 type SubResource = original.SubResource
 type WnsCredential = original.WnsCredential
 type WnsCredentialProperties = original.WnsCredentialProperties
-type NameClient = original.NameClient
 
-func NewNameClient(subscriptionID string) NameClient {
-	return original.NewNameClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewNameClientWithBaseURI(baseURI string, subscriptionID string) NameClient {
-	return original.NewNameClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type NamespacesClient = original.NamespacesClient
+type HubsClient = original.HubsClient
 
-func NewNamespacesClient(subscriptionID string) NamespacesClient {
-	return original.NewNamespacesClient(subscriptionID)
+func NewHubsClient(subscriptionID string) HubsClient {
+	return original.NewHubsClient(subscriptionID)
 }
-func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) NamespacesClient {
-	return original.NewNamespacesClientWithBaseURI(baseURI, subscriptionID)
+func NewHubsClientWithBaseURI(baseURI string, subscriptionID string) HubsClient {
+	return original.NewHubsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type Client = original.Client
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewClient(subscriptionID string) Client {
-	return original.NewClient(subscriptionID)
-}
-func NewClientWithBaseURI(baseURI string, subscriptionID string) Client {
-	return original.NewClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/operationalinsights/mgmt/operationalinsights/models.go b/profiles/latest/operationalinsights/mgmt/operationalinsights/models.go
index b963c157f283..27f4637275f0 100644
--- a/profiles/latest/operationalinsights/mgmt/operationalinsights/models.go
+++ b/profiles/latest/operationalinsights/mgmt/operationalinsights/models.go
@@ -21,17 +21,22 @@ package operationalinsights
 
 import original "github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-03-20/operationalinsights"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type OperationsClient = original.OperationsClient
 
-type BaseClient = original.BaseClient
+func NewOperationsClient(subscriptionID string, purgeID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID, purgeID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string, purgeID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID, purgeID)
+}
 
-func New(subscriptionID string, purgeID string) BaseClient {
-	return original.New(subscriptionID, purgeID)
+type SavedSearchesClient = original.SavedSearchesClient
+
+func NewSavedSearchesClient(subscriptionID string, purgeID string) SavedSearchesClient {
+	return original.NewSavedSearchesClient(subscriptionID, purgeID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string, purgeID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID, purgeID)
+func NewSavedSearchesClientWithBaseURI(baseURI string, subscriptionID string, purgeID string) SavedSearchesClient {
+	return original.NewSavedSearchesClientWithBaseURI(baseURI, subscriptionID, purgeID)
 }
 
 type PurgeState = original.PurgeState
@@ -102,22 +107,21 @@ type WorkspacePurgeResponse = original.WorkspacePurgeResponse
 type WorkspacePurgeStatusResponse = original.WorkspacePurgeStatusResponse
 type WorkspacesGetSearchResultsFuture = original.WorkspacesGetSearchResultsFuture
 type WorkspacesPurgeFuture = original.WorkspacesPurgeFuture
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string, purgeID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID, purgeID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string, purgeID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID, purgeID)
+func Version() string {
+	return original.Version()
 }
 
-type SavedSearchesClient = original.SavedSearchesClient
+type WorkspacesClient = original.WorkspacesClient
 
-func NewSavedSearchesClient(subscriptionID string, purgeID string) SavedSearchesClient {
-	return original.NewSavedSearchesClient(subscriptionID, purgeID)
+func NewWorkspacesClient(subscriptionID string, purgeID string) WorkspacesClient {
+	return original.NewWorkspacesClient(subscriptionID, purgeID)
 }
-func NewSavedSearchesClientWithBaseURI(baseURI string, subscriptionID string, purgeID string) SavedSearchesClient {
-	return original.NewSavedSearchesClientWithBaseURI(baseURI, subscriptionID, purgeID)
+func NewWorkspacesClientWithBaseURI(baseURI string, subscriptionID string, purgeID string) WorkspacesClient {
+	return original.NewWorkspacesClientWithBaseURI(baseURI, subscriptionID, purgeID)
 }
 
 type StorageInsightsClient = original.StorageInsightsClient
@@ -128,18 +132,16 @@ func NewStorageInsightsClient(subscriptionID string, purgeID string) StorageInsi
 func NewStorageInsightsClientWithBaseURI(baseURI string, subscriptionID string, purgeID string) StorageInsightsClient {
 	return original.NewStorageInsightsClientWithBaseURI(baseURI, subscriptionID, purgeID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
-}
-func Version() string {
-	return original.Version()
-}
 
-type WorkspacesClient = original.WorkspacesClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewWorkspacesClient(subscriptionID string, purgeID string) WorkspacesClient {
-	return original.NewWorkspacesClient(subscriptionID, purgeID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string, purgeID string) BaseClient {
+	return original.New(subscriptionID, purgeID)
 }
-func NewWorkspacesClientWithBaseURI(baseURI string, subscriptionID string, purgeID string) WorkspacesClient {
-	return original.NewWorkspacesClientWithBaseURI(baseURI, subscriptionID, purgeID)
+func NewWithBaseURI(baseURI string, subscriptionID string, purgeID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID, purgeID)
 }
diff --git a/profiles/latest/postgresql/mgmt/postgresql/models.go b/profiles/latest/postgresql/mgmt/postgresql/models.go
index efae3b5a1d2f..5d774f635fdc 100644
--- a/profiles/latest/postgresql/mgmt/postgresql/models.go
+++ b/profiles/latest/postgresql/mgmt/postgresql/models.go
@@ -21,26 +21,13 @@ package postgresql
 
 import original "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql"
 
-type CheckNameAvailabilityClient = original.CheckNameAvailabilityClient
-
-func NewCheckNameAvailabilityClient(subscriptionID string) CheckNameAvailabilityClient {
-	return original.NewCheckNameAvailabilityClient(subscriptionID)
-}
-func NewCheckNameAvailabilityClientWithBaseURI(baseURI string, subscriptionID string) CheckNameAvailabilityClient {
-	return original.NewCheckNameAvailabilityClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ConfigurationsClient = original.ConfigurationsClient
@@ -52,22 +39,13 @@ func NewConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) C
 	return original.NewConfigurationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DatabasesClient = original.DatabasesClient
-
-func NewDatabasesClient(subscriptionID string) DatabasesClient {
-	return original.NewDatabasesClient(subscriptionID)
-}
-func NewDatabasesClientWithBaseURI(baseURI string, subscriptionID string) DatabasesClient {
-	return original.NewDatabasesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type FirewallRulesClient = original.FirewallRulesClient
+type ServersClient = original.ServersClient
 
-func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClient(subscriptionID)
+func NewServersClient(subscriptionID string) ServersClient {
+	return original.NewServersClient(subscriptionID)
 }
-func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
+func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersClient {
+	return original.NewServersClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type LocationBasedPerformanceTierClient = original.LocationBasedPerformanceTierClient
@@ -79,15 +57,6 @@ func NewLocationBasedPerformanceTierClientWithBaseURI(baseURI string, subscripti
 	return original.NewLocationBasedPerformanceTierClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LogFilesClient = original.LogFilesClient
-
-func NewLogFilesClient(subscriptionID string) LogFilesClient {
-	return original.NewLogFilesClient(subscriptionID)
-}
-func NewLogFilesClientWithBaseURI(baseURI string, subscriptionID string) LogFilesClient {
-	return original.NewLogFilesClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type CreateMode = original.CreateMode
 
 const (
@@ -213,22 +182,13 @@ type ServerUpdateParametersProperties = original.ServerUpdateParametersPropertie
 type Sku = original.Sku
 type StorageProfile = original.StorageProfile
 type TrackedResource = original.TrackedResource
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ServersClient = original.ServersClient
+type DatabasesClient = original.DatabasesClient
 
-func NewServersClient(subscriptionID string) ServersClient {
-	return original.NewServersClient(subscriptionID)
+func NewDatabasesClient(subscriptionID string) DatabasesClient {
+	return original.NewDatabasesClient(subscriptionID)
 }
-func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersClient {
-	return original.NewServersClientWithBaseURI(baseURI, subscriptionID)
+func NewDatabasesClientWithBaseURI(baseURI string, subscriptionID string) DatabasesClient {
+	return original.NewDatabasesClientWithBaseURI(baseURI, subscriptionID)
 }
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
@@ -236,3 +196,43 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type FirewallRulesClient = original.FirewallRulesClient
+
+func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClient(subscriptionID)
+}
+func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type CheckNameAvailabilityClient = original.CheckNameAvailabilityClient
+
+func NewCheckNameAvailabilityClient(subscriptionID string) CheckNameAvailabilityClient {
+	return original.NewCheckNameAvailabilityClient(subscriptionID)
+}
+func NewCheckNameAvailabilityClientWithBaseURI(baseURI string, subscriptionID string) CheckNameAvailabilityClient {
+	return original.NewCheckNameAvailabilityClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type LogFilesClient = original.LogFilesClient
+
+func NewLogFilesClient(subscriptionID string) LogFilesClient {
+	return original.NewLogFilesClient(subscriptionID)
+}
+func NewLogFilesClientWithBaseURI(baseURI string, subscriptionID string) LogFilesClient {
+	return original.NewLogFilesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/powerbidedicated/mgmt/powerbidedicated/models.go b/profiles/latest/powerbidedicated/mgmt/powerbidedicated/models.go
index d1d259acd2b9..b9a0b12d0246 100644
--- a/profiles/latest/powerbidedicated/mgmt/powerbidedicated/models.go
+++ b/profiles/latest/powerbidedicated/mgmt/powerbidedicated/models.go
@@ -21,26 +21,13 @@ package powerbidedicated
 
 import original "github.com/Azure/azure-sdk-for-go/services/powerbidedicated/mgmt/2017-10-01/powerbidedicated"
 
-type CapacitiesClient = original.CapacitiesClient
-
-func NewCapacitiesClient(subscriptionID string) CapacitiesClient {
-	return original.NewCapacitiesClient(subscriptionID)
-}
-func NewCapacitiesClientWithBaseURI(baseURI string, subscriptionID string) CapacitiesClient {
-	return original.NewCapacitiesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ProvisioningState = original.ProvisioningState
@@ -117,17 +104,32 @@ type ResourceSku = original.ResourceSku
 type SkuDetailsForExistingResource = original.SkuDetailsForExistingResource
 type SkuEnumerationForExistingResourceResult = original.SkuEnumerationForExistingResourceResult
 type SkuEnumerationForNewResourceResult = original.SkuEnumerationForNewResourceResult
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
 func Version() string {
 	return original.Version()
 }
+
+type CapacitiesClient = original.CapacitiesClient
+
+func NewCapacitiesClient(subscriptionID string) CapacitiesClient {
+	return original.NewCapacitiesClient(subscriptionID)
+}
+func NewCapacitiesClientWithBaseURI(baseURI string, subscriptionID string) CapacitiesClient {
+	return original.NewCapacitiesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/powerbiembedded/mgmt/powerbiembedded/models.go b/profiles/latest/powerbiembedded/mgmt/powerbiembedded/models.go
index 73141d7d5bc8..62cea1965549 100644
--- a/profiles/latest/powerbiembedded/mgmt/powerbiembedded/models.go
+++ b/profiles/latest/powerbiembedded/mgmt/powerbiembedded/models.go
@@ -21,17 +21,13 @@ package powerbiembedded
 
 import original "github.com/Azure/azure-sdk-for-go/services/powerbiembedded/mgmt/2016-01-29/powerbiembedded"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type WorkspaceCollectionsClient = original.WorkspaceCollectionsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewWorkspaceCollectionsClient(subscriptionID string) WorkspaceCollectionsClient {
+	return original.NewWorkspaceCollectionsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewWorkspaceCollectionsClientWithBaseURI(baseURI string, subscriptionID string) WorkspaceCollectionsClient {
+	return original.NewWorkspaceCollectionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccessKeyName = original.AccessKeyName
@@ -82,15 +78,6 @@ func Version() string {
 	return original.Version()
 }
 
-type WorkspaceCollectionsClient = original.WorkspaceCollectionsClient
-
-func NewWorkspaceCollectionsClient(subscriptionID string) WorkspaceCollectionsClient {
-	return original.NewWorkspaceCollectionsClient(subscriptionID)
-}
-func NewWorkspaceCollectionsClientWithBaseURI(baseURI string, subscriptionID string) WorkspaceCollectionsClient {
-	return original.NewWorkspaceCollectionsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type WorkspacesClient = original.WorkspacesClient
 
 func NewWorkspacesClient(subscriptionID string) WorkspacesClient {
@@ -99,3 +86,16 @@ func NewWorkspacesClient(subscriptionID string) WorkspacesClient {
 func NewWorkspacesClientWithBaseURI(baseURI string, subscriptionID string) WorkspacesClient {
 	return original.NewWorkspacesClientWithBaseURI(baseURI, subscriptionID)
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/provisioningservices/mgmt/iothub/models.go b/profiles/latest/provisioningservices/mgmt/iothub/models.go
index 27344a747f12..6784f7e0185c 100644
--- a/profiles/latest/provisioningservices/mgmt/iothub/models.go
+++ b/profiles/latest/provisioningservices/mgmt/iothub/models.go
@@ -21,26 +21,13 @@ package iothub
 
 import original "github.com/Azure/azure-sdk-for-go/services/provisioningservices/mgmt/2018-01-22/iothub"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type DpsCertificateClient = original.DpsCertificateClient
+type OperationsClient = original.OperationsClient
 
-func NewDpsCertificateClient(subscriptionID string) DpsCertificateClient {
-	return original.NewDpsCertificateClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewDpsCertificateClientWithBaseURI(baseURI string, subscriptionID string) DpsCertificateClient {
-	return original.NewDpsCertificateClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type IotDpsResourceClient = original.IotDpsResourceClient
@@ -169,13 +156,13 @@ type TagsResource = original.TagsResource
 type VerificationCodeRequest = original.VerificationCodeRequest
 type VerificationCodeResponse = original.VerificationCodeResponse
 type VerificationCodeResponseProperties = original.VerificationCodeResponseProperties
-type OperationsClient = original.OperationsClient
+type DpsCertificateClient = original.DpsCertificateClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewDpsCertificateClient(subscriptionID string) DpsCertificateClient {
+	return original.NewDpsCertificateClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewDpsCertificateClientWithBaseURI(baseURI string, subscriptionID string) DpsCertificateClient {
+	return original.NewDpsCertificateClientWithBaseURI(baseURI, subscriptionID)
 }
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
@@ -183,3 +170,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/recoveryservices/mgmt/backup/models.go b/profiles/latest/recoveryservices/mgmt/backup/models.go
index aa194e2027ff..97c01f4aaf43 100644
--- a/profiles/latest/recoveryservices/mgmt/backup/models.go
+++ b/profiles/latest/recoveryservices/mgmt/backup/models.go
@@ -21,80 +21,130 @@ package backup
 
 import original "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2017-07-01/backup"
 
-type BackupsClient = original.BackupsClient
+type ItemLevelRecoveryConnectionsClient = original.ItemLevelRecoveryConnectionsClient
 
-func NewBackupsClient(subscriptionID string) BackupsClient {
-	return original.NewBackupsClient(subscriptionID)
+func NewItemLevelRecoveryConnectionsClient(subscriptionID string) ItemLevelRecoveryConnectionsClient {
+	return original.NewItemLevelRecoveryConnectionsClient(subscriptionID)
 }
-func NewBackupsClientWithBaseURI(baseURI string, subscriptionID string) BackupsClient {
-	return original.NewBackupsClientWithBaseURI(baseURI, subscriptionID)
+func NewItemLevelRecoveryConnectionsClientWithBaseURI(baseURI string, subscriptionID string) ItemLevelRecoveryConnectionsClient {
+	return original.NewItemLevelRecoveryConnectionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type ProtectableContainersClient = original.ProtectableContainersClient
 
-type BaseClient = original.BaseClient
+func NewProtectableContainersClient(subscriptionID string) ProtectableContainersClient {
+	return original.NewProtectableContainersClient(subscriptionID)
+}
+func NewProtectableContainersClientWithBaseURI(baseURI string, subscriptionID string) ProtectableContainersClient {
+	return original.NewProtectableContainersClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type OperationResultsClient = original.OperationResultsClient
+
+func NewOperationResultsClient(subscriptionID string) OperationResultsClient {
+	return original.NewOperationResultsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) OperationResultsClient {
+	return original.NewOperationResultsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type EnginesClient = original.EnginesClient
+type OperationsClient = original.OperationsClient
 
-func NewEnginesClient(subscriptionID string) EnginesClient {
-	return original.NewEnginesClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewEnginesClientWithBaseURI(baseURI string, subscriptionID string) EnginesClient {
-	return original.NewEnginesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ExportJobsOperationResultsClient = original.ExportJobsOperationResultsClient
+type ProtectedItemOperationResultsClient = original.ProtectedItemOperationResultsClient
 
-func NewExportJobsOperationResultsClient(subscriptionID string) ExportJobsOperationResultsClient {
-	return original.NewExportJobsOperationResultsClient(subscriptionID)
+func NewProtectedItemOperationResultsClient(subscriptionID string) ProtectedItemOperationResultsClient {
+	return original.NewProtectedItemOperationResultsClient(subscriptionID)
 }
-func NewExportJobsOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ExportJobsOperationResultsClient {
-	return original.NewExportJobsOperationResultsClientWithBaseURI(baseURI, subscriptionID)
+func NewProtectedItemOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ProtectedItemOperationResultsClient {
+	return original.NewProtectedItemOperationResultsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type FeatureSupportClient = original.FeatureSupportClient
+type ProtectionContainersGroupClient = original.ProtectionContainersGroupClient
 
-func NewFeatureSupportClient(subscriptionID string) FeatureSupportClient {
-	return original.NewFeatureSupportClient(subscriptionID)
+func NewProtectionContainersGroupClient(subscriptionID string) ProtectionContainersGroupClient {
+	return original.NewProtectionContainersGroupClient(subscriptionID)
 }
-func NewFeatureSupportClientWithBaseURI(baseURI string, subscriptionID string) FeatureSupportClient {
-	return original.NewFeatureSupportClientWithBaseURI(baseURI, subscriptionID)
+func NewProtectionContainersGroupClientWithBaseURI(baseURI string, subscriptionID string) ProtectionContainersGroupClient {
+	return original.NewProtectionContainersGroupClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ItemLevelRecoveryConnectionsClient = original.ItemLevelRecoveryConnectionsClient
+type ProtectionPolicyOperationStatusesClient = original.ProtectionPolicyOperationStatusesClient
 
-func NewItemLevelRecoveryConnectionsClient(subscriptionID string) ItemLevelRecoveryConnectionsClient {
-	return original.NewItemLevelRecoveryConnectionsClient(subscriptionID)
+func NewProtectionPolicyOperationStatusesClient(subscriptionID string) ProtectionPolicyOperationStatusesClient {
+	return original.NewProtectionPolicyOperationStatusesClient(subscriptionID)
 }
-func NewItemLevelRecoveryConnectionsClientWithBaseURI(baseURI string, subscriptionID string) ItemLevelRecoveryConnectionsClient {
-	return original.NewItemLevelRecoveryConnectionsClientWithBaseURI(baseURI, subscriptionID)
+func NewProtectionPolicyOperationStatusesClientWithBaseURI(baseURI string, subscriptionID string) ProtectionPolicyOperationStatusesClient {
+	return original.NewProtectionPolicyOperationStatusesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type JobCancellationsClient = original.JobCancellationsClient
+type ProtectedItemsGroupClient = original.ProtectedItemsGroupClient
 
-func NewJobCancellationsClient(subscriptionID string) JobCancellationsClient {
-	return original.NewJobCancellationsClient(subscriptionID)
+func NewProtectedItemsGroupClient(subscriptionID string) ProtectedItemsGroupClient {
+	return original.NewProtectedItemsGroupClient(subscriptionID)
 }
-func NewJobCancellationsClientWithBaseURI(baseURI string, subscriptionID string) JobCancellationsClient {
-	return original.NewJobCancellationsClientWithBaseURI(baseURI, subscriptionID)
+func NewProtectedItemsGroupClientWithBaseURI(baseURI string, subscriptionID string) ProtectedItemsGroupClient {
+	return original.NewProtectedItemsGroupClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type JobDetailsClient = original.JobDetailsClient
+type ProtectionContainerOperationResultsClient = original.ProtectionContainerOperationResultsClient
 
-func NewJobDetailsClient(subscriptionID string) JobDetailsClient {
-	return original.NewJobDetailsClient(subscriptionID)
+func NewProtectionContainerOperationResultsClient(subscriptionID string) ProtectionContainerOperationResultsClient {
+	return original.NewProtectionContainerOperationResultsClient(subscriptionID)
 }
-func NewJobDetailsClientWithBaseURI(baseURI string, subscriptionID string) JobDetailsClient {
-	return original.NewJobDetailsClientWithBaseURI(baseURI, subscriptionID)
+func NewProtectionContainerOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ProtectionContainerOperationResultsClient {
+	return original.NewProtectionContainerOperationResultsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ProtectionContainerRefreshOperationResultsClient = original.ProtectionContainerRefreshOperationResultsClient
+
+func NewProtectionContainerRefreshOperationResultsClient(subscriptionID string) ProtectionContainerRefreshOperationResultsClient {
+	return original.NewProtectionContainerRefreshOperationResultsClient(subscriptionID)
+}
+func NewProtectionContainerRefreshOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ProtectionContainerRefreshOperationResultsClient {
+	return original.NewProtectionContainerRefreshOperationResultsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ProtectionContainersClient = original.ProtectionContainersClient
+
+func NewProtectionContainersClient(subscriptionID string) ProtectionContainersClient {
+	return original.NewProtectionContainersClient(subscriptionID)
+}
+func NewProtectionContainersClientWithBaseURI(baseURI string, subscriptionID string) ProtectionContainersClient {
+	return original.NewProtectionContainersClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type StatusClient = original.StatusClient
+
+func NewStatusClient(subscriptionID string) StatusClient {
+	return original.NewStatusClient(subscriptionID)
+}
+func NewStatusClientWithBaseURI(baseURI string, subscriptionID string) StatusClient {
+	return original.NewStatusClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ResourceStorageConfigsClient = original.ResourceStorageConfigsClient
+
+func NewResourceStorageConfigsClient(subscriptionID string) ResourceStorageConfigsClient {
+	return original.NewResourceStorageConfigsClient(subscriptionID)
+}
+func NewResourceStorageConfigsClientWithBaseURI(baseURI string, subscriptionID string) ResourceStorageConfigsClient {
+	return original.NewResourceStorageConfigsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ProtectionPolicyOperationResultsClient = original.ProtectionPolicyOperationResultsClient
+
+func NewProtectionPolicyOperationResultsClient(subscriptionID string) ProtectionPolicyOperationResultsClient {
+	return original.NewProtectionPolicyOperationResultsClient(subscriptionID)
+}
+func NewProtectionPolicyOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ProtectionPolicyOperationResultsClient {
+	return original.NewProtectionPolicyOperationResultsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type JobOperationResultsClient = original.JobOperationResultsClient
@@ -106,6 +156,15 @@ func NewJobOperationResultsClientWithBaseURI(baseURI string, subscriptionID stri
 	return original.NewJobOperationResultsClientWithBaseURI(baseURI, subscriptionID)
 }
 
+type EnginesClient = original.EnginesClient
+
+func NewEnginesClient(subscriptionID string) EnginesClient {
+	return original.NewEnginesClient(subscriptionID)
+}
+func NewEnginesClientWithBaseURI(baseURI string, subscriptionID string) EnginesClient {
+	return original.NewEnginesClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type JobsClient = original.JobsClient
 
 func NewJobsClient(subscriptionID string) JobsClient {
@@ -115,13 +174,13 @@ func NewJobsClientWithBaseURI(baseURI string, subscriptionID string) JobsClient
 	return original.NewJobsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type JobsGroupClient = original.JobsGroupClient
+type BackupsClient = original.BackupsClient
 
-func NewJobsGroupClient(subscriptionID string) JobsGroupClient {
-	return original.NewJobsGroupClient(subscriptionID)
+func NewBackupsClient(subscriptionID string) BackupsClient {
+	return original.NewBackupsClient(subscriptionID)
 }
-func NewJobsGroupClientWithBaseURI(baseURI string, subscriptionID string) JobsGroupClient {
-	return original.NewJobsGroupClientWithBaseURI(baseURI, subscriptionID)
+func NewBackupsClientWithBaseURI(baseURI string, subscriptionID string) BackupsClient {
+	return original.NewBackupsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AzureFileShareType = original.AzureFileShareType
@@ -1336,67 +1395,37 @@ type WorkloadProtectableItemResourceList = original.WorkloadProtectableItemResou
 type WorkloadProtectableItemResourceListIterator = original.WorkloadProtectableItemResourceListIterator
 type WorkloadProtectableItemResourceListPage = original.WorkloadProtectableItemResourceListPage
 type YearlyRetentionSchedule = original.YearlyRetentionSchedule
-type OperationResultsClient = original.OperationResultsClient
-
-func NewOperationResultsClient(subscriptionID string) OperationResultsClient {
-	return original.NewOperationResultsClient(subscriptionID)
-}
-func NewOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) OperationResultsClient {
-	return original.NewOperationResultsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type OperationStatusesClient = original.OperationStatusesClient
-
-func NewOperationStatusesClient(subscriptionID string) OperationStatusesClient {
-	return original.NewOperationStatusesClient(subscriptionID)
-}
-func NewOperationStatusesClientWithBaseURI(baseURI string, subscriptionID string) OperationStatusesClient {
-	return original.NewOperationStatusesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type PoliciesClient = original.PoliciesClient
+type ProtectionPoliciesClient = original.ProtectionPoliciesClient
 
-func NewPoliciesClient(subscriptionID string) PoliciesClient {
-	return original.NewPoliciesClient(subscriptionID)
+func NewProtectionPoliciesClient(subscriptionID string) ProtectionPoliciesClient {
+	return original.NewProtectionPoliciesClient(subscriptionID)
 }
-func NewPoliciesClientWithBaseURI(baseURI string, subscriptionID string) PoliciesClient {
-	return original.NewPoliciesClientWithBaseURI(baseURI, subscriptionID)
+func NewProtectionPoliciesClientWithBaseURI(baseURI string, subscriptionID string) ProtectionPoliciesClient {
+	return original.NewProtectionPoliciesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProtectableContainersClient = original.ProtectableContainersClient
+type UsageSummariesClient = original.UsageSummariesClient
 
-func NewProtectableContainersClient(subscriptionID string) ProtectableContainersClient {
-	return original.NewProtectableContainersClient(subscriptionID)
+func NewUsageSummariesClient(subscriptionID string) UsageSummariesClient {
+	return original.NewUsageSummariesClient(subscriptionID)
 }
-func NewProtectableContainersClientWithBaseURI(baseURI string, subscriptionID string) ProtectableContainersClient {
-	return original.NewProtectableContainersClientWithBaseURI(baseURI, subscriptionID)
+func NewUsageSummariesClientWithBaseURI(baseURI string, subscriptionID string) UsageSummariesClient {
+	return original.NewUsageSummariesClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type ProtectableItemsClient = original.ProtectableItemsClient
-
-func NewProtectableItemsClient(subscriptionID string) ProtectableItemsClient {
-	return original.NewProtectableItemsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewProtectableItemsClientWithBaseURI(baseURI string, subscriptionID string) ProtectableItemsClient {
-	return original.NewProtectableItemsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type ProtectedItemOperationResultsClient = original.ProtectedItemOperationResultsClient
+type SecurityPINsClient = original.SecurityPINsClient
 
-func NewProtectedItemOperationResultsClient(subscriptionID string) ProtectedItemOperationResultsClient {
-	return original.NewProtectedItemOperationResultsClient(subscriptionID)
+func NewSecurityPINsClient(subscriptionID string) SecurityPINsClient {
+	return original.NewSecurityPINsClient(subscriptionID)
 }
-func NewProtectedItemOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ProtectedItemOperationResultsClient {
-	return original.NewProtectedItemOperationResultsClientWithBaseURI(baseURI, subscriptionID)
+func NewSecurityPINsClientWithBaseURI(baseURI string, subscriptionID string) SecurityPINsClient {
+	return original.NewSecurityPINsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ProtectedItemOperationStatusesClient = original.ProtectedItemOperationStatusesClient
@@ -1408,94 +1437,67 @@ func NewProtectedItemOperationStatusesClientWithBaseURI(baseURI string, subscrip
 	return original.NewProtectedItemOperationStatusesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProtectedItemsClient = original.ProtectedItemsClient
-
-func NewProtectedItemsClient(subscriptionID string) ProtectedItemsClient {
-	return original.NewProtectedItemsClient(subscriptionID)
-}
-func NewProtectedItemsClientWithBaseURI(baseURI string, subscriptionID string) ProtectedItemsClient {
-	return original.NewProtectedItemsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ProtectedItemsGroupClient = original.ProtectedItemsGroupClient
-
-func NewProtectedItemsGroupClient(subscriptionID string) ProtectedItemsGroupClient {
-	return original.NewProtectedItemsGroupClient(subscriptionID)
-}
-func NewProtectedItemsGroupClientWithBaseURI(baseURI string, subscriptionID string) ProtectedItemsGroupClient {
-	return original.NewProtectedItemsGroupClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ProtectionContainerOperationResultsClient = original.ProtectionContainerOperationResultsClient
-
-func NewProtectionContainerOperationResultsClient(subscriptionID string) ProtectionContainerOperationResultsClient {
-	return original.NewProtectionContainerOperationResultsClient(subscriptionID)
-}
-func NewProtectionContainerOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ProtectionContainerOperationResultsClient {
-	return original.NewProtectionContainerOperationResultsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ProtectionContainerRefreshOperationResultsClient = original.ProtectionContainerRefreshOperationResultsClient
+type ExportJobsOperationResultsClient = original.ExportJobsOperationResultsClient
 
-func NewProtectionContainerRefreshOperationResultsClient(subscriptionID string) ProtectionContainerRefreshOperationResultsClient {
-	return original.NewProtectionContainerRefreshOperationResultsClient(subscriptionID)
+func NewExportJobsOperationResultsClient(subscriptionID string) ExportJobsOperationResultsClient {
+	return original.NewExportJobsOperationResultsClient(subscriptionID)
 }
-func NewProtectionContainerRefreshOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ProtectionContainerRefreshOperationResultsClient {
-	return original.NewProtectionContainerRefreshOperationResultsClientWithBaseURI(baseURI, subscriptionID)
+func NewExportJobsOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ExportJobsOperationResultsClient {
+	return original.NewExportJobsOperationResultsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProtectionContainersClient = original.ProtectionContainersClient
+type ResourceVaultConfigsClient = original.ResourceVaultConfigsClient
 
-func NewProtectionContainersClient(subscriptionID string) ProtectionContainersClient {
-	return original.NewProtectionContainersClient(subscriptionID)
+func NewResourceVaultConfigsClient(subscriptionID string) ResourceVaultConfigsClient {
+	return original.NewResourceVaultConfigsClient(subscriptionID)
 }
-func NewProtectionContainersClientWithBaseURI(baseURI string, subscriptionID string) ProtectionContainersClient {
-	return original.NewProtectionContainersClientWithBaseURI(baseURI, subscriptionID)
+func NewResourceVaultConfigsClientWithBaseURI(baseURI string, subscriptionID string) ResourceVaultConfigsClient {
+	return original.NewResourceVaultConfigsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProtectionContainersGroupClient = original.ProtectionContainersGroupClient
+type RestoresClient = original.RestoresClient
 
-func NewProtectionContainersGroupClient(subscriptionID string) ProtectionContainersGroupClient {
-	return original.NewProtectionContainersGroupClient(subscriptionID)
+func NewRestoresClient(subscriptionID string) RestoresClient {
+	return original.NewRestoresClient(subscriptionID)
 }
-func NewProtectionContainersGroupClientWithBaseURI(baseURI string, subscriptionID string) ProtectionContainersGroupClient {
-	return original.NewProtectionContainersGroupClientWithBaseURI(baseURI, subscriptionID)
+func NewRestoresClientWithBaseURI(baseURI string, subscriptionID string) RestoresClient {
+	return original.NewRestoresClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProtectionIntentClient = original.ProtectionIntentClient
+type JobCancellationsClient = original.JobCancellationsClient
 
-func NewProtectionIntentClient(subscriptionID string) ProtectionIntentClient {
-	return original.NewProtectionIntentClient(subscriptionID)
+func NewJobCancellationsClient(subscriptionID string) JobCancellationsClient {
+	return original.NewJobCancellationsClient(subscriptionID)
 }
-func NewProtectionIntentClientWithBaseURI(baseURI string, subscriptionID string) ProtectionIntentClient {
-	return original.NewProtectionIntentClientWithBaseURI(baseURI, subscriptionID)
+func NewJobCancellationsClientWithBaseURI(baseURI string, subscriptionID string) JobCancellationsClient {
+	return original.NewJobCancellationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProtectionPoliciesClient = original.ProtectionPoliciesClient
+type OperationStatusesClient = original.OperationStatusesClient
 
-func NewProtectionPoliciesClient(subscriptionID string) ProtectionPoliciesClient {
-	return original.NewProtectionPoliciesClient(subscriptionID)
+func NewOperationStatusesClient(subscriptionID string) OperationStatusesClient {
+	return original.NewOperationStatusesClient(subscriptionID)
 }
-func NewProtectionPoliciesClientWithBaseURI(baseURI string, subscriptionID string) ProtectionPoliciesClient {
-	return original.NewProtectionPoliciesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationStatusesClientWithBaseURI(baseURI string, subscriptionID string) OperationStatusesClient {
+	return original.NewOperationStatusesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProtectionPolicyOperationResultsClient = original.ProtectionPolicyOperationResultsClient
+type FeatureSupportClient = original.FeatureSupportClient
 
-func NewProtectionPolicyOperationResultsClient(subscriptionID string) ProtectionPolicyOperationResultsClient {
-	return original.NewProtectionPolicyOperationResultsClient(subscriptionID)
+func NewFeatureSupportClient(subscriptionID string) FeatureSupportClient {
+	return original.NewFeatureSupportClient(subscriptionID)
 }
-func NewProtectionPolicyOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ProtectionPolicyOperationResultsClient {
-	return original.NewProtectionPolicyOperationResultsClientWithBaseURI(baseURI, subscriptionID)
+func NewFeatureSupportClientWithBaseURI(baseURI string, subscriptionID string) FeatureSupportClient {
+	return original.NewFeatureSupportClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProtectionPolicyOperationStatusesClient = original.ProtectionPolicyOperationStatusesClient
+type ProtectableItemsClient = original.ProtectableItemsClient
 
-func NewProtectionPolicyOperationStatusesClient(subscriptionID string) ProtectionPolicyOperationStatusesClient {
-	return original.NewProtectionPolicyOperationStatusesClient(subscriptionID)
+func NewProtectableItemsClient(subscriptionID string) ProtectableItemsClient {
+	return original.NewProtectableItemsClient(subscriptionID)
 }
-func NewProtectionPolicyOperationStatusesClientWithBaseURI(baseURI string, subscriptionID string) ProtectionPolicyOperationStatusesClient {
-	return original.NewProtectionPolicyOperationStatusesClientWithBaseURI(baseURI, subscriptionID)
+func NewProtectableItemsClientWithBaseURI(baseURI string, subscriptionID string) ProtectableItemsClient {
+	return original.NewProtectableItemsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type RecoveryPointsClient = original.RecoveryPointsClient
@@ -1507,71 +1509,69 @@ func NewRecoveryPointsClientWithBaseURI(baseURI string, subscriptionID string) R
 	return original.NewRecoveryPointsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ResourceStorageConfigsClient = original.ResourceStorageConfigsClient
+type WorkloadItemsClient = original.WorkloadItemsClient
 
-func NewResourceStorageConfigsClient(subscriptionID string) ResourceStorageConfigsClient {
-	return original.NewResourceStorageConfigsClient(subscriptionID)
+func NewWorkloadItemsClient(subscriptionID string) WorkloadItemsClient {
+	return original.NewWorkloadItemsClient(subscriptionID)
 }
-func NewResourceStorageConfigsClientWithBaseURI(baseURI string, subscriptionID string) ResourceStorageConfigsClient {
-	return original.NewResourceStorageConfigsClientWithBaseURI(baseURI, subscriptionID)
+func NewWorkloadItemsClientWithBaseURI(baseURI string, subscriptionID string) WorkloadItemsClient {
+	return original.NewWorkloadItemsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ResourceVaultConfigsClient = original.ResourceVaultConfigsClient
+type ProtectedItemsClient = original.ProtectedItemsClient
 
-func NewResourceVaultConfigsClient(subscriptionID string) ResourceVaultConfigsClient {
-	return original.NewResourceVaultConfigsClient(subscriptionID)
+func NewProtectedItemsClient(subscriptionID string) ProtectedItemsClient {
+	return original.NewProtectedItemsClient(subscriptionID)
 }
-func NewResourceVaultConfigsClientWithBaseURI(baseURI string, subscriptionID string) ResourceVaultConfigsClient {
-	return original.NewResourceVaultConfigsClientWithBaseURI(baseURI, subscriptionID)
+func NewProtectedItemsClientWithBaseURI(baseURI string, subscriptionID string) ProtectedItemsClient {
+	return original.NewProtectedItemsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type RestoresClient = original.RestoresClient
+type PoliciesClient = original.PoliciesClient
 
-func NewRestoresClient(subscriptionID string) RestoresClient {
-	return original.NewRestoresClient(subscriptionID)
+func NewPoliciesClient(subscriptionID string) PoliciesClient {
+	return original.NewPoliciesClient(subscriptionID)
 }
-func NewRestoresClientWithBaseURI(baseURI string, subscriptionID string) RestoresClient {
-	return original.NewRestoresClientWithBaseURI(baseURI, subscriptionID)
+func NewPoliciesClientWithBaseURI(baseURI string, subscriptionID string) PoliciesClient {
+	return original.NewPoliciesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SecurityPINsClient = original.SecurityPINsClient
+type JobDetailsClient = original.JobDetailsClient
 
-func NewSecurityPINsClient(subscriptionID string) SecurityPINsClient {
-	return original.NewSecurityPINsClient(subscriptionID)
+func NewJobDetailsClient(subscriptionID string) JobDetailsClient {
+	return original.NewJobDetailsClient(subscriptionID)
 }
-func NewSecurityPINsClientWithBaseURI(baseURI string, subscriptionID string) SecurityPINsClient {
-	return original.NewSecurityPINsClientWithBaseURI(baseURI, subscriptionID)
+func NewJobDetailsClientWithBaseURI(baseURI string, subscriptionID string) JobDetailsClient {
+	return original.NewJobDetailsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type StatusClient = original.StatusClient
+type ProtectionIntentClient = original.ProtectionIntentClient
 
-func NewStatusClient(subscriptionID string) StatusClient {
-	return original.NewStatusClient(subscriptionID)
+func NewProtectionIntentClient(subscriptionID string) ProtectionIntentClient {
+	return original.NewProtectionIntentClient(subscriptionID)
 }
-func NewStatusClientWithBaseURI(baseURI string, subscriptionID string) StatusClient {
-	return original.NewStatusClientWithBaseURI(baseURI, subscriptionID)
+func NewProtectionIntentClientWithBaseURI(baseURI string, subscriptionID string) ProtectionIntentClient {
+	return original.NewProtectionIntentClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UsageSummariesClient = original.UsageSummariesClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewUsageSummariesClient(subscriptionID string) UsageSummariesClient {
-	return original.NewUsageSummariesClient(subscriptionID)
-}
-func NewUsageSummariesClientWithBaseURI(baseURI string, subscriptionID string) UsageSummariesClient {
-	return original.NewUsageSummariesClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
-type WorkloadItemsClient = original.WorkloadItemsClient
+type JobsGroupClient = original.JobsGroupClient
 
-func NewWorkloadItemsClient(subscriptionID string) WorkloadItemsClient {
-	return original.NewWorkloadItemsClient(subscriptionID)
+func NewJobsGroupClient(subscriptionID string) JobsGroupClient {
+	return original.NewJobsGroupClient(subscriptionID)
 }
-func NewWorkloadItemsClientWithBaseURI(baseURI string, subscriptionID string) WorkloadItemsClient {
-	return original.NewWorkloadItemsClientWithBaseURI(baseURI, subscriptionID)
+func NewJobsGroupClientWithBaseURI(baseURI string, subscriptionID string) JobsGroupClient {
+	return original.NewJobsGroupClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/recoveryservices/mgmt/recoveryservices/models.go b/profiles/latest/recoveryservices/mgmt/recoveryservices/models.go
index 1d5be92c5f94..d2bae0c7a0be 100644
--- a/profiles/latest/recoveryservices/mgmt/recoveryservices/models.go
+++ b/profiles/latest/recoveryservices/mgmt/recoveryservices/models.go
@@ -21,17 +21,40 @@ package recoveryservices
 
 import original "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type OperationsClient = original.OperationsClient
 
-type BaseClient = original.BaseClient
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type UsagesClient = original.UsagesClient
+
+func NewUsagesClient(subscriptionID string) UsagesClient {
+	return original.NewUsagesClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
+	return original.NewUsagesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type VaultCertificatesClient = original.VaultCertificatesClient
+
+func NewVaultCertificatesClient(subscriptionID string) VaultCertificatesClient {
+	return original.NewVaultCertificatesClient(subscriptionID)
+}
+func NewVaultCertificatesClientWithBaseURI(baseURI string, subscriptionID string) VaultCertificatesClient {
+	return original.NewVaultCertificatesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type VaultsClient = original.VaultsClient
+
+func NewVaultsClient(subscriptionID string) VaultsClient {
+	return original.NewVaultsClient(subscriptionID)
+}
+func NewVaultsClientWithBaseURI(baseURI string, subscriptionID string) VaultsClient {
+	return original.NewVaultsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AuthType = original.AuthType
@@ -145,15 +168,6 @@ type VaultListPage = original.VaultListPage
 type VaultProperties = original.VaultProperties
 type VaultUsage = original.VaultUsage
 type VaultUsageList = original.VaultUsageList
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type RegisteredIdentitiesClient = original.RegisteredIdentitiesClient
 
 func NewRegisteredIdentitiesClient(subscriptionID string) RegisteredIdentitiesClient {
@@ -162,32 +176,11 @@ func NewRegisteredIdentitiesClient(subscriptionID string) RegisteredIdentitiesCl
 func NewRegisteredIdentitiesClientWithBaseURI(baseURI string, subscriptionID string) RegisteredIdentitiesClient {
 	return original.NewRegisteredIdentitiesClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type ReplicationUsagesClient = original.ReplicationUsagesClient
-
-func NewReplicationUsagesClient(subscriptionID string) ReplicationUsagesClient {
-	return original.NewReplicationUsagesClient(subscriptionID)
-}
-func NewReplicationUsagesClientWithBaseURI(baseURI string, subscriptionID string) ReplicationUsagesClient {
-	return original.NewReplicationUsagesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type UsagesClient = original.UsagesClient
-
-func NewUsagesClient(subscriptionID string) UsagesClient {
-	return original.NewUsagesClient(subscriptionID)
-}
-func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
-	return original.NewUsagesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type VaultCertificatesClient = original.VaultCertificatesClient
-
-func NewVaultCertificatesClient(subscriptionID string) VaultCertificatesClient {
-	return original.NewVaultCertificatesClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewVaultCertificatesClientWithBaseURI(baseURI string, subscriptionID string) VaultCertificatesClient {
-	return original.NewVaultCertificatesClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
 type VaultExtendedInfoClient = original.VaultExtendedInfoClient
@@ -199,17 +192,24 @@ func NewVaultExtendedInfoClientWithBaseURI(baseURI string, subscriptionID string
 	return original.NewVaultExtendedInfoClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VaultsClient = original.VaultsClient
+type ReplicationUsagesClient = original.ReplicationUsagesClient
 
-func NewVaultsClient(subscriptionID string) VaultsClient {
-	return original.NewVaultsClient(subscriptionID)
+func NewReplicationUsagesClient(subscriptionID string) ReplicationUsagesClient {
+	return original.NewReplicationUsagesClient(subscriptionID)
 }
-func NewVaultsClientWithBaseURI(baseURI string, subscriptionID string) VaultsClient {
-	return original.NewVaultsClientWithBaseURI(baseURI, subscriptionID)
+func NewReplicationUsagesClientWithBaseURI(baseURI string, subscriptionID string) ReplicationUsagesClient {
+	return original.NewReplicationUsagesClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/recoveryservices/mgmt/siterecovery/models.go b/profiles/latest/recoveryservices/mgmt/siterecovery/models.go
index 30df1f9cd078..982006ca87ce 100644
--- a/profiles/latest/recoveryservices/mgmt/siterecovery/models.go
+++ b/profiles/latest/recoveryservices/mgmt/siterecovery/models.go
@@ -21,17 +21,94 @@ package siterecovery
 
 import original "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2018-01-10/siterecovery"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type TargetComputeSizesClient = original.TargetComputeSizesClient
 
-type BaseClient = original.BaseClient
+func NewTargetComputeSizesClient(subscriptionID string, resourceGroupName string, resourceName string) TargetComputeSizesClient {
+	return original.NewTargetComputeSizesClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewTargetComputeSizesClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) TargetComputeSizesClient {
+	return original.NewTargetComputeSizesClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
 
-func New(subscriptionID string, resourceGroupName string, resourceName string) BaseClient {
-	return original.New(subscriptionID, resourceGroupName, resourceName)
+type ReplicationPoliciesClient = original.ReplicationPoliciesClient
+
+func NewReplicationPoliciesClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationPoliciesClient {
+	return original.NewReplicationPoliciesClient(subscriptionID, resourceGroupName, resourceName)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+func NewReplicationPoliciesClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationPoliciesClient {
+	return original.NewReplicationPoliciesClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
+type ReplicationVaultHealthClient = original.ReplicationVaultHealthClient
+
+func NewReplicationVaultHealthClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationVaultHealthClient {
+	return original.NewReplicationVaultHealthClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewReplicationVaultHealthClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationVaultHealthClient {
+	return original.NewReplicationVaultHealthClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
+type OperationsClient = original.OperationsClient
+
+func NewOperationsClient(subscriptionID string, resourceGroupName string, resourceName string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
+type ReplicationProtectedItemsClient = original.ReplicationProtectedItemsClient
+
+func NewReplicationProtectedItemsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectedItemsClient {
+	return original.NewReplicationProtectedItemsClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewReplicationProtectedItemsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectedItemsClient {
+	return original.NewReplicationProtectedItemsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
+type ReplicationStorageClassificationsClient = original.ReplicationStorageClassificationsClient
+
+func NewReplicationStorageClassificationsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationStorageClassificationsClient {
+	return original.NewReplicationStorageClassificationsClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewReplicationStorageClassificationsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationStorageClassificationsClient {
+	return original.NewReplicationStorageClassificationsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
+type ReplicationRecoveryServicesProvidersClient = original.ReplicationRecoveryServicesProvidersClient
+
+func NewReplicationRecoveryServicesProvidersClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationRecoveryServicesProvidersClient {
+	return original.NewReplicationRecoveryServicesProvidersClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewReplicationRecoveryServicesProvidersClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationRecoveryServicesProvidersClient {
+	return original.NewReplicationRecoveryServicesProvidersClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
+type ReplicationJobsClient = original.ReplicationJobsClient
+
+func NewReplicationJobsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationJobsClient {
+	return original.NewReplicationJobsClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewReplicationJobsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationJobsClient {
+	return original.NewReplicationJobsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
+type ReplicationProtectableItemsClient = original.ReplicationProtectableItemsClient
+
+func NewReplicationProtectableItemsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectableItemsClient {
+	return original.NewReplicationProtectableItemsClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewReplicationProtectableItemsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectableItemsClient {
+	return original.NewReplicationProtectableItemsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
+type ReplicationProtectionContainerMappingsClient = original.ReplicationProtectionContainerMappingsClient
+
+func NewReplicationProtectionContainerMappingsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectionContainerMappingsClient {
+	return original.NewReplicationProtectionContainerMappingsClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewReplicationProtectionContainerMappingsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectionContainerMappingsClient {
+	return original.NewReplicationProtectionContainerMappingsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
 
 type A2ARpRecoveryPointType = original.A2ARpRecoveryPointType
@@ -1108,22 +1185,21 @@ type VMwareDetails = original.VMwareDetails
 type VMwareV2FabricCreationInput = original.VMwareV2FabricCreationInput
 type VMwareV2FabricSpecificDetails = original.VMwareV2FabricSpecificDetails
 type VMwareVirtualMachineDetails = original.VMwareVirtualMachineDetails
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string, resourceGroupName string, resourceName string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID, resourceGroupName, resourceName)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+func Version() string {
+	return original.Version()
 }
 
-type RecoveryPointsClient = original.RecoveryPointsClient
+type ReplicationNetworkMappingsClient = original.ReplicationNetworkMappingsClient
 
-func NewRecoveryPointsClient(subscriptionID string, resourceGroupName string, resourceName string) RecoveryPointsClient {
-	return original.NewRecoveryPointsClient(subscriptionID, resourceGroupName, resourceName)
+func NewReplicationNetworkMappingsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationNetworkMappingsClient {
+	return original.NewReplicationNetworkMappingsClient(subscriptionID, resourceGroupName, resourceName)
 }
-func NewRecoveryPointsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) RecoveryPointsClient {
-	return original.NewRecoveryPointsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+func NewReplicationNetworkMappingsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationNetworkMappingsClient {
+	return original.NewReplicationNetworkMappingsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
 
 type ReplicationAlertSettingsClient = original.ReplicationAlertSettingsClient
@@ -1135,6 +1211,15 @@ func NewReplicationAlertSettingsClientWithBaseURI(baseURI string, subscriptionID
 	return original.NewReplicationAlertSettingsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
 
+type RecoveryPointsClient = original.RecoveryPointsClient
+
+func NewRecoveryPointsClient(subscriptionID string, resourceGroupName string, resourceName string) RecoveryPointsClient {
+	return original.NewRecoveryPointsClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewRecoveryPointsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) RecoveryPointsClient {
+	return original.NewRecoveryPointsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
 type ReplicationEventsClient = original.ReplicationEventsClient
 
 func NewReplicationEventsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationEventsClient {
@@ -1144,87 +1229,6 @@ func NewReplicationEventsClientWithBaseURI(baseURI string, subscriptionID string
 	return original.NewReplicationEventsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
 
-type ReplicationFabricsClient = original.ReplicationFabricsClient
-
-func NewReplicationFabricsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationFabricsClient {
-	return original.NewReplicationFabricsClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationFabricsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationFabricsClient {
-	return original.NewReplicationFabricsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
-type ReplicationJobsClient = original.ReplicationJobsClient
-
-func NewReplicationJobsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationJobsClient {
-	return original.NewReplicationJobsClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationJobsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationJobsClient {
-	return original.NewReplicationJobsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
-type ReplicationLogicalNetworksClient = original.ReplicationLogicalNetworksClient
-
-func NewReplicationLogicalNetworksClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationLogicalNetworksClient {
-	return original.NewReplicationLogicalNetworksClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationLogicalNetworksClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationLogicalNetworksClient {
-	return original.NewReplicationLogicalNetworksClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
-type ReplicationNetworkMappingsClient = original.ReplicationNetworkMappingsClient
-
-func NewReplicationNetworkMappingsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationNetworkMappingsClient {
-	return original.NewReplicationNetworkMappingsClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationNetworkMappingsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationNetworkMappingsClient {
-	return original.NewReplicationNetworkMappingsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
-type ReplicationNetworksClient = original.ReplicationNetworksClient
-
-func NewReplicationNetworksClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationNetworksClient {
-	return original.NewReplicationNetworksClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationNetworksClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationNetworksClient {
-	return original.NewReplicationNetworksClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
-type ReplicationPoliciesClient = original.ReplicationPoliciesClient
-
-func NewReplicationPoliciesClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationPoliciesClient {
-	return original.NewReplicationPoliciesClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationPoliciesClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationPoliciesClient {
-	return original.NewReplicationPoliciesClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
-type ReplicationProtectableItemsClient = original.ReplicationProtectableItemsClient
-
-func NewReplicationProtectableItemsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectableItemsClient {
-	return original.NewReplicationProtectableItemsClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationProtectableItemsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectableItemsClient {
-	return original.NewReplicationProtectableItemsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
-type ReplicationProtectedItemsClient = original.ReplicationProtectedItemsClient
-
-func NewReplicationProtectedItemsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectedItemsClient {
-	return original.NewReplicationProtectedItemsClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationProtectedItemsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectedItemsClient {
-	return original.NewReplicationProtectedItemsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
-type ReplicationProtectionContainerMappingsClient = original.ReplicationProtectionContainerMappingsClient
-
-func NewReplicationProtectionContainerMappingsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectionContainerMappingsClient {
-	return original.NewReplicationProtectionContainerMappingsClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationProtectionContainerMappingsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectionContainerMappingsClient {
-	return original.NewReplicationProtectionContainerMappingsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
 type ReplicationProtectionContainersClient = original.ReplicationProtectionContainersClient
 
 func NewReplicationProtectionContainersClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectionContainersClient {
@@ -1234,6 +1238,15 @@ func NewReplicationProtectionContainersClientWithBaseURI(baseURI string, subscri
 	return original.NewReplicationProtectionContainersClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
 
+type ReplicationFabricsClient = original.ReplicationFabricsClient
+
+func NewReplicationFabricsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationFabricsClient {
+	return original.NewReplicationFabricsClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewReplicationFabricsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationFabricsClient {
+	return original.NewReplicationFabricsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
 type ReplicationRecoveryPlansClient = original.ReplicationRecoveryPlansClient
 
 func NewReplicationRecoveryPlansClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationRecoveryPlansClient {
@@ -1243,15 +1256,6 @@ func NewReplicationRecoveryPlansClientWithBaseURI(baseURI string, subscriptionID
 	return original.NewReplicationRecoveryPlansClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
 
-type ReplicationRecoveryServicesProvidersClient = original.ReplicationRecoveryServicesProvidersClient
-
-func NewReplicationRecoveryServicesProvidersClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationRecoveryServicesProvidersClient {
-	return original.NewReplicationRecoveryServicesProvidersClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationRecoveryServicesProvidersClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationRecoveryServicesProvidersClient {
-	return original.NewReplicationRecoveryServicesProvidersClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
 type ReplicationStorageClassificationMappingsClient = original.ReplicationStorageClassificationMappingsClient
 
 func NewReplicationStorageClassificationMappingsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationStorageClassificationMappingsClient {
@@ -1261,22 +1265,35 @@ func NewReplicationStorageClassificationMappingsClientWithBaseURI(baseURI string
 	return original.NewReplicationStorageClassificationMappingsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
 
-type ReplicationStorageClassificationsClient = original.ReplicationStorageClassificationsClient
+type ReplicationNetworksClient = original.ReplicationNetworksClient
 
-func NewReplicationStorageClassificationsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationStorageClassificationsClient {
-	return original.NewReplicationStorageClassificationsClient(subscriptionID, resourceGroupName, resourceName)
+func NewReplicationNetworksClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationNetworksClient {
+	return original.NewReplicationNetworksClient(subscriptionID, resourceGroupName, resourceName)
 }
-func NewReplicationStorageClassificationsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationStorageClassificationsClient {
-	return original.NewReplicationStorageClassificationsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+func NewReplicationNetworksClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationNetworksClient {
+	return original.NewReplicationNetworksClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
 
-type ReplicationVaultHealthClient = original.ReplicationVaultHealthClient
+type ReplicationLogicalNetworksClient = original.ReplicationLogicalNetworksClient
 
-func NewReplicationVaultHealthClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationVaultHealthClient {
-	return original.NewReplicationVaultHealthClient(subscriptionID, resourceGroupName, resourceName)
+func NewReplicationLogicalNetworksClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationLogicalNetworksClient {
+	return original.NewReplicationLogicalNetworksClient(subscriptionID, resourceGroupName, resourceName)
 }
-func NewReplicationVaultHealthClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationVaultHealthClient {
-	return original.NewReplicationVaultHealthClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+func NewReplicationLogicalNetworksClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationLogicalNetworksClient {
+	return original.NewReplicationLogicalNetworksClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string, resourceGroupName string, resourceName string) BaseClient {
+	return original.New(subscriptionID, resourceGroupName, resourceName)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
 
 type ReplicationvCentersClient = original.ReplicationvCentersClient
@@ -1287,18 +1304,3 @@ func NewReplicationvCentersClient(subscriptionID string, resourceGroupName strin
 func NewReplicationvCentersClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationvCentersClient {
 	return original.NewReplicationvCentersClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
-
-type TargetComputeSizesClient = original.TargetComputeSizesClient
-
-func NewTargetComputeSizesClient(subscriptionID string, resourceGroupName string, resourceName string) TargetComputeSizesClient {
-	return original.NewTargetComputeSizesClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewTargetComputeSizesClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) TargetComputeSizesClient {
-	return original.NewTargetComputeSizesClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
-}
-func Version() string {
-	return original.Version()
-}
diff --git a/profiles/latest/redis/mgmt/redis/models.go b/profiles/latest/redis/mgmt/redis/models.go
index d96a407e58d9..344fd2f0fe2c 100644
--- a/profiles/latest/redis/mgmt/redis/models.go
+++ b/profiles/latest/redis/mgmt/redis/models.go
@@ -21,35 +21,22 @@ package redis
 
 import original "github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type FirewallRulesClient = original.FirewallRulesClient
+type OperationsClient = original.OperationsClient
 
-func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LinkedServerClient = original.LinkedServerClient
+type Client = original.Client
 
-func NewLinkedServerClient(subscriptionID string) LinkedServerClient {
-	return original.NewLinkedServerClient(subscriptionID)
+func NewClient(subscriptionID string) Client {
+	return original.NewClient(subscriptionID)
 }
-func NewLinkedServerClientWithBaseURI(baseURI string, subscriptionID string) LinkedServerClient {
-	return original.NewLinkedServerClientWithBaseURI(baseURI, subscriptionID)
+func NewClientWithBaseURI(baseURI string, subscriptionID string) Client {
+	return original.NewClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type DayOfWeek = original.DayOfWeek
@@ -210,35 +197,48 @@ type TrackedResource = original.TrackedResource
 type UpdateParameters = original.UpdateParameters
 type UpdateProperties = original.UpdateProperties
 type UpgradeNotification = original.UpgradeNotification
-type OperationsClient = original.OperationsClient
+type LinkedServerClient = original.LinkedServerClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewLinkedServerClient(subscriptionID string) LinkedServerClient {
+	return original.NewLinkedServerClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewLinkedServerClientWithBaseURI(baseURI string, subscriptionID string) LinkedServerClient {
+	return original.NewLinkedServerClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
+}
+func Version() string {
+	return original.Version()
 }
 
-type PatchSchedulesClient = original.PatchSchedulesClient
+type FirewallRulesClient = original.FirewallRulesClient
 
-func NewPatchSchedulesClient(subscriptionID string) PatchSchedulesClient {
-	return original.NewPatchSchedulesClient(subscriptionID)
+func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClient(subscriptionID)
 }
-func NewPatchSchedulesClientWithBaseURI(baseURI string, subscriptionID string) PatchSchedulesClient {
-	return original.NewPatchSchedulesClientWithBaseURI(baseURI, subscriptionID)
+func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type Client = original.Client
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewClient(subscriptionID string) Client {
-	return original.NewClient(subscriptionID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewClientWithBaseURI(baseURI string, subscriptionID string) Client {
-	return original.NewClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+type PatchSchedulesClient = original.PatchSchedulesClient
+
+func NewPatchSchedulesClient(subscriptionID string) PatchSchedulesClient {
+	return original.NewPatchSchedulesClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewPatchSchedulesClientWithBaseURI(baseURI string, subscriptionID string) PatchSchedulesClient {
+	return original.NewPatchSchedulesClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/relay/mgmt/relay/models.go b/profiles/latest/relay/mgmt/relay/models.go
index ef1ae5064e30..605d0abe99fd 100644
--- a/profiles/latest/relay/mgmt/relay/models.go
+++ b/profiles/latest/relay/mgmt/relay/models.go
@@ -21,17 +21,31 @@ package relay
 
 import original "github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type OperationsClient = original.OperationsClient
 
-type BaseClient = original.BaseClient
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type WCFRelaysClient = original.WCFRelaysClient
+
+func NewWCFRelaysClient(subscriptionID string) WCFRelaysClient {
+	return original.NewWCFRelaysClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewWCFRelaysClientWithBaseURI(baseURI string, subscriptionID string) WCFRelaysClient {
+	return original.NewWCFRelaysClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type NamespacesClient = original.NamespacesClient
+
+func NewNamespacesClient(subscriptionID string) NamespacesClient {
+	return original.NewNamespacesClient(subscriptionID)
+}
+func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) NamespacesClient {
+	return original.NewNamespacesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type HybridConnectionsClient = original.HybridConnectionsClient
@@ -154,23 +168,7 @@ type WcfRelayProperties = original.WcfRelayProperties
 type WcfRelaysListResult = original.WcfRelaysListResult
 type WcfRelaysListResultIterator = original.WcfRelaysListResultIterator
 type WcfRelaysListResultPage = original.WcfRelaysListResultPage
-type NamespacesClient = original.NamespacesClient
-
-func NewNamespacesClient(subscriptionID string) NamespacesClient {
-	return original.NewNamespacesClient(subscriptionID)
-}
-func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) NamespacesClient {
-	return original.NewNamespacesClientWithBaseURI(baseURI, subscriptionID)
-}
 
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
@@ -178,11 +176,15 @@ func Version() string {
 	return original.Version()
 }
 
-type WCFRelaysClient = original.WCFRelaysClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewWCFRelaysClient(subscriptionID string) WCFRelaysClient {
-	return original.NewWCFRelaysClient(subscriptionID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewWCFRelaysClientWithBaseURI(baseURI string, subscriptionID string) WCFRelaysClient {
-	return original.NewWCFRelaysClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/reservations/mgmt/reservations/models.go b/profiles/latest/reservations/mgmt/reservations/models.go
index f2a5ba4a6f6b..a1b97b9bcb02 100644
--- a/profiles/latest/reservations/mgmt/reservations/models.go
+++ b/profiles/latest/reservations/mgmt/reservations/models.go
@@ -21,17 +21,13 @@ package reservations
 
 import original "github.com/Azure/azure-sdk-for-go/services/reservations/mgmt/2017-11-01/reservations"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationClient = original.OperationClient
 
-func New() BaseClient {
-	return original.New()
+func NewOperationClient() OperationClient {
+	return original.NewOperationClient()
 }
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
+func NewOperationClientWithBaseURI(baseURI string) OperationClient {
+	return original.NewOperationClientWithBaseURI(baseURI)
 }
 
 type AppliedScopeType = original.AppliedScopeType
@@ -274,15 +270,6 @@ type SplitFuture = original.SplitFuture
 type SplitProperties = original.SplitProperties
 type SplitPropertiesType = original.SplitPropertiesType
 type SplitRequest = original.SplitRequest
-type OperationClient = original.OperationClient
-
-func NewOperationClient() OperationClient {
-	return original.NewOperationClient()
-}
-func NewOperationClientWithBaseURI(baseURI string) OperationClient {
-	return original.NewOperationClientWithBaseURI(baseURI)
-}
-
 type OrderClient = original.OrderClient
 
 func NewOrderClient() OrderClient {
@@ -291,6 +278,25 @@ func NewOrderClient() OrderClient {
 func NewOrderClientWithBaseURI(baseURI string) OrderClient {
 	return original.NewOrderClientWithBaseURI(baseURI)
 }
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
+}
+func Version() string {
+	return original.Version()
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
 
 type Client = original.Client
 
@@ -300,9 +306,3 @@ func NewClient() Client {
 func NewClientWithBaseURI(baseURI string) Client {
 	return original.NewClientWithBaseURI(baseURI)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
-}
-func Version() string {
-	return original.Version()
-}
diff --git a/profiles/latest/resourcehealth/mgmt/resourcehealth/models.go b/profiles/latest/resourcehealth/mgmt/resourcehealth/models.go
index 75d81ea35010..7108711e3097 100644
--- a/profiles/latest/resourcehealth/mgmt/resourcehealth/models.go
+++ b/profiles/latest/resourcehealth/mgmt/resourcehealth/models.go
@@ -21,26 +21,13 @@ package resourcehealth
 
 import original "github.com/Azure/azure-sdk-for-go/services/resourcehealth/mgmt/2017-07-01/resourcehealth"
 
-type AvailabilityStatusesClient = original.AvailabilityStatusesClient
-
-func NewAvailabilityStatusesClient(subscriptionID string) AvailabilityStatusesClient {
-	return original.NewAvailabilityStatusesClient(subscriptionID)
-}
-func NewAvailabilityStatusesClientWithBaseURI(baseURI string, subscriptionID string) AvailabilityStatusesClient {
-	return original.NewAvailabilityStatusesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AvailabilityStateValues = original.AvailabilityStateValues
@@ -80,17 +67,32 @@ type RecommendedAction = original.RecommendedAction
 type ServiceImpactingEvent = original.ServiceImpactingEvent
 type ServiceImpactingEventIncidentProperties = original.ServiceImpactingEventIncidentProperties
 type ServiceImpactingEventStatus = original.ServiceImpactingEventStatus
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
 func Version() string {
 	return original.Version()
 }
+
+type AvailabilityStatusesClient = original.AvailabilityStatusesClient
+
+func NewAvailabilityStatusesClient(subscriptionID string) AvailabilityStatusesClient {
+	return original.NewAvailabilityStatusesClient(subscriptionID)
+}
+func NewAvailabilityStatusesClientWithBaseURI(baseURI string, subscriptionID string) AvailabilityStatusesClient {
+	return original.NewAvailabilityStatusesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/resources/mgmt/features/models.go b/profiles/latest/resources/mgmt/features/models.go
index f780769ab758..7447b06d7f16 100644
--- a/profiles/latest/resources/mgmt/features/models.go
+++ b/profiles/latest/resources/mgmt/features/models.go
@@ -21,19 +21,6 @@ package features
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2015-12-01/features"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type Client = original.Client
 
 func NewClient(subscriptionID string) Client {
@@ -55,3 +42,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/resources/mgmt/links/models.go b/profiles/latest/resources/mgmt/links/models.go
index 79ce025c40b7..45f4b97012c7 100644
--- a/profiles/latest/resources/mgmt/links/models.go
+++ b/profiles/latest/resources/mgmt/links/models.go
@@ -21,17 +21,13 @@ package links
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-09-01/links"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type ResourceLinksClient = original.ResourceLinksClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewResourceLinksClient(subscriptionID string) ResourceLinksClient {
+	return original.NewResourceLinksClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewResourceLinksClientWithBaseURI(baseURI string, subscriptionID string) ResourceLinksClient {
+	return original.NewResourceLinksClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type Filter = original.Filter
@@ -50,17 +46,23 @@ type ResourceLinkProperties = original.ResourceLinkProperties
 type ResourceLinkResult = original.ResourceLinkResult
 type ResourceLinkResultIterator = original.ResourceLinkResultIterator
 type ResourceLinkResultPage = original.ResourceLinkResultPage
-type ResourceLinksClient = original.ResourceLinksClient
 
-func NewResourceLinksClient(subscriptionID string) ResourceLinksClient {
-	return original.NewResourceLinksClient(subscriptionID)
-}
-func NewResourceLinksClientWithBaseURI(baseURI string, subscriptionID string) ResourceLinksClient {
-	return original.NewResourceLinksClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/resources/mgmt/locks/models.go b/profiles/latest/resources/mgmt/locks/models.go
index 711481bce1ce..74f0b51dd329 100644
--- a/profiles/latest/resources/mgmt/locks/models.go
+++ b/profiles/latest/resources/mgmt/locks/models.go
@@ -21,19 +21,6 @@ package locks
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-09-01/locks"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type ManagementLocksClient = original.ManagementLocksClient
 
 func NewManagementLocksClient(subscriptionID string) ManagementLocksClient {
@@ -68,3 +55,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/resources/mgmt/policy/models.go b/profiles/latest/resources/mgmt/policy/models.go
index c763f4806f9b..adbd616b1ba9 100644
--- a/profiles/latest/resources/mgmt/policy/models.go
+++ b/profiles/latest/resources/mgmt/policy/models.go
@@ -21,28 +21,6 @@ package policy
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy"
 
-type AssignmentsClient = original.AssignmentsClient
-
-func NewAssignmentsClient(subscriptionID string) AssignmentsClient {
-	return original.NewAssignmentsClient(subscriptionID)
-}
-func NewAssignmentsClientWithBaseURI(baseURI string, subscriptionID string) AssignmentsClient {
-	return original.NewAssignmentsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type DefinitionsClient = original.DefinitionsClient
 
 func NewDefinitionsClient(subscriptionID string) DefinitionsClient {
@@ -93,3 +71,25 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
+
+type AssignmentsClient = original.AssignmentsClient
+
+func NewAssignmentsClient(subscriptionID string) AssignmentsClient {
+	return original.NewAssignmentsClient(subscriptionID)
+}
+func NewAssignmentsClientWithBaseURI(baseURI string, subscriptionID string) AssignmentsClient {
+	return original.NewAssignmentsClientWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/resources/mgmt/resources/models.go b/profiles/latest/resources/mgmt/resources/models.go
index a9039ee55825..0fc0204e98ff 100644
--- a/profiles/latest/resources/mgmt/resources/models.go
+++ b/profiles/latest/resources/mgmt/resources/models.go
@@ -21,44 +21,22 @@ package resources
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-02-01/resources"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type DeploymentOperationsClient = original.DeploymentOperationsClient
-
-func NewDeploymentOperationsClient(subscriptionID string) DeploymentOperationsClient {
-	return original.NewDeploymentOperationsClient(subscriptionID)
-}
-func NewDeploymentOperationsClientWithBaseURI(baseURI string, subscriptionID string) DeploymentOperationsClient {
-	return original.NewDeploymentOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type DeploymentsClient = original.DeploymentsClient
+type TagsClient = original.TagsClient
 
-func NewDeploymentsClient(subscriptionID string) DeploymentsClient {
-	return original.NewDeploymentsClient(subscriptionID)
+func NewTagsClient(subscriptionID string) TagsClient {
+	return original.NewTagsClient(subscriptionID)
 }
-func NewDeploymentsClientWithBaseURI(baseURI string, subscriptionID string) DeploymentsClient {
-	return original.NewDeploymentsClientWithBaseURI(baseURI, subscriptionID)
+func NewTagsClientWithBaseURI(baseURI string, subscriptionID string) TagsClient {
+	return original.NewTagsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type GroupsClient = original.GroupsClient
+type Client = original.Client
 
-func NewGroupsClient(subscriptionID string) GroupsClient {
-	return original.NewGroupsClient(subscriptionID)
+func NewClient(subscriptionID string) Client {
+	return original.NewClient(subscriptionID)
 }
-func NewGroupsClientWithBaseURI(baseURI string, subscriptionID string) GroupsClient {
-	return original.NewGroupsClientWithBaseURI(baseURI, subscriptionID)
+func NewClientWithBaseURI(baseURI string, subscriptionID string) Client {
+	return original.NewClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type DeploymentMode = original.DeploymentMode
@@ -166,35 +144,59 @@ type TemplateLink = original.TemplateLink
 type UpdateByIDFuture = original.UpdateByIDFuture
 type UpdateFuture = original.UpdateFuture
 type ValidateMoveResourcesFuture = original.ValidateMoveResourcesFuture
-type ProvidersClient = original.ProvidersClient
 
-func NewProvidersClient(subscriptionID string) ProvidersClient {
-	return original.NewProvidersClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewProvidersClientWithBaseURI(baseURI string, subscriptionID string) ProvidersClient {
-	return original.NewProvidersClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type Client = original.Client
+type DeploymentOperationsClient = original.DeploymentOperationsClient
 
-func NewClient(subscriptionID string) Client {
-	return original.NewClient(subscriptionID)
+func NewDeploymentOperationsClient(subscriptionID string) DeploymentOperationsClient {
+	return original.NewDeploymentOperationsClient(subscriptionID)
 }
-func NewClientWithBaseURI(baseURI string, subscriptionID string) Client {
-	return original.NewClientWithBaseURI(baseURI, subscriptionID)
+func NewDeploymentOperationsClientWithBaseURI(baseURI string, subscriptionID string) DeploymentOperationsClient {
+	return original.NewDeploymentOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TagsClient = original.TagsClient
+type DeploymentsClient = original.DeploymentsClient
 
-func NewTagsClient(subscriptionID string) TagsClient {
-	return original.NewTagsClient(subscriptionID)
+func NewDeploymentsClient(subscriptionID string) DeploymentsClient {
+	return original.NewDeploymentsClient(subscriptionID)
 }
-func NewTagsClientWithBaseURI(baseURI string, subscriptionID string) TagsClient {
-	return original.NewTagsClientWithBaseURI(baseURI, subscriptionID)
+func NewDeploymentsClientWithBaseURI(baseURI string, subscriptionID string) DeploymentsClient {
+	return original.NewDeploymentsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+type GroupsClient = original.GroupsClient
+
+func NewGroupsClient(subscriptionID string) GroupsClient {
+	return original.NewGroupsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewGroupsClientWithBaseURI(baseURI string, subscriptionID string) GroupsClient {
+	return original.NewGroupsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ProvidersClient = original.ProvidersClient
+
+func NewProvidersClient(subscriptionID string) ProvidersClient {
+	return original.NewProvidersClient(subscriptionID)
+}
+func NewProvidersClientWithBaseURI(baseURI string, subscriptionID string) ProvidersClient {
+	return original.NewProvidersClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/resources/mgmt/subscriptions/models.go b/profiles/latest/resources/mgmt/subscriptions/models.go
index a4f33af50d34..57cd348a7be2 100644
--- a/profiles/latest/resources/mgmt/subscriptions/models.go
+++ b/profiles/latest/resources/mgmt/subscriptions/models.go
@@ -21,17 +21,13 @@ package subscriptions
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-06-01/subscriptions"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type TenantsClient = original.TenantsClient
 
-func New() BaseClient {
-	return original.New()
+func NewTenantsClient() TenantsClient {
+	return original.NewTenantsClient()
 }
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
+func NewTenantsClientWithBaseURI(baseURI string) TenantsClient {
+	return original.NewTenantsClientWithBaseURI(baseURI)
 }
 
 type SpendingLimit = original.SpendingLimit
@@ -79,18 +75,22 @@ func NewClient() Client {
 func NewClientWithBaseURI(baseURI string) Client {
 	return original.NewClientWithBaseURI(baseURI)
 }
-
-type TenantsClient = original.TenantsClient
-
-func NewTenantsClient() TenantsClient {
-	return original.NewTenantsClient()
-}
-func NewTenantsClientWithBaseURI(baseURI string) TenantsClient {
-	return original.NewTenantsClientWithBaseURI(baseURI)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
diff --git a/profiles/latest/scheduler/mgmt/scheduler/models.go b/profiles/latest/scheduler/mgmt/scheduler/models.go
index a1dc8b721f94..7bab9598581d 100644
--- a/profiles/latest/scheduler/mgmt/scheduler/models.go
+++ b/profiles/latest/scheduler/mgmt/scheduler/models.go
@@ -21,17 +21,13 @@ package scheduler
 
 import original "github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type JobsClient = original.JobsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewJobsClient(subscriptionID string) JobsClient {
+	return original.NewJobsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewJobsClientWithBaseURI(baseURI string, subscriptionID string) JobsClient {
+	return original.NewJobsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type JobCollectionsClient = original.JobCollectionsClient
@@ -43,15 +39,6 @@ func NewJobCollectionsClientWithBaseURI(baseURI string, subscriptionID string) J
 	return original.NewJobCollectionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type JobsClient = original.JobsClient
-
-func NewJobsClient(subscriptionID string) JobsClient {
-	return original.NewJobsClient(subscriptionID)
-}
-func NewJobsClientWithBaseURI(baseURI string, subscriptionID string) JobsClient {
-	return original.NewJobsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type DayOfWeek = original.DayOfWeek
 
 const (
@@ -270,3 +257,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/search/mgmt/search/models.go b/profiles/latest/search/mgmt/search/models.go
index a2ee638efe46..559f85a905a4 100644
--- a/profiles/latest/search/mgmt/search/models.go
+++ b/profiles/latest/search/mgmt/search/models.go
@@ -21,26 +21,31 @@ package search
 
 import original "github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search"
 
-type AdminKeysClient = original.AdminKeysClient
+type OperationsClient = original.OperationsClient
 
-func NewAdminKeysClient(subscriptionID string) AdminKeysClient {
-	return original.NewAdminKeysClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewAdminKeysClientWithBaseURI(baseURI string, subscriptionID string) AdminKeysClient {
-	return original.NewAdminKeysClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type ServicesClient = original.ServicesClient
 
-type BaseClient = original.BaseClient
+func NewServicesClient(subscriptionID string) ServicesClient {
+	return original.NewServicesClient(subscriptionID)
+}
+func NewServicesClientWithBaseURI(baseURI string, subscriptionID string) ServicesClient {
+	return original.NewServicesClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type AdminKeysClient = original.AdminKeysClient
+
+func NewAdminKeysClient(subscriptionID string) AdminKeysClient {
+	return original.NewAdminKeysClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewAdminKeysClientWithBaseURI(baseURI string, subscriptionID string) AdminKeysClient {
+	return original.NewAdminKeysClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AdminKeyKind = original.AdminKeyKind
@@ -133,13 +138,12 @@ type ServiceListResult = original.ServiceListResult
 type ServiceProperties = original.ServiceProperties
 type ServicesCreateOrUpdateFuture = original.ServicesCreateOrUpdateFuture
 type Sku = original.Sku
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
 type QueryKeysClient = original.QueryKeysClient
@@ -151,17 +155,15 @@ func NewQueryKeysClientWithBaseURI(baseURI string, subscriptionID string) QueryK
 	return original.NewQueryKeysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ServicesClient = original.ServicesClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewServicesClient(subscriptionID string) ServicesClient {
-	return original.NewServicesClient(subscriptionID)
-}
-func NewServicesClientWithBaseURI(baseURI string, subscriptionID string) ServicesClient {
-	return original.NewServicesClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/servicebus/mgmt/servicebus/models.go b/profiles/latest/servicebus/mgmt/servicebus/models.go
index ec44e2fec708..ed67efbd35b7 100644
--- a/profiles/latest/servicebus/mgmt/servicebus/models.go
+++ b/profiles/latest/servicebus/mgmt/servicebus/models.go
@@ -21,35 +21,31 @@ package servicebus
 
 import original "github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type RegionsClient = original.RegionsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewRegionsClient(subscriptionID string) RegionsClient {
+	return original.NewRegionsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewRegionsClientWithBaseURI(baseURI string, subscriptionID string) RegionsClient {
+	return original.NewRegionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DisasterRecoveryConfigsClient = original.DisasterRecoveryConfigsClient
+type OperationsClient = original.OperationsClient
 
-func NewDisasterRecoveryConfigsClient(subscriptionID string) DisasterRecoveryConfigsClient {
-	return original.NewDisasterRecoveryConfigsClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewDisasterRecoveryConfigsClientWithBaseURI(baseURI string, subscriptionID string) DisasterRecoveryConfigsClient {
-	return original.NewDisasterRecoveryConfigsClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type EventHubsClient = original.EventHubsClient
+type NamespacesClient = original.NamespacesClient
 
-func NewEventHubsClient(subscriptionID string) EventHubsClient {
-	return original.NewEventHubsClient(subscriptionID)
+func NewNamespacesClient(subscriptionID string) NamespacesClient {
+	return original.NewNamespacesClient(subscriptionID)
 }
-func NewEventHubsClientWithBaseURI(baseURI string, subscriptionID string) EventHubsClient {
-	return original.NewEventHubsClientWithBaseURI(baseURI, subscriptionID)
+func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) NamespacesClient {
+	return original.NewNamespacesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccessRights = original.AccessRights
@@ -249,22 +245,22 @@ type SBTopicProperties = original.SBTopicProperties
 type SQLFilter = original.SQLFilter
 type SQLRuleAction = original.SQLRuleAction
 type TrackedResource = original.TrackedResource
-type NamespacesClient = original.NamespacesClient
+type QueuesClient = original.QueuesClient
 
-func NewNamespacesClient(subscriptionID string) NamespacesClient {
-	return original.NewNamespacesClient(subscriptionID)
+func NewQueuesClient(subscriptionID string) QueuesClient {
+	return original.NewQueuesClient(subscriptionID)
 }
-func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) NamespacesClient {
-	return original.NewNamespacesClientWithBaseURI(baseURI, subscriptionID)
+func NewQueuesClientWithBaseURI(baseURI string, subscriptionID string) QueuesClient {
+	return original.NewQueuesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type OperationsClient = original.OperationsClient
+type SubscriptionsClient = original.SubscriptionsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewSubscriptionsClient(subscriptionID string) SubscriptionsClient {
+	return original.NewSubscriptionsClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewSubscriptionsClientWithBaseURI(baseURI string, subscriptionID string) SubscriptionsClient {
+	return original.NewSubscriptionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type PremiumMessagingRegionsClient = original.PremiumMessagingRegionsClient
@@ -275,23 +271,20 @@ func NewPremiumMessagingRegionsClient(subscriptionID string) PremiumMessagingReg
 func NewPremiumMessagingRegionsClientWithBaseURI(baseURI string, subscriptionID string) PremiumMessagingRegionsClient {
 	return original.NewPremiumMessagingRegionsClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type QueuesClient = original.QueuesClient
-
-func NewQueuesClient(subscriptionID string) QueuesClient {
-	return original.NewQueuesClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewQueuesClientWithBaseURI(baseURI string, subscriptionID string) QueuesClient {
-	return original.NewQueuesClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type RegionsClient = original.RegionsClient
+type TopicsClient = original.TopicsClient
 
-func NewRegionsClient(subscriptionID string) RegionsClient {
-	return original.NewRegionsClient(subscriptionID)
+func NewTopicsClient(subscriptionID string) TopicsClient {
+	return original.NewTopicsClient(subscriptionID)
 }
-func NewRegionsClientWithBaseURI(baseURI string, subscriptionID string) RegionsClient {
-	return original.NewRegionsClientWithBaseURI(baseURI, subscriptionID)
+func NewTopicsClientWithBaseURI(baseURI string, subscriptionID string) TopicsClient {
+	return original.NewTopicsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type RulesClient = original.RulesClient
@@ -303,26 +296,33 @@ func NewRulesClientWithBaseURI(baseURI string, subscriptionID string) RulesClien
 	return original.NewRulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SubscriptionsClient = original.SubscriptionsClient
+type DisasterRecoveryConfigsClient = original.DisasterRecoveryConfigsClient
 
-func NewSubscriptionsClient(subscriptionID string) SubscriptionsClient {
-	return original.NewSubscriptionsClient(subscriptionID)
+func NewDisasterRecoveryConfigsClient(subscriptionID string) DisasterRecoveryConfigsClient {
+	return original.NewDisasterRecoveryConfigsClient(subscriptionID)
 }
-func NewSubscriptionsClientWithBaseURI(baseURI string, subscriptionID string) SubscriptionsClient {
-	return original.NewSubscriptionsClientWithBaseURI(baseURI, subscriptionID)
+func NewDisasterRecoveryConfigsClientWithBaseURI(baseURI string, subscriptionID string) DisasterRecoveryConfigsClient {
+	return original.NewDisasterRecoveryConfigsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TopicsClient = original.TopicsClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewTopicsClient(subscriptionID string) TopicsClient {
-	return original.NewTopicsClient(subscriptionID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewTopicsClientWithBaseURI(baseURI string, subscriptionID string) TopicsClient {
-	return original.NewTopicsClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+type EventHubsClient = original.EventHubsClient
+
+func NewEventHubsClient(subscriptionID string) EventHubsClient {
+	return original.NewEventHubsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewEventHubsClientWithBaseURI(baseURI string, subscriptionID string) EventHubsClient {
+	return original.NewEventHubsClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/servicefabric/mgmt/servicefabric/models.go b/profiles/latest/servicefabric/mgmt/servicefabric/models.go
index b7010a2e66f9..d47503809e8b 100644
--- a/profiles/latest/servicefabric/mgmt/servicefabric/models.go
+++ b/profiles/latest/servicefabric/mgmt/servicefabric/models.go
@@ -21,28 +21,6 @@ package servicefabric
 
 import original "github.com/Azure/azure-sdk-for-go/services/servicefabric/mgmt/2016-09-01/servicefabric"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type ClustersClient = original.ClustersClient
-
-func NewClustersClient(subscriptionID string) ClustersClient {
-	return original.NewClustersClient(subscriptionID)
-}
-func NewClustersClientWithBaseURI(baseURI string, subscriptionID string) ClustersClient {
-	return original.NewClustersClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type ClusterVersionsClient = original.ClusterVersionsClient
 
 func NewClusterVersionsClient(subscriptionID string) ClusterVersionsClient {
@@ -52,6 +30,15 @@ func NewClusterVersionsClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewClusterVersionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
+type OperationsClient = original.OperationsClient
+
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type ClusterState = original.ClusterState
 
 const (
@@ -205,17 +192,32 @@ type OperationResult = original.OperationResult
 type Resource = original.Resource
 type SettingsParameterDescription = original.SettingsParameterDescription
 type SettingsSectionDescription = original.SettingsSectionDescription
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
 func Version() string {
 	return original.Version()
 }
+
+type ClustersClient = original.ClustersClient
+
+func NewClustersClient(subscriptionID string) ClustersClient {
+	return original.NewClustersClient(subscriptionID)
+}
+func NewClustersClientWithBaseURI(baseURI string, subscriptionID string) ClustersClient {
+	return original.NewClustersClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/servicefabric/servicefabric/models.go b/profiles/latest/servicefabric/servicefabric/models.go
index eaafdac72ecf..5551af3fd1e0 100644
--- a/profiles/latest/servicefabric/servicefabric/models.go
+++ b/profiles/latest/servicefabric/servicefabric/models.go
@@ -21,143 +21,166 @@ package servicefabric
 
 import original "github.com/Azure/azure-sdk-for-go/services/servicefabric/1.0.0/servicefabric"
 
-type ApplicationHealthsClient = original.ApplicationHealthsClient
+type DeployedReplicasClient = original.DeployedReplicasClient
 
-func NewApplicationHealthsClient(timeout *int32) ApplicationHealthsClient {
-	return original.NewApplicationHealthsClient(timeout)
+func NewDeployedReplicasClient(timeout *int32) DeployedReplicasClient {
+	return original.NewDeployedReplicasClient(timeout)
 }
-func NewApplicationHealthsClientWithBaseURI(baseURI string, timeout *int32) ApplicationHealthsClient {
-	return original.NewApplicationHealthsClientWithBaseURI(baseURI, timeout)
+func NewDeployedReplicasClientWithBaseURI(baseURI string, timeout *int32) DeployedReplicasClient {
+	return original.NewDeployedReplicasClientWithBaseURI(baseURI, timeout)
 }
 
-type ApplicationManifestsClient = original.ApplicationManifestsClient
+type ServiceGroupMembersClient = original.ServiceGroupMembersClient
 
-func NewApplicationManifestsClient(timeout *int32) ApplicationManifestsClient {
-	return original.NewApplicationManifestsClient(timeout)
+func NewServiceGroupMembersClient(timeout *int32) ServiceGroupMembersClient {
+	return original.NewServiceGroupMembersClient(timeout)
 }
-func NewApplicationManifestsClientWithBaseURI(baseURI string, timeout *int32) ApplicationManifestsClient {
-	return original.NewApplicationManifestsClientWithBaseURI(baseURI, timeout)
+func NewServiceGroupMembersClientWithBaseURI(baseURI string, timeout *int32) ServiceGroupMembersClient {
+	return original.NewServiceGroupMembersClientWithBaseURI(baseURI, timeout)
 }
 
-type ApplicationsClient = original.ApplicationsClient
+type ReplicaLoadInformationsClient = original.ReplicaLoadInformationsClient
 
-func NewApplicationsClient(timeout *int32) ApplicationsClient {
-	return original.NewApplicationsClient(timeout)
+func NewReplicaLoadInformationsClient(timeout *int32) ReplicaLoadInformationsClient {
+	return original.NewReplicaLoadInformationsClient(timeout)
 }
-func NewApplicationsClientWithBaseURI(baseURI string, timeout *int32) ApplicationsClient {
-	return original.NewApplicationsClientWithBaseURI(baseURI, timeout)
+func NewReplicaLoadInformationsClientWithBaseURI(baseURI string, timeout *int32) ReplicaLoadInformationsClient {
+	return original.NewReplicaLoadInformationsClientWithBaseURI(baseURI, timeout)
 }
 
-type ApplicationTypesClient = original.ApplicationTypesClient
+type ServiceGroupDescriptionsClient = original.ServiceGroupDescriptionsClient
 
-func NewApplicationTypesClient(timeout *int32) ApplicationTypesClient {
-	return original.NewApplicationTypesClient(timeout)
+func NewServiceGroupDescriptionsClient(timeout *int32) ServiceGroupDescriptionsClient {
+	return original.NewServiceGroupDescriptionsClient(timeout)
 }
-func NewApplicationTypesClientWithBaseURI(baseURI string, timeout *int32) ApplicationTypesClient {
-	return original.NewApplicationTypesClientWithBaseURI(baseURI, timeout)
+func NewServiceGroupDescriptionsClientWithBaseURI(baseURI string, timeout *int32) ServiceGroupDescriptionsClient {
+	return original.NewServiceGroupDescriptionsClientWithBaseURI(baseURI, timeout)
 }
 
-type ApplicationUpgradeRollbacksClient = original.ApplicationUpgradeRollbacksClient
+type ServiceFromTemplatesClient = original.ServiceFromTemplatesClient
 
-func NewApplicationUpgradeRollbacksClient(timeout *int32) ApplicationUpgradeRollbacksClient {
-	return original.NewApplicationUpgradeRollbacksClient(timeout)
+func NewServiceFromTemplatesClient(timeout *int32) ServiceFromTemplatesClient {
+	return original.NewServiceFromTemplatesClient(timeout)
 }
-func NewApplicationUpgradeRollbacksClientWithBaseURI(baseURI string, timeout *int32) ApplicationUpgradeRollbacksClient {
-	return original.NewApplicationUpgradeRollbacksClientWithBaseURI(baseURI, timeout)
+func NewServiceFromTemplatesClientWithBaseURI(baseURI string, timeout *int32) ServiceFromTemplatesClient {
+	return original.NewServiceFromTemplatesClientWithBaseURI(baseURI, timeout)
 }
 
-type ApplicationUpgradesClient = original.ApplicationUpgradesClient
+type NodeStatesClient = original.NodeStatesClient
 
-func NewApplicationUpgradesClient(timeout *int32) ApplicationUpgradesClient {
-	return original.NewApplicationUpgradesClient(timeout)
+func NewNodeStatesClient(timeout *int32) NodeStatesClient {
+	return original.NewNodeStatesClient(timeout)
 }
-func NewApplicationUpgradesClientWithBaseURI(baseURI string, timeout *int32) ApplicationUpgradesClient {
-	return original.NewApplicationUpgradesClientWithBaseURI(baseURI, timeout)
+func NewNodeStatesClientWithBaseURI(baseURI string, timeout *int32) NodeStatesClient {
+	return original.NewNodeStatesClientWithBaseURI(baseURI, timeout)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type ServiceGroupsClient = original.ServiceGroupsClient
 
-type BaseClient = original.BaseClient
+func NewServiceGroupsClient(timeout *int32) ServiceGroupsClient {
+	return original.NewServiceGroupsClient(timeout)
+}
+func NewServiceGroupsClientWithBaseURI(baseURI string, timeout *int32) ServiceGroupsClient {
+	return original.NewServiceGroupsClientWithBaseURI(baseURI, timeout)
+}
 
-func New(timeout *int32) BaseClient {
-	return original.New(timeout)
+type UpgradeProgressesClient = original.UpgradeProgressesClient
+
+func NewUpgradeProgressesClient(timeout *int32) UpgradeProgressesClient {
+	return original.NewUpgradeProgressesClient(timeout)
 }
-func NewWithBaseURI(baseURI string, timeout *int32) BaseClient {
-	return original.NewWithBaseURI(baseURI, timeout)
+func NewUpgradeProgressesClientWithBaseURI(baseURI string, timeout *int32) UpgradeProgressesClient {
+	return original.NewUpgradeProgressesClientWithBaseURI(baseURI, timeout)
 }
 
-type ClusterHealthsClient = original.ClusterHealthsClient
+type ReplicasClient = original.ReplicasClient
 
-func NewClusterHealthsClient(timeout *int32) ClusterHealthsClient {
-	return original.NewClusterHealthsClient(timeout)
+func NewReplicasClient(timeout *int32) ReplicasClient {
+	return original.NewReplicasClient(timeout)
 }
-func NewClusterHealthsClientWithBaseURI(baseURI string, timeout *int32) ClusterHealthsClient {
-	return original.NewClusterHealthsClientWithBaseURI(baseURI, timeout)
+func NewReplicasClientWithBaseURI(baseURI string, timeout *int32) ReplicasClient {
+	return original.NewReplicasClientWithBaseURI(baseURI, timeout)
 }
 
-type ClusterLoadInformationsClient = original.ClusterLoadInformationsClient
+type ServiceGroupFromTemplatesClient = original.ServiceGroupFromTemplatesClient
 
-func NewClusterLoadInformationsClient(timeout *int32) ClusterLoadInformationsClient {
-	return original.NewClusterLoadInformationsClient(timeout)
+func NewServiceGroupFromTemplatesClient(timeout *int32) ServiceGroupFromTemplatesClient {
+	return original.NewServiceGroupFromTemplatesClient(timeout)
 }
-func NewClusterLoadInformationsClientWithBaseURI(baseURI string, timeout *int32) ClusterLoadInformationsClient {
-	return original.NewClusterLoadInformationsClientWithBaseURI(baseURI, timeout)
+func NewServiceGroupFromTemplatesClientWithBaseURI(baseURI string, timeout *int32) ServiceGroupFromTemplatesClient {
+	return original.NewServiceGroupFromTemplatesClientWithBaseURI(baseURI, timeout)
 }
 
-type ClusterManifestsClient = original.ClusterManifestsClient
+type ApplicationHealthsClient = original.ApplicationHealthsClient
 
-func NewClusterManifestsClient(timeout *int32) ClusterManifestsClient {
-	return original.NewClusterManifestsClient(timeout)
+func NewApplicationHealthsClient(timeout *int32) ApplicationHealthsClient {
+	return original.NewApplicationHealthsClient(timeout)
 }
-func NewClusterManifestsClientWithBaseURI(baseURI string, timeout *int32) ClusterManifestsClient {
-	return original.NewClusterManifestsClientWithBaseURI(baseURI, timeout)
+func NewApplicationHealthsClientWithBaseURI(baseURI string, timeout *int32) ApplicationHealthsClient {
+	return original.NewApplicationHealthsClientWithBaseURI(baseURI, timeout)
 }
 
-type ClusterPackagesClient = original.ClusterPackagesClient
+type ServiceDescriptionsClient = original.ServiceDescriptionsClient
 
-func NewClusterPackagesClient(timeout *int32) ClusterPackagesClient {
-	return original.NewClusterPackagesClient(timeout)
+func NewServiceDescriptionsClient(timeout *int32) ServiceDescriptionsClient {
+	return original.NewServiceDescriptionsClient(timeout)
 }
-func NewClusterPackagesClientWithBaseURI(baseURI string, timeout *int32) ClusterPackagesClient {
-	return original.NewClusterPackagesClientWithBaseURI(baseURI, timeout)
+func NewServiceDescriptionsClientWithBaseURI(baseURI string, timeout *int32) ServiceDescriptionsClient {
+	return original.NewServiceDescriptionsClientWithBaseURI(baseURI, timeout)
 }
 
-type ClusterUpgradesClient = original.ClusterUpgradesClient
+type PartitionHealthsClient = original.PartitionHealthsClient
 
-func NewClusterUpgradesClient(timeout *int32) ClusterUpgradesClient {
-	return original.NewClusterUpgradesClient(timeout)
+func NewPartitionHealthsClient(timeout *int32) PartitionHealthsClient {
+	return original.NewPartitionHealthsClient(timeout)
 }
-func NewClusterUpgradesClientWithBaseURI(baseURI string, timeout *int32) ClusterUpgradesClient {
-	return original.NewClusterUpgradesClientWithBaseURI(baseURI, timeout)
+func NewPartitionHealthsClientWithBaseURI(baseURI string, timeout *int32) PartitionHealthsClient {
+	return original.NewPartitionHealthsClientWithBaseURI(baseURI, timeout)
 }
 
-type DeployedApplicationHealthsClient = original.DeployedApplicationHealthsClient
+type ApplicationTypesClient = original.ApplicationTypesClient
 
-func NewDeployedApplicationHealthsClient(timeout *int32) DeployedApplicationHealthsClient {
-	return original.NewDeployedApplicationHealthsClient(timeout)
+func NewApplicationTypesClient(timeout *int32) ApplicationTypesClient {
+	return original.NewApplicationTypesClient(timeout)
 }
-func NewDeployedApplicationHealthsClientWithBaseURI(baseURI string, timeout *int32) DeployedApplicationHealthsClient {
-	return original.NewDeployedApplicationHealthsClientWithBaseURI(baseURI, timeout)
+func NewApplicationTypesClientWithBaseURI(baseURI string, timeout *int32) ApplicationTypesClient {
+	return original.NewApplicationTypesClientWithBaseURI(baseURI, timeout)
 }
 
-type DeployedApplicationsClient = original.DeployedApplicationsClient
+type ServiceHealthsClient = original.ServiceHealthsClient
 
-func NewDeployedApplicationsClient(timeout *int32) DeployedApplicationsClient {
-	return original.NewDeployedApplicationsClient(timeout)
+func NewServiceHealthsClient(timeout *int32) ServiceHealthsClient {
+	return original.NewServiceHealthsClient(timeout)
 }
-func NewDeployedApplicationsClientWithBaseURI(baseURI string, timeout *int32) DeployedApplicationsClient {
-	return original.NewDeployedApplicationsClientWithBaseURI(baseURI, timeout)
+func NewServiceHealthsClientWithBaseURI(baseURI string, timeout *int32) ServiceHealthsClient {
+	return original.NewServiceHealthsClientWithBaseURI(baseURI, timeout)
 }
 
-type DeployedCodePackagesClient = original.DeployedCodePackagesClient
+type ServicesClient = original.ServicesClient
 
-func NewDeployedCodePackagesClient(timeout *int32) DeployedCodePackagesClient {
-	return original.NewDeployedCodePackagesClient(timeout)
+func NewServicesClient(timeout *int32) ServicesClient {
+	return original.NewServicesClient(timeout)
 }
-func NewDeployedCodePackagesClientWithBaseURI(baseURI string, timeout *int32) DeployedCodePackagesClient {
-	return original.NewDeployedCodePackagesClientWithBaseURI(baseURI, timeout)
+func NewServicesClientWithBaseURI(baseURI string, timeout *int32) ServicesClient {
+	return original.NewServicesClientWithBaseURI(baseURI, timeout)
+}
+
+type NodeLoadInformationsClient = original.NodeLoadInformationsClient
+
+func NewNodeLoadInformationsClient(timeout *int32) NodeLoadInformationsClient {
+	return original.NewNodeLoadInformationsClient(timeout)
+}
+func NewNodeLoadInformationsClientWithBaseURI(baseURI string, timeout *int32) NodeLoadInformationsClient {
+	return original.NewNodeLoadInformationsClientWithBaseURI(baseURI, timeout)
+}
+
+type ClusterManifestsClient = original.ClusterManifestsClient
+
+func NewClusterManifestsClient(timeout *int32) ClusterManifestsClient {
+	return original.NewClusterManifestsClient(timeout)
+}
+func NewClusterManifestsClientWithBaseURI(baseURI string, timeout *int32) ClusterManifestsClient {
+	return original.NewClusterManifestsClientWithBaseURI(baseURI, timeout)
 }
 
 type DeployedReplicaDetailsClient = original.DeployedReplicaDetailsClient
@@ -169,40 +192,67 @@ func NewDeployedReplicaDetailsClientWithBaseURI(baseURI string, timeout *int32)
 	return original.NewDeployedReplicaDetailsClientWithBaseURI(baseURI, timeout)
 }
 
-type DeployedReplicasClient = original.DeployedReplicasClient
+type DeployedCodePackagesClient = original.DeployedCodePackagesClient
 
-func NewDeployedReplicasClient(timeout *int32) DeployedReplicasClient {
-	return original.NewDeployedReplicasClient(timeout)
+func NewDeployedCodePackagesClient(timeout *int32) DeployedCodePackagesClient {
+	return original.NewDeployedCodePackagesClient(timeout)
 }
-func NewDeployedReplicasClientWithBaseURI(baseURI string, timeout *int32) DeployedReplicasClient {
-	return original.NewDeployedReplicasClientWithBaseURI(baseURI, timeout)
+func NewDeployedCodePackagesClientWithBaseURI(baseURI string, timeout *int32) DeployedCodePackagesClient {
+	return original.NewDeployedCodePackagesClientWithBaseURI(baseURI, timeout)
 }
 
-type DeployedServicePackageHealthsClient = original.DeployedServicePackageHealthsClient
+type ApplicationUpgradesClient = original.ApplicationUpgradesClient
 
-func NewDeployedServicePackageHealthsClient(timeout *int32) DeployedServicePackageHealthsClient {
-	return original.NewDeployedServicePackageHealthsClient(timeout)
+func NewApplicationUpgradesClient(timeout *int32) ApplicationUpgradesClient {
+	return original.NewApplicationUpgradesClient(timeout)
 }
-func NewDeployedServicePackageHealthsClientWithBaseURI(baseURI string, timeout *int32) DeployedServicePackageHealthsClient {
-	return original.NewDeployedServicePackageHealthsClientWithBaseURI(baseURI, timeout)
+func NewApplicationUpgradesClientWithBaseURI(baseURI string, timeout *int32) ApplicationUpgradesClient {
+	return original.NewApplicationUpgradesClientWithBaseURI(baseURI, timeout)
 }
 
-type DeployedServicePackagesClient = original.DeployedServicePackagesClient
+type NodesClient = original.NodesClient
 
-func NewDeployedServicePackagesClient(timeout *int32) DeployedServicePackagesClient {
-	return original.NewDeployedServicePackagesClient(timeout)
+func NewNodesClient(timeout *int32) NodesClient {
+	return original.NewNodesClient(timeout)
 }
-func NewDeployedServicePackagesClientWithBaseURI(baseURI string, timeout *int32) DeployedServicePackagesClient {
-	return original.NewDeployedServicePackagesClientWithBaseURI(baseURI, timeout)
+func NewNodesClientWithBaseURI(baseURI string, timeout *int32) NodesClient {
+	return original.NewNodesClientWithBaseURI(baseURI, timeout)
 }
 
-type DeployedServiceTypesClient = original.DeployedServiceTypesClient
+type ClusterUpgradesClient = original.ClusterUpgradesClient
 
-func NewDeployedServiceTypesClient(timeout *int32) DeployedServiceTypesClient {
-	return original.NewDeployedServiceTypesClient(timeout)
+func NewClusterUpgradesClient(timeout *int32) ClusterUpgradesClient {
+	return original.NewClusterUpgradesClient(timeout)
 }
-func NewDeployedServiceTypesClientWithBaseURI(baseURI string, timeout *int32) DeployedServiceTypesClient {
-	return original.NewDeployedServiceTypesClientWithBaseURI(baseURI, timeout)
+func NewClusterUpgradesClientWithBaseURI(baseURI string, timeout *int32) ClusterUpgradesClient {
+	return original.NewClusterUpgradesClientWithBaseURI(baseURI, timeout)
+}
+
+type ServiceManifestsClient = original.ServiceManifestsClient
+
+func NewServiceManifestsClient(timeout *int32) ServiceManifestsClient {
+	return original.NewServiceManifestsClient(timeout)
+}
+func NewServiceManifestsClientWithBaseURI(baseURI string, timeout *int32) ServiceManifestsClient {
+	return original.NewServiceManifestsClientWithBaseURI(baseURI, timeout)
+}
+
+type ClusterHealthsClient = original.ClusterHealthsClient
+
+func NewClusterHealthsClient(timeout *int32) ClusterHealthsClient {
+	return original.NewClusterHealthsClient(timeout)
+}
+func NewClusterHealthsClientWithBaseURI(baseURI string, timeout *int32) ClusterHealthsClient {
+	return original.NewClusterHealthsClientWithBaseURI(baseURI, timeout)
+}
+
+type PartitionsClient = original.PartitionsClient
+
+func NewPartitionsClient(timeout *int32) PartitionsClient {
+	return original.NewPartitionsClient(timeout)
+}
+func NewPartitionsClientWithBaseURI(baseURI string, timeout *int32) PartitionsClient {
+	return original.NewPartitionsClientWithBaseURI(baseURI, timeout)
 }
 
 type AggregatedHealthState = original.AggregatedHealthState
@@ -1270,6 +1320,24 @@ type UpdateServiceGroupDescription = original.UpdateServiceGroupDescription
 type UpgradeDomainDeltaNodesCheckHealthEvaluation = original.UpgradeDomainDeltaNodesCheckHealthEvaluation
 type UpgradeDomainDeployedApplicationsHealthEvaluation = original.UpgradeDomainDeployedApplicationsHealthEvaluation
 type UpgradeDomainNodesHealthEvaluation = original.UpgradeDomainNodesHealthEvaluation
+type ClusterLoadInformationsClient = original.ClusterLoadInformationsClient
+
+func NewClusterLoadInformationsClient(timeout *int32) ClusterLoadInformationsClient {
+	return original.NewClusterLoadInformationsClient(timeout)
+}
+func NewClusterLoadInformationsClientWithBaseURI(baseURI string, timeout *int32) ClusterLoadInformationsClient {
+	return original.NewClusterLoadInformationsClientWithBaseURI(baseURI, timeout)
+}
+
+type DeployedServiceTypesClient = original.DeployedServiceTypesClient
+
+func NewDeployedServiceTypesClient(timeout *int32) DeployedServiceTypesClient {
+	return original.NewDeployedServiceTypesClient(timeout)
+}
+func NewDeployedServiceTypesClientWithBaseURI(baseURI string, timeout *int32) DeployedServiceTypesClient {
+	return original.NewDeployedServiceTypesClientWithBaseURI(baseURI, timeout)
+}
+
 type NodeHealthsClient = original.NodeHealthsClient
 
 func NewNodeHealthsClient(timeout *int32) NodeHealthsClient {
@@ -1279,49 +1347,46 @@ func NewNodeHealthsClientWithBaseURI(baseURI string, timeout *int32) NodeHealths
 	return original.NewNodeHealthsClientWithBaseURI(baseURI, timeout)
 }
 
-type NodeLoadInformationsClient = original.NodeLoadInformationsClient
+type ApplicationsClient = original.ApplicationsClient
 
-func NewNodeLoadInformationsClient(timeout *int32) NodeLoadInformationsClient {
-	return original.NewNodeLoadInformationsClient(timeout)
+func NewApplicationsClient(timeout *int32) ApplicationsClient {
+	return original.NewApplicationsClient(timeout)
 }
-func NewNodeLoadInformationsClientWithBaseURI(baseURI string, timeout *int32) NodeLoadInformationsClient {
-	return original.NewNodeLoadInformationsClientWithBaseURI(baseURI, timeout)
+func NewApplicationsClientWithBaseURI(baseURI string, timeout *int32) ApplicationsClient {
+	return original.NewApplicationsClientWithBaseURI(baseURI, timeout)
 }
 
-type NodesClient = original.NodesClient
+type ApplicationManifestsClient = original.ApplicationManifestsClient
 
-func NewNodesClient(timeout *int32) NodesClient {
-	return original.NewNodesClient(timeout)
+func NewApplicationManifestsClient(timeout *int32) ApplicationManifestsClient {
+	return original.NewApplicationManifestsClient(timeout)
 }
-func NewNodesClientWithBaseURI(baseURI string, timeout *int32) NodesClient {
-	return original.NewNodesClientWithBaseURI(baseURI, timeout)
+func NewApplicationManifestsClientWithBaseURI(baseURI string, timeout *int32) ApplicationManifestsClient {
+	return original.NewApplicationManifestsClientWithBaseURI(baseURI, timeout)
 }
-
-type NodeStatesClient = original.NodeStatesClient
-
-func NewNodeStatesClient(timeout *int32) NodeStatesClient {
-	return original.NewNodeStatesClient(timeout)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewNodeStatesClientWithBaseURI(baseURI string, timeout *int32) NodeStatesClient {
-	return original.NewNodeStatesClientWithBaseURI(baseURI, timeout)
+func Version() string {
+	return original.Version()
 }
 
-type PartitionHealthsClient = original.PartitionHealthsClient
+type ApplicationUpgradeRollbacksClient = original.ApplicationUpgradeRollbacksClient
 
-func NewPartitionHealthsClient(timeout *int32) PartitionHealthsClient {
-	return original.NewPartitionHealthsClient(timeout)
+func NewApplicationUpgradeRollbacksClient(timeout *int32) ApplicationUpgradeRollbacksClient {
+	return original.NewApplicationUpgradeRollbacksClient(timeout)
 }
-func NewPartitionHealthsClientWithBaseURI(baseURI string, timeout *int32) PartitionHealthsClient {
-	return original.NewPartitionHealthsClientWithBaseURI(baseURI, timeout)
+func NewApplicationUpgradeRollbacksClientWithBaseURI(baseURI string, timeout *int32) ApplicationUpgradeRollbacksClient {
+	return original.NewApplicationUpgradeRollbacksClientWithBaseURI(baseURI, timeout)
 }
 
-type PartitionListsClient = original.PartitionListsClient
+type DeployedServicePackageHealthsClient = original.DeployedServicePackageHealthsClient
 
-func NewPartitionListsClient(timeout *int32) PartitionListsClient {
-	return original.NewPartitionListsClient(timeout)
+func NewDeployedServicePackageHealthsClient(timeout *int32) DeployedServicePackageHealthsClient {
+	return original.NewDeployedServicePackageHealthsClient(timeout)
 }
-func NewPartitionListsClientWithBaseURI(baseURI string, timeout *int32) PartitionListsClient {
-	return original.NewPartitionListsClientWithBaseURI(baseURI, timeout)
+func NewDeployedServicePackageHealthsClientWithBaseURI(baseURI string, timeout *int32) DeployedServicePackageHealthsClient {
+	return original.NewDeployedServicePackageHealthsClientWithBaseURI(baseURI, timeout)
 }
 
 type PartitionLoadInformationsClient = original.PartitionLoadInformationsClient
@@ -1333,130 +1398,71 @@ func NewPartitionLoadInformationsClientWithBaseURI(baseURI string, timeout *int3
 	return original.NewPartitionLoadInformationsClientWithBaseURI(baseURI, timeout)
 }
 
-type PartitionLoadsClient = original.PartitionLoadsClient
-
-func NewPartitionLoadsClient(timeout *int32) PartitionLoadsClient {
-	return original.NewPartitionLoadsClient(timeout)
-}
-func NewPartitionLoadsClientWithBaseURI(baseURI string, timeout *int32) PartitionLoadsClient {
-	return original.NewPartitionLoadsClientWithBaseURI(baseURI, timeout)
-}
-
-type PartitionsClient = original.PartitionsClient
-
-func NewPartitionsClient(timeout *int32) PartitionsClient {
-	return original.NewPartitionsClient(timeout)
-}
-func NewPartitionsClientWithBaseURI(baseURI string, timeout *int32) PartitionsClient {
-	return original.NewPartitionsClientWithBaseURI(baseURI, timeout)
-}
-
-type ReplicaHealthsClient = original.ReplicaHealthsClient
-
-func NewReplicaHealthsClient(timeout *int32) ReplicaHealthsClient {
-	return original.NewReplicaHealthsClient(timeout)
-}
-func NewReplicaHealthsClientWithBaseURI(baseURI string, timeout *int32) ReplicaHealthsClient {
-	return original.NewReplicaHealthsClientWithBaseURI(baseURI, timeout)
-}
-
-type ReplicaLoadInformationsClient = original.ReplicaLoadInformationsClient
-
-func NewReplicaLoadInformationsClient(timeout *int32) ReplicaLoadInformationsClient {
-	return original.NewReplicaLoadInformationsClient(timeout)
-}
-func NewReplicaLoadInformationsClientWithBaseURI(baseURI string, timeout *int32) ReplicaLoadInformationsClient {
-	return original.NewReplicaLoadInformationsClientWithBaseURI(baseURI, timeout)
-}
-
-type ReplicasClient = original.ReplicasClient
-
-func NewReplicasClient(timeout *int32) ReplicasClient {
-	return original.NewReplicasClient(timeout)
-}
-func NewReplicasClientWithBaseURI(baseURI string, timeout *int32) ReplicasClient {
-	return original.NewReplicasClientWithBaseURI(baseURI, timeout)
-}
-
-type ServiceDescriptionsClient = original.ServiceDescriptionsClient
-
-func NewServiceDescriptionsClient(timeout *int32) ServiceDescriptionsClient {
-	return original.NewServiceDescriptionsClient(timeout)
-}
-func NewServiceDescriptionsClientWithBaseURI(baseURI string, timeout *int32) ServiceDescriptionsClient {
-	return original.NewServiceDescriptionsClientWithBaseURI(baseURI, timeout)
-}
-
-type ServiceFromTemplatesClient = original.ServiceFromTemplatesClient
+type DeployedServicePackagesClient = original.DeployedServicePackagesClient
 
-func NewServiceFromTemplatesClient(timeout *int32) ServiceFromTemplatesClient {
-	return original.NewServiceFromTemplatesClient(timeout)
+func NewDeployedServicePackagesClient(timeout *int32) DeployedServicePackagesClient {
+	return original.NewDeployedServicePackagesClient(timeout)
 }
-func NewServiceFromTemplatesClientWithBaseURI(baseURI string, timeout *int32) ServiceFromTemplatesClient {
-	return original.NewServiceFromTemplatesClientWithBaseURI(baseURI, timeout)
+func NewDeployedServicePackagesClientWithBaseURI(baseURI string, timeout *int32) DeployedServicePackagesClient {
+	return original.NewDeployedServicePackagesClientWithBaseURI(baseURI, timeout)
 }
 
-type ServiceGroupDescriptionsClient = original.ServiceGroupDescriptionsClient
+type DeployedApplicationHealthsClient = original.DeployedApplicationHealthsClient
 
-func NewServiceGroupDescriptionsClient(timeout *int32) ServiceGroupDescriptionsClient {
-	return original.NewServiceGroupDescriptionsClient(timeout)
+func NewDeployedApplicationHealthsClient(timeout *int32) DeployedApplicationHealthsClient {
+	return original.NewDeployedApplicationHealthsClient(timeout)
 }
-func NewServiceGroupDescriptionsClientWithBaseURI(baseURI string, timeout *int32) ServiceGroupDescriptionsClient {
-	return original.NewServiceGroupDescriptionsClientWithBaseURI(baseURI, timeout)
+func NewDeployedApplicationHealthsClientWithBaseURI(baseURI string, timeout *int32) DeployedApplicationHealthsClient {
+	return original.NewDeployedApplicationHealthsClientWithBaseURI(baseURI, timeout)
 }
 
-type ServiceGroupFromTemplatesClient = original.ServiceGroupFromTemplatesClient
+type PartitionListsClient = original.PartitionListsClient
 
-func NewServiceGroupFromTemplatesClient(timeout *int32) ServiceGroupFromTemplatesClient {
-	return original.NewServiceGroupFromTemplatesClient(timeout)
+func NewPartitionListsClient(timeout *int32) PartitionListsClient {
+	return original.NewPartitionListsClient(timeout)
 }
-func NewServiceGroupFromTemplatesClientWithBaseURI(baseURI string, timeout *int32) ServiceGroupFromTemplatesClient {
-	return original.NewServiceGroupFromTemplatesClientWithBaseURI(baseURI, timeout)
+func NewPartitionListsClientWithBaseURI(baseURI string, timeout *int32) PartitionListsClient {
+	return original.NewPartitionListsClientWithBaseURI(baseURI, timeout)
 }
 
-type ServiceGroupMembersClient = original.ServiceGroupMembersClient
+type DeployedApplicationsClient = original.DeployedApplicationsClient
 
-func NewServiceGroupMembersClient(timeout *int32) ServiceGroupMembersClient {
-	return original.NewServiceGroupMembersClient(timeout)
+func NewDeployedApplicationsClient(timeout *int32) DeployedApplicationsClient {
+	return original.NewDeployedApplicationsClient(timeout)
 }
-func NewServiceGroupMembersClientWithBaseURI(baseURI string, timeout *int32) ServiceGroupMembersClient {
-	return original.NewServiceGroupMembersClientWithBaseURI(baseURI, timeout)
+func NewDeployedApplicationsClientWithBaseURI(baseURI string, timeout *int32) DeployedApplicationsClient {
+	return original.NewDeployedApplicationsClientWithBaseURI(baseURI, timeout)
 }
 
-type ServiceGroupsClient = original.ServiceGroupsClient
+type ClusterPackagesClient = original.ClusterPackagesClient
 
-func NewServiceGroupsClient(timeout *int32) ServiceGroupsClient {
-	return original.NewServiceGroupsClient(timeout)
+func NewClusterPackagesClient(timeout *int32) ClusterPackagesClient {
+	return original.NewClusterPackagesClient(timeout)
 }
-func NewServiceGroupsClientWithBaseURI(baseURI string, timeout *int32) ServiceGroupsClient {
-	return original.NewServiceGroupsClientWithBaseURI(baseURI, timeout)
+func NewClusterPackagesClientWithBaseURI(baseURI string, timeout *int32) ClusterPackagesClient {
+	return original.NewClusterPackagesClientWithBaseURI(baseURI, timeout)
 }
 
-type ServiceHealthsClient = original.ServiceHealthsClient
-
-func NewServiceHealthsClient(timeout *int32) ServiceHealthsClient {
-	return original.NewServiceHealthsClient(timeout)
-}
-func NewServiceHealthsClientWithBaseURI(baseURI string, timeout *int32) ServiceHealthsClient {
-	return original.NewServiceHealthsClientWithBaseURI(baseURI, timeout)
-}
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-type ServiceManifestsClient = original.ServiceManifestsClient
+type BaseClient = original.BaseClient
 
-func NewServiceManifestsClient(timeout *int32) ServiceManifestsClient {
-	return original.NewServiceManifestsClient(timeout)
+func New(timeout *int32) BaseClient {
+	return original.New(timeout)
 }
-func NewServiceManifestsClientWithBaseURI(baseURI string, timeout *int32) ServiceManifestsClient {
-	return original.NewServiceManifestsClientWithBaseURI(baseURI, timeout)
+func NewWithBaseURI(baseURI string, timeout *int32) BaseClient {
+	return original.NewWithBaseURI(baseURI, timeout)
 }
 
-type ServicesClient = original.ServicesClient
+type ReplicaHealthsClient = original.ReplicaHealthsClient
 
-func NewServicesClient(timeout *int32) ServicesClient {
-	return original.NewServicesClient(timeout)
+func NewReplicaHealthsClient(timeout *int32) ReplicaHealthsClient {
+	return original.NewReplicaHealthsClient(timeout)
 }
-func NewServicesClientWithBaseURI(baseURI string, timeout *int32) ServicesClient {
-	return original.NewServicesClientWithBaseURI(baseURI, timeout)
+func NewReplicaHealthsClientWithBaseURI(baseURI string, timeout *int32) ReplicaHealthsClient {
+	return original.NewReplicaHealthsClientWithBaseURI(baseURI, timeout)
 }
 
 type ServiceTypesClient = original.ServiceTypesClient
@@ -1468,17 +1474,11 @@ func NewServiceTypesClientWithBaseURI(baseURI string, timeout *int32) ServiceTyp
 	return original.NewServiceTypesClientWithBaseURI(baseURI, timeout)
 }
 
-type UpgradeProgressesClient = original.UpgradeProgressesClient
+type PartitionLoadsClient = original.PartitionLoadsClient
 
-func NewUpgradeProgressesClient(timeout *int32) UpgradeProgressesClient {
-	return original.NewUpgradeProgressesClient(timeout)
-}
-func NewUpgradeProgressesClientWithBaseURI(baseURI string, timeout *int32) UpgradeProgressesClient {
-	return original.NewUpgradeProgressesClientWithBaseURI(baseURI, timeout)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+func NewPartitionLoadsClient(timeout *int32) PartitionLoadsClient {
+	return original.NewPartitionLoadsClient(timeout)
 }
-func Version() string {
-	return original.Version()
+func NewPartitionLoadsClientWithBaseURI(baseURI string, timeout *int32) PartitionLoadsClient {
+	return original.NewPartitionLoadsClientWithBaseURI(baseURI, timeout)
 }
diff --git a/profiles/latest/sql/mgmt/sql/models.go b/profiles/latest/sql/mgmt/sql/models.go
index 0a61cc4f9901..d6dc28796f88 100644
--- a/profiles/latest/sql/mgmt/sql/models.go
+++ b/profiles/latest/sql/mgmt/sql/models.go
@@ -21,28 +21,6 @@ package sql
 
 import original "github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2014-04-01/sql"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type DatabasesClient = original.DatabasesClient
-
-func NewDatabasesClient(subscriptionID string) DatabasesClient {
-	return original.NewDatabasesClient(subscriptionID)
-}
-func NewDatabasesClientWithBaseURI(baseURI string, subscriptionID string) DatabasesClient {
-	return original.NewDatabasesClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type DatabaseThreatDetectionPoliciesClient = original.DatabaseThreatDetectionPoliciesClient
 
 func NewDatabaseThreatDetectionPoliciesClient(subscriptionID string) DatabaseThreatDetectionPoliciesClient {
@@ -52,22 +30,13 @@ func NewDatabaseThreatDetectionPoliciesClientWithBaseURI(baseURI string, subscri
 	return original.NewDatabaseThreatDetectionPoliciesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ElasticPoolActivitiesClient = original.ElasticPoolActivitiesClient
-
-func NewElasticPoolActivitiesClient(subscriptionID string) ElasticPoolActivitiesClient {
-	return original.NewElasticPoolActivitiesClient(subscriptionID)
-}
-func NewElasticPoolActivitiesClientWithBaseURI(baseURI string, subscriptionID string) ElasticPoolActivitiesClient {
-	return original.NewElasticPoolActivitiesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ElasticPoolDatabaseActivitiesClient = original.ElasticPoolDatabaseActivitiesClient
+type RecommendedElasticPoolsClient = original.RecommendedElasticPoolsClient
 
-func NewElasticPoolDatabaseActivitiesClient(subscriptionID string) ElasticPoolDatabaseActivitiesClient {
-	return original.NewElasticPoolDatabaseActivitiesClient(subscriptionID)
+func NewRecommendedElasticPoolsClient(subscriptionID string) RecommendedElasticPoolsClient {
+	return original.NewRecommendedElasticPoolsClient(subscriptionID)
 }
-func NewElasticPoolDatabaseActivitiesClientWithBaseURI(baseURI string, subscriptionID string) ElasticPoolDatabaseActivitiesClient {
-	return original.NewElasticPoolDatabaseActivitiesClientWithBaseURI(baseURI, subscriptionID)
+func NewRecommendedElasticPoolsClientWithBaseURI(baseURI string, subscriptionID string) RecommendedElasticPoolsClient {
+	return original.NewRecommendedElasticPoolsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ElasticPoolsClient = original.ElasticPoolsClient
@@ -79,13 +48,22 @@ func NewElasticPoolsClientWithBaseURI(baseURI string, subscriptionID string) Ela
 	return original.NewElasticPoolsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type FirewallRulesClient = original.FirewallRulesClient
+type ServersClient = original.ServersClient
 
-func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClient(subscriptionID)
+func NewServersClient(subscriptionID string) ServersClient {
+	return original.NewServersClient(subscriptionID)
 }
-func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
+func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersClient {
+	return original.NewServersClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type TransparentDataEncryptionsClient = original.TransparentDataEncryptionsClient
+
+func NewTransparentDataEncryptionsClient(subscriptionID string) TransparentDataEncryptionsClient {
+	return original.NewTransparentDataEncryptionsClient(subscriptionID)
+}
+func NewTransparentDataEncryptionsClientWithBaseURI(baseURI string, subscriptionID string) TransparentDataEncryptionsClient {
+	return original.NewTransparentDataEncryptionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AuthenticationType = original.AuthenticationType
@@ -466,40 +444,46 @@ type TransparentDataEncryptionActivity = original.TransparentDataEncryptionActiv
 type TransparentDataEncryptionActivityListResult = original.TransparentDataEncryptionActivityListResult
 type TransparentDataEncryptionActivityProperties = original.TransparentDataEncryptionActivityProperties
 type TransparentDataEncryptionProperties = original.TransparentDataEncryptionProperties
-type RecommendedElasticPoolsClient = original.RecommendedElasticPoolsClient
+type DatabasesClient = original.DatabasesClient
 
-func NewRecommendedElasticPoolsClient(subscriptionID string) RecommendedElasticPoolsClient {
-	return original.NewRecommendedElasticPoolsClient(subscriptionID)
+func NewDatabasesClient(subscriptionID string) DatabasesClient {
+	return original.NewDatabasesClient(subscriptionID)
 }
-func NewRecommendedElasticPoolsClientWithBaseURI(baseURI string, subscriptionID string) RecommendedElasticPoolsClient {
-	return original.NewRecommendedElasticPoolsClientWithBaseURI(baseURI, subscriptionID)
+func NewDatabasesClientWithBaseURI(baseURI string, subscriptionID string) DatabasesClient {
+	return original.NewDatabasesClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
+}
+func Version() string {
+	return original.Version()
 }
 
-type ReplicationLinksClient = original.ReplicationLinksClient
+type ElasticPoolDatabaseActivitiesClient = original.ElasticPoolDatabaseActivitiesClient
 
-func NewReplicationLinksClient(subscriptionID string) ReplicationLinksClient {
-	return original.NewReplicationLinksClient(subscriptionID)
+func NewElasticPoolDatabaseActivitiesClient(subscriptionID string) ElasticPoolDatabaseActivitiesClient {
+	return original.NewElasticPoolDatabaseActivitiesClient(subscriptionID)
 }
-func NewReplicationLinksClientWithBaseURI(baseURI string, subscriptionID string) ReplicationLinksClient {
-	return original.NewReplicationLinksClientWithBaseURI(baseURI, subscriptionID)
+func NewElasticPoolDatabaseActivitiesClientWithBaseURI(baseURI string, subscriptionID string) ElasticPoolDatabaseActivitiesClient {
+	return original.NewElasticPoolDatabaseActivitiesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ServersClient = original.ServersClient
+type FirewallRulesClient = original.FirewallRulesClient
 
-func NewServersClient(subscriptionID string) ServersClient {
-	return original.NewServersClient(subscriptionID)
+func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClient(subscriptionID)
 }
-func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersClient {
-	return original.NewServersClientWithBaseURI(baseURI, subscriptionID)
+func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ServiceTierAdvisorsClient = original.ServiceTierAdvisorsClient
+type ElasticPoolActivitiesClient = original.ElasticPoolActivitiesClient
 
-func NewServiceTierAdvisorsClient(subscriptionID string) ServiceTierAdvisorsClient {
-	return original.NewServiceTierAdvisorsClient(subscriptionID)
+func NewElasticPoolActivitiesClient(subscriptionID string) ElasticPoolActivitiesClient {
+	return original.NewElasticPoolActivitiesClient(subscriptionID)
 }
-func NewServiceTierAdvisorsClientWithBaseURI(baseURI string, subscriptionID string) ServiceTierAdvisorsClient {
-	return original.NewServiceTierAdvisorsClientWithBaseURI(baseURI, subscriptionID)
+func NewElasticPoolActivitiesClientWithBaseURI(baseURI string, subscriptionID string) ElasticPoolActivitiesClient {
+	return original.NewElasticPoolActivitiesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type TransparentDataEncryptionActivitiesClient = original.TransparentDataEncryptionActivitiesClient
@@ -511,17 +495,33 @@ func NewTransparentDataEncryptionActivitiesClientWithBaseURI(baseURI string, sub
 	return original.NewTransparentDataEncryptionActivitiesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TransparentDataEncryptionsClient = original.TransparentDataEncryptionsClient
+type ReplicationLinksClient = original.ReplicationLinksClient
 
-func NewTransparentDataEncryptionsClient(subscriptionID string) TransparentDataEncryptionsClient {
-	return original.NewTransparentDataEncryptionsClient(subscriptionID)
+func NewReplicationLinksClient(subscriptionID string) ReplicationLinksClient {
+	return original.NewReplicationLinksClient(subscriptionID)
 }
-func NewTransparentDataEncryptionsClientWithBaseURI(baseURI string, subscriptionID string) TransparentDataEncryptionsClient {
-	return original.NewTransparentDataEncryptionsClientWithBaseURI(baseURI, subscriptionID)
+func NewReplicationLinksClientWithBaseURI(baseURI string, subscriptionID string) ReplicationLinksClient {
+	return original.NewReplicationLinksClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
+
+type ServiceTierAdvisorsClient = original.ServiceTierAdvisorsClient
+
+func NewServiceTierAdvisorsClient(subscriptionID string) ServiceTierAdvisorsClient {
+	return original.NewServiceTierAdvisorsClient(subscriptionID)
+}
+func NewServiceTierAdvisorsClientWithBaseURI(baseURI string, subscriptionID string) ServiceTierAdvisorsClient {
+	return original.NewServiceTierAdvisorsClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/storage/mgmt/storage/models.go b/profiles/latest/storage/mgmt/storage/models.go
index 5d195b709033..981c5e3b2db6 100644
--- a/profiles/latest/storage/mgmt/storage/models.go
+++ b/profiles/latest/storage/mgmt/storage/models.go
@@ -21,26 +21,31 @@ package storage
 
 import original "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage"
 
-type AccountsClient = original.AccountsClient
+type OperationsClient = original.OperationsClient
 
-func NewAccountsClient(subscriptionID string) AccountsClient {
-	return original.NewAccountsClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
-	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type SkusClient = original.SkusClient
 
-type BaseClient = original.BaseClient
+func NewSkusClient(subscriptionID string) SkusClient {
+	return original.NewSkusClient(subscriptionID)
+}
+func NewSkusClientWithBaseURI(baseURI string, subscriptionID string) SkusClient {
+	return original.NewSkusClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type UsageClient = original.UsageClient
+
+func NewUsageClient(subscriptionID string) UsageClient {
+	return original.NewUsageClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewUsageClientWithBaseURI(baseURI string, subscriptionID string) UsageClient {
+	return original.NewUsageClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccessTier = original.AccessTier
@@ -329,35 +334,32 @@ type Usage = original.Usage
 type UsageListResult = original.UsageListResult
 type UsageName = original.UsageName
 type VirtualNetworkRule = original.VirtualNetworkRule
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type SkusClient = original.SkusClient
+type AccountsClient = original.AccountsClient
 
-func NewSkusClient(subscriptionID string) SkusClient {
-	return original.NewSkusClient(subscriptionID)
+func NewAccountsClient(subscriptionID string) AccountsClient {
+	return original.NewAccountsClient(subscriptionID)
 }
-func NewSkusClientWithBaseURI(baseURI string, subscriptionID string) SkusClient {
-	return original.NewSkusClientWithBaseURI(baseURI, subscriptionID)
+func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
+	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UsageClient = original.UsageClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewUsageClient(subscriptionID string) UsageClient {
-	return original.NewUsageClient(subscriptionID)
-}
-func NewUsageClientWithBaseURI(baseURI string, subscriptionID string) UsageClient {
-	return original.NewUsageClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/storageimportexport/mgmt/storageimportexport/models.go b/profiles/latest/storageimportexport/mgmt/storageimportexport/models.go
index d3cb203714c6..8144fa48829b 100644
--- a/profiles/latest/storageimportexport/mgmt/storageimportexport/models.go
+++ b/profiles/latest/storageimportexport/mgmt/storageimportexport/models.go
@@ -21,26 +21,22 @@ package storageimportexport
 
 import original "github.com/Azure/azure-sdk-for-go/services/storageimportexport/mgmt/2016-11-01/storageimportexport"
 
-type BitLockerKeysClient = original.BitLockerKeysClient
+type OperationsClient = original.OperationsClient
 
-func NewBitLockerKeysClient(subscriptionID string, acceptLanguage string) BitLockerKeysClient {
-	return original.NewBitLockerKeysClient(subscriptionID, acceptLanguage)
+func NewOperationsClient(subscriptionID string, acceptLanguage string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID, acceptLanguage)
 }
-func NewBitLockerKeysClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) BitLockerKeysClient {
-	return original.NewBitLockerKeysClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type LocationsClient = original.LocationsClient
 
-func New(subscriptionID string, acceptLanguage string) BaseClient {
-	return original.New(subscriptionID, acceptLanguage)
+func NewLocationsClient(subscriptionID string, acceptLanguage string) LocationsClient {
+	return original.NewLocationsClient(subscriptionID, acceptLanguage)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID, acceptLanguage)
+func NewLocationsClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) LocationsClient {
+	return original.NewLocationsClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
 }
 
 type JobsClient = original.JobsClient
@@ -52,15 +48,6 @@ func NewJobsClientWithBaseURI(baseURI string, subscriptionID string, acceptLangu
 	return original.NewJobsClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
 }
 
-type LocationsClient = original.LocationsClient
-
-func NewLocationsClient(subscriptionID string, acceptLanguage string) LocationsClient {
-	return original.NewLocationsClient(subscriptionID, acceptLanguage)
-}
-func NewLocationsClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) LocationsClient {
-	return original.NewLocationsClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
-}
-
 type DriveState = original.DriveState
 
 const (
@@ -103,17 +90,32 @@ type ReturnShipping = original.ReturnShipping
 type ShippingInformation = original.ShippingInformation
 type UpdateJobParameters = original.UpdateJobParameters
 type UpdateJobParametersProperties = original.UpdateJobParametersProperties
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string, acceptLanguage string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID, acceptLanguage)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
 }
 func Version() string {
 	return original.Version()
 }
+
+type BitLockerKeysClient = original.BitLockerKeysClient
+
+func NewBitLockerKeysClient(subscriptionID string, acceptLanguage string) BitLockerKeysClient {
+	return original.NewBitLockerKeysClient(subscriptionID, acceptLanguage)
+}
+func NewBitLockerKeysClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) BitLockerKeysClient {
+	return original.NewBitLockerKeysClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string, acceptLanguage string) BaseClient {
+	return original.New(subscriptionID, acceptLanguage)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID, acceptLanguage)
+}
diff --git a/profiles/latest/storsimple8000series/mgmt/storsimple/models.go b/profiles/latest/storsimple8000series/mgmt/storsimple/models.go
index 94bfb88e2b43..2f8a953f8f28 100644
--- a/profiles/latest/storsimple8000series/mgmt/storsimple/models.go
+++ b/profiles/latest/storsimple8000series/mgmt/storsimple/models.go
@@ -21,71 +21,58 @@ package storsimple
 
 import original "github.com/Azure/azure-sdk-for-go/services/storsimple8000series/mgmt/2017-06-01/storsimple"
 
-type AccessControlRecordsClient = original.AccessControlRecordsClient
-
-func NewAccessControlRecordsClient(subscriptionID string) AccessControlRecordsClient {
-	return original.NewAccessControlRecordsClient(subscriptionID)
-}
-func NewAccessControlRecordsClientWithBaseURI(baseURI string, subscriptionID string) AccessControlRecordsClient {
-	return original.NewAccessControlRecordsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type AlertsClient = original.AlertsClient
+type DevicesClient = original.DevicesClient
 
-func NewAlertsClient(subscriptionID string) AlertsClient {
-	return original.NewAlertsClient(subscriptionID)
+func NewDevicesClient(subscriptionID string) DevicesClient {
+	return original.NewDevicesClient(subscriptionID)
 }
-func NewAlertsClientWithBaseURI(baseURI string, subscriptionID string) AlertsClient {
-	return original.NewAlertsClientWithBaseURI(baseURI, subscriptionID)
+func NewDevicesClientWithBaseURI(baseURI string, subscriptionID string) DevicesClient {
+	return original.NewDevicesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type BackupPoliciesClient = original.BackupPoliciesClient
+type StorageAccountCredentialsClient = original.StorageAccountCredentialsClient
 
-func NewBackupPoliciesClient(subscriptionID string) BackupPoliciesClient {
-	return original.NewBackupPoliciesClient(subscriptionID)
+func NewStorageAccountCredentialsClient(subscriptionID string) StorageAccountCredentialsClient {
+	return original.NewStorageAccountCredentialsClient(subscriptionID)
 }
-func NewBackupPoliciesClientWithBaseURI(baseURI string, subscriptionID string) BackupPoliciesClient {
-	return original.NewBackupPoliciesClientWithBaseURI(baseURI, subscriptionID)
+func NewStorageAccountCredentialsClientWithBaseURI(baseURI string, subscriptionID string) StorageAccountCredentialsClient {
+	return original.NewStorageAccountCredentialsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type BackupsClient = original.BackupsClient
+type HardwareComponentGroupsClient = original.HardwareComponentGroupsClient
 
-func NewBackupsClient(subscriptionID string) BackupsClient {
-	return original.NewBackupsClient(subscriptionID)
+func NewHardwareComponentGroupsClient(subscriptionID string) HardwareComponentGroupsClient {
+	return original.NewHardwareComponentGroupsClient(subscriptionID)
 }
-func NewBackupsClientWithBaseURI(baseURI string, subscriptionID string) BackupsClient {
-	return original.NewBackupsClientWithBaseURI(baseURI, subscriptionID)
+func NewHardwareComponentGroupsClientWithBaseURI(baseURI string, subscriptionID string) HardwareComponentGroupsClient {
+	return original.NewHardwareComponentGroupsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type BackupSchedulesClient = original.BackupSchedulesClient
+type AccessControlRecordsClient = original.AccessControlRecordsClient
 
-func NewBackupSchedulesClient(subscriptionID string) BackupSchedulesClient {
-	return original.NewBackupSchedulesClient(subscriptionID)
+func NewAccessControlRecordsClient(subscriptionID string) AccessControlRecordsClient {
+	return original.NewAccessControlRecordsClient(subscriptionID)
 }
-func NewBackupSchedulesClientWithBaseURI(baseURI string, subscriptionID string) BackupSchedulesClient {
-	return original.NewBackupSchedulesClientWithBaseURI(baseURI, subscriptionID)
+func NewAccessControlRecordsClientWithBaseURI(baseURI string, subscriptionID string) AccessControlRecordsClient {
+	return original.NewAccessControlRecordsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type BandwidthSettingsClient = original.BandwidthSettingsClient
+type VolumesClient = original.VolumesClient
 
-func NewBandwidthSettingsClient(subscriptionID string) BandwidthSettingsClient {
-	return original.NewBandwidthSettingsClient(subscriptionID)
+func NewVolumesClient(subscriptionID string) VolumesClient {
+	return original.NewVolumesClient(subscriptionID)
 }
-func NewBandwidthSettingsClientWithBaseURI(baseURI string, subscriptionID string) BandwidthSettingsClient {
-	return original.NewBandwidthSettingsClientWithBaseURI(baseURI, subscriptionID)
+func NewVolumesClientWithBaseURI(baseURI string, subscriptionID string) VolumesClient {
+	return original.NewVolumesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type CloudAppliancesClient = original.CloudAppliancesClient
@@ -97,13 +84,13 @@ func NewCloudAppliancesClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewCloudAppliancesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DevicesClient = original.DevicesClient
+type BackupSchedulesClient = original.BackupSchedulesClient
 
-func NewDevicesClient(subscriptionID string) DevicesClient {
-	return original.NewDevicesClient(subscriptionID)
+func NewBackupSchedulesClient(subscriptionID string) BackupSchedulesClient {
+	return original.NewBackupSchedulesClient(subscriptionID)
 }
-func NewDevicesClientWithBaseURI(baseURI string, subscriptionID string) DevicesClient {
-	return original.NewDevicesClientWithBaseURI(baseURI, subscriptionID)
+func NewBackupSchedulesClientWithBaseURI(baseURI string, subscriptionID string) BackupSchedulesClient {
+	return original.NewBackupSchedulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type DeviceSettingsClient = original.DeviceSettingsClient
@@ -115,15 +102,6 @@ func NewDeviceSettingsClientWithBaseURI(baseURI string, subscriptionID string) D
 	return original.NewDeviceSettingsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type HardwareComponentGroupsClient = original.HardwareComponentGroupsClient
-
-func NewHardwareComponentGroupsClient(subscriptionID string) HardwareComponentGroupsClient {
-	return original.NewHardwareComponentGroupsClient(subscriptionID)
-}
-func NewHardwareComponentGroupsClientWithBaseURI(baseURI string, subscriptionID string) HardwareComponentGroupsClient {
-	return original.NewHardwareComponentGroupsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type JobsClient = original.JobsClient
 
 func NewJobsClient(subscriptionID string) JobsClient {
@@ -133,13 +111,22 @@ func NewJobsClientWithBaseURI(baseURI string, subscriptionID string) JobsClient
 	return original.NewJobsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ManagersClient = original.ManagersClient
+type AlertsClient = original.AlertsClient
 
-func NewManagersClient(subscriptionID string) ManagersClient {
-	return original.NewManagersClient(subscriptionID)
+func NewAlertsClient(subscriptionID string) AlertsClient {
+	return original.NewAlertsClient(subscriptionID)
 }
-func NewManagersClientWithBaseURI(baseURI string, subscriptionID string) ManagersClient {
-	return original.NewManagersClientWithBaseURI(baseURI, subscriptionID)
+func NewAlertsClientWithBaseURI(baseURI string, subscriptionID string) AlertsClient {
+	return original.NewAlertsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type BackupsClient = original.BackupsClient
+
+func NewBackupsClient(subscriptionID string) BackupsClient {
+	return original.NewBackupsClient(subscriptionID)
+}
+func NewBackupsClientWithBaseURI(baseURI string, subscriptionID string) BackupsClient {
+	return original.NewBackupsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AlertEmailNotificationStatus = original.AlertEmailNotificationStatus
@@ -919,22 +906,13 @@ type VolumeProperties = original.VolumeProperties
 type VolumesCreateOrUpdateFuture = original.VolumesCreateOrUpdateFuture
 type VolumesDeleteFuture = original.VolumesDeleteFuture
 type WebproxySettings = original.WebproxySettings
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type StorageAccountCredentialsClient = original.StorageAccountCredentialsClient
+type BackupPoliciesClient = original.BackupPoliciesClient
 
-func NewStorageAccountCredentialsClient(subscriptionID string) StorageAccountCredentialsClient {
-	return original.NewStorageAccountCredentialsClient(subscriptionID)
+func NewBackupPoliciesClient(subscriptionID string) BackupPoliciesClient {
+	return original.NewBackupPoliciesClient(subscriptionID)
 }
-func NewStorageAccountCredentialsClientWithBaseURI(baseURI string, subscriptionID string) StorageAccountCredentialsClient {
-	return original.NewStorageAccountCredentialsClientWithBaseURI(baseURI, subscriptionID)
+func NewBackupPoliciesClientWithBaseURI(baseURI string, subscriptionID string) BackupPoliciesClient {
+	return original.NewBackupPoliciesClientWithBaseURI(baseURI, subscriptionID)
 }
 func UserAgent() string {
 	return original.UserAgent() + " profiles/latest"
@@ -952,11 +930,33 @@ func NewVolumeContainersClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewVolumeContainersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VolumesClient = original.VolumesClient
+type BandwidthSettingsClient = original.BandwidthSettingsClient
 
-func NewVolumesClient(subscriptionID string) VolumesClient {
-	return original.NewVolumesClient(subscriptionID)
+func NewBandwidthSettingsClient(subscriptionID string) BandwidthSettingsClient {
+	return original.NewBandwidthSettingsClient(subscriptionID)
 }
-func NewVolumesClientWithBaseURI(baseURI string, subscriptionID string) VolumesClient {
-	return original.NewVolumesClientWithBaseURI(baseURI, subscriptionID)
+func NewBandwidthSettingsClientWithBaseURI(baseURI string, subscriptionID string) BandwidthSettingsClient {
+	return original.NewBandwidthSettingsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
+
+type ManagersClient = original.ManagersClient
+
+func NewManagersClient(subscriptionID string) ManagersClient {
+	return original.NewManagersClient(subscriptionID)
+}
+func NewManagersClientWithBaseURI(baseURI string, subscriptionID string) ManagersClient {
+	return original.NewManagersClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/streamanalytics/mgmt/streamanalytics/models.go b/profiles/latest/streamanalytics/mgmt/streamanalytics/models.go
index 9286ef1b0f57..33c1673c7e1f 100644
--- a/profiles/latest/streamanalytics/mgmt/streamanalytics/models.go
+++ b/profiles/latest/streamanalytics/mgmt/streamanalytics/models.go
@@ -21,26 +21,22 @@ package streamanalytics
 
 import original "github.com/Azure/azure-sdk-for-go/services/streamanalytics/mgmt/2016-03-01/streamanalytics"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type FunctionsClient = original.FunctionsClient
+type TransformationsClient = original.TransformationsClient
 
-func NewFunctionsClient(subscriptionID string) FunctionsClient {
-	return original.NewFunctionsClient(subscriptionID)
+func NewTransformationsClient(subscriptionID string) TransformationsClient {
+	return original.NewTransformationsClient(subscriptionID)
 }
-func NewFunctionsClientWithBaseURI(baseURI string, subscriptionID string) FunctionsClient {
-	return original.NewFunctionsClientWithBaseURI(baseURI, subscriptionID)
+func NewTransformationsClientWithBaseURI(baseURI string, subscriptionID string) TransformationsClient {
+	return original.NewTransformationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type InputsClient = original.InputsClient
@@ -353,13 +349,28 @@ type SubscriptionQuotaProperties = original.SubscriptionQuotaProperties
 type SubscriptionQuotasListResult = original.SubscriptionQuotasListResult
 type Transformation = original.Transformation
 type TransformationProperties = original.TransformationProperties
-type OperationsClient = original.OperationsClient
+type FunctionsClient = original.FunctionsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewFunctionsClient(subscriptionID string) FunctionsClient {
+	return original.NewFunctionsClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewFunctionsClientWithBaseURI(baseURI string, subscriptionID string) FunctionsClient {
+	return original.NewFunctionsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type SubscriptionsClient = original.SubscriptionsClient
+
+func NewSubscriptionsClient(subscriptionID string) SubscriptionsClient {
+	return original.NewSubscriptionsClient(subscriptionID)
+}
+func NewSubscriptionsClientWithBaseURI(baseURI string, subscriptionID string) SubscriptionsClient {
+	return original.NewSubscriptionsClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
+}
+func Version() string {
+	return original.Version()
 }
 
 type OutputsClient = original.OutputsClient
@@ -380,26 +391,15 @@ func NewStreamingJobsClientWithBaseURI(baseURI string, subscriptionID string) St
 	return original.NewStreamingJobsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SubscriptionsClient = original.SubscriptionsClient
-
-func NewSubscriptionsClient(subscriptionID string) SubscriptionsClient {
-	return original.NewSubscriptionsClient(subscriptionID)
-}
-func NewSubscriptionsClientWithBaseURI(baseURI string, subscriptionID string) SubscriptionsClient {
-	return original.NewSubscriptionsClientWithBaseURI(baseURI, subscriptionID)
-}
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-type TransformationsClient = original.TransformationsClient
+type BaseClient = original.BaseClient
 
-func NewTransformationsClient(subscriptionID string) TransformationsClient {
-	return original.NewTransformationsClient(subscriptionID)
-}
-func NewTransformationsClientWithBaseURI(baseURI string, subscriptionID string) TransformationsClient {
-	return original.NewTransformationsClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/latest/timeseriesinsights/mgmt/timeseriesinsights/models.go b/profiles/latest/timeseriesinsights/mgmt/timeseriesinsights/models.go
index 159a502cb0a7..1a1b8765a1c3 100644
--- a/profiles/latest/timeseriesinsights/mgmt/timeseriesinsights/models.go
+++ b/profiles/latest/timeseriesinsights/mgmt/timeseriesinsights/models.go
@@ -21,35 +21,13 @@ package timeseriesinsights
 
 import original "github.com/Azure/azure-sdk-for-go/services/timeseriesinsights/mgmt/2017-11-15/timeseriesinsights"
 
-type AccessPoliciesClient = original.AccessPoliciesClient
-
-func NewAccessPoliciesClient(subscriptionID string) AccessPoliciesClient {
-	return original.NewAccessPoliciesClient(subscriptionID)
-}
-func NewAccessPoliciesClientWithBaseURI(baseURI string, subscriptionID string) AccessPoliciesClient {
-	return original.NewAccessPoliciesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type EnvironmentsClient = original.EnvironmentsClient
+type OperationsClient = original.OperationsClient
 
-func NewEnvironmentsClient(subscriptionID string) EnvironmentsClient {
-	return original.NewEnvironmentsClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewEnvironmentsClientWithBaseURI(baseURI string, subscriptionID string) EnvironmentsClient {
-	return original.NewEnvironmentsClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type EventSourcesClient = original.EventSourcesClient
@@ -61,6 +39,15 @@ func NewEventSourcesClientWithBaseURI(baseURI string, subscriptionID string) Eve
 	return original.NewEventSourcesClientWithBaseURI(baseURI, subscriptionID)
 }
 
+type AccessPoliciesClient = original.AccessPoliciesClient
+
+func NewAccessPoliciesClient(subscriptionID string) AccessPoliciesClient {
+	return original.NewAccessPoliciesClient(subscriptionID)
+}
+func NewAccessPoliciesClientWithBaseURI(baseURI string, subscriptionID string) AccessPoliciesClient {
+	return original.NewAccessPoliciesClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type AccessPolicyRole = original.AccessPolicyRole
 
 const (
@@ -246,13 +233,34 @@ type Resource = original.Resource
 type ResourceProperties = original.ResourceProperties
 type Sku = original.Sku
 type TrackedResource = original.TrackedResource
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
+}
+
+type EnvironmentsClient = original.EnvironmentsClient
+
+func NewEnvironmentsClient(subscriptionID string) EnvironmentsClient {
+	return original.NewEnvironmentsClient(subscriptionID)
+}
+func NewEnvironmentsClientWithBaseURI(baseURI string, subscriptionID string) EnvironmentsClient {
+	return original.NewEnvironmentsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
 type ReferenceDataSetsClient = original.ReferenceDataSetsClient
@@ -263,9 +271,3 @@ func NewReferenceDataSetsClient(subscriptionID string) ReferenceDataSetsClient {
 func NewReferenceDataSetsClientWithBaseURI(baseURI string, subscriptionID string) ReferenceDataSetsClient {
 	return original.NewReferenceDataSetsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
-}
-func Version() string {
-	return original.Version()
-}
diff --git a/profiles/latest/trafficmanager/mgmt/trafficmanager/models.go b/profiles/latest/trafficmanager/mgmt/trafficmanager/models.go
index 68ca41c38591..48701587fafb 100644
--- a/profiles/latest/trafficmanager/mgmt/trafficmanager/models.go
+++ b/profiles/latest/trafficmanager/mgmt/trafficmanager/models.go
@@ -21,28 +21,6 @@ package trafficmanager
 
 import original "github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2017-05-01/trafficmanager"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type EndpointsClient = original.EndpointsClient
-
-func NewEndpointsClient(subscriptionID string) EndpointsClient {
-	return original.NewEndpointsClient(subscriptionID)
-}
-func NewEndpointsClientWithBaseURI(baseURI string, subscriptionID string) EndpointsClient {
-	return original.NewEndpointsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type GeographicHierarchiesClient = original.GeographicHierarchiesClient
 
 func NewGeographicHierarchiesClient(subscriptionID string) GeographicHierarchiesClient {
@@ -160,3 +138,25 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type EndpointsClient = original.EndpointsClient
+
+func NewEndpointsClient(subscriptionID string) EndpointsClient {
+	return original.NewEndpointsClient(subscriptionID)
+}
+func NewEndpointsClientWithBaseURI(baseURI string, subscriptionID string) EndpointsClient {
+	return original.NewEndpointsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/latest/web/mgmt/web/models.go b/profiles/latest/web/mgmt/web/models.go
index 2eb64d79ed09..077b1a97ee7f 100644
--- a/profiles/latest/web/mgmt/web/models.go
+++ b/profiles/latest/web/mgmt/web/models.go
@@ -21,24 +21,6 @@ package web
 
 import original "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web"
 
-type AppsClient = original.AppsClient
-
-func NewAppsClient(subscriptionID string) AppsClient {
-	return original.NewAppsClient(subscriptionID)
-}
-func NewAppsClientWithBaseURI(baseURI string, subscriptionID string) AppsClient {
-	return original.NewAppsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type AppServiceCertificateOrdersClient = original.AppServiceCertificateOrdersClient
-
-func NewAppServiceCertificateOrdersClient(subscriptionID string) AppServiceCertificateOrdersClient {
-	return original.NewAppServiceCertificateOrdersClient(subscriptionID)
-}
-func NewAppServiceCertificateOrdersClientWithBaseURI(baseURI string, subscriptionID string) AppServiceCertificateOrdersClient {
-	return original.NewAppServiceCertificateOrdersClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type AppServiceEnvironmentsClient = original.AppServiceEnvironmentsClient
 
 func NewAppServiceEnvironmentsClient(subscriptionID string) AppServiceEnvironmentsClient {
@@ -48,13 +30,13 @@ func NewAppServiceEnvironmentsClientWithBaseURI(baseURI string, subscriptionID s
 	return original.NewAppServiceEnvironmentsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type AppServicePlansClient = original.AppServicePlansClient
+type ProviderClient = original.ProviderClient
 
-func NewAppServicePlansClient(subscriptionID string) AppServicePlansClient {
-	return original.NewAppServicePlansClient(subscriptionID)
+func NewProviderClient(subscriptionID string) ProviderClient {
+	return original.NewProviderClient(subscriptionID)
 }
-func NewAppServicePlansClientWithBaseURI(baseURI string, subscriptionID string) AppServicePlansClient {
-	return original.NewAppServicePlansClientWithBaseURI(baseURI, subscriptionID)
+func NewProviderClientWithBaseURI(baseURI string, subscriptionID string) ProviderClient {
+	return original.NewProviderClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type BillingMetersClient = original.BillingMetersClient
@@ -66,44 +48,22 @@ func NewBillingMetersClientWithBaseURI(baseURI string, subscriptionID string) Bi
 	return original.NewBillingMetersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CertificateRegistrationProviderClient = original.CertificateRegistrationProviderClient
-
-func NewCertificateRegistrationProviderClient(subscriptionID string) CertificateRegistrationProviderClient {
-	return original.NewCertificateRegistrationProviderClient(subscriptionID)
-}
-func NewCertificateRegistrationProviderClientWithBaseURI(baseURI string, subscriptionID string) CertificateRegistrationProviderClient {
-	return original.NewCertificateRegistrationProviderClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type CertificatesClient = original.CertificatesClient
-
-func NewCertificatesClient(subscriptionID string) CertificatesClient {
-	return original.NewCertificatesClient(subscriptionID)
-}
-func NewCertificatesClientWithBaseURI(baseURI string, subscriptionID string) CertificatesClient {
-	return original.NewCertificatesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type TopLevelDomainsClient = original.TopLevelDomainsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewTopLevelDomainsClient(subscriptionID string) TopLevelDomainsClient {
+	return original.NewTopLevelDomainsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewTopLevelDomainsClientWithBaseURI(baseURI string, subscriptionID string) TopLevelDomainsClient {
+	return original.NewTopLevelDomainsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DeletedWebAppsClient = original.DeletedWebAppsClient
+type AppServicePlansClient = original.AppServicePlansClient
 
-func NewDeletedWebAppsClient(subscriptionID string) DeletedWebAppsClient {
-	return original.NewDeletedWebAppsClient(subscriptionID)
+func NewAppServicePlansClient(subscriptionID string) AppServicePlansClient {
+	return original.NewAppServicePlansClient(subscriptionID)
 }
-func NewDeletedWebAppsClientWithBaseURI(baseURI string, subscriptionID string) DeletedWebAppsClient {
-	return original.NewDeletedWebAppsClientWithBaseURI(baseURI, subscriptionID)
+func NewAppServicePlansClientWithBaseURI(baseURI string, subscriptionID string) AppServicePlansClient {
+	return original.NewAppServicePlansClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type DiagnosticsClient = original.DiagnosticsClient
@@ -124,13 +84,13 @@ func NewDomainRegistrationProviderClientWithBaseURI(baseURI string, subscription
 	return original.NewDomainRegistrationProviderClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DomainsClient = original.DomainsClient
+type AppsClient = original.AppsClient
 
-func NewDomainsClient(subscriptionID string) DomainsClient {
-	return original.NewDomainsClient(subscriptionID)
+func NewAppsClient(subscriptionID string) AppsClient {
+	return original.NewAppsClient(subscriptionID)
 }
-func NewDomainsClientWithBaseURI(baseURI string, subscriptionID string) DomainsClient {
-	return original.NewDomainsClientWithBaseURI(baseURI, subscriptionID)
+func NewAppsClientWithBaseURI(baseURI string, subscriptionID string) AppsClient {
+	return original.NewAppsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccessControlEntryAction = original.AccessControlEntryAction
@@ -1410,13 +1370,28 @@ type WorkerPoolCollection = original.WorkerPoolCollection
 type WorkerPoolCollectionIterator = original.WorkerPoolCollectionIterator
 type WorkerPoolCollectionPage = original.WorkerPoolCollectionPage
 type WorkerPoolResource = original.WorkerPoolResource
-type ProviderClient = original.ProviderClient
+type CertificateRegistrationProviderClient = original.CertificateRegistrationProviderClient
 
-func NewProviderClient(subscriptionID string) ProviderClient {
-	return original.NewProviderClient(subscriptionID)
+func NewCertificateRegistrationProviderClient(subscriptionID string) CertificateRegistrationProviderClient {
+	return original.NewCertificateRegistrationProviderClient(subscriptionID)
 }
-func NewProviderClientWithBaseURI(baseURI string, subscriptionID string) ProviderClient {
-	return original.NewProviderClientWithBaseURI(baseURI, subscriptionID)
+func NewCertificateRegistrationProviderClientWithBaseURI(baseURI string, subscriptionID string) CertificateRegistrationProviderClient {
+	return original.NewCertificateRegistrationProviderClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/latest"
+}
+func Version() string {
+	return original.Version()
+}
+
+type CertificatesClient = original.CertificatesClient
+
+func NewCertificatesClient(subscriptionID string) CertificatesClient {
+	return original.NewCertificatesClient(subscriptionID)
+}
+func NewCertificatesClientWithBaseURI(baseURI string, subscriptionID string) CertificatesClient {
+	return original.NewCertificatesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type RecommendationsClient = original.RecommendationsClient
@@ -1428,26 +1403,51 @@ func NewRecommendationsClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewRecommendationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ResourceHealthMetadataClient = original.ResourceHealthMetadataClient
+type DomainsClient = original.DomainsClient
 
-func NewResourceHealthMetadataClient(subscriptionID string) ResourceHealthMetadataClient {
-	return original.NewResourceHealthMetadataClient(subscriptionID)
+func NewDomainsClient(subscriptionID string) DomainsClient {
+	return original.NewDomainsClient(subscriptionID)
 }
-func NewResourceHealthMetadataClientWithBaseURI(baseURI string, subscriptionID string) ResourceHealthMetadataClient {
-	return original.NewResourceHealthMetadataClientWithBaseURI(baseURI, subscriptionID)
+func NewDomainsClientWithBaseURI(baseURI string, subscriptionID string) DomainsClient {
+	return original.NewDomainsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TopLevelDomainsClient = original.TopLevelDomainsClient
+type AppServiceCertificateOrdersClient = original.AppServiceCertificateOrdersClient
 
-func NewTopLevelDomainsClient(subscriptionID string) TopLevelDomainsClient {
-	return original.NewTopLevelDomainsClient(subscriptionID)
+func NewAppServiceCertificateOrdersClient(subscriptionID string) AppServiceCertificateOrdersClient {
+	return original.NewAppServiceCertificateOrdersClient(subscriptionID)
 }
-func NewTopLevelDomainsClientWithBaseURI(baseURI string, subscriptionID string) TopLevelDomainsClient {
-	return original.NewTopLevelDomainsClientWithBaseURI(baseURI, subscriptionID)
+func NewAppServiceCertificateOrdersClientWithBaseURI(baseURI string, subscriptionID string) AppServiceCertificateOrdersClient {
+	return original.NewAppServiceCertificateOrdersClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/latest"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
+
+type DeletedWebAppsClient = original.DeletedWebAppsClient
+
+func NewDeletedWebAppsClient(subscriptionID string) DeletedWebAppsClient {
+	return original.NewDeletedWebAppsClient(subscriptionID)
+}
+func NewDeletedWebAppsClientWithBaseURI(baseURI string, subscriptionID string) DeletedWebAppsClient {
+	return original.NewDeletedWebAppsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ResourceHealthMetadataClient = original.ResourceHealthMetadataClient
+
+func NewResourceHealthMetadataClient(subscriptionID string) ResourceHealthMetadataClient {
+	return original.NewResourceHealthMetadataClient(subscriptionID)
+}
+func NewResourceHealthMetadataClientWithBaseURI(baseURI string, subscriptionID string) ResourceHealthMetadataClient {
+	return original.NewResourceHealthMetadataClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/addons/mgmt/addons/models.go b/profiles/preview/addons/mgmt/addons/models.go
index 4f014261c0df..328b70f54681 100644
--- a/profiles/preview/addons/mgmt/addons/models.go
+++ b/profiles/preview/addons/mgmt/addons/models.go
@@ -21,17 +21,22 @@ package addons
 
 import original "github.com/Azure/azure-sdk-for-go/services/addons/mgmt/2018-03-01/addons"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type SupportPlanTypesClient = original.SupportPlanTypesClient
 
-type BaseClient = original.BaseClient
+func NewSupportPlanTypesClient(subscriptionID string) SupportPlanTypesClient {
+	return original.NewSupportPlanTypesClient(subscriptionID)
+}
+func NewSupportPlanTypesClientWithBaseURI(baseURI string, subscriptionID string) SupportPlanTypesClient {
+	return original.NewSupportPlanTypesClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type OperationsClient = original.OperationsClient
+
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type OneTimeCharge = original.OneTimeCharge
@@ -96,26 +101,23 @@ type OperationsDefinition = original.OperationsDefinition
 type OperationsDisplayDefinition = original.OperationsDisplayDefinition
 type SupportPlanTypesCreateOrUpdateFuture = original.SupportPlanTypesCreateOrUpdateFuture
 type SupportPlanTypesDeleteFuture = original.SupportPlanTypesDeleteFuture
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 
-type SupportPlanTypesClient = original.SupportPlanTypesClient
-
-func NewSupportPlanTypesClient(subscriptionID string) SupportPlanTypesClient {
-	return original.NewSupportPlanTypesClient(subscriptionID)
-}
-func NewSupportPlanTypesClientWithBaseURI(baseURI string, subscriptionID string) SupportPlanTypesClient {
-	return original.NewSupportPlanTypesClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/advisor/mgmt/advisor/models.go b/profiles/preview/advisor/mgmt/advisor/models.go
index 92373b92858e..ab870be8026e 100644
--- a/profiles/preview/advisor/mgmt/advisor/models.go
+++ b/profiles/preview/advisor/mgmt/advisor/models.go
@@ -21,17 +21,13 @@ package advisor
 
 import original "github.com/Azure/azure-sdk-for-go/services/advisor/mgmt/2017-04-19/advisor"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ConfigurationsClient = original.ConfigurationsClient
@@ -104,13 +100,21 @@ type SuppressionContractListResult = original.SuppressionContractListResult
 type SuppressionContractListResultIterator = original.SuppressionContractListResultIterator
 type SuppressionContractListResultPage = original.SuppressionContractListResultPage
 type SuppressionProperties = original.SuppressionProperties
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
+}
+
+type SuppressionsClient = original.SuppressionsClient
+
+func NewSuppressionsClient(subscriptionID string) SuppressionsClient {
+	return original.NewSuppressionsClient(subscriptionID)
+}
+func NewSuppressionsClientWithBaseURI(baseURI string, subscriptionID string) SuppressionsClient {
+	return original.NewSuppressionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type RecommendationsClient = original.RecommendationsClient
@@ -122,17 +126,15 @@ func NewRecommendationsClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewRecommendationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SuppressionsClient = original.SuppressionsClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewSuppressionsClient(subscriptionID string) SuppressionsClient {
-	return original.NewSuppressionsClient(subscriptionID)
-}
-func NewSuppressionsClientWithBaseURI(baseURI string, subscriptionID string) SuppressionsClient {
-	return original.NewSuppressionsClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/analysisservices/mgmt/analysisservices/models.go b/profiles/preview/analysisservices/mgmt/analysisservices/models.go
index db5da3c807a4..38ac94942f20 100644
--- a/profiles/preview/analysisservices/mgmt/analysisservices/models.go
+++ b/profiles/preview/analysisservices/mgmt/analysisservices/models.go
@@ -21,17 +21,22 @@ package analysisservices
 
 import original "github.com/Azure/azure-sdk-for-go/services/analysisservices/mgmt/2017-08-01/analysisservices"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type OperationsClient = original.OperationsClient
 
-type BaseClient = original.BaseClient
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type ServersClient = original.ServersClient
+
+func NewServersClient(subscriptionID string) ServersClient {
+	return original.NewServersClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersClient {
+	return original.NewServersClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ConnectionMode = original.ConnectionMode
@@ -140,26 +145,23 @@ type ServerUpdateParameters = original.ServerUpdateParameters
 type SkuDetailsForExistingResource = original.SkuDetailsForExistingResource
 type SkuEnumerationForExistingResourceResult = original.SkuEnumerationForExistingResourceResult
 type SkuEnumerationForNewResourceResult = original.SkuEnumerationForNewResourceResult
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 
-type ServersClient = original.ServersClient
-
-func NewServersClient(subscriptionID string) ServersClient {
-	return original.NewServersClient(subscriptionID)
-}
-func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersClient {
-	return original.NewServersClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/apimanagement/mgmt/apimanagement/models.go b/profiles/preview/apimanagement/mgmt/apimanagement/models.go
index d182db423a7e..3fdd3b68cac7 100644
--- a/profiles/preview/apimanagement/mgmt/apimanagement/models.go
+++ b/profiles/preview/apimanagement/mgmt/apimanagement/models.go
@@ -21,157 +21,94 @@ package apimanagement
 
 import original "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2017-03-01/apimanagement"
 
-type APIClient = original.APIClient
-
-func NewAPIClient(subscriptionID string) APIClient {
-	return original.NewAPIClient(subscriptionID)
-}
-func NewAPIClientWithBaseURI(baseURI string, subscriptionID string) APIClient {
-	return original.NewAPIClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type APIDiagnosticClient = original.APIDiagnosticClient
-
-func NewAPIDiagnosticClient(subscriptionID string) APIDiagnosticClient {
-	return original.NewAPIDiagnosticClient(subscriptionID)
-}
-func NewAPIDiagnosticClientWithBaseURI(baseURI string, subscriptionID string) APIDiagnosticClient {
-	return original.NewAPIDiagnosticClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type APIDiagnosticLoggerClient = original.APIDiagnosticLoggerClient
-
-func NewAPIDiagnosticLoggerClient(subscriptionID string) APIDiagnosticLoggerClient {
-	return original.NewAPIDiagnosticLoggerClient(subscriptionID)
-}
-func NewAPIDiagnosticLoggerClientWithBaseURI(baseURI string, subscriptionID string) APIDiagnosticLoggerClient {
-	return original.NewAPIDiagnosticLoggerClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type APIExportClient = original.APIExportClient
-
-func NewAPIExportClient(subscriptionID string) APIExportClient {
-	return original.NewAPIExportClient(subscriptionID)
-}
-func NewAPIExportClientWithBaseURI(baseURI string, subscriptionID string) APIExportClient {
-	return original.NewAPIExportClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type APIIssuAttachmentClient = original.APIIssuAttachmentClient
-
-func NewAPIIssuAttachmentClient(subscriptionID string) APIIssuAttachmentClient {
-	return original.NewAPIIssuAttachmentClient(subscriptionID)
-}
-func NewAPIIssuAttachmentClientWithBaseURI(baseURI string, subscriptionID string) APIIssuAttachmentClient {
-	return original.NewAPIIssuAttachmentClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type APIIssuCommentClient = original.APIIssuCommentClient
-
-func NewAPIIssuCommentClient(subscriptionID string) APIIssuCommentClient {
-	return original.NewAPIIssuCommentClient(subscriptionID)
-}
-func NewAPIIssuCommentClientWithBaseURI(baseURI string, subscriptionID string) APIIssuCommentClient {
-	return original.NewAPIIssuCommentClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type APIIssueClient = original.APIIssueClient
-
-func NewAPIIssueClient(subscriptionID string) APIIssueClient {
-	return original.NewAPIIssueClient(subscriptionID)
-}
-func NewAPIIssueClientWithBaseURI(baseURI string, subscriptionID string) APIIssueClient {
-	return original.NewAPIIssueClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type APIIssueAttachmentClient = original.APIIssueAttachmentClient
+type BackendClient = original.BackendClient
 
-func NewAPIIssueAttachmentClient(subscriptionID string) APIIssueAttachmentClient {
-	return original.NewAPIIssueAttachmentClient(subscriptionID)
+func NewBackendClient(subscriptionID string) BackendClient {
+	return original.NewBackendClient(subscriptionID)
 }
-func NewAPIIssueAttachmentClientWithBaseURI(baseURI string, subscriptionID string) APIIssueAttachmentClient {
-	return original.NewAPIIssueAttachmentClientWithBaseURI(baseURI, subscriptionID)
+func NewBackendClientWithBaseURI(baseURI string, subscriptionID string) BackendClient {
+	return original.NewBackendClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIIssueAttachmentsClient = original.APIIssueAttachmentsClient
+type ServiceClient = original.ServiceClient
 
-func NewAPIIssueAttachmentsClient(subscriptionID string) APIIssueAttachmentsClient {
-	return original.NewAPIIssueAttachmentsClient(subscriptionID)
+func NewServiceClient(subscriptionID string) ServiceClient {
+	return original.NewServiceClient(subscriptionID)
 }
-func NewAPIIssueAttachmentsClientWithBaseURI(baseURI string, subscriptionID string) APIIssueAttachmentsClient {
-	return original.NewAPIIssueAttachmentsClientWithBaseURI(baseURI, subscriptionID)
+func NewServiceClientWithBaseURI(baseURI string, subscriptionID string) ServiceClient {
+	return original.NewServiceClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIIssueCommentClient = original.APIIssueCommentClient
+type RegionsClient = original.RegionsClient
 
-func NewAPIIssueCommentClient(subscriptionID string) APIIssueCommentClient {
-	return original.NewAPIIssueCommentClient(subscriptionID)
+func NewRegionsClient(subscriptionID string) RegionsClient {
+	return original.NewRegionsClient(subscriptionID)
 }
-func NewAPIIssueCommentClientWithBaseURI(baseURI string, subscriptionID string) APIIssueCommentClient {
-	return original.NewAPIIssueCommentClientWithBaseURI(baseURI, subscriptionID)
+func NewRegionsClientWithBaseURI(baseURI string, subscriptionID string) RegionsClient {
+	return original.NewRegionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIIssueCommentsClient = original.APIIssueCommentsClient
+type OperationsClient = original.OperationsClient
 
-func NewAPIIssueCommentsClient(subscriptionID string) APIIssueCommentsClient {
-	return original.NewAPIIssueCommentsClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewAPIIssueCommentsClientWithBaseURI(baseURI string, subscriptionID string) APIIssueCommentsClient {
-	return original.NewAPIIssueCommentsClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIIssuesClient = original.APIIssuesClient
+type UserGroupClient = original.UserGroupClient
 
-func NewAPIIssuesClient(subscriptionID string) APIIssuesClient {
-	return original.NewAPIIssuesClient(subscriptionID)
+func NewUserGroupClient(subscriptionID string) UserGroupClient {
+	return original.NewUserGroupClient(subscriptionID)
 }
-func NewAPIIssuesClientWithBaseURI(baseURI string, subscriptionID string) APIIssuesClient {
-	return original.NewAPIIssuesClientWithBaseURI(baseURI, subscriptionID)
+func NewUserGroupClientWithBaseURI(baseURI string, subscriptionID string) UserGroupClient {
+	return original.NewUserGroupClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIOperationClient = original.APIOperationClient
+type ProductAPIClient = original.ProductAPIClient
 
-func NewAPIOperationClient(subscriptionID string) APIOperationClient {
-	return original.NewAPIOperationClient(subscriptionID)
+func NewProductAPIClient(subscriptionID string) ProductAPIClient {
+	return original.NewProductAPIClient(subscriptionID)
 }
-func NewAPIOperationClientWithBaseURI(baseURI string, subscriptionID string) APIOperationClient {
-	return original.NewAPIOperationClientWithBaseURI(baseURI, subscriptionID)
+func NewProductAPIClientWithBaseURI(baseURI string, subscriptionID string) ProductAPIClient {
+	return original.NewProductAPIClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIOperationPolicyClient = original.APIOperationPolicyClient
+type SignUpSettingsClient = original.SignUpSettingsClient
 
-func NewAPIOperationPolicyClient(subscriptionID string) APIOperationPolicyClient {
-	return original.NewAPIOperationPolicyClient(subscriptionID)
+func NewSignUpSettingsClient(subscriptionID string) SignUpSettingsClient {
+	return original.NewSignUpSettingsClient(subscriptionID)
 }
-func NewAPIOperationPolicyClientWithBaseURI(baseURI string, subscriptionID string) APIOperationPolicyClient {
-	return original.NewAPIOperationPolicyClientWithBaseURI(baseURI, subscriptionID)
+func NewSignUpSettingsClientWithBaseURI(baseURI string, subscriptionID string) SignUpSettingsClient {
+	return original.NewSignUpSettingsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIPolicyClient = original.APIPolicyClient
+type APIIssuCommentClient = original.APIIssuCommentClient
 
-func NewAPIPolicyClient(subscriptionID string) APIPolicyClient {
-	return original.NewAPIPolicyClient(subscriptionID)
+func NewAPIIssuCommentClient(subscriptionID string) APIIssuCommentClient {
+	return original.NewAPIIssuCommentClient(subscriptionID)
 }
-func NewAPIPolicyClientWithBaseURI(baseURI string, subscriptionID string) APIPolicyClient {
-	return original.NewAPIPolicyClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIIssuCommentClientWithBaseURI(baseURI string, subscriptionID string) APIIssuCommentClient {
+	return original.NewAPIIssuCommentClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIProductClient = original.APIProductClient
+type APIDiagnosticClient = original.APIDiagnosticClient
 
-func NewAPIProductClient(subscriptionID string) APIProductClient {
-	return original.NewAPIProductClient(subscriptionID)
+func NewAPIDiagnosticClient(subscriptionID string) APIDiagnosticClient {
+	return original.NewAPIDiagnosticClient(subscriptionID)
 }
-func NewAPIProductClientWithBaseURI(baseURI string, subscriptionID string) APIProductClient {
-	return original.NewAPIProductClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIDiagnosticClientWithBaseURI(baseURI string, subscriptionID string) APIDiagnosticClient {
+	return original.NewAPIDiagnosticClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIReleaseClient = original.APIReleaseClient
+type PropertyClient = original.PropertyClient
 
-func NewAPIReleaseClient(subscriptionID string) APIReleaseClient {
-	return original.NewAPIReleaseClient(subscriptionID)
+func NewPropertyClient(subscriptionID string) PropertyClient {
+	return original.NewPropertyClient(subscriptionID)
 }
-func NewAPIReleaseClientWithBaseURI(baseURI string, subscriptionID string) APIReleaseClient {
-	return original.NewAPIReleaseClientWithBaseURI(baseURI, subscriptionID)
+func NewPropertyClientWithBaseURI(baseURI string, subscriptionID string) PropertyClient {
+	return original.NewPropertyClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type APIRevisionsClient = original.APIRevisionsClient
@@ -183,134 +120,112 @@ func NewAPIRevisionsClientWithBaseURI(baseURI string, subscriptionID string) API
 	return original.NewAPIRevisionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APISchemaClient = original.APISchemaClient
-
-func NewAPISchemaClient(subscriptionID string) APISchemaClient {
-	return original.NewAPISchemaClient(subscriptionID)
-}
-func NewAPISchemaClientWithBaseURI(baseURI string, subscriptionID string) APISchemaClient {
-	return original.NewAPISchemaClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type APIVersionSetClient = original.APIVersionSetClient
-
-func NewAPIVersionSetClient(subscriptionID string) APIVersionSetClient {
-	return original.NewAPIVersionSetClient(subscriptionID)
-}
-func NewAPIVersionSetClientWithBaseURI(baseURI string, subscriptionID string) APIVersionSetClient {
-	return original.NewAPIVersionSetClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type AuthorizationServerClient = original.AuthorizationServerClient
+type OperationClient = original.OperationClient
 
-func NewAuthorizationServerClient(subscriptionID string) AuthorizationServerClient {
-	return original.NewAuthorizationServerClient(subscriptionID)
+func NewOperationClient(subscriptionID string) OperationClient {
+	return original.NewOperationClient(subscriptionID)
 }
-func NewAuthorizationServerClientWithBaseURI(baseURI string, subscriptionID string) AuthorizationServerClient {
-	return original.NewAuthorizationServerClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationClientWithBaseURI(baseURI string, subscriptionID string) OperationClient {
+	return original.NewOperationClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type BackendClient = original.BackendClient
+type TenantConfigurationClient = original.TenantConfigurationClient
 
-func NewBackendClient(subscriptionID string) BackendClient {
-	return original.NewBackendClient(subscriptionID)
+func NewTenantConfigurationClient(subscriptionID string) TenantConfigurationClient {
+	return original.NewTenantConfigurationClient(subscriptionID)
 }
-func NewBackendClientWithBaseURI(baseURI string, subscriptionID string) BackendClient {
-	return original.NewBackendClientWithBaseURI(baseURI, subscriptionID)
+func NewTenantConfigurationClientWithBaseURI(baseURI string, subscriptionID string) TenantConfigurationClient {
+	return original.NewTenantConfigurationClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CertificateClient = original.CertificateClient
+type APIIssuAttachmentClient = original.APIIssuAttachmentClient
 
-func NewCertificateClient(subscriptionID string) CertificateClient {
-	return original.NewCertificateClient(subscriptionID)
+func NewAPIIssuAttachmentClient(subscriptionID string) APIIssuAttachmentClient {
+	return original.NewAPIIssuAttachmentClient(subscriptionID)
 }
-func NewCertificateClientWithBaseURI(baseURI string, subscriptionID string) CertificateClient {
-	return original.NewCertificateClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIIssuAttachmentClientWithBaseURI(baseURI string, subscriptionID string) APIIssuAttachmentClient {
+	return original.NewAPIIssuAttachmentClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type APIIssueAttachmentsClient = original.APIIssueAttachmentsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewAPIIssueAttachmentsClient(subscriptionID string) APIIssueAttachmentsClient {
+	return original.NewAPIIssueAttachmentsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewAPIIssueAttachmentsClientWithBaseURI(baseURI string, subscriptionID string) APIIssueAttachmentsClient {
+	return original.NewAPIIssueAttachmentsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DelegationSettingsClient = original.DelegationSettingsClient
+type PolicySnippetsClient = original.PolicySnippetsClient
 
-func NewDelegationSettingsClient(subscriptionID string) DelegationSettingsClient {
-	return original.NewDelegationSettingsClient(subscriptionID)
+func NewPolicySnippetsClient(subscriptionID string) PolicySnippetsClient {
+	return original.NewPolicySnippetsClient(subscriptionID)
 }
-func NewDelegationSettingsClientWithBaseURI(baseURI string, subscriptionID string) DelegationSettingsClient {
-	return original.NewDelegationSettingsClientWithBaseURI(baseURI, subscriptionID)
+func NewPolicySnippetsClientWithBaseURI(baseURI string, subscriptionID string) PolicySnippetsClient {
+	return original.NewPolicySnippetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DiagnosticClient = original.DiagnosticClient
+type AuthorizationServerClient = original.AuthorizationServerClient
 
-func NewDiagnosticClient(subscriptionID string) DiagnosticClient {
-	return original.NewDiagnosticClient(subscriptionID)
+func NewAuthorizationServerClient(subscriptionID string) AuthorizationServerClient {
+	return original.NewAuthorizationServerClient(subscriptionID)
 }
-func NewDiagnosticClientWithBaseURI(baseURI string, subscriptionID string) DiagnosticClient {
-	return original.NewDiagnosticClientWithBaseURI(baseURI, subscriptionID)
+func NewAuthorizationServerClientWithBaseURI(baseURI string, subscriptionID string) AuthorizationServerClient {
+	return original.NewAuthorizationServerClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DiagnosticLoggerClient = original.DiagnosticLoggerClient
+type IdentityProviderClient = original.IdentityProviderClient
 
-func NewDiagnosticLoggerClient(subscriptionID string) DiagnosticLoggerClient {
-	return original.NewDiagnosticLoggerClient(subscriptionID)
+func NewIdentityProviderClient(subscriptionID string) IdentityProviderClient {
+	return original.NewIdentityProviderClient(subscriptionID)
 }
-func NewDiagnosticLoggerClientWithBaseURI(baseURI string, subscriptionID string) DiagnosticLoggerClient {
-	return original.NewDiagnosticLoggerClientWithBaseURI(baseURI, subscriptionID)
+func NewIdentityProviderClientWithBaseURI(baseURI string, subscriptionID string) IdentityProviderClient {
+	return original.NewIdentityProviderClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type EmailTemplateClient = original.EmailTemplateClient
+type APIIssueClient = original.APIIssueClient
 
-func NewEmailTemplateClient(subscriptionID string) EmailTemplateClient {
-	return original.NewEmailTemplateClient(subscriptionID)
+func NewAPIIssueClient(subscriptionID string) APIIssueClient {
+	return original.NewAPIIssueClient(subscriptionID)
 }
-func NewEmailTemplateClientWithBaseURI(baseURI string, subscriptionID string) EmailTemplateClient {
-	return original.NewEmailTemplateClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIIssueClientWithBaseURI(baseURI string, subscriptionID string) APIIssueClient {
+	return original.NewAPIIssueClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type GroupClient = original.GroupClient
+type UserSubscriptionClient = original.UserSubscriptionClient
 
-func NewGroupClient(subscriptionID string) GroupClient {
-	return original.NewGroupClient(subscriptionID)
+func NewUserSubscriptionClient(subscriptionID string) UserSubscriptionClient {
+	return original.NewUserSubscriptionClient(subscriptionID)
 }
-func NewGroupClientWithBaseURI(baseURI string, subscriptionID string) GroupClient {
-	return original.NewGroupClientWithBaseURI(baseURI, subscriptionID)
+func NewUserSubscriptionClientWithBaseURI(baseURI string, subscriptionID string) UserSubscriptionClient {
+	return original.NewUserSubscriptionClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type GroupUserClient = original.GroupUserClient
+type UserIdentitiesClient = original.UserIdentitiesClient
 
-func NewGroupUserClient(subscriptionID string) GroupUserClient {
-	return original.NewGroupUserClient(subscriptionID)
+func NewUserIdentitiesClient(subscriptionID string) UserIdentitiesClient {
+	return original.NewUserIdentitiesClient(subscriptionID)
 }
-func NewGroupUserClientWithBaseURI(baseURI string, subscriptionID string) GroupUserClient {
-	return original.NewGroupUserClientWithBaseURI(baseURI, subscriptionID)
+func NewUserIdentitiesClientWithBaseURI(baseURI string, subscriptionID string) UserIdentitiesClient {
+	return original.NewUserIdentitiesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type IdentityProviderClient = original.IdentityProviderClient
+type TenantAccessClient = original.TenantAccessClient
 
-func NewIdentityProviderClient(subscriptionID string) IdentityProviderClient {
-	return original.NewIdentityProviderClient(subscriptionID)
+func NewTenantAccessClient(subscriptionID string) TenantAccessClient {
+	return original.NewTenantAccessClient(subscriptionID)
 }
-func NewIdentityProviderClientWithBaseURI(baseURI string, subscriptionID string) IdentityProviderClient {
-	return original.NewIdentityProviderClientWithBaseURI(baseURI, subscriptionID)
+func NewTenantAccessClientWithBaseURI(baseURI string, subscriptionID string) TenantAccessClient {
+	return original.NewTenantAccessClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LoggerClient = original.LoggerClient
+type ProductClient = original.ProductClient
 
-func NewLoggerClient(subscriptionID string) LoggerClient {
-	return original.NewLoggerClient(subscriptionID)
+func NewProductClient(subscriptionID string) ProductClient {
+	return original.NewProductClient(subscriptionID)
 }
-func NewLoggerClientWithBaseURI(baseURI string, subscriptionID string) LoggerClient {
-	return original.NewLoggerClientWithBaseURI(baseURI, subscriptionID)
+func NewProductClientWithBaseURI(baseURI string, subscriptionID string) ProductClient {
+	return original.NewProductClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type APIType = original.APIType
@@ -980,13 +895,22 @@ type UserUpdateParameters = original.UserUpdateParameters
 type UserUpdateParametersProperties = original.UserUpdateParametersProperties
 type VirtualNetworkConfiguration = original.VirtualNetworkConfiguration
 type X509CertificateName = original.X509CertificateName
-type NetworkStatusClient = original.NetworkStatusClient
+type ProductGroupClient = original.ProductGroupClient
 
-func NewNetworkStatusClient(subscriptionID string) NetworkStatusClient {
-	return original.NewNetworkStatusClient(subscriptionID)
+func NewProductGroupClient(subscriptionID string) ProductGroupClient {
+	return original.NewProductGroupClient(subscriptionID)
 }
-func NewNetworkStatusClientWithBaseURI(baseURI string, subscriptionID string) NetworkStatusClient {
-	return original.NewNetworkStatusClientWithBaseURI(baseURI, subscriptionID)
+func NewProductGroupClientWithBaseURI(baseURI string, subscriptionID string) ProductGroupClient {
+	return original.NewProductGroupClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type EmailTemplateClient = original.EmailTemplateClient
+
+func NewEmailTemplateClient(subscriptionID string) EmailTemplateClient {
+	return original.NewEmailTemplateClient(subscriptionID)
+}
+func NewEmailTemplateClientWithBaseURI(baseURI string, subscriptionID string) EmailTemplateClient {
+	return original.NewEmailTemplateClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type NotificationClient = original.NotificationClient
@@ -998,15 +922,6 @@ func NewNotificationClientWithBaseURI(baseURI string, subscriptionID string) Not
 	return original.NewNotificationClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type NotificationRecipientEmailClient = original.NotificationRecipientEmailClient
-
-func NewNotificationRecipientEmailClient(subscriptionID string) NotificationRecipientEmailClient {
-	return original.NewNotificationRecipientEmailClient(subscriptionID)
-}
-func NewNotificationRecipientEmailClientWithBaseURI(baseURI string, subscriptionID string) NotificationRecipientEmailClient {
-	return original.NewNotificationRecipientEmailClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type NotificationRecipientUserClient = original.NotificationRecipientUserClient
 
 func NewNotificationRecipientUserClient(subscriptionID string) NotificationRecipientUserClient {
@@ -1016,6 +931,48 @@ func NewNotificationRecipientUserClientWithBaseURI(baseURI string, subscriptionI
 	return original.NewNotificationRecipientUserClientWithBaseURI(baseURI, subscriptionID)
 }
 
+type APIDiagnosticLoggerClient = original.APIDiagnosticLoggerClient
+
+func NewAPIDiagnosticLoggerClient(subscriptionID string) APIDiagnosticLoggerClient {
+	return original.NewAPIDiagnosticLoggerClient(subscriptionID)
+}
+func NewAPIDiagnosticLoggerClientWithBaseURI(baseURI string, subscriptionID string) APIDiagnosticLoggerClient {
+	return original.NewAPIDiagnosticLoggerClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type TagClient = original.TagClient
+
+func NewTagClient(subscriptionID string) TagClient {
+	return original.NewTagClient(subscriptionID)
+}
+func NewTagClientWithBaseURI(baseURI string, subscriptionID string) TagClient {
+	return original.NewTagClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
+}
+
+type DiagnosticClient = original.DiagnosticClient
+
+func NewDiagnosticClient(subscriptionID string) DiagnosticClient {
+	return original.NewDiagnosticClient(subscriptionID)
+}
+func NewDiagnosticClientWithBaseURI(baseURI string, subscriptionID string) DiagnosticClient {
+	return original.NewDiagnosticClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type APIIssuesClient = original.APIIssuesClient
+
+func NewAPIIssuesClient(subscriptionID string) APIIssuesClient {
+	return original.NewAPIIssuesClient(subscriptionID)
+}
+func NewAPIIssuesClientWithBaseURI(baseURI string, subscriptionID string) APIIssuesClient {
+	return original.NewAPIIssuesClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type OpenIDConnectProviderClient = original.OpenIDConnectProviderClient
 
 func NewOpenIDConnectProviderClient(subscriptionID string) OpenIDConnectProviderClient {
@@ -1025,76 +982,121 @@ func NewOpenIDConnectProviderClientWithBaseURI(baseURI string, subscriptionID st
 	return original.NewOpenIDConnectProviderClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type OperationClient = original.OperationClient
+type QuotaByCounterKeysClient = original.QuotaByCounterKeysClient
 
-func NewOperationClient(subscriptionID string) OperationClient {
-	return original.NewOperationClient(subscriptionID)
+func NewQuotaByCounterKeysClient(subscriptionID string) QuotaByCounterKeysClient {
+	return original.NewQuotaByCounterKeysClient(subscriptionID)
 }
-func NewOperationClientWithBaseURI(baseURI string, subscriptionID string) OperationClient {
-	return original.NewOperationClientWithBaseURI(baseURI, subscriptionID)
+func NewQuotaByCounterKeysClientWithBaseURI(baseURI string, subscriptionID string) QuotaByCounterKeysClient {
+	return original.NewQuotaByCounterKeysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type OperationsClient = original.OperationsClient
+type SubscriptionClient = original.SubscriptionClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewSubscriptionClient(subscriptionID string) SubscriptionClient {
+	return original.NewSubscriptionClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewSubscriptionClientWithBaseURI(baseURI string, subscriptionID string) SubscriptionClient {
+	return original.NewSubscriptionClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type PolicyClient = original.PolicyClient
+type DelegationSettingsClient = original.DelegationSettingsClient
 
-func NewPolicyClient(subscriptionID string) PolicyClient {
-	return original.NewPolicyClient(subscriptionID)
+func NewDelegationSettingsClient(subscriptionID string) DelegationSettingsClient {
+	return original.NewDelegationSettingsClient(subscriptionID)
+}
+func NewDelegationSettingsClientWithBaseURI(baseURI string, subscriptionID string) DelegationSettingsClient {
+	return original.NewDelegationSettingsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type LoggerClient = original.LoggerClient
+
+func NewLoggerClient(subscriptionID string) LoggerClient {
+	return original.NewLoggerClient(subscriptionID)
+}
+func NewLoggerClientWithBaseURI(baseURI string, subscriptionID string) LoggerClient {
+	return original.NewLoggerClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type APIOperationPolicyClient = original.APIOperationPolicyClient
+
+func NewAPIOperationPolicyClient(subscriptionID string) APIOperationPolicyClient {
+	return original.NewAPIOperationPolicyClient(subscriptionID)
+}
+func NewAPIOperationPolicyClientWithBaseURI(baseURI string, subscriptionID string) APIOperationPolicyClient {
+	return original.NewAPIOperationPolicyClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type CertificateClient = original.CertificateClient
+
+func NewCertificateClient(subscriptionID string) CertificateClient {
+	return original.NewCertificateClient(subscriptionID)
+}
+func NewCertificateClientWithBaseURI(baseURI string, subscriptionID string) CertificateClient {
+	return original.NewCertificateClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type APIPolicyClient = original.APIPolicyClient
+
+func NewAPIPolicyClient(subscriptionID string) APIPolicyClient {
+	return original.NewAPIPolicyClient(subscriptionID)
+}
+func NewAPIPolicyClientWithBaseURI(baseURI string, subscriptionID string) APIPolicyClient {
+	return original.NewAPIPolicyClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ReportsClient = original.ReportsClient
+
+func NewReportsClient(subscriptionID string) ReportsClient {
+	return original.NewReportsClient(subscriptionID)
 }
-func NewPolicyClientWithBaseURI(baseURI string, subscriptionID string) PolicyClient {
-	return original.NewPolicyClientWithBaseURI(baseURI, subscriptionID)
+func NewReportsClientWithBaseURI(baseURI string, subscriptionID string) ReportsClient {
+	return original.NewReportsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type PolicySnippetsClient = original.PolicySnippetsClient
+type APIProductClient = original.APIProductClient
 
-func NewPolicySnippetsClient(subscriptionID string) PolicySnippetsClient {
-	return original.NewPolicySnippetsClient(subscriptionID)
+func NewAPIProductClient(subscriptionID string) APIProductClient {
+	return original.NewAPIProductClient(subscriptionID)
 }
-func NewPolicySnippetsClientWithBaseURI(baseURI string, subscriptionID string) PolicySnippetsClient {
-	return original.NewPolicySnippetsClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIProductClientWithBaseURI(baseURI string, subscriptionID string) APIProductClient {
+	return original.NewAPIProductClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProductClient = original.ProductClient
+type APIIssueCommentsClient = original.APIIssueCommentsClient
 
-func NewProductClient(subscriptionID string) ProductClient {
-	return original.NewProductClient(subscriptionID)
+func NewAPIIssueCommentsClient(subscriptionID string) APIIssueCommentsClient {
+	return original.NewAPIIssueCommentsClient(subscriptionID)
 }
-func NewProductClientWithBaseURI(baseURI string, subscriptionID string) ProductClient {
-	return original.NewProductClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIIssueCommentsClientWithBaseURI(baseURI string, subscriptionID string) APIIssueCommentsClient {
+	return original.NewAPIIssueCommentsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProductAPIClient = original.ProductAPIClient
+type APIIssueAttachmentClient = original.APIIssueAttachmentClient
 
-func NewProductAPIClient(subscriptionID string) ProductAPIClient {
-	return original.NewProductAPIClient(subscriptionID)
+func NewAPIIssueAttachmentClient(subscriptionID string) APIIssueAttachmentClient {
+	return original.NewAPIIssueAttachmentClient(subscriptionID)
 }
-func NewProductAPIClientWithBaseURI(baseURI string, subscriptionID string) ProductAPIClient {
-	return original.NewProductAPIClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIIssueAttachmentClientWithBaseURI(baseURI string, subscriptionID string) APIIssueAttachmentClient {
+	return original.NewAPIIssueAttachmentClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProductGroupClient = original.ProductGroupClient
+type APISchemaClient = original.APISchemaClient
 
-func NewProductGroupClient(subscriptionID string) ProductGroupClient {
-	return original.NewProductGroupClient(subscriptionID)
+func NewAPISchemaClient(subscriptionID string) APISchemaClient {
+	return original.NewAPISchemaClient(subscriptionID)
 }
-func NewProductGroupClientWithBaseURI(baseURI string, subscriptionID string) ProductGroupClient {
-	return original.NewProductGroupClientWithBaseURI(baseURI, subscriptionID)
+func NewAPISchemaClientWithBaseURI(baseURI string, subscriptionID string) APISchemaClient {
+	return original.NewAPISchemaClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProductPolicyClient = original.ProductPolicyClient
+type APIIssueCommentClient = original.APIIssueCommentClient
 
-func NewProductPolicyClient(subscriptionID string) ProductPolicyClient {
-	return original.NewProductPolicyClient(subscriptionID)
+func NewAPIIssueCommentClient(subscriptionID string) APIIssueCommentClient {
+	return original.NewAPIIssueCommentClient(subscriptionID)
 }
-func NewProductPolicyClientWithBaseURI(baseURI string, subscriptionID string) ProductPolicyClient {
-	return original.NewProductPolicyClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIIssueCommentClientWithBaseURI(baseURI string, subscriptionID string) APIIssueCommentClient {
+	return original.NewAPIIssueCommentClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ProductSubscriptionsClient = original.ProductSubscriptionsClient
@@ -1106,179 +1108,177 @@ func NewProductSubscriptionsClientWithBaseURI(baseURI string, subscriptionID str
 	return original.NewProductSubscriptionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type PropertyClient = original.PropertyClient
+type TagResourceClient = original.TagResourceClient
 
-func NewPropertyClient(subscriptionID string) PropertyClient {
-	return original.NewPropertyClient(subscriptionID)
+func NewTagResourceClient(subscriptionID string) TagResourceClient {
+	return original.NewTagResourceClient(subscriptionID)
 }
-func NewPropertyClientWithBaseURI(baseURI string, subscriptionID string) PropertyClient {
-	return original.NewPropertyClientWithBaseURI(baseURI, subscriptionID)
+func NewTagResourceClientWithBaseURI(baseURI string, subscriptionID string) TagResourceClient {
+	return original.NewTagResourceClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type QuotaByCounterKeysClient = original.QuotaByCounterKeysClient
+type APIVersionSetClient = original.APIVersionSetClient
 
-func NewQuotaByCounterKeysClient(subscriptionID string) QuotaByCounterKeysClient {
-	return original.NewQuotaByCounterKeysClient(subscriptionID)
+func NewAPIVersionSetClient(subscriptionID string) APIVersionSetClient {
+	return original.NewAPIVersionSetClient(subscriptionID)
 }
-func NewQuotaByCounterKeysClientWithBaseURI(baseURI string, subscriptionID string) QuotaByCounterKeysClient {
-	return original.NewQuotaByCounterKeysClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIVersionSetClientWithBaseURI(baseURI string, subscriptionID string) APIVersionSetClient {
+	return original.NewAPIVersionSetClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type QuotaByPeriodKeysClient = original.QuotaByPeriodKeysClient
+type SignInSettingsClient = original.SignInSettingsClient
 
-func NewQuotaByPeriodKeysClient(subscriptionID string) QuotaByPeriodKeysClient {
-	return original.NewQuotaByPeriodKeysClient(subscriptionID)
+func NewSignInSettingsClient(subscriptionID string) SignInSettingsClient {
+	return original.NewSignInSettingsClient(subscriptionID)
 }
-func NewQuotaByPeriodKeysClientWithBaseURI(baseURI string, subscriptionID string) QuotaByPeriodKeysClient {
-	return original.NewQuotaByPeriodKeysClientWithBaseURI(baseURI, subscriptionID)
+func NewSignInSettingsClientWithBaseURI(baseURI string, subscriptionID string) SignInSettingsClient {
+	return original.NewSignInSettingsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type RegionsClient = original.RegionsClient
+type GroupUserClient = original.GroupUserClient
 
-func NewRegionsClient(subscriptionID string) RegionsClient {
-	return original.NewRegionsClient(subscriptionID)
+func NewGroupUserClient(subscriptionID string) GroupUserClient {
+	return original.NewGroupUserClient(subscriptionID)
 }
-func NewRegionsClientWithBaseURI(baseURI string, subscriptionID string) RegionsClient {
-	return original.NewRegionsClientWithBaseURI(baseURI, subscriptionID)
+func NewGroupUserClientWithBaseURI(baseURI string, subscriptionID string) GroupUserClient {
+	return original.NewGroupUserClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ReportsClient = original.ReportsClient
+type APIReleaseClient = original.APIReleaseClient
 
-func NewReportsClient(subscriptionID string) ReportsClient {
-	return original.NewReportsClient(subscriptionID)
+func NewAPIReleaseClient(subscriptionID string) APIReleaseClient {
+	return original.NewAPIReleaseClient(subscriptionID)
 }
-func NewReportsClientWithBaseURI(baseURI string, subscriptionID string) ReportsClient {
-	return original.NewReportsClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIReleaseClientWithBaseURI(baseURI string, subscriptionID string) APIReleaseClient {
+	return original.NewAPIReleaseClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ServiceClient = original.ServiceClient
+type APIExportClient = original.APIExportClient
 
-func NewServiceClient(subscriptionID string) ServiceClient {
-	return original.NewServiceClient(subscriptionID)
+func NewAPIExportClient(subscriptionID string) APIExportClient {
+	return original.NewAPIExportClient(subscriptionID)
 }
-func NewServiceClientWithBaseURI(baseURI string, subscriptionID string) ServiceClient {
-	return original.NewServiceClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIExportClientWithBaseURI(baseURI string, subscriptionID string) APIExportClient {
+	return original.NewAPIExportClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SignInSettingsClient = original.SignInSettingsClient
+type GroupClient = original.GroupClient
 
-func NewSignInSettingsClient(subscriptionID string) SignInSettingsClient {
-	return original.NewSignInSettingsClient(subscriptionID)
+func NewGroupClient(subscriptionID string) GroupClient {
+	return original.NewGroupClient(subscriptionID)
 }
-func NewSignInSettingsClientWithBaseURI(baseURI string, subscriptionID string) SignInSettingsClient {
-	return original.NewSignInSettingsClientWithBaseURI(baseURI, subscriptionID)
+func NewGroupClientWithBaseURI(baseURI string, subscriptionID string) GroupClient {
+	return original.NewGroupClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SignUpSettingsClient = original.SignUpSettingsClient
+type APIClient = original.APIClient
 
-func NewSignUpSettingsClient(subscriptionID string) SignUpSettingsClient {
-	return original.NewSignUpSettingsClient(subscriptionID)
+func NewAPIClient(subscriptionID string) APIClient {
+	return original.NewAPIClient(subscriptionID)
 }
-func NewSignUpSettingsClientWithBaseURI(baseURI string, subscriptionID string) SignUpSettingsClient {
-	return original.NewSignUpSettingsClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIClientWithBaseURI(baseURI string, subscriptionID string) APIClient {
+	return original.NewAPIClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SubscriptionClient = original.SubscriptionClient
+type TenantAccessGitClient = original.TenantAccessGitClient
 
-func NewSubscriptionClient(subscriptionID string) SubscriptionClient {
-	return original.NewSubscriptionClient(subscriptionID)
+func NewTenantAccessGitClient(subscriptionID string) TenantAccessGitClient {
+	return original.NewTenantAccessGitClient(subscriptionID)
 }
-func NewSubscriptionClientWithBaseURI(baseURI string, subscriptionID string) SubscriptionClient {
-	return original.NewSubscriptionClientWithBaseURI(baseURI, subscriptionID)
+func NewTenantAccessGitClientWithBaseURI(baseURI string, subscriptionID string) TenantAccessGitClient {
+	return original.NewTenantAccessGitClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TagClient = original.TagClient
+type UserClient = original.UserClient
 
-func NewTagClient(subscriptionID string) TagClient {
-	return original.NewTagClient(subscriptionID)
+func NewUserClient(subscriptionID string) UserClient {
+	return original.NewUserClient(subscriptionID)
 }
-func NewTagClientWithBaseURI(baseURI string, subscriptionID string) TagClient {
-	return original.NewTagClientWithBaseURI(baseURI, subscriptionID)
+func NewUserClientWithBaseURI(baseURI string, subscriptionID string) UserClient {
+	return original.NewUserClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TagDescriptionClient = original.TagDescriptionClient
+type ProductPolicyClient = original.ProductPolicyClient
 
-func NewTagDescriptionClient(subscriptionID string) TagDescriptionClient {
-	return original.NewTagDescriptionClient(subscriptionID)
+func NewProductPolicyClient(subscriptionID string) ProductPolicyClient {
+	return original.NewProductPolicyClient(subscriptionID)
 }
-func NewTagDescriptionClientWithBaseURI(baseURI string, subscriptionID string) TagDescriptionClient {
-	return original.NewTagDescriptionClientWithBaseURI(baseURI, subscriptionID)
+func NewProductPolicyClientWithBaseURI(baseURI string, subscriptionID string) ProductPolicyClient {
+	return original.NewProductPolicyClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TagResourceClient = original.TagResourceClient
+type DiagnosticLoggerClient = original.DiagnosticLoggerClient
 
-func NewTagResourceClient(subscriptionID string) TagResourceClient {
-	return original.NewTagResourceClient(subscriptionID)
+func NewDiagnosticLoggerClient(subscriptionID string) DiagnosticLoggerClient {
+	return original.NewDiagnosticLoggerClient(subscriptionID)
 }
-func NewTagResourceClientWithBaseURI(baseURI string, subscriptionID string) TagResourceClient {
-	return original.NewTagResourceClientWithBaseURI(baseURI, subscriptionID)
+func NewDiagnosticLoggerClientWithBaseURI(baseURI string, subscriptionID string) DiagnosticLoggerClient {
+	return original.NewDiagnosticLoggerClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TenantAccessClient = original.TenantAccessClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewTenantAccessClient(subscriptionID string) TenantAccessClient {
-	return original.NewTenantAccessClient(subscriptionID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewTenantAccessClientWithBaseURI(baseURI string, subscriptionID string) TenantAccessClient {
-	return original.NewTenantAccessClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
-type TenantAccessGitClient = original.TenantAccessGitClient
+type NotificationRecipientEmailClient = original.NotificationRecipientEmailClient
 
-func NewTenantAccessGitClient(subscriptionID string) TenantAccessGitClient {
-	return original.NewTenantAccessGitClient(subscriptionID)
+func NewNotificationRecipientEmailClient(subscriptionID string) NotificationRecipientEmailClient {
+	return original.NewNotificationRecipientEmailClient(subscriptionID)
 }
-func NewTenantAccessGitClientWithBaseURI(baseURI string, subscriptionID string) TenantAccessGitClient {
-	return original.NewTenantAccessGitClientWithBaseURI(baseURI, subscriptionID)
+func NewNotificationRecipientEmailClientWithBaseURI(baseURI string, subscriptionID string) NotificationRecipientEmailClient {
+	return original.NewNotificationRecipientEmailClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TenantConfigurationClient = original.TenantConfigurationClient
+type APIOperationClient = original.APIOperationClient
 
-func NewTenantConfigurationClient(subscriptionID string) TenantConfigurationClient {
-	return original.NewTenantConfigurationClient(subscriptionID)
+func NewAPIOperationClient(subscriptionID string) APIOperationClient {
+	return original.NewAPIOperationClient(subscriptionID)
 }
-func NewTenantConfigurationClientWithBaseURI(baseURI string, subscriptionID string) TenantConfigurationClient {
-	return original.NewTenantConfigurationClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIOperationClientWithBaseURI(baseURI string, subscriptionID string) APIOperationClient {
+	return original.NewAPIOperationClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UserClient = original.UserClient
+type PolicyClient = original.PolicyClient
 
-func NewUserClient(subscriptionID string) UserClient {
-	return original.NewUserClient(subscriptionID)
+func NewPolicyClient(subscriptionID string) PolicyClient {
+	return original.NewPolicyClient(subscriptionID)
 }
-func NewUserClientWithBaseURI(baseURI string, subscriptionID string) UserClient {
-	return original.NewUserClientWithBaseURI(baseURI, subscriptionID)
+func NewPolicyClientWithBaseURI(baseURI string, subscriptionID string) PolicyClient {
+	return original.NewPolicyClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UserGroupClient = original.UserGroupClient
+type QuotaByPeriodKeysClient = original.QuotaByPeriodKeysClient
 
-func NewUserGroupClient(subscriptionID string) UserGroupClient {
-	return original.NewUserGroupClient(subscriptionID)
+func NewQuotaByPeriodKeysClient(subscriptionID string) QuotaByPeriodKeysClient {
+	return original.NewQuotaByPeriodKeysClient(subscriptionID)
 }
-func NewUserGroupClientWithBaseURI(baseURI string, subscriptionID string) UserGroupClient {
-	return original.NewUserGroupClientWithBaseURI(baseURI, subscriptionID)
+func NewQuotaByPeriodKeysClientWithBaseURI(baseURI string, subscriptionID string) QuotaByPeriodKeysClient {
+	return original.NewQuotaByPeriodKeysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UserIdentitiesClient = original.UserIdentitiesClient
+type TagDescriptionClient = original.TagDescriptionClient
 
-func NewUserIdentitiesClient(subscriptionID string) UserIdentitiesClient {
-	return original.NewUserIdentitiesClient(subscriptionID)
+func NewTagDescriptionClient(subscriptionID string) TagDescriptionClient {
+	return original.NewTagDescriptionClient(subscriptionID)
 }
-func NewUserIdentitiesClientWithBaseURI(baseURI string, subscriptionID string) UserIdentitiesClient {
-	return original.NewUserIdentitiesClientWithBaseURI(baseURI, subscriptionID)
+func NewTagDescriptionClientWithBaseURI(baseURI string, subscriptionID string) TagDescriptionClient {
+	return original.NewTagDescriptionClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UserSubscriptionClient = original.UserSubscriptionClient
+type NetworkStatusClient = original.NetworkStatusClient
 
-func NewUserSubscriptionClient(subscriptionID string) UserSubscriptionClient {
-	return original.NewUserSubscriptionClient(subscriptionID)
-}
-func NewUserSubscriptionClientWithBaseURI(baseURI string, subscriptionID string) UserSubscriptionClient {
-	return original.NewUserSubscriptionClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+func NewNetworkStatusClient(subscriptionID string) NetworkStatusClient {
+	return original.NewNetworkStatusClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewNetworkStatusClientWithBaseURI(baseURI string, subscriptionID string) NetworkStatusClient {
+	return original.NewNetworkStatusClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/appinsights/mgmt/insights/models.go b/profiles/preview/appinsights/mgmt/insights/models.go
index 4d914633c865..bd8344be703c 100644
--- a/profiles/preview/appinsights/mgmt/insights/models.go
+++ b/profiles/preview/appinsights/mgmt/insights/models.go
@@ -21,107 +21,67 @@ package insights
 
 import original "github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights"
 
-type AnalyticsItemClient = original.AnalyticsItemClient
-
-func NewAnalyticsItemClient(subscriptionID string) AnalyticsItemClient {
-	return original.NewAnalyticsItemClient(subscriptionID)
-}
-func NewAnalyticsItemClientWithBaseURI(baseURI string, subscriptionID string) AnalyticsItemClient {
-	return original.NewAnalyticsItemClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type AnnotationsClient = original.AnnotationsClient
-
-func NewAnnotationsClient(subscriptionID string) AnnotationsClient {
-	return original.NewAnnotationsClient(subscriptionID)
-}
-func NewAnnotationsClientWithBaseURI(baseURI string, subscriptionID string) AnnotationsClient {
-	return original.NewAnnotationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type APIKeysClient = original.APIKeysClient
-
-func NewAPIKeysClient(subscriptionID string) APIKeysClient {
-	return original.NewAPIKeysClient(subscriptionID)
-}
-func NewAPIKeysClientWithBaseURI(baseURI string, subscriptionID string) APIKeysClient {
-	return original.NewAPIKeysClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type ComponentAvailableFeaturesClient = original.ComponentAvailableFeaturesClient
+type ComponentQuotaStatusClient = original.ComponentQuotaStatusClient
 
-func NewComponentAvailableFeaturesClient(subscriptionID string) ComponentAvailableFeaturesClient {
-	return original.NewComponentAvailableFeaturesClient(subscriptionID)
+func NewComponentQuotaStatusClient(subscriptionID string) ComponentQuotaStatusClient {
+	return original.NewComponentQuotaStatusClient(subscriptionID)
 }
-func NewComponentAvailableFeaturesClientWithBaseURI(baseURI string, subscriptionID string) ComponentAvailableFeaturesClient {
-	return original.NewComponentAvailableFeaturesClientWithBaseURI(baseURI, subscriptionID)
+func NewComponentQuotaStatusClientWithBaseURI(baseURI string, subscriptionID string) ComponentQuotaStatusClient {
+	return original.NewComponentQuotaStatusClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ComponentCurrentBillingFeaturesClient = original.ComponentCurrentBillingFeaturesClient
+type OperationsClient = original.OperationsClient
 
-func NewComponentCurrentBillingFeaturesClient(subscriptionID string) ComponentCurrentBillingFeaturesClient {
-	return original.NewComponentCurrentBillingFeaturesClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewComponentCurrentBillingFeaturesClientWithBaseURI(baseURI string, subscriptionID string) ComponentCurrentBillingFeaturesClient {
-	return original.NewComponentCurrentBillingFeaturesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ComponentFeatureCapabilitiesClient = original.ComponentFeatureCapabilitiesClient
+type ComponentsClient = original.ComponentsClient
 
-func NewComponentFeatureCapabilitiesClient(subscriptionID string) ComponentFeatureCapabilitiesClient {
-	return original.NewComponentFeatureCapabilitiesClient(subscriptionID)
+func NewComponentsClient(subscriptionID string) ComponentsClient {
+	return original.NewComponentsClient(subscriptionID)
 }
-func NewComponentFeatureCapabilitiesClientWithBaseURI(baseURI string, subscriptionID string) ComponentFeatureCapabilitiesClient {
-	return original.NewComponentFeatureCapabilitiesClientWithBaseURI(baseURI, subscriptionID)
+func NewComponentsClientWithBaseURI(baseURI string, subscriptionID string) ComponentsClient {
+	return original.NewComponentsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ComponentQuotaStatusClient = original.ComponentQuotaStatusClient
+type WorkbooksClient = original.WorkbooksClient
 
-func NewComponentQuotaStatusClient(subscriptionID string) ComponentQuotaStatusClient {
-	return original.NewComponentQuotaStatusClient(subscriptionID)
+func NewWorkbooksClient(subscriptionID string) WorkbooksClient {
+	return original.NewWorkbooksClient(subscriptionID)
 }
-func NewComponentQuotaStatusClientWithBaseURI(baseURI string, subscriptionID string) ComponentQuotaStatusClient {
-	return original.NewComponentQuotaStatusClientWithBaseURI(baseURI, subscriptionID)
+func NewWorkbooksClientWithBaseURI(baseURI string, subscriptionID string) WorkbooksClient {
+	return original.NewWorkbooksClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ComponentsClient = original.ComponentsClient
+type WebTestLocationsClient = original.WebTestLocationsClient
 
-func NewComponentsClient(subscriptionID string) ComponentsClient {
-	return original.NewComponentsClient(subscriptionID)
+func NewWebTestLocationsClient(subscriptionID string) WebTestLocationsClient {
+	return original.NewWebTestLocationsClient(subscriptionID)
 }
-func NewComponentsClientWithBaseURI(baseURI string, subscriptionID string) ComponentsClient {
-	return original.NewComponentsClientWithBaseURI(baseURI, subscriptionID)
+func NewWebTestLocationsClientWithBaseURI(baseURI string, subscriptionID string) WebTestLocationsClient {
+	return original.NewWebTestLocationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ExportConfigurationsClient = original.ExportConfigurationsClient
+type WorkbookClient = original.WorkbookClient
 
-func NewExportConfigurationsClient(subscriptionID string) ExportConfigurationsClient {
-	return original.NewExportConfigurationsClient(subscriptionID)
+func NewWorkbookClient(subscriptionID string) WorkbookClient {
+	return original.NewWorkbookClient(subscriptionID)
 }
-func NewExportConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) ExportConfigurationsClient {
-	return original.NewExportConfigurationsClientWithBaseURI(baseURI, subscriptionID)
+func NewWorkbookClientWithBaseURI(baseURI string, subscriptionID string) WorkbookClient {
+	return original.NewWorkbookClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type FavoriteClient = original.FavoriteClient
+type AnnotationsClient = original.AnnotationsClient
 
-func NewFavoriteClient(subscriptionID string) FavoriteClient {
-	return original.NewFavoriteClient(subscriptionID)
+func NewAnnotationsClient(subscriptionID string) AnnotationsClient {
+	return original.NewAnnotationsClient(subscriptionID)
 }
-func NewFavoriteClientWithBaseURI(baseURI string, subscriptionID string) FavoriteClient {
-	return original.NewFavoriteClientWithBaseURI(baseURI, subscriptionID)
+func NewAnnotationsClientWithBaseURI(baseURI string, subscriptionID string) AnnotationsClient {
+	return original.NewAnnotationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type FavoritesClient = original.FavoritesClient
@@ -351,13 +311,28 @@ type Workbooks = original.Workbooks
 type WorkItemConfiguration = original.WorkItemConfiguration
 type WorkItemConfigurationError = original.WorkItemConfigurationError
 type WorkItemCreateConfiguration = original.WorkItemCreateConfiguration
-type OperationsClient = original.OperationsClient
+type ComponentFeatureCapabilitiesClient = original.ComponentFeatureCapabilitiesClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewComponentFeatureCapabilitiesClient(subscriptionID string) ComponentFeatureCapabilitiesClient {
+	return original.NewComponentFeatureCapabilitiesClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewComponentFeatureCapabilitiesClientWithBaseURI(baseURI string, subscriptionID string) ComponentFeatureCapabilitiesClient {
+	return original.NewComponentFeatureCapabilitiesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ExportConfigurationsClient = original.ExportConfigurationsClient
+
+func NewExportConfigurationsClient(subscriptionID string) ExportConfigurationsClient {
+	return original.NewExportConfigurationsClient(subscriptionID)
+}
+func NewExportConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) ExportConfigurationsClient {
+	return original.NewExportConfigurationsClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
 }
 
 type ProactiveDetectionConfigurationsClient = original.ProactiveDetectionConfigurationsClient
@@ -368,20 +343,23 @@ func NewProactiveDetectionConfigurationsClient(subscriptionID string) ProactiveD
 func NewProactiveDetectionConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) ProactiveDetectionConfigurationsClient {
 	return original.NewProactiveDetectionConfigurationsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+type WorkItemConfigurationsClient = original.WorkItemConfigurationsClient
+
+func NewWorkItemConfigurationsClient(subscriptionID string) WorkItemConfigurationsClient {
+	return original.NewWorkItemConfigurationsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWorkItemConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) WorkItemConfigurationsClient {
+	return original.NewWorkItemConfigurationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type WebTestLocationsClient = original.WebTestLocationsClient
+type AnalyticsItemClient = original.AnalyticsItemClient
 
-func NewWebTestLocationsClient(subscriptionID string) WebTestLocationsClient {
-	return original.NewWebTestLocationsClient(subscriptionID)
+func NewAnalyticsItemClient(subscriptionID string) AnalyticsItemClient {
+	return original.NewAnalyticsItemClient(subscriptionID)
 }
-func NewWebTestLocationsClientWithBaseURI(baseURI string, subscriptionID string) WebTestLocationsClient {
-	return original.NewWebTestLocationsClientWithBaseURI(baseURI, subscriptionID)
+func NewAnalyticsItemClientWithBaseURI(baseURI string, subscriptionID string) AnalyticsItemClient {
+	return original.NewAnalyticsItemClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type WebTestsClient = original.WebTestsClient
@@ -393,29 +371,51 @@ func NewWebTestsClientWithBaseURI(baseURI string, subscriptionID string) WebTest
 	return original.NewWebTestsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type WorkbookClient = original.WorkbookClient
+type APIKeysClient = original.APIKeysClient
 
-func NewWorkbookClient(subscriptionID string) WorkbookClient {
-	return original.NewWorkbookClient(subscriptionID)
+func NewAPIKeysClient(subscriptionID string) APIKeysClient {
+	return original.NewAPIKeysClient(subscriptionID)
 }
-func NewWorkbookClientWithBaseURI(baseURI string, subscriptionID string) WorkbookClient {
-	return original.NewWorkbookClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIKeysClientWithBaseURI(baseURI string, subscriptionID string) APIKeysClient {
+	return original.NewAPIKeysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type WorkbooksClient = original.WorkbooksClient
+type ComponentCurrentBillingFeaturesClient = original.ComponentCurrentBillingFeaturesClient
 
-func NewWorkbooksClient(subscriptionID string) WorkbooksClient {
-	return original.NewWorkbooksClient(subscriptionID)
+func NewComponentCurrentBillingFeaturesClient(subscriptionID string) ComponentCurrentBillingFeaturesClient {
+	return original.NewComponentCurrentBillingFeaturesClient(subscriptionID)
 }
-func NewWorkbooksClientWithBaseURI(baseURI string, subscriptionID string) WorkbooksClient {
-	return original.NewWorkbooksClientWithBaseURI(baseURI, subscriptionID)
+func NewComponentCurrentBillingFeaturesClientWithBaseURI(baseURI string, subscriptionID string) ComponentCurrentBillingFeaturesClient {
+	return original.NewComponentCurrentBillingFeaturesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type WorkItemConfigurationsClient = original.WorkItemConfigurationsClient
+type ComponentAvailableFeaturesClient = original.ComponentAvailableFeaturesClient
 
-func NewWorkItemConfigurationsClient(subscriptionID string) WorkItemConfigurationsClient {
-	return original.NewWorkItemConfigurationsClient(subscriptionID)
+func NewComponentAvailableFeaturesClient(subscriptionID string) ComponentAvailableFeaturesClient {
+	return original.NewComponentAvailableFeaturesClient(subscriptionID)
 }
-func NewWorkItemConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) WorkItemConfigurationsClient {
-	return original.NewWorkItemConfigurationsClientWithBaseURI(baseURI, subscriptionID)
+func NewComponentAvailableFeaturesClientWithBaseURI(baseURI string, subscriptionID string) ComponentAvailableFeaturesClient {
+	return original.NewComponentAvailableFeaturesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
+
+type FavoriteClient = original.FavoriteClient
+
+func NewFavoriteClient(subscriptionID string) FavoriteClient {
+	return original.NewFavoriteClient(subscriptionID)
+}
+func NewFavoriteClientWithBaseURI(baseURI string, subscriptionID string) FavoriteClient {
+	return original.NewFavoriteClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/authorization/mgmt/authorization/models.go b/profiles/preview/authorization/mgmt/authorization/models.go
index 9c347f537aec..a4428d4941a3 100644
--- a/profiles/preview/authorization/mgmt/authorization/models.go
+++ b/profiles/preview/authorization/mgmt/authorization/models.go
@@ -21,26 +21,31 @@ package authorization
 
 import original "github.com/Azure/azure-sdk-for-go/services/authorization/mgmt/2018-01-01-preview/authorization"
 
-type ClassicAdministratorsClient = original.ClassicAdministratorsClient
+type RoleDefinitionsClient = original.RoleDefinitionsClient
 
-func NewClassicAdministratorsClient(subscriptionID string) ClassicAdministratorsClient {
-	return original.NewClassicAdministratorsClient(subscriptionID)
+func NewRoleDefinitionsClient(subscriptionID string) RoleDefinitionsClient {
+	return original.NewRoleDefinitionsClient(subscriptionID)
 }
-func NewClassicAdministratorsClientWithBaseURI(baseURI string, subscriptionID string) ClassicAdministratorsClient {
-	return original.NewClassicAdministratorsClientWithBaseURI(baseURI, subscriptionID)
+func NewRoleDefinitionsClientWithBaseURI(baseURI string, subscriptionID string) RoleDefinitionsClient {
+	return original.NewRoleDefinitionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type RoleAssignmentsClient = original.RoleAssignmentsClient
 
-type BaseClient = original.BaseClient
+func NewRoleAssignmentsClient(subscriptionID string) RoleAssignmentsClient {
+	return original.NewRoleAssignmentsClient(subscriptionID)
+}
+func NewRoleAssignmentsClientWithBaseURI(baseURI string, subscriptionID string) RoleAssignmentsClient {
+	return original.NewRoleAssignmentsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type ProviderOperationsMetadataClient = original.ProviderOperationsMetadataClient
+
+func NewProviderOperationsMetadataClient(subscriptionID string) ProviderOperationsMetadataClient {
+	return original.NewProviderOperationsMetadataClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewProviderOperationsMetadataClientWithBaseURI(baseURI string, subscriptionID string) ProviderOperationsMetadataClient {
+	return original.NewProviderOperationsMetadataClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ClassicAdministrator = original.ClassicAdministrator
@@ -72,44 +77,39 @@ type RoleDefinitionListResult = original.RoleDefinitionListResult
 type RoleDefinitionListResultIterator = original.RoleDefinitionListResultIterator
 type RoleDefinitionListResultPage = original.RoleDefinitionListResultPage
 type RoleDefinitionProperties = original.RoleDefinitionProperties
-type PermissionsClient = original.PermissionsClient
+type ClassicAdministratorsClient = original.ClassicAdministratorsClient
 
-func NewPermissionsClient(subscriptionID string) PermissionsClient {
-	return original.NewPermissionsClient(subscriptionID)
+func NewClassicAdministratorsClient(subscriptionID string) ClassicAdministratorsClient {
+	return original.NewClassicAdministratorsClient(subscriptionID)
 }
-func NewPermissionsClientWithBaseURI(baseURI string, subscriptionID string) PermissionsClient {
-	return original.NewPermissionsClientWithBaseURI(baseURI, subscriptionID)
+func NewClassicAdministratorsClientWithBaseURI(baseURI string, subscriptionID string) ClassicAdministratorsClient {
+	return original.NewClassicAdministratorsClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type ProviderOperationsMetadataClient = original.ProviderOperationsMetadataClient
-
-func NewProviderOperationsMetadataClient(subscriptionID string) ProviderOperationsMetadataClient {
-	return original.NewProviderOperationsMetadataClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewProviderOperationsMetadataClientWithBaseURI(baseURI string, subscriptionID string) ProviderOperationsMetadataClient {
-	return original.NewProviderOperationsMetadataClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type RoleAssignmentsClient = original.RoleAssignmentsClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewRoleAssignmentsClient(subscriptionID string) RoleAssignmentsClient {
-	return original.NewRoleAssignmentsClient(subscriptionID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewRoleAssignmentsClientWithBaseURI(baseURI string, subscriptionID string) RoleAssignmentsClient {
-	return original.NewRoleAssignmentsClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
-type RoleDefinitionsClient = original.RoleDefinitionsClient
+type PermissionsClient = original.PermissionsClient
 
-func NewRoleDefinitionsClient(subscriptionID string) RoleDefinitionsClient {
-	return original.NewRoleDefinitionsClient(subscriptionID)
-}
-func NewRoleDefinitionsClientWithBaseURI(baseURI string, subscriptionID string) RoleDefinitionsClient {
-	return original.NewRoleDefinitionsClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+func NewPermissionsClient(subscriptionID string) PermissionsClient {
+	return original.NewPermissionsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewPermissionsClientWithBaseURI(baseURI string, subscriptionID string) PermissionsClient {
+	return original.NewPermissionsClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/automation/mgmt/automation/models.go b/profiles/preview/automation/mgmt/automation/models.go
index ff3dc7f7db95..3e33e5a1dd4a 100644
--- a/profiles/preview/automation/mgmt/automation/models.go
+++ b/profiles/preview/automation/mgmt/automation/models.go
@@ -21,62 +21,40 @@ package automation
 
 import original "github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2017-05-15-preview/automation"
 
-type AccountClient = original.AccountClient
-
-func NewAccountClient(subscriptionID string) AccountClient {
-	return original.NewAccountClient(subscriptionID)
-}
-func NewAccountClientWithBaseURI(baseURI string, subscriptionID string) AccountClient {
-	return original.NewAccountClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ActivityClient = original.ActivityClient
-
-func NewActivityClient(subscriptionID string) ActivityClient {
-	return original.NewActivityClient(subscriptionID)
-}
-func NewActivityClientWithBaseURI(baseURI string, subscriptionID string) ActivityClient {
-	return original.NewActivityClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type AgentRegistrationInformationClient = original.AgentRegistrationInformationClient
+type JobStreamClient = original.JobStreamClient
 
-func NewAgentRegistrationInformationClient(subscriptionID string) AgentRegistrationInformationClient {
-	return original.NewAgentRegistrationInformationClient(subscriptionID)
+func NewJobStreamClient(subscriptionID string) JobStreamClient {
+	return original.NewJobStreamClient(subscriptionID)
 }
-func NewAgentRegistrationInformationClientWithBaseURI(baseURI string, subscriptionID string) AgentRegistrationInformationClient {
-	return original.NewAgentRegistrationInformationClientWithBaseURI(baseURI, subscriptionID)
+func NewJobStreamClientWithBaseURI(baseURI string, subscriptionID string) JobStreamClient {
+	return original.NewJobStreamClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CertificateClient = original.CertificateClient
+type DscNodeClient = original.DscNodeClient
 
-func NewCertificateClient(subscriptionID string) CertificateClient {
-	return original.NewCertificateClient(subscriptionID)
+func NewDscNodeClient(subscriptionID string) DscNodeClient {
+	return original.NewDscNodeClient(subscriptionID)
 }
-func NewCertificateClientWithBaseURI(baseURI string, subscriptionID string) CertificateClient {
-	return original.NewCertificateClientWithBaseURI(baseURI, subscriptionID)
+func NewDscNodeClientWithBaseURI(baseURI string, subscriptionID string) DscNodeClient {
+	return original.NewDscNodeClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ConnectionClient = original.ConnectionClient
+type SoftwareUpdateConfigurationsClient = original.SoftwareUpdateConfigurationsClient
 
-func NewConnectionClient(subscriptionID string) ConnectionClient {
-	return original.NewConnectionClient(subscriptionID)
+func NewSoftwareUpdateConfigurationsClient(subscriptionID string) SoftwareUpdateConfigurationsClient {
+	return original.NewSoftwareUpdateConfigurationsClient(subscriptionID)
 }
-func NewConnectionClientWithBaseURI(baseURI string, subscriptionID string) ConnectionClient {
-	return original.NewConnectionClientWithBaseURI(baseURI, subscriptionID)
+func NewSoftwareUpdateConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) SoftwareUpdateConfigurationsClient {
+	return original.NewSoftwareUpdateConfigurationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ConnectionTypeClient = original.ConnectionTypeClient
@@ -88,31 +66,40 @@ func NewConnectionTypeClientWithBaseURI(baseURI string, subscriptionID string) C
 	return original.NewConnectionTypeClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CredentialClient = original.CredentialClient
+type UsagesClient = original.UsagesClient
 
-func NewCredentialClient(subscriptionID string) CredentialClient {
-	return original.NewCredentialClient(subscriptionID)
+func NewUsagesClient(subscriptionID string) UsagesClient {
+	return original.NewUsagesClient(subscriptionID)
 }
-func NewCredentialClientWithBaseURI(baseURI string, subscriptionID string) CredentialClient {
-	return original.NewCredentialClientWithBaseURI(baseURI, subscriptionID)
+func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
+	return original.NewUsagesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DscCompilationJobClient = original.DscCompilationJobClient
+type ScheduleClient = original.ScheduleClient
 
-func NewDscCompilationJobClient(subscriptionID string) DscCompilationJobClient {
-	return original.NewDscCompilationJobClient(subscriptionID)
+func NewScheduleClient(subscriptionID string) ScheduleClient {
+	return original.NewScheduleClient(subscriptionID)
 }
-func NewDscCompilationJobClientWithBaseURI(baseURI string, subscriptionID string) DscCompilationJobClient {
-	return original.NewDscCompilationJobClientWithBaseURI(baseURI, subscriptionID)
+func NewScheduleClientWithBaseURI(baseURI string, subscriptionID string) ScheduleClient {
+	return original.NewScheduleClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DscCompilationJobStreamClient = original.DscCompilationJobStreamClient
+type AgentRegistrationInformationClient = original.AgentRegistrationInformationClient
 
-func NewDscCompilationJobStreamClient(subscriptionID string) DscCompilationJobStreamClient {
-	return original.NewDscCompilationJobStreamClient(subscriptionID)
+func NewAgentRegistrationInformationClient(subscriptionID string) AgentRegistrationInformationClient {
+	return original.NewAgentRegistrationInformationClient(subscriptionID)
 }
-func NewDscCompilationJobStreamClientWithBaseURI(baseURI string, subscriptionID string) DscCompilationJobStreamClient {
-	return original.NewDscCompilationJobStreamClientWithBaseURI(baseURI, subscriptionID)
+func NewAgentRegistrationInformationClientWithBaseURI(baseURI string, subscriptionID string) AgentRegistrationInformationClient {
+	return original.NewAgentRegistrationInformationClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type WebhookClient = original.WebhookClient
+
+func NewWebhookClient(subscriptionID string) WebhookClient {
+	return original.NewWebhookClient(subscriptionID)
+}
+func NewWebhookClientWithBaseURI(baseURI string, subscriptionID string) WebhookClient {
+	return original.NewWebhookClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type DscConfigurationClient = original.DscConfigurationClient
@@ -124,85 +111,94 @@ func NewDscConfigurationClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewDscConfigurationClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DscNodeClient = original.DscNodeClient
+type NodeReportsClient = original.NodeReportsClient
 
-func NewDscNodeClient(subscriptionID string) DscNodeClient {
-	return original.NewDscNodeClient(subscriptionID)
+func NewNodeReportsClient(subscriptionID string) NodeReportsClient {
+	return original.NewNodeReportsClient(subscriptionID)
 }
-func NewDscNodeClientWithBaseURI(baseURI string, subscriptionID string) DscNodeClient {
-	return original.NewDscNodeClientWithBaseURI(baseURI, subscriptionID)
+func NewNodeReportsClientWithBaseURI(baseURI string, subscriptionID string) NodeReportsClient {
+	return original.NewNodeReportsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DscNodeConfigurationClient = original.DscNodeConfigurationClient
+type JobClient = original.JobClient
 
-func NewDscNodeConfigurationClient(subscriptionID string) DscNodeConfigurationClient {
-	return original.NewDscNodeConfigurationClient(subscriptionID)
+func NewJobClient(subscriptionID string) JobClient {
+	return original.NewJobClient(subscriptionID)
 }
-func NewDscNodeConfigurationClientWithBaseURI(baseURI string, subscriptionID string) DscNodeConfigurationClient {
-	return original.NewDscNodeConfigurationClientWithBaseURI(baseURI, subscriptionID)
+func NewJobClientWithBaseURI(baseURI string, subscriptionID string) JobClient {
+	return original.NewJobClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type FieldsClient = original.FieldsClient
+type DscCompilationJobClient = original.DscCompilationJobClient
 
-func NewFieldsClient(subscriptionID string) FieldsClient {
-	return original.NewFieldsClient(subscriptionID)
+func NewDscCompilationJobClient(subscriptionID string) DscCompilationJobClient {
+	return original.NewDscCompilationJobClient(subscriptionID)
 }
-func NewFieldsClientWithBaseURI(baseURI string, subscriptionID string) FieldsClient {
-	return original.NewFieldsClientWithBaseURI(baseURI, subscriptionID)
+func NewDscCompilationJobClientWithBaseURI(baseURI string, subscriptionID string) DscCompilationJobClient {
+	return original.NewDscCompilationJobClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type HybridRunbookWorkerGroupClient = original.HybridRunbookWorkerGroupClient
+type ModuleClient = original.ModuleClient
 
-func NewHybridRunbookWorkerGroupClient(subscriptionID string) HybridRunbookWorkerGroupClient {
-	return original.NewHybridRunbookWorkerGroupClient(subscriptionID)
+func NewModuleClient(subscriptionID string) ModuleClient {
+	return original.NewModuleClient(subscriptionID)
 }
-func NewHybridRunbookWorkerGroupClientWithBaseURI(baseURI string, subscriptionID string) HybridRunbookWorkerGroupClient {
-	return original.NewHybridRunbookWorkerGroupClientWithBaseURI(baseURI, subscriptionID)
+func NewModuleClientWithBaseURI(baseURI string, subscriptionID string) ModuleClient {
+	return original.NewModuleClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type JobClient = original.JobClient
+type AccountClient = original.AccountClient
 
-func NewJobClient(subscriptionID string) JobClient {
-	return original.NewJobClient(subscriptionID)
+func NewAccountClient(subscriptionID string) AccountClient {
+	return original.NewAccountClient(subscriptionID)
 }
-func NewJobClientWithBaseURI(baseURI string, subscriptionID string) JobClient {
-	return original.NewJobClientWithBaseURI(baseURI, subscriptionID)
+func NewAccountClientWithBaseURI(baseURI string, subscriptionID string) AccountClient {
+	return original.NewAccountClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type JobScheduleClient = original.JobScheduleClient
+type StatisticsClient = original.StatisticsClient
 
-func NewJobScheduleClient(subscriptionID string) JobScheduleClient {
-	return original.NewJobScheduleClient(subscriptionID)
+func NewStatisticsClient(subscriptionID string) StatisticsClient {
+	return original.NewStatisticsClient(subscriptionID)
 }
-func NewJobScheduleClientWithBaseURI(baseURI string, subscriptionID string) JobScheduleClient {
-	return original.NewJobScheduleClientWithBaseURI(baseURI, subscriptionID)
+func NewStatisticsClientWithBaseURI(baseURI string, subscriptionID string) StatisticsClient {
+	return original.NewStatisticsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type JobStreamClient = original.JobStreamClient
+type RunbookDraftClient = original.RunbookDraftClient
 
-func NewJobStreamClient(subscriptionID string) JobStreamClient {
-	return original.NewJobStreamClient(subscriptionID)
+func NewRunbookDraftClient(subscriptionID string) RunbookDraftClient {
+	return original.NewRunbookDraftClient(subscriptionID)
 }
-func NewJobStreamClientWithBaseURI(baseURI string, subscriptionID string) JobStreamClient {
-	return original.NewJobStreamClientWithBaseURI(baseURI, subscriptionID)
+func NewRunbookDraftClientWithBaseURI(baseURI string, subscriptionID string) RunbookDraftClient {
+	return original.NewRunbookDraftClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type KeysClient = original.KeysClient
+type SoftwareUpdateConfigurationMachineRunsClient = original.SoftwareUpdateConfigurationMachineRunsClient
 
-func NewKeysClient(subscriptionID string) KeysClient {
-	return original.NewKeysClient(subscriptionID)
+func NewSoftwareUpdateConfigurationMachineRunsClient(subscriptionID string) SoftwareUpdateConfigurationMachineRunsClient {
+	return original.NewSoftwareUpdateConfigurationMachineRunsClient(subscriptionID)
 }
-func NewKeysClientWithBaseURI(baseURI string, subscriptionID string) KeysClient {
-	return original.NewKeysClientWithBaseURI(baseURI, subscriptionID)
+func NewSoftwareUpdateConfigurationMachineRunsClientWithBaseURI(baseURI string, subscriptionID string) SoftwareUpdateConfigurationMachineRunsClient {
+	return original.NewSoftwareUpdateConfigurationMachineRunsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LinkedWorkspaceClient = original.LinkedWorkspaceClient
+type ObjectDataTypesClient = original.ObjectDataTypesClient
 
-func NewLinkedWorkspaceClient(subscriptionID string) LinkedWorkspaceClient {
-	return original.NewLinkedWorkspaceClient(subscriptionID)
+func NewObjectDataTypesClient(subscriptionID string) ObjectDataTypesClient {
+	return original.NewObjectDataTypesClient(subscriptionID)
 }
-func NewLinkedWorkspaceClientWithBaseURI(baseURI string, subscriptionID string) LinkedWorkspaceClient {
-	return original.NewLinkedWorkspaceClientWithBaseURI(baseURI, subscriptionID)
+func NewObjectDataTypesClientWithBaseURI(baseURI string, subscriptionID string) ObjectDataTypesClient {
+	return original.NewObjectDataTypesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ActivityClient = original.ActivityClient
+
+func NewActivityClient(subscriptionID string) ActivityClient {
+	return original.NewActivityClient(subscriptionID)
+}
+func NewActivityClientWithBaseURI(baseURI string, subscriptionID string) ActivityClient {
+	return original.NewActivityClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccountState = original.AccountState
@@ -797,40 +793,37 @@ type WebhookProperties = original.WebhookProperties
 type WebhookUpdateParameters = original.WebhookUpdateParameters
 type WebhookUpdateProperties = original.WebhookUpdateProperties
 type WindowsProperties = original.WindowsProperties
-type ModuleClient = original.ModuleClient
+type SoftwareUpdateConfigurationRunsClient = original.SoftwareUpdateConfigurationRunsClient
 
-func NewModuleClient(subscriptionID string) ModuleClient {
-	return original.NewModuleClient(subscriptionID)
+func NewSoftwareUpdateConfigurationRunsClient(subscriptionID string) SoftwareUpdateConfigurationRunsClient {
+	return original.NewSoftwareUpdateConfigurationRunsClient(subscriptionID)
 }
-func NewModuleClientWithBaseURI(baseURI string, subscriptionID string) ModuleClient {
-	return original.NewModuleClientWithBaseURI(baseURI, subscriptionID)
+func NewSoftwareUpdateConfigurationRunsClientWithBaseURI(baseURI string, subscriptionID string) SoftwareUpdateConfigurationRunsClient {
+	return original.NewSoftwareUpdateConfigurationRunsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type NodeReportsClient = original.NodeReportsClient
+type JobScheduleClient = original.JobScheduleClient
 
-func NewNodeReportsClient(subscriptionID string) NodeReportsClient {
-	return original.NewNodeReportsClient(subscriptionID)
+func NewJobScheduleClient(subscriptionID string) JobScheduleClient {
+	return original.NewJobScheduleClient(subscriptionID)
 }
-func NewNodeReportsClientWithBaseURI(baseURI string, subscriptionID string) NodeReportsClient {
-	return original.NewNodeReportsClientWithBaseURI(baseURI, subscriptionID)
+func NewJobScheduleClientWithBaseURI(baseURI string, subscriptionID string) JobScheduleClient {
+	return original.NewJobScheduleClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type ObjectDataTypesClient = original.ObjectDataTypesClient
-
-func NewObjectDataTypesClient(subscriptionID string) ObjectDataTypesClient {
-	return original.NewObjectDataTypesClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewObjectDataTypesClientWithBaseURI(baseURI string, subscriptionID string) ObjectDataTypesClient {
-	return original.NewObjectDataTypesClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type OperationsClient = original.OperationsClient
+type DscCompilationJobStreamClient = original.DscCompilationJobStreamClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewDscCompilationJobStreamClient(subscriptionID string) DscCompilationJobStreamClient {
+	return original.NewDscCompilationJobStreamClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewDscCompilationJobStreamClientWithBaseURI(baseURI string, subscriptionID string) DscCompilationJobStreamClient {
+	return original.NewDscCompilationJobStreamClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type RunbookClient = original.RunbookClient
@@ -842,125 +835,132 @@ func NewRunbookClientWithBaseURI(baseURI string, subscriptionID string) RunbookC
 	return original.NewRunbookClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type RunbookDraftClient = original.RunbookDraftClient
+type FieldsClient = original.FieldsClient
 
-func NewRunbookDraftClient(subscriptionID string) RunbookDraftClient {
-	return original.NewRunbookDraftClient(subscriptionID)
+func NewFieldsClient(subscriptionID string) FieldsClient {
+	return original.NewFieldsClient(subscriptionID)
 }
-func NewRunbookDraftClientWithBaseURI(baseURI string, subscriptionID string) RunbookDraftClient {
-	return original.NewRunbookDraftClientWithBaseURI(baseURI, subscriptionID)
+func NewFieldsClientWithBaseURI(baseURI string, subscriptionID string) FieldsClient {
+	return original.NewFieldsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ScheduleClient = original.ScheduleClient
+type CertificateClient = original.CertificateClient
 
-func NewScheduleClient(subscriptionID string) ScheduleClient {
-	return original.NewScheduleClient(subscriptionID)
+func NewCertificateClient(subscriptionID string) CertificateClient {
+	return original.NewCertificateClient(subscriptionID)
 }
-func NewScheduleClientWithBaseURI(baseURI string, subscriptionID string) ScheduleClient {
-	return original.NewScheduleClientWithBaseURI(baseURI, subscriptionID)
+func NewCertificateClientWithBaseURI(baseURI string, subscriptionID string) CertificateClient {
+	return original.NewCertificateClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SoftwareUpdateConfigurationMachineRunsClient = original.SoftwareUpdateConfigurationMachineRunsClient
+type SourceControlClient = original.SourceControlClient
 
-func NewSoftwareUpdateConfigurationMachineRunsClient(subscriptionID string) SoftwareUpdateConfigurationMachineRunsClient {
-	return original.NewSoftwareUpdateConfigurationMachineRunsClient(subscriptionID)
+func NewSourceControlClient(subscriptionID string) SourceControlClient {
+	return original.NewSourceControlClient(subscriptionID)
 }
-func NewSoftwareUpdateConfigurationMachineRunsClientWithBaseURI(baseURI string, subscriptionID string) SoftwareUpdateConfigurationMachineRunsClient {
-	return original.NewSoftwareUpdateConfigurationMachineRunsClientWithBaseURI(baseURI, subscriptionID)
+func NewSourceControlClientWithBaseURI(baseURI string, subscriptionID string) SourceControlClient {
+	return original.NewSourceControlClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SoftwareUpdateConfigurationRunsClient = original.SoftwareUpdateConfigurationRunsClient
+type VariableClient = original.VariableClient
 
-func NewSoftwareUpdateConfigurationRunsClient(subscriptionID string) SoftwareUpdateConfigurationRunsClient {
-	return original.NewSoftwareUpdateConfigurationRunsClient(subscriptionID)
+func NewVariableClient(subscriptionID string) VariableClient {
+	return original.NewVariableClient(subscriptionID)
 }
-func NewSoftwareUpdateConfigurationRunsClientWithBaseURI(baseURI string, subscriptionID string) SoftwareUpdateConfigurationRunsClient {
-	return original.NewSoftwareUpdateConfigurationRunsClientWithBaseURI(baseURI, subscriptionID)
+func NewVariableClientWithBaseURI(baseURI string, subscriptionID string) VariableClient {
+	return original.NewVariableClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SoftwareUpdateConfigurationsClient = original.SoftwareUpdateConfigurationsClient
+type ConnectionClient = original.ConnectionClient
 
-func NewSoftwareUpdateConfigurationsClient(subscriptionID string) SoftwareUpdateConfigurationsClient {
-	return original.NewSoftwareUpdateConfigurationsClient(subscriptionID)
+func NewConnectionClient(subscriptionID string) ConnectionClient {
+	return original.NewConnectionClient(subscriptionID)
 }
-func NewSoftwareUpdateConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) SoftwareUpdateConfigurationsClient {
-	return original.NewSoftwareUpdateConfigurationsClientWithBaseURI(baseURI, subscriptionID)
+func NewConnectionClientWithBaseURI(baseURI string, subscriptionID string) ConnectionClient {
+	return original.NewConnectionClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SourceControlClient = original.SourceControlClient
+type TestJobClient = original.TestJobClient
 
-func NewSourceControlClient(subscriptionID string) SourceControlClient {
-	return original.NewSourceControlClient(subscriptionID)
+func NewTestJobClient(subscriptionID string) TestJobClient {
+	return original.NewTestJobClient(subscriptionID)
 }
-func NewSourceControlClientWithBaseURI(baseURI string, subscriptionID string) SourceControlClient {
-	return original.NewSourceControlClientWithBaseURI(baseURI, subscriptionID)
+func NewTestJobClientWithBaseURI(baseURI string, subscriptionID string) TestJobClient {
+	return original.NewTestJobClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SourceControlSyncJobClient = original.SourceControlSyncJobClient
+type KeysClient = original.KeysClient
 
-func NewSourceControlSyncJobClient(subscriptionID string) SourceControlSyncJobClient {
-	return original.NewSourceControlSyncJobClient(subscriptionID)
+func NewKeysClient(subscriptionID string) KeysClient {
+	return original.NewKeysClient(subscriptionID)
 }
-func NewSourceControlSyncJobClientWithBaseURI(baseURI string, subscriptionID string) SourceControlSyncJobClient {
-	return original.NewSourceControlSyncJobClientWithBaseURI(baseURI, subscriptionID)
+func NewKeysClientWithBaseURI(baseURI string, subscriptionID string) KeysClient {
+	return original.NewKeysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type StatisticsClient = original.StatisticsClient
+type CredentialClient = original.CredentialClient
 
-func NewStatisticsClient(subscriptionID string) StatisticsClient {
-	return original.NewStatisticsClient(subscriptionID)
+func NewCredentialClient(subscriptionID string) CredentialClient {
+	return original.NewCredentialClient(subscriptionID)
 }
-func NewStatisticsClientWithBaseURI(baseURI string, subscriptionID string) StatisticsClient {
-	return original.NewStatisticsClientWithBaseURI(baseURI, subscriptionID)
+func NewCredentialClientWithBaseURI(baseURI string, subscriptionID string) CredentialClient {
+	return original.NewCredentialClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TestJobClient = original.TestJobClient
+type DscNodeConfigurationClient = original.DscNodeConfigurationClient
 
-func NewTestJobClient(subscriptionID string) TestJobClient {
-	return original.NewTestJobClient(subscriptionID)
+func NewDscNodeConfigurationClient(subscriptionID string) DscNodeConfigurationClient {
+	return original.NewDscNodeConfigurationClient(subscriptionID)
 }
-func NewTestJobClientWithBaseURI(baseURI string, subscriptionID string) TestJobClient {
-	return original.NewTestJobClientWithBaseURI(baseURI, subscriptionID)
+func NewDscNodeConfigurationClientWithBaseURI(baseURI string, subscriptionID string) DscNodeConfigurationClient {
+	return original.NewDscNodeConfigurationClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TestJobStreamsClient = original.TestJobStreamsClient
+type SourceControlSyncJobClient = original.SourceControlSyncJobClient
 
-func NewTestJobStreamsClient(subscriptionID string) TestJobStreamsClient {
-	return original.NewTestJobStreamsClient(subscriptionID)
+func NewSourceControlSyncJobClient(subscriptionID string) SourceControlSyncJobClient {
+	return original.NewSourceControlSyncJobClient(subscriptionID)
 }
-func NewTestJobStreamsClientWithBaseURI(baseURI string, subscriptionID string) TestJobStreamsClient {
-	return original.NewTestJobStreamsClientWithBaseURI(baseURI, subscriptionID)
+func NewSourceControlSyncJobClientWithBaseURI(baseURI string, subscriptionID string) SourceControlSyncJobClient {
+	return original.NewSourceControlSyncJobClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UsagesClient = original.UsagesClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewUsagesClient(subscriptionID string) UsagesClient {
-	return original.NewUsagesClient(subscriptionID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
-	return original.NewUsagesClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
-type VariableClient = original.VariableClient
+type HybridRunbookWorkerGroupClient = original.HybridRunbookWorkerGroupClient
 
-func NewVariableClient(subscriptionID string) VariableClient {
-	return original.NewVariableClient(subscriptionID)
+func NewHybridRunbookWorkerGroupClient(subscriptionID string) HybridRunbookWorkerGroupClient {
+	return original.NewHybridRunbookWorkerGroupClient(subscriptionID)
 }
-func NewVariableClientWithBaseURI(baseURI string, subscriptionID string) VariableClient {
-	return original.NewVariableClientWithBaseURI(baseURI, subscriptionID)
+func NewHybridRunbookWorkerGroupClientWithBaseURI(baseURI string, subscriptionID string) HybridRunbookWorkerGroupClient {
+	return original.NewHybridRunbookWorkerGroupClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+type LinkedWorkspaceClient = original.LinkedWorkspaceClient
+
+func NewLinkedWorkspaceClient(subscriptionID string) LinkedWorkspaceClient {
+	return original.NewLinkedWorkspaceClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewLinkedWorkspaceClientWithBaseURI(baseURI string, subscriptionID string) LinkedWorkspaceClient {
+	return original.NewLinkedWorkspaceClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type WebhookClient = original.WebhookClient
+type TestJobStreamsClient = original.TestJobStreamsClient
 
-func NewWebhookClient(subscriptionID string) WebhookClient {
-	return original.NewWebhookClient(subscriptionID)
+func NewTestJobStreamsClient(subscriptionID string) TestJobStreamsClient {
+	return original.NewTestJobStreamsClient(subscriptionID)
 }
-func NewWebhookClientWithBaseURI(baseURI string, subscriptionID string) WebhookClient {
-	return original.NewWebhookClientWithBaseURI(baseURI, subscriptionID)
+func NewTestJobStreamsClientWithBaseURI(baseURI string, subscriptionID string) TestJobStreamsClient {
+	return original.NewTestJobStreamsClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/azsadmin/mgmt/fabric/models.go b/profiles/preview/azsadmin/mgmt/fabric/models.go
index 2b78981f9102..0290355c1e90 100644
--- a/profiles/preview/azsadmin/mgmt/fabric/models.go
+++ b/profiles/preview/azsadmin/mgmt/fabric/models.go
@@ -21,17 +21,22 @@ package fabric
 
 import original "github.com/Azure/azure-sdk-for-go/services/azsadmin/mgmt/2016-05-01/fabric"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type StoragePoolsClient = original.StoragePoolsClient
 
-type BaseClient = original.BaseClient
+func NewStoragePoolsClient(subscriptionID string) StoragePoolsClient {
+	return original.NewStoragePoolsClient(subscriptionID)
+}
+func NewStoragePoolsClientWithBaseURI(baseURI string, subscriptionID string) StoragePoolsClient {
+	return original.NewStoragePoolsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type VolumesClient = original.VolumesClient
+
+func NewVolumesClient(subscriptionID string) VolumesClient {
+	return original.NewVolumesClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewVolumesClientWithBaseURI(baseURI string, subscriptionID string) VolumesClient {
+	return original.NewVolumesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ComputeFabricOperationsClient = original.ComputeFabricOperationsClient
@@ -43,49 +48,31 @@ func NewComputeFabricOperationsClientWithBaseURI(baseURI string, subscriptionID
 	return original.NewComputeFabricOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type EdgeGatewayPoolsClient = original.EdgeGatewayPoolsClient
-
-func NewEdgeGatewayPoolsClient(subscriptionID string) EdgeGatewayPoolsClient {
-	return original.NewEdgeGatewayPoolsClient(subscriptionID)
-}
-func NewEdgeGatewayPoolsClientWithBaseURI(baseURI string, subscriptionID string) EdgeGatewayPoolsClient {
-	return original.NewEdgeGatewayPoolsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type EdgeGatewaysClient = original.EdgeGatewaysClient
-
-func NewEdgeGatewaysClient(subscriptionID string) EdgeGatewaysClient {
-	return original.NewEdgeGatewaysClient(subscriptionID)
-}
-func NewEdgeGatewaysClientWithBaseURI(baseURI string, subscriptionID string) EdgeGatewaysClient {
-	return original.NewEdgeGatewaysClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type FileSharesClient = original.FileSharesClient
+type InfraRolesClient = original.InfraRolesClient
 
-func NewFileSharesClient(subscriptionID string) FileSharesClient {
-	return original.NewFileSharesClient(subscriptionID)
+func NewInfraRolesClient(subscriptionID string) InfraRolesClient {
+	return original.NewInfraRolesClient(subscriptionID)
 }
-func NewFileSharesClientWithBaseURI(baseURI string, subscriptionID string) FileSharesClient {
-	return original.NewFileSharesClientWithBaseURI(baseURI, subscriptionID)
+func NewInfraRolesClientWithBaseURI(baseURI string, subscriptionID string) InfraRolesClient {
+	return original.NewInfraRolesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type InfraRoleInstancesClient = original.InfraRoleInstancesClient
+type LocationsClient = original.LocationsClient
 
-func NewInfraRoleInstancesClient(subscriptionID string) InfraRoleInstancesClient {
-	return original.NewInfraRoleInstancesClient(subscriptionID)
+func NewLocationsClient(subscriptionID string) LocationsClient {
+	return original.NewLocationsClient(subscriptionID)
 }
-func NewInfraRoleInstancesClientWithBaseURI(baseURI string, subscriptionID string) InfraRoleInstancesClient {
-	return original.NewInfraRoleInstancesClientWithBaseURI(baseURI, subscriptionID)
+func NewLocationsClientWithBaseURI(baseURI string, subscriptionID string) LocationsClient {
+	return original.NewLocationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type InfraRolesClient = original.InfraRolesClient
+type StorageSystemsClient = original.StorageSystemsClient
 
-func NewInfraRolesClient(subscriptionID string) InfraRolesClient {
-	return original.NewInfraRolesClient(subscriptionID)
+func NewStorageSystemsClient(subscriptionID string) StorageSystemsClient {
+	return original.NewStorageSystemsClient(subscriptionID)
 }
-func NewInfraRolesClientWithBaseURI(baseURI string, subscriptionID string) InfraRolesClient {
-	return original.NewInfraRolesClientWithBaseURI(baseURI, subscriptionID)
+func NewStorageSystemsClientWithBaseURI(baseURI string, subscriptionID string) StorageSystemsClient {
+	return original.NewStorageSystemsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type IPPoolsClient = original.IPPoolsClient
@@ -97,13 +84,22 @@ func NewIPPoolsClientWithBaseURI(baseURI string, subscriptionID string) IPPoolsC
 	return original.NewIPPoolsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LocationsClient = original.LocationsClient
+type FileSharesClient = original.FileSharesClient
 
-func NewLocationsClient(subscriptionID string) LocationsClient {
-	return original.NewLocationsClient(subscriptionID)
+func NewFileSharesClient(subscriptionID string) FileSharesClient {
+	return original.NewFileSharesClient(subscriptionID)
 }
-func NewLocationsClientWithBaseURI(baseURI string, subscriptionID string) LocationsClient {
-	return original.NewLocationsClientWithBaseURI(baseURI, subscriptionID)
+func NewFileSharesClientWithBaseURI(baseURI string, subscriptionID string) FileSharesClient {
+	return original.NewFileSharesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type EdgeGatewaysClient = original.EdgeGatewaysClient
+
+func NewEdgeGatewaysClient(subscriptionID string) EdgeGatewaysClient {
+	return original.NewEdgeGatewaysClient(subscriptionID)
+}
+func NewEdgeGatewaysClientWithBaseURI(baseURI string, subscriptionID string) EdgeGatewaysClient {
+	return original.NewEdgeGatewaysClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type LogicalNetworksClient = original.LogicalNetworksClient
@@ -115,24 +111,6 @@ func NewLogicalNetworksClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewLogicalNetworksClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LogicalSubnetsClient = original.LogicalSubnetsClient
-
-func NewLogicalSubnetsClient(subscriptionID string) LogicalSubnetsClient {
-	return original.NewLogicalSubnetsClient(subscriptionID)
-}
-func NewLogicalSubnetsClientWithBaseURI(baseURI string, subscriptionID string) LogicalSubnetsClient {
-	return original.NewLogicalSubnetsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type MacAddressPoolsClient = original.MacAddressPoolsClient
-
-func NewMacAddressPoolsClient(subscriptionID string) MacAddressPoolsClient {
-	return original.NewMacAddressPoolsClient(subscriptionID)
-}
-func NewMacAddressPoolsClientWithBaseURI(baseURI string, subscriptionID string) MacAddressPoolsClient {
-	return original.NewMacAddressPoolsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type InfraRoleInstanceState = original.InfraRoleInstanceState
 
 const (
@@ -290,6 +268,15 @@ type VolumeList = original.VolumeList
 type VolumeListIterator = original.VolumeListIterator
 type VolumeListPage = original.VolumeListPage
 type VolumeModel = original.VolumeModel
+type ScaleUnitNodesClient = original.ScaleUnitNodesClient
+
+func NewScaleUnitNodesClient(subscriptionID string) ScaleUnitNodesClient {
+	return original.NewScaleUnitNodesClient(subscriptionID)
+}
+func NewScaleUnitNodesClientWithBaseURI(baseURI string, subscriptionID string) ScaleUnitNodesClient {
+	return original.NewScaleUnitNodesClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type NetworkFabricOperationsClient = original.NetworkFabricOperationsClient
 
 func NewNetworkFabricOperationsClient(subscriptionID string) NetworkFabricOperationsClient {
@@ -298,23 +285,20 @@ func NewNetworkFabricOperationsClient(subscriptionID string) NetworkFabricOperat
 func NewNetworkFabricOperationsClientWithBaseURI(baseURI string, subscriptionID string) NetworkFabricOperationsClient {
 	return original.NewNetworkFabricOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type ScaleUnitNodesClient = original.ScaleUnitNodesClient
-
-func NewScaleUnitNodesClient(subscriptionID string) ScaleUnitNodesClient {
-	return original.NewScaleUnitNodesClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewScaleUnitNodesClientWithBaseURI(baseURI string, subscriptionID string) ScaleUnitNodesClient {
-	return original.NewScaleUnitNodesClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type ScaleUnitsClient = original.ScaleUnitsClient
+type LogicalSubnetsClient = original.LogicalSubnetsClient
 
-func NewScaleUnitsClient(subscriptionID string) ScaleUnitsClient {
-	return original.NewScaleUnitsClient(subscriptionID)
+func NewLogicalSubnetsClient(subscriptionID string) LogicalSubnetsClient {
+	return original.NewLogicalSubnetsClient(subscriptionID)
 }
-func NewScaleUnitsClientWithBaseURI(baseURI string, subscriptionID string) ScaleUnitsClient {
-	return original.NewScaleUnitsClientWithBaseURI(baseURI, subscriptionID)
+func NewLogicalSubnetsClientWithBaseURI(baseURI string, subscriptionID string) LogicalSubnetsClient {
+	return original.NewLogicalSubnetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type SlbMuxInstancesClient = original.SlbMuxInstancesClient
@@ -326,35 +310,51 @@ func NewSlbMuxInstancesClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewSlbMuxInstancesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type StoragePoolsClient = original.StoragePoolsClient
+type ScaleUnitsClient = original.ScaleUnitsClient
 
-func NewStoragePoolsClient(subscriptionID string) StoragePoolsClient {
-	return original.NewStoragePoolsClient(subscriptionID)
+func NewScaleUnitsClient(subscriptionID string) ScaleUnitsClient {
+	return original.NewScaleUnitsClient(subscriptionID)
 }
-func NewStoragePoolsClientWithBaseURI(baseURI string, subscriptionID string) StoragePoolsClient {
-	return original.NewStoragePoolsClientWithBaseURI(baseURI, subscriptionID)
+func NewScaleUnitsClientWithBaseURI(baseURI string, subscriptionID string) ScaleUnitsClient {
+	return original.NewScaleUnitsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type StorageSystemsClient = original.StorageSystemsClient
+type MacAddressPoolsClient = original.MacAddressPoolsClient
 
-func NewStorageSystemsClient(subscriptionID string) StorageSystemsClient {
-	return original.NewStorageSystemsClient(subscriptionID)
+func NewMacAddressPoolsClient(subscriptionID string) MacAddressPoolsClient {
+	return original.NewMacAddressPoolsClient(subscriptionID)
 }
-func NewStorageSystemsClientWithBaseURI(baseURI string, subscriptionID string) StorageSystemsClient {
-	return original.NewStorageSystemsClientWithBaseURI(baseURI, subscriptionID)
+func NewMacAddressPoolsClientWithBaseURI(baseURI string, subscriptionID string) MacAddressPoolsClient {
+	return original.NewMacAddressPoolsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
-type VolumesClient = original.VolumesClient
+type EdgeGatewayPoolsClient = original.EdgeGatewayPoolsClient
 
-func NewVolumesClient(subscriptionID string) VolumesClient {
-	return original.NewVolumesClient(subscriptionID)
+func NewEdgeGatewayPoolsClient(subscriptionID string) EdgeGatewayPoolsClient {
+	return original.NewEdgeGatewayPoolsClient(subscriptionID)
 }
-func NewVolumesClientWithBaseURI(baseURI string, subscriptionID string) VolumesClient {
-	return original.NewVolumesClientWithBaseURI(baseURI, subscriptionID)
+func NewEdgeGatewayPoolsClientWithBaseURI(baseURI string, subscriptionID string) EdgeGatewayPoolsClient {
+	return original.NewEdgeGatewayPoolsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type InfraRoleInstancesClient = original.InfraRoleInstancesClient
+
+func NewInfraRoleInstancesClient(subscriptionID string) InfraRoleInstancesClient {
+	return original.NewInfraRoleInstancesClient(subscriptionID)
+}
+func NewInfraRoleInstancesClientWithBaseURI(baseURI string, subscriptionID string) InfraRoleInstancesClient {
+	return original.NewInfraRoleInstancesClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/azsadmin/mgmt/infrastructureinsights/models.go b/profiles/preview/azsadmin/mgmt/infrastructureinsights/models.go
index d5af371d1554..16dbfaa8aab9 100644
--- a/profiles/preview/azsadmin/mgmt/infrastructureinsights/models.go
+++ b/profiles/preview/azsadmin/mgmt/infrastructureinsights/models.go
@@ -21,26 +21,31 @@ package infrastructureinsights
 
 import original "github.com/Azure/azure-sdk-for-go/services/azsadmin/mgmt/2016-05-01/infrastructureinsights"
 
-type AlertsClient = original.AlertsClient
+type ServiceHealthsClient = original.ServiceHealthsClient
 
-func NewAlertsClient(subscriptionID string) AlertsClient {
-	return original.NewAlertsClient(subscriptionID)
+func NewServiceHealthsClient(subscriptionID string) ServiceHealthsClient {
+	return original.NewServiceHealthsClient(subscriptionID)
 }
-func NewAlertsClientWithBaseURI(baseURI string, subscriptionID string) AlertsClient {
-	return original.NewAlertsClientWithBaseURI(baseURI, subscriptionID)
+func NewServiceHealthsClientWithBaseURI(baseURI string, subscriptionID string) ServiceHealthsClient {
+	return original.NewServiceHealthsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type RegionHealthsClient = original.RegionHealthsClient
 
-type BaseClient = original.BaseClient
+func NewRegionHealthsClient(subscriptionID string) RegionHealthsClient {
+	return original.NewRegionHealthsClient(subscriptionID)
+}
+func NewRegionHealthsClientWithBaseURI(baseURI string, subscriptionID string) RegionHealthsClient {
+	return original.NewRegionHealthsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type AlertsClient = original.AlertsClient
+
+func NewAlertsClient(subscriptionID string) AlertsClient {
+	return original.NewAlertsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewAlertsClientWithBaseURI(baseURI string, subscriptionID string) AlertsClient {
+	return original.NewAlertsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type MetricsSourceType = original.MetricsSourceType
@@ -96,13 +101,12 @@ type ServiceHealthListIterator = original.ServiceHealthListIterator
 type ServiceHealthListPage = original.ServiceHealthListPage
 type ServiceHealthModel = original.ServiceHealthModel
 type UsageMetrics = original.UsageMetrics
-type RegionHealthsClient = original.RegionHealthsClient
 
-func NewRegionHealthsClient(subscriptionID string) RegionHealthsClient {
-	return original.NewRegionHealthsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewRegionHealthsClientWithBaseURI(baseURI string, subscriptionID string) RegionHealthsClient {
-	return original.NewRegionHealthsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
 type ResourceHealthsClient = original.ResourceHealthsClient
@@ -114,17 +118,15 @@ func NewResourceHealthsClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewResourceHealthsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ServiceHealthsClient = original.ServiceHealthsClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewServiceHealthsClient(subscriptionID string) ServiceHealthsClient {
-	return original.NewServiceHealthsClient(subscriptionID)
-}
-func NewServiceHealthsClientWithBaseURI(baseURI string, subscriptionID string) ServiceHealthsClient {
-	return original.NewServiceHealthsClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/azurestack/mgmt/azurestack/models.go b/profiles/preview/azurestack/mgmt/azurestack/models.go
index 443e7c43157f..a33f86565d1f 100644
--- a/profiles/preview/azurestack/mgmt/azurestack/models.go
+++ b/profiles/preview/azurestack/mgmt/azurestack/models.go
@@ -21,17 +21,13 @@ package azurestack
 
 import original "github.com/Azure/azure-sdk-for-go/services/azurestack/mgmt/2017-06-01/azurestack"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type CustomerSubscriptionsClient = original.CustomerSubscriptionsClient
@@ -114,13 +110,12 @@ type Resource = original.Resource
 type URI = original.URI
 type VirtualMachineExtensionProductProperties = original.VirtualMachineExtensionProductProperties
 type VirtualMachineProductProperties = original.VirtualMachineProductProperties
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
 type ProductsClient = original.ProductsClient
@@ -140,9 +135,16 @@ func NewRegistrationsClient(subscriptionID string) RegistrationsClient {
 func NewRegistrationsClientWithBaseURI(baseURI string, subscriptionID string) RegistrationsClient {
 	return original.NewRegistrationsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/batch/batch/models.go b/profiles/preview/batch/batch/models.go
index ef62562eee54..93929b33e781 100644
--- a/profiles/preview/batch/batch/models.go
+++ b/profiles/preview/batch/batch/models.go
@@ -21,53 +21,13 @@ package batch
 
 import original "github.com/Azure/azure-sdk-for-go/services/batch/2018-03-01.6.1/batch"
 
-type AccountClient = original.AccountClient
-
-func NewAccountClient() AccountClient {
-	return original.NewAccountClient()
-}
-func NewAccountClientWithBaseURI(baseURI string) AccountClient {
-	return original.NewAccountClientWithBaseURI(baseURI)
-}
-
-type ApplicationClient = original.ApplicationClient
-
-func NewApplicationClient() ApplicationClient {
-	return original.NewApplicationClient()
-}
-func NewApplicationClientWithBaseURI(baseURI string) ApplicationClient {
-	return original.NewApplicationClientWithBaseURI(baseURI)
-}
-
-type CertificateClient = original.CertificateClient
-
-func NewCertificateClient() CertificateClient {
-	return original.NewCertificateClient()
-}
-func NewCertificateClientWithBaseURI(baseURI string) CertificateClient {
-	return original.NewCertificateClientWithBaseURI(baseURI)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
-}
-
-type ComputeNodeClient = original.ComputeNodeClient
+type JobClient = original.JobClient
 
-func NewComputeNodeClient() ComputeNodeClient {
-	return original.NewComputeNodeClient()
+func NewJobClient() JobClient {
+	return original.NewJobClient()
 }
-func NewComputeNodeClientWithBaseURI(baseURI string) ComputeNodeClient {
-	return original.NewComputeNodeClientWithBaseURI(baseURI)
+func NewJobClientWithBaseURI(baseURI string) JobClient {
+	return original.NewJobClientWithBaseURI(baseURI)
 }
 
 type FileClient = original.FileClient
@@ -79,22 +39,22 @@ func NewFileClientWithBaseURI(baseURI string) FileClient {
 	return original.NewFileClientWithBaseURI(baseURI)
 }
 
-type JobClient = original.JobClient
+type ApplicationClient = original.ApplicationClient
 
-func NewJobClient() JobClient {
-	return original.NewJobClient()
+func NewApplicationClient() ApplicationClient {
+	return original.NewApplicationClient()
 }
-func NewJobClientWithBaseURI(baseURI string) JobClient {
-	return original.NewJobClientWithBaseURI(baseURI)
+func NewApplicationClientWithBaseURI(baseURI string) ApplicationClient {
+	return original.NewApplicationClientWithBaseURI(baseURI)
 }
 
-type JobScheduleClient = original.JobScheduleClient
+type AccountClient = original.AccountClient
 
-func NewJobScheduleClient() JobScheduleClient {
-	return original.NewJobScheduleClient()
+func NewAccountClient() AccountClient {
+	return original.NewAccountClient()
 }
-func NewJobScheduleClientWithBaseURI(baseURI string) JobScheduleClient {
-	return original.NewJobScheduleClientWithBaseURI(baseURI)
+func NewAccountClientWithBaseURI(baseURI string) AccountClient {
+	return original.NewAccountClientWithBaseURI(baseURI)
 }
 
 type AccessScope = original.AccessScope
@@ -723,13 +683,28 @@ type UserAccount = original.UserAccount
 type UserIdentity = original.UserIdentity
 type VirtualMachineConfiguration = original.VirtualMachineConfiguration
 type WindowsConfiguration = original.WindowsConfiguration
-type PoolClient = original.PoolClient
+type ComputeNodeClient = original.ComputeNodeClient
 
-func NewPoolClient() PoolClient {
-	return original.NewPoolClient()
+func NewComputeNodeClient() ComputeNodeClient {
+	return original.NewComputeNodeClient()
 }
-func NewPoolClientWithBaseURI(baseURI string) PoolClient {
-	return original.NewPoolClientWithBaseURI(baseURI)
+func NewComputeNodeClientWithBaseURI(baseURI string) ComputeNodeClient {
+	return original.NewComputeNodeClientWithBaseURI(baseURI)
+}
+
+type JobScheduleClient = original.JobScheduleClient
+
+func NewJobScheduleClient() JobScheduleClient {
+	return original.NewJobScheduleClient()
+}
+func NewJobScheduleClientWithBaseURI(baseURI string) JobScheduleClient {
+	return original.NewJobScheduleClientWithBaseURI(baseURI)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
 }
 
 type TaskClient = original.TaskClient
@@ -740,9 +715,34 @@ func NewTaskClient() TaskClient {
 func NewTaskClientWithBaseURI(baseURI string) TaskClient {
 	return original.NewTaskClientWithBaseURI(baseURI)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+type CertificateClient = original.CertificateClient
+
+func NewCertificateClient() CertificateClient {
+	return original.NewCertificateClient()
 }
-func Version() string {
-	return original.Version()
+func NewCertificateClientWithBaseURI(baseURI string) CertificateClient {
+	return original.NewCertificateClientWithBaseURI(baseURI)
+}
+
+type PoolClient = original.PoolClient
+
+func NewPoolClient() PoolClient {
+	return original.NewPoolClient()
+}
+func NewPoolClientWithBaseURI(baseURI string) PoolClient {
+	return original.NewPoolClientWithBaseURI(baseURI)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
 }
diff --git a/profiles/preview/batch/mgmt/batch/models.go b/profiles/preview/batch/mgmt/batch/models.go
index a5adcc35e0b3..af4752114587 100644
--- a/profiles/preview/batch/mgmt/batch/models.go
+++ b/profiles/preview/batch/mgmt/batch/models.go
@@ -21,13 +21,22 @@ package batch
 
 import original "github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2017-09-01/batch"
 
-type AccountClient = original.AccountClient
+type LocationClient = original.LocationClient
 
-func NewAccountClient(subscriptionID string) AccountClient {
-	return original.NewAccountClient(subscriptionID)
+func NewLocationClient(subscriptionID string) LocationClient {
+	return original.NewLocationClient(subscriptionID)
 }
-func NewAccountClientWithBaseURI(baseURI string, subscriptionID string) AccountClient {
-	return original.NewAccountClientWithBaseURI(baseURI, subscriptionID)
+func NewLocationClientWithBaseURI(baseURI string, subscriptionID string) LocationClient {
+	return original.NewLocationClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type OperationsClient = original.OperationsClient
+
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ApplicationClient = original.ApplicationClient
@@ -39,6 +48,15 @@ func NewApplicationClientWithBaseURI(baseURI string, subscriptionID string) Appl
 	return original.NewApplicationClientWithBaseURI(baseURI, subscriptionID)
 }
 
+type AccountClient = original.AccountClient
+
+func NewAccountClient(subscriptionID string) AccountClient {
+	return original.NewAccountClient(subscriptionID)
+}
+func NewAccountClientWithBaseURI(baseURI string, subscriptionID string) AccountClient {
+	return original.NewAccountClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type ApplicationPackageClient = original.ApplicationPackageClient
 
 func NewApplicationPackageClient(subscriptionID string) ApplicationPackageClient {
@@ -48,37 +66,6 @@ func NewApplicationPackageClientWithBaseURI(baseURI string, subscriptionID strin
 	return original.NewApplicationPackageClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CertificateClient = original.CertificateClient
-
-func NewCertificateClient(subscriptionID string) CertificateClient {
-	return original.NewCertificateClient(subscriptionID)
-}
-func NewCertificateClientWithBaseURI(baseURI string, subscriptionID string) CertificateClient {
-	return original.NewCertificateClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type LocationClient = original.LocationClient
-
-func NewLocationClient(subscriptionID string) LocationClient {
-	return original.NewLocationClient(subscriptionID)
-}
-func NewLocationClientWithBaseURI(baseURI string, subscriptionID string) LocationClient {
-	return original.NewLocationClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type AccountKeyType = original.AccountKeyType
 
 const (
@@ -393,13 +380,21 @@ type UserAccount = original.UserAccount
 type UserIdentity = original.UserIdentity
 type VirtualMachineConfiguration = original.VirtualMachineConfiguration
 type WindowsConfiguration = original.WindowsConfiguration
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
+}
+
+type CertificateClient = original.CertificateClient
+
+func NewCertificateClient(subscriptionID string) CertificateClient {
+	return original.NewCertificateClient(subscriptionID)
+}
+func NewCertificateClientWithBaseURI(baseURI string, subscriptionID string) CertificateClient {
+	return original.NewCertificateClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type PoolClient = original.PoolClient
@@ -410,9 +405,16 @@ func NewPoolClient(subscriptionID string) PoolClient {
 func NewPoolClientWithBaseURI(baseURI string, subscriptionID string) PoolClient {
 	return original.NewPoolClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/batchai/mgmt/batchai/models.go b/profiles/preview/batchai/mgmt/batchai/models.go
index 3a196ad2108f..0165b91fcf4d 100644
--- a/profiles/preview/batchai/mgmt/batchai/models.go
+++ b/profiles/preview/batchai/mgmt/batchai/models.go
@@ -21,26 +21,31 @@ package batchai
 
 import original "github.com/Azure/azure-sdk-for-go/services/batchai/mgmt/2018-03-01/batchai"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type OperationsClient = original.OperationsClient
 
-type BaseClient = original.BaseClient
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type UsageClient = original.UsageClient
+
+func NewUsageClient(subscriptionID string) UsageClient {
+	return original.NewUsageClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewUsageClientWithBaseURI(baseURI string, subscriptionID string) UsageClient {
+	return original.NewUsageClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ClustersClient = original.ClustersClient
+type JobsClient = original.JobsClient
 
-func NewClustersClient(subscriptionID string) ClustersClient {
-	return original.NewClustersClient(subscriptionID)
+func NewJobsClient(subscriptionID string) JobsClient {
+	return original.NewJobsClient(subscriptionID)
 }
-func NewClustersClientWithBaseURI(baseURI string, subscriptionID string) ClustersClient {
-	return original.NewClustersClientWithBaseURI(baseURI, subscriptionID)
+func NewJobsClientWithBaseURI(baseURI string, subscriptionID string) JobsClient {
+	return original.NewJobsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type FileServersClient = original.FileServersClient
@@ -52,15 +57,6 @@ func NewFileServersClientWithBaseURI(baseURI string, subscriptionID string) File
 	return original.NewFileServersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type JobsClient = original.JobsClient
-
-func NewJobsClient(subscriptionID string) JobsClient {
-	return original.NewJobsClient(subscriptionID)
-}
-func NewJobsClientWithBaseURI(baseURI string, subscriptionID string) JobsClient {
-	return original.NewJobsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type AllocationState = original.AllocationState
 
 const (
@@ -295,26 +291,32 @@ type Usage = original.Usage
 type UsageName = original.UsageName
 type UserAccountSettings = original.UserAccountSettings
 type VirtualMachineConfiguration = original.VirtualMachineConfiguration
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type UsageClient = original.UsageClient
+type ClustersClient = original.ClustersClient
 
-func NewUsageClient(subscriptionID string) UsageClient {
-	return original.NewUsageClient(subscriptionID)
+func NewClustersClient(subscriptionID string) ClustersClient {
+	return original.NewClustersClient(subscriptionID)
 }
-func NewUsageClientWithBaseURI(baseURI string, subscriptionID string) UsageClient {
-	return original.NewUsageClientWithBaseURI(baseURI, subscriptionID)
+func NewClustersClientWithBaseURI(baseURI string, subscriptionID string) ClustersClient {
+	return original.NewClustersClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/billing/mgmt/billing/models.go b/profiles/preview/billing/mgmt/billing/models.go
index 440721255bb4..e9c56e594a92 100644
--- a/profiles/preview/billing/mgmt/billing/models.go
+++ b/profiles/preview/billing/mgmt/billing/models.go
@@ -21,26 +21,13 @@ package billing
 
 import original "github.com/Azure/azure-sdk-for-go/services/billing/mgmt/2018-03-01-preview/billing"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type EnrollmentAccountsClient = original.EnrollmentAccountsClient
+type OperationsClient = original.OperationsClient
 
-func NewEnrollmentAccountsClient(subscriptionID string) EnrollmentAccountsClient {
-	return original.NewEnrollmentAccountsClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewEnrollmentAccountsClientWithBaseURI(baseURI string, subscriptionID string) EnrollmentAccountsClient {
-	return original.NewEnrollmentAccountsClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type InvoicesClient = original.InvoicesClient
@@ -52,6 +39,15 @@ func NewInvoicesClientWithBaseURI(baseURI string, subscriptionID string) Invoice
 	return original.NewInvoicesClientWithBaseURI(baseURI, subscriptionID)
 }
 
+type PeriodsClient = original.PeriodsClient
+
+func NewPeriodsClient(subscriptionID string) PeriodsClient {
+	return original.NewPeriodsClient(subscriptionID)
+}
+func NewPeriodsClientWithBaseURI(baseURI string, subscriptionID string) PeriodsClient {
+	return original.NewPeriodsClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type DownloadURL = original.DownloadURL
 type EnrollmentAccount = original.EnrollmentAccount
 type EnrollmentAccountListResult = original.EnrollmentAccountListResult
@@ -76,26 +72,32 @@ type PeriodsListResult = original.PeriodsListResult
 type PeriodsListResultIterator = original.PeriodsListResultIterator
 type PeriodsListResultPage = original.PeriodsListResultPage
 type Resource = original.Resource
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type PeriodsClient = original.PeriodsClient
+type EnrollmentAccountsClient = original.EnrollmentAccountsClient
 
-func NewPeriodsClient(subscriptionID string) PeriodsClient {
-	return original.NewPeriodsClient(subscriptionID)
+func NewEnrollmentAccountsClient(subscriptionID string) EnrollmentAccountsClient {
+	return original.NewEnrollmentAccountsClient(subscriptionID)
 }
-func NewPeriodsClientWithBaseURI(baseURI string, subscriptionID string) PeriodsClient {
-	return original.NewPeriodsClientWithBaseURI(baseURI, subscriptionID)
+func NewEnrollmentAccountsClientWithBaseURI(baseURI string, subscriptionID string) EnrollmentAccountsClient {
+	return original.NewEnrollmentAccountsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/cdn/mgmt/cdn/models.go b/profiles/preview/cdn/mgmt/cdn/models.go
index fd76117b42b8..10c439ecfd9c 100644
--- a/profiles/preview/cdn/mgmt/cdn/models.go
+++ b/profiles/preview/cdn/mgmt/cdn/models.go
@@ -21,44 +21,31 @@ package cdn
 
 import original "github.com/Azure/azure-sdk-for-go/services/cdn/mgmt/2017-10-12/cdn"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type CustomDomainsClient = original.CustomDomainsClient
+type OriginsClient = original.OriginsClient
 
-func NewCustomDomainsClient(subscriptionID string) CustomDomainsClient {
-	return original.NewCustomDomainsClient(subscriptionID)
+func NewOriginsClient(subscriptionID string) OriginsClient {
+	return original.NewOriginsClient(subscriptionID)
 }
-func NewCustomDomainsClientWithBaseURI(baseURI string, subscriptionID string) CustomDomainsClient {
-	return original.NewCustomDomainsClientWithBaseURI(baseURI, subscriptionID)
+func NewOriginsClientWithBaseURI(baseURI string, subscriptionID string) OriginsClient {
+	return original.NewOriginsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type EdgeNodesClient = original.EdgeNodesClient
+type OperationsClient = original.OperationsClient
 
-func NewEdgeNodesClient(subscriptionID string) EdgeNodesClient {
-	return original.NewEdgeNodesClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewEdgeNodesClientWithBaseURI(baseURI string, subscriptionID string) EdgeNodesClient {
-	return original.NewEdgeNodesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type EndpointsClient = original.EndpointsClient
+type ResourceUsageClient = original.ResourceUsageClient
 
-func NewEndpointsClient(subscriptionID string) EndpointsClient {
-	return original.NewEndpointsClient(subscriptionID)
+func NewResourceUsageClient(subscriptionID string) ResourceUsageClient {
+	return original.NewResourceUsageClient(subscriptionID)
 }
-func NewEndpointsClientWithBaseURI(baseURI string, subscriptionID string) EndpointsClient {
-	return original.NewEndpointsClientWithBaseURI(baseURI, subscriptionID)
+func NewResourceUsageClientWithBaseURI(baseURI string, subscriptionID string) ResourceUsageClient {
+	return original.NewResourceUsageClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type CacheBehavior = original.CacheBehavior
@@ -340,44 +327,57 @@ type ValidateCustomDomainInput = original.ValidateCustomDomainInput
 type ValidateCustomDomainOutput = original.ValidateCustomDomainOutput
 type ValidateProbeInput = original.ValidateProbeInput
 type ValidateProbeOutput = original.ValidateProbeOutput
-type OperationsClient = original.OperationsClient
+type ProfilesClient = original.ProfilesClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewProfilesClient(subscriptionID string) ProfilesClient {
+	return original.NewProfilesClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewProfilesClientWithBaseURI(baseURI string, subscriptionID string) ProfilesClient {
+	return original.NewProfilesClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
 }
 
-type OriginsClient = original.OriginsClient
+type EndpointsClient = original.EndpointsClient
 
-func NewOriginsClient(subscriptionID string) OriginsClient {
-	return original.NewOriginsClient(subscriptionID)
+func NewEndpointsClient(subscriptionID string) EndpointsClient {
+	return original.NewEndpointsClient(subscriptionID)
 }
-func NewOriginsClientWithBaseURI(baseURI string, subscriptionID string) OriginsClient {
-	return original.NewOriginsClientWithBaseURI(baseURI, subscriptionID)
+func NewEndpointsClientWithBaseURI(baseURI string, subscriptionID string) EndpointsClient {
+	return original.NewEndpointsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProfilesClient = original.ProfilesClient
+type CustomDomainsClient = original.CustomDomainsClient
 
-func NewProfilesClient(subscriptionID string) ProfilesClient {
-	return original.NewProfilesClient(subscriptionID)
+func NewCustomDomainsClient(subscriptionID string) CustomDomainsClient {
+	return original.NewCustomDomainsClient(subscriptionID)
 }
-func NewProfilesClientWithBaseURI(baseURI string, subscriptionID string) ProfilesClient {
-	return original.NewProfilesClientWithBaseURI(baseURI, subscriptionID)
+func NewCustomDomainsClientWithBaseURI(baseURI string, subscriptionID string) CustomDomainsClient {
+	return original.NewCustomDomainsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ResourceUsageClient = original.ResourceUsageClient
+type EdgeNodesClient = original.EdgeNodesClient
 
-func NewResourceUsageClient(subscriptionID string) ResourceUsageClient {
-	return original.NewResourceUsageClient(subscriptionID)
+func NewEdgeNodesClient(subscriptionID string) EdgeNodesClient {
+	return original.NewEdgeNodesClient(subscriptionID)
 }
-func NewResourceUsageClientWithBaseURI(baseURI string, subscriptionID string) ResourceUsageClient {
-	return original.NewResourceUsageClientWithBaseURI(baseURI, subscriptionID)
+func NewEdgeNodesClientWithBaseURI(baseURI string, subscriptionID string) EdgeNodesClient {
+	return original.NewEdgeNodesClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/cognitiveservices/computervision/models.go b/profiles/preview/cognitiveservices/computervision/models.go
index ade2bc783f91..97e86f488e25 100644
--- a/profiles/preview/cognitiveservices/computervision/models.go
+++ b/profiles/preview/cognitiveservices/computervision/models.go
@@ -21,15 +21,6 @@ package computervision
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/computervision"
 
-type BaseClient = original.BaseClient
-
-func New(azureRegion AzureRegions) BaseClient {
-	return original.New(azureRegion)
-}
-func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
-	return original.NewWithoutDefaults(azureRegion)
-}
-
 type AzureRegions = original.AzureRegions
 
 const (
@@ -219,3 +210,12 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type BaseClient = original.BaseClient
+
+func New(azureRegion AzureRegions) BaseClient {
+	return original.New(azureRegion)
+}
+func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
+	return original.NewWithoutDefaults(azureRegion)
+}
diff --git a/profiles/preview/cognitiveservices/contentmoderator/models.go b/profiles/preview/cognitiveservices/contentmoderator/models.go
index 83ada577606e..a650118b249d 100644
--- a/profiles/preview/cognitiveservices/contentmoderator/models.go
+++ b/profiles/preview/cognitiveservices/contentmoderator/models.go
@@ -21,19 +21,10 @@ package contentmoderator
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/contentmoderator"
 
-type BaseClient = original.BaseClient
-
-func New(baseURL AzureRegionBaseURL) BaseClient {
-	return original.New(baseURL)
-}
-func NewWithoutDefaults(baseURL AzureRegionBaseURL) BaseClient {
-	return original.NewWithoutDefaults(baseURL)
-}
-
-type ImageModerationClient = original.ImageModerationClient
+type ListManagementImageListsClient = original.ListManagementImageListsClient
 
-func NewImageModerationClient(baseURL AzureRegionBaseURL) ImageModerationClient {
-	return original.NewImageModerationClient(baseURL)
+func NewListManagementImageListsClient(baseURL AzureRegionBaseURL) ListManagementImageListsClient {
+	return original.NewListManagementImageListsClient(baseURL)
 }
 
 type ListManagementImageClient = original.ListManagementImageClient
@@ -42,10 +33,10 @@ func NewListManagementImageClient(baseURL AzureRegionBaseURL) ListManagementImag
 	return original.NewListManagementImageClient(baseURL)
 }
 
-type ListManagementImageListsClient = original.ListManagementImageListsClient
+type ListManagementTermListsClient = original.ListManagementTermListsClient
 
-func NewListManagementImageListsClient(baseURL AzureRegionBaseURL) ListManagementImageListsClient {
-	return original.NewListManagementImageListsClient(baseURL)
+func NewListManagementTermListsClient(baseURL AzureRegionBaseURL) ListManagementTermListsClient {
+	return original.NewListManagementTermListsClient(baseURL)
 }
 
 type ListManagementTermClient = original.ListManagementTermClient
@@ -54,12 +45,6 @@ func NewListManagementTermClient(baseURL AzureRegionBaseURL) ListManagementTermC
 	return original.NewListManagementTermClient(baseURL)
 }
 
-type ListManagementTermListsClient = original.ListManagementTermListsClient
-
-func NewListManagementTermListsClient(baseURL AzureRegionBaseURL) ListManagementTermListsClient {
-	return original.NewListManagementTermListsClient(baseURL)
-}
-
 type AzureRegionBaseURL = original.AzureRegionBaseURL
 
 const (
@@ -171,20 +156,35 @@ type TranscriptModerationBodyItemTermsItem = original.TranscriptModerationBodyIt
 type VideoFrameBodyItem = original.VideoFrameBodyItem
 type VideoFrameBodyItemMetadataItem = original.VideoFrameBodyItemMetadataItem
 type VideoFrameBodyItemReviewerResultTagsItem = original.VideoFrameBodyItemReviewerResultTagsItem
-type ReviewsClient = original.ReviewsClient
-
-func NewReviewsClient(baseURL AzureRegionBaseURL) ReviewsClient {
-	return original.NewReviewsClient(baseURL)
-}
-
 type TextModerationClient = original.TextModerationClient
 
 func NewTextModerationClient(baseURL AzureRegionBaseURL) TextModerationClient {
 	return original.NewTextModerationClient(baseURL)
 }
+
+type ImageModerationClient = original.ImageModerationClient
+
+func NewImageModerationClient(baseURL AzureRegionBaseURL) ImageModerationClient {
+	return original.NewImageModerationClient(baseURL)
+}
+
+type ReviewsClient = original.ReviewsClient
+
+func NewReviewsClient(baseURL AzureRegionBaseURL) ReviewsClient {
+	return original.NewReviewsClient(baseURL)
+}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+type BaseClient = original.BaseClient
+
+func New(baseURL AzureRegionBaseURL) BaseClient {
+	return original.New(baseURL)
+}
+func NewWithoutDefaults(baseURL AzureRegionBaseURL) BaseClient {
+	return original.NewWithoutDefaults(baseURL)
+}
diff --git a/profiles/preview/cognitiveservices/customsearch/models.go b/profiles/preview/cognitiveservices/customsearch/models.go
index 0a59a39f2911..1183ed321813 100644
--- a/profiles/preview/cognitiveservices/customsearch/models.go
+++ b/profiles/preview/cognitiveservices/customsearch/models.go
@@ -21,19 +21,6 @@ package customsearch
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/customsearch"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
-}
-
 type CustomInstanceClient = original.CustomInstanceClient
 
 func NewCustomInstanceClient() CustomInstanceClient {
@@ -150,3 +137,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
diff --git a/profiles/preview/cognitiveservices/customvision/prediction/models.go b/profiles/preview/cognitiveservices/customvision/prediction/models.go
index af407c1bf5f4..0394fe9de8a3 100644
--- a/profiles/preview/cognitiveservices/customvision/prediction/models.go
+++ b/profiles/preview/cognitiveservices/customvision/prediction/models.go
@@ -21,6 +21,17 @@ package prediction
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.1/customvision/prediction"
 
+type ImagePredictionResultModel = original.ImagePredictionResultModel
+type ImageTagPredictionModel = original.ImageTagPredictionModel
+type ImageURL = original.ImageURL
+
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
+}
+
 const (
 	DefaultBaseURI = original.DefaultBaseURI
 )
@@ -33,14 +44,3 @@ func New(aPIKey string) BaseClient {
 func NewWithBaseURI(baseURI string, aPIKey string) BaseClient {
 	return original.NewWithBaseURI(baseURI, aPIKey)
 }
-
-type ImagePredictionResultModel = original.ImagePredictionResultModel
-type ImageTagPredictionModel = original.ImageTagPredictionModel
-type ImageURL = original.ImageURL
-
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
-}
-func Version() string {
-	return original.Version()
-}
diff --git a/profiles/preview/cognitiveservices/customvision/training/models.go b/profiles/preview/cognitiveservices/customvision/training/models.go
index 9e3272e628c0..1ff2316bb40f 100644
--- a/profiles/preview/cognitiveservices/customvision/training/models.go
+++ b/profiles/preview/cognitiveservices/customvision/training/models.go
@@ -21,19 +21,6 @@ package training
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.2/customvision/training"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(aPIKey string) BaseClient {
-	return original.New(aPIKey)
-}
-func NewWithBaseURI(baseURI string, aPIKey string) BaseClient {
-	return original.NewWithBaseURI(baseURI, aPIKey)
-}
-
 type OrderBy = original.OrderBy
 
 const (
@@ -135,3 +122,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(aPIKey string) BaseClient {
+	return original.New(aPIKey)
+}
+func NewWithBaseURI(baseURI string, aPIKey string) BaseClient {
+	return original.NewWithBaseURI(baseURI, aPIKey)
+}
diff --git a/profiles/preview/cognitiveservices/entitysearch/models.go b/profiles/preview/cognitiveservices/entitysearch/models.go
index 56a8c5815488..0c2666dd4f40 100644
--- a/profiles/preview/cognitiveservices/entitysearch/models.go
+++ b/profiles/preview/cognitiveservices/entitysearch/models.go
@@ -21,28 +21,6 @@ package entitysearch
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/entitysearch"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
-}
-
-type EntitiesClient = original.EntitiesClient
-
-func NewEntitiesClient() EntitiesClient {
-	return original.NewEntitiesClient()
-}
-func NewEntitiesClientWithBaseURI(baseURI string) EntitiesClient {
-	return original.NewEntitiesClientWithBaseURI(baseURI)
-}
-
 type AnswerType = original.AnswerType
 
 const (
@@ -312,3 +290,25 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type EntitiesClient = original.EntitiesClient
+
+func NewEntitiesClient() EntitiesClient {
+	return original.NewEntitiesClient()
+}
+func NewEntitiesClientWithBaseURI(baseURI string) EntitiesClient {
+	return original.NewEntitiesClientWithBaseURI(baseURI)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
diff --git a/profiles/preview/cognitiveservices/face/models.go b/profiles/preview/cognitiveservices/face/models.go
index 84c67df1185f..f2c044bef840 100644
--- a/profiles/preview/cognitiveservices/face/models.go
+++ b/profiles/preview/cognitiveservices/face/models.go
@@ -21,13 +21,16 @@ package face
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/face"
 
-type BaseClient = original.BaseClient
+type PersonGroupPersonClient = original.PersonGroupPersonClient
 
-func New(azureRegion AzureRegions) BaseClient {
-	return original.New(azureRegion)
+func NewPersonGroupPersonClient(azureRegion AzureRegions) PersonGroupPersonClient {
+	return original.NewPersonGroupPersonClient(azureRegion)
 }
-func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
-	return original.NewWithoutDefaults(azureRegion)
+
+type PersonGroupClient = original.PersonGroupClient
+
+func NewPersonGroupClient(azureRegion AzureRegions) PersonGroupClient {
+	return original.NewPersonGroupClient(azureRegion)
 }
 
 type Client = original.Client
@@ -36,12 +39,6 @@ func NewClient(azureRegion AzureRegions) Client {
 	return original.NewClient(azureRegion)
 }
 
-type ListClient = original.ListClient
-
-func NewListClient(azureRegion AzureRegions) ListClient {
-	return original.NewListClient(azureRegion)
-}
-
 type AccessoryType = original.AccessoryType
 
 const (
@@ -242,20 +239,25 @@ type UpdatePersonFaceRequest = original.UpdatePersonFaceRequest
 type VerifyFaceToFaceRequest = original.VerifyFaceToFaceRequest
 type VerifyFaceToPersonRequest = original.VerifyFaceToPersonRequest
 type VerifyResult = original.VerifyResult
-type PersonGroupClient = original.PersonGroupClient
-
-func NewPersonGroupClient(azureRegion AzureRegions) PersonGroupClient {
-	return original.NewPersonGroupClient(azureRegion)
-}
-
-type PersonGroupPersonClient = original.PersonGroupPersonClient
 
-func NewPersonGroupPersonClient(azureRegion AzureRegions) PersonGroupPersonClient {
-	return original.NewPersonGroupPersonClient(azureRegion)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+type ListClient = original.ListClient
+
+func NewListClient(azureRegion AzureRegions) ListClient {
+	return original.NewListClient(azureRegion)
+}
+
+type BaseClient = original.BaseClient
+
+func New(azureRegion AzureRegions) BaseClient {
+	return original.New(azureRegion)
+}
+func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
+	return original.NewWithoutDefaults(azureRegion)
+}
diff --git a/profiles/preview/cognitiveservices/imagesearch/models.go b/profiles/preview/cognitiveservices/imagesearch/models.go
index e26f2d580355..a6af8e9f2a59 100644
--- a/profiles/preview/cognitiveservices/imagesearch/models.go
+++ b/profiles/preview/cognitiveservices/imagesearch/models.go
@@ -21,28 +21,6 @@ package imagesearch
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/imagesearch"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
-}
-
-type ImagesClient = original.ImagesClient
-
-func NewImagesClient() ImagesClient {
-	return original.NewImagesClient()
-}
-func NewImagesClientWithBaseURI(baseURI string) ImagesClient {
-	return original.NewImagesClientWithBaseURI(baseURI)
-}
-
 type Currency = original.Currency
 
 const (
@@ -525,3 +503,25 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type ImagesClient = original.ImagesClient
+
+func NewImagesClient() ImagesClient {
+	return original.NewImagesClient()
+}
+func NewImagesClientWithBaseURI(baseURI string) ImagesClient {
+	return original.NewImagesClientWithBaseURI(baseURI)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
diff --git a/profiles/preview/cognitiveservices/luis/programmatic/models.go b/profiles/preview/cognitiveservices/luis/programmatic/models.go
index f4aec516cbee..afa54c4f45e2 100644
--- a/profiles/preview/cognitiveservices/luis/programmatic/models.go
+++ b/profiles/preview/cognitiveservices/luis/programmatic/models.go
@@ -21,27 +21,6 @@ package programmatic
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v2.0/luis/programmatic"
 
-type AppsClient = original.AppsClient
-
-func NewAppsClient(azureRegion AzureRegions) AppsClient {
-	return original.NewAppsClient(azureRegion)
-}
-
-type BaseClient = original.BaseClient
-
-func New(azureRegion AzureRegions) BaseClient {
-	return original.New(azureRegion)
-}
-func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
-	return original.NewWithoutDefaults(azureRegion)
-}
-
-type ExamplesClient = original.ExamplesClient
-
-func NewExamplesClient(azureRegion AzureRegions) ExamplesClient {
-	return original.NewExamplesClient(azureRegion)
-}
-
 type FeaturesClient = original.FeaturesClient
 
 func NewFeaturesClient(azureRegion AzureRegions) FeaturesClient {
@@ -54,6 +33,18 @@ func NewModelClient(azureRegion AzureRegions) ModelClient {
 	return original.NewModelClient(azureRegion)
 }
 
+type VersionsClient = original.VersionsClient
+
+func NewVersionsClient(azureRegion AzureRegions) VersionsClient {
+	return original.NewVersionsClient(azureRegion)
+}
+
+type AppsClient = original.AppsClient
+
+func NewAppsClient(azureRegion AzureRegions) AppsClient {
+	return original.NewAppsClient(azureRegion)
+}
+
 type AzureRegions = original.AzureRegions
 
 const (
@@ -294,6 +285,29 @@ type UUID = original.UUID
 type VersionInfo = original.VersionInfo
 type WordListBaseUpdateObject = original.WordListBaseUpdateObject
 type WordListObject = original.WordListObject
+
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
+}
+
+type ExamplesClient = original.ExamplesClient
+
+func NewExamplesClient(azureRegion AzureRegions) ExamplesClient {
+	return original.NewExamplesClient(azureRegion)
+}
+
+type BaseClient = original.BaseClient
+
+func New(azureRegion AzureRegions) BaseClient {
+	return original.New(azureRegion)
+}
+func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
+	return original.NewWithoutDefaults(azureRegion)
+}
+
 type PermissionsClient = original.PermissionsClient
 
 func NewPermissionsClient(azureRegion AzureRegions) PermissionsClient {
@@ -305,15 +319,3 @@ type TrainClient = original.TrainClient
 func NewTrainClient(azureRegion AzureRegions) TrainClient {
 	return original.NewTrainClient(azureRegion)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
-}
-func Version() string {
-	return original.Version()
-}
-
-type VersionsClient = original.VersionsClient
-
-func NewVersionsClient(azureRegion AzureRegions) VersionsClient {
-	return original.NewVersionsClient(azureRegion)
-}
diff --git a/profiles/preview/cognitiveservices/luis/runtime/models.go b/profiles/preview/cognitiveservices/luis/runtime/models.go
index 2819f52d7020..604224610ff0 100644
--- a/profiles/preview/cognitiveservices/luis/runtime/models.go
+++ b/profiles/preview/cognitiveservices/luis/runtime/models.go
@@ -21,15 +21,6 @@ package runtime
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v2.0/luis/runtime"
 
-type BaseClient = original.BaseClient
-
-func New(azureRegion AzureRegions) BaseClient {
-	return original.New(azureRegion)
-}
-func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
-	return original.NewWithoutDefaults(azureRegion)
-}
-
 type AzureRegions = original.AzureRegions
 
 const (
@@ -59,14 +50,25 @@ type EntityWithResolution = original.EntityWithResolution
 type EntityWithScore = original.EntityWithScore
 type IntentModel = original.IntentModel
 type LuisResult = original.LuisResult
-type PredictionClient = original.PredictionClient
 
-func NewPredictionClient(azureRegion AzureRegions) PredictionClient {
-	return original.NewPredictionClient(azureRegion)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+type PredictionClient = original.PredictionClient
+
+func NewPredictionClient(azureRegion AzureRegions) PredictionClient {
+	return original.NewPredictionClient(azureRegion)
+}
+
+type BaseClient = original.BaseClient
+
+func New(azureRegion AzureRegions) BaseClient {
+	return original.New(azureRegion)
+}
+func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
+	return original.NewWithoutDefaults(azureRegion)
+}
diff --git a/profiles/preview/cognitiveservices/mgmt/cognitiveservices/models.go b/profiles/preview/cognitiveservices/mgmt/cognitiveservices/models.go
index 8e981ede022a..e7d40cc1e5e4 100644
--- a/profiles/preview/cognitiveservices/mgmt/cognitiveservices/models.go
+++ b/profiles/preview/cognitiveservices/mgmt/cognitiveservices/models.go
@@ -21,13 +21,13 @@ package cognitiveservices
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/mgmt/2017-04-18/cognitiveservices"
 
-type AccountsClient = original.AccountsClient
+type OperationsClient = original.OperationsClient
 
-func NewAccountsClient(subscriptionID string) AccountsClient {
-	return original.NewAccountsClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
-	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type CheckSkuAvailabilityClient = original.CheckSkuAvailabilityClient
@@ -39,19 +39,6 @@ func NewCheckSkuAvailabilityClientWithBaseURI(baseURI string, subscriptionID str
 	return original.NewCheckSkuAvailabilityClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type KeyName = original.KeyName
 
 const (
@@ -220,15 +207,6 @@ type ResourceSkusResultPage = original.ResourceSkusResultPage
 type Sku = original.Sku
 type Usage = original.Usage
 type UsagesResult = original.UsagesResult
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type ResourceSkusClient = original.ResourceSkusClient
 
 func NewResourceSkusClient(subscriptionID string) ResourceSkusClient {
@@ -243,3 +221,25 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type AccountsClient = original.AccountsClient
+
+func NewAccountsClient(subscriptionID string) AccountsClient {
+	return original.NewAccountsClient(subscriptionID)
+}
+func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
+	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/cognitiveservices/newssearch/models.go b/profiles/preview/cognitiveservices/newssearch/models.go
index dae471bb74e3..98f354084e2c 100644
--- a/profiles/preview/cognitiveservices/newssearch/models.go
+++ b/profiles/preview/cognitiveservices/newssearch/models.go
@@ -21,19 +21,6 @@ package newssearch
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/newssearch"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
-}
-
 type ErrorCode = original.ErrorCode
 
 const (
@@ -158,6 +145,14 @@ type BasicThing = original.BasicThing
 type Thing = original.Thing
 type TrendingTopics = original.TrendingTopics
 type VideoObject = original.VideoObject
+
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
+}
+
 type NewsClient = original.NewsClient
 
 func NewNewsClient() NewsClient {
@@ -166,9 +161,16 @@ func NewNewsClient() NewsClient {
 func NewNewsClientWithBaseURI(baseURI string) NewsClient {
 	return original.NewNewsClientWithBaseURI(baseURI)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
 }
diff --git a/profiles/preview/cognitiveservices/spellcheck/models.go b/profiles/preview/cognitiveservices/spellcheck/models.go
index a4d56e209f0d..c03e364077ee 100644
--- a/profiles/preview/cognitiveservices/spellcheck/models.go
+++ b/profiles/preview/cognitiveservices/spellcheck/models.go
@@ -21,19 +21,6 @@ package spellcheck
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/spellcheck"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
-}
-
 type ActionType = original.ActionType
 
 const (
@@ -126,3 +113,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
diff --git a/profiles/preview/cognitiveservices/textanalytics/models.go b/profiles/preview/cognitiveservices/textanalytics/models.go
index 3d23b1c7dedc..9598adec3c4f 100644
--- a/profiles/preview/cognitiveservices/textanalytics/models.go
+++ b/profiles/preview/cognitiveservices/textanalytics/models.go
@@ -21,15 +21,6 @@ package textanalytics
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v2.0/textanalytics"
 
-type BaseClient = original.BaseClient
-
-func New(azureRegion AzureRegions) BaseClient {
-	return original.New(azureRegion)
-}
-func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
-	return original.NewWithoutDefaults(azureRegion)
-}
-
 type AzureRegions = original.AzureRegions
 
 const (
@@ -72,3 +63,12 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type BaseClient = original.BaseClient
+
+func New(azureRegion AzureRegions) BaseClient {
+	return original.New(azureRegion)
+}
+func NewWithoutDefaults(azureRegion AzureRegions) BaseClient {
+	return original.NewWithoutDefaults(azureRegion)
+}
diff --git a/profiles/preview/cognitiveservices/videosearch/models.go b/profiles/preview/cognitiveservices/videosearch/models.go
index deebceae8b7b..6036c2b811aa 100644
--- a/profiles/preview/cognitiveservices/videosearch/models.go
+++ b/profiles/preview/cognitiveservices/videosearch/models.go
@@ -21,17 +21,13 @@ package videosearch
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/videosearch"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type VideosClient = original.VideosClient
 
-func New() BaseClient {
-	return original.New()
+func NewVideosClient() VideosClient {
+	return original.NewVideosClient()
 }
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
+func NewVideosClientWithBaseURI(baseURI string) VideosClient {
+	return original.NewVideosClientWithBaseURI(baseURI)
 }
 
 type ErrorCode = original.ErrorCode
@@ -226,11 +222,15 @@ func Version() string {
 	return original.Version()
 }
 
-type VideosClient = original.VideosClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewVideosClient() VideosClient {
-	return original.NewVideosClient()
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
 }
-func NewVideosClientWithBaseURI(baseURI string) VideosClient {
-	return original.NewVideosClientWithBaseURI(baseURI)
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
 }
diff --git a/profiles/preview/cognitiveservices/websearch/models.go b/profiles/preview/cognitiveservices/websearch/models.go
index 14e24e7a375c..2726950bc863 100644
--- a/profiles/preview/cognitiveservices/websearch/models.go
+++ b/profiles/preview/cognitiveservices/websearch/models.go
@@ -21,19 +21,6 @@ package websearch
 
 import original "github.com/Azure/azure-sdk-for-go/services/cognitiveservices/v1.0/websearch"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
-}
-
 type AnswerType = original.AnswerType
 
 const (
@@ -228,3 +215,16 @@ func NewWebClient() WebClient {
 func NewWebClientWithBaseURI(baseURI string) WebClient {
 	return original.NewWebClientWithBaseURI(baseURI)
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
diff --git a/profiles/preview/commerce/mgmt/commerce/models.go b/profiles/preview/commerce/mgmt/commerce/models.go
index 9e023588e785..50e453669963 100644
--- a/profiles/preview/commerce/mgmt/commerce/models.go
+++ b/profiles/preview/commerce/mgmt/commerce/models.go
@@ -21,17 +21,13 @@ package commerce
 
 import original "github.com/Azure/azure-sdk-for-go/services/commerce/mgmt/2015-06-01-preview/commerce"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type UsageAggregatesClient = original.UsageAggregatesClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewUsageAggregatesClient(subscriptionID string) UsageAggregatesClient {
+	return original.NewUsageAggregatesClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewUsageAggregatesClientWithBaseURI(baseURI string, subscriptionID string) UsageAggregatesClient {
+	return original.NewUsageAggregatesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AggregationGranularity = original.AggregationGranularity
@@ -73,6 +69,14 @@ type UsageAggregationListResult = original.UsageAggregationListResult
 type UsageAggregationListResultIterator = original.UsageAggregationListResultIterator
 type UsageAggregationListResultPage = original.UsageAggregationListResultPage
 type UsageSample = original.UsageSample
+
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
+}
+
 type RateCardClient = original.RateCardClient
 
 func NewRateCardClient(subscriptionID string) RateCardClient {
@@ -82,17 +86,15 @@ func NewRateCardClientWithBaseURI(baseURI string, subscriptionID string) RateCar
 	return original.NewRateCardClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UsageAggregatesClient = original.UsageAggregatesClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewUsageAggregatesClient(subscriptionID string) UsageAggregatesClient {
-	return original.NewUsageAggregatesClient(subscriptionID)
-}
-func NewUsageAggregatesClientWithBaseURI(baseURI string, subscriptionID string) UsageAggregatesClient {
-	return original.NewUsageAggregatesClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/compute/mgmt/compute/models.go b/profiles/preview/compute/mgmt/compute/models.go
index 2f20fc3a5c36..962b910f8c7e 100644
--- a/profiles/preview/compute/mgmt/compute/models.go
+++ b/profiles/preview/compute/mgmt/compute/models.go
@@ -30,53 +30,94 @@ func NewAvailabilitySetsClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewAvailabilitySetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type VirtualMachineExtensionsClient = original.VirtualMachineExtensionsClient
 
-type BaseClient = original.BaseClient
+func NewVirtualMachineExtensionsClient(subscriptionID string) VirtualMachineExtensionsClient {
+	return original.NewVirtualMachineExtensionsClient(subscriptionID)
+}
+func NewVirtualMachineExtensionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineExtensionsClient {
+	return original.NewVirtualMachineExtensionsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type LogAnalyticsClient = original.LogAnalyticsClient
+
+func NewLogAnalyticsClient(subscriptionID string) LogAnalyticsClient {
+	return original.NewLogAnalyticsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewLogAnalyticsClientWithBaseURI(baseURI string, subscriptionID string) LogAnalyticsClient {
+	return original.NewLogAnalyticsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ContainerServicesClient = original.ContainerServicesClient
+type OperationsClient = original.OperationsClient
 
-func NewContainerServicesClient(subscriptionID string) ContainerServicesClient {
-	return original.NewContainerServicesClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewContainerServicesClientWithBaseURI(baseURI string, subscriptionID string) ContainerServicesClient {
-	return original.NewContainerServicesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DisksClient = original.DisksClient
+type VirtualMachineRunCommandsClient = original.VirtualMachineRunCommandsClient
 
-func NewDisksClient(subscriptionID string) DisksClient {
-	return original.NewDisksClient(subscriptionID)
+func NewVirtualMachineRunCommandsClient(subscriptionID string) VirtualMachineRunCommandsClient {
+	return original.NewVirtualMachineRunCommandsClient(subscriptionID)
 }
-func NewDisksClientWithBaseURI(baseURI string, subscriptionID string) DisksClient {
-	return original.NewDisksClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualMachineRunCommandsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineRunCommandsClient {
+	return original.NewVirtualMachineRunCommandsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ImagesClient = original.ImagesClient
+type VirtualMachineSizesClient = original.VirtualMachineSizesClient
 
-func NewImagesClient(subscriptionID string) ImagesClient {
-	return original.NewImagesClient(subscriptionID)
+func NewVirtualMachineSizesClient(subscriptionID string) VirtualMachineSizesClient {
+	return original.NewVirtualMachineSizesClient(subscriptionID)
 }
-func NewImagesClientWithBaseURI(baseURI string, subscriptionID string) ImagesClient {
-	return original.NewImagesClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualMachineSizesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineSizesClient {
+	return original.NewVirtualMachineSizesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LogAnalyticsClient = original.LogAnalyticsClient
+type VirtualMachineScaleSetRollingUpgradesClient = original.VirtualMachineScaleSetRollingUpgradesClient
 
-func NewLogAnalyticsClient(subscriptionID string) LogAnalyticsClient {
-	return original.NewLogAnalyticsClient(subscriptionID)
+func NewVirtualMachineScaleSetRollingUpgradesClient(subscriptionID string) VirtualMachineScaleSetRollingUpgradesClient {
+	return original.NewVirtualMachineScaleSetRollingUpgradesClient(subscriptionID)
 }
-func NewLogAnalyticsClientWithBaseURI(baseURI string, subscriptionID string) LogAnalyticsClient {
-	return original.NewLogAnalyticsClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualMachineScaleSetRollingUpgradesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetRollingUpgradesClient {
+	return original.NewVirtualMachineScaleSetRollingUpgradesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type VirtualMachineImagesClient = original.VirtualMachineImagesClient
+
+func NewVirtualMachineImagesClient(subscriptionID string) VirtualMachineImagesClient {
+	return original.NewVirtualMachineImagesClient(subscriptionID)
+}
+func NewVirtualMachineImagesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineImagesClient {
+	return original.NewVirtualMachineImagesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type UsageClient = original.UsageClient
+
+func NewUsageClient(subscriptionID string) UsageClient {
+	return original.NewUsageClient(subscriptionID)
+}
+func NewUsageClientWithBaseURI(baseURI string, subscriptionID string) UsageClient {
+	return original.NewUsageClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type VirtualMachineScaleSetVMsClient = original.VirtualMachineScaleSetVMsClient
+
+func NewVirtualMachineScaleSetVMsClient(subscriptionID string) VirtualMachineScaleSetVMsClient {
+	return original.NewVirtualMachineScaleSetVMsClient(subscriptionID)
+}
+func NewVirtualMachineScaleSetVMsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetVMsClient {
+	return original.NewVirtualMachineScaleSetVMsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ContainerServicesClient = original.ContainerServicesClient
+
+func NewContainerServicesClient(subscriptionID string) ContainerServicesClient {
+	return original.NewContainerServicesClient(subscriptionID)
+}
+func NewContainerServicesClientWithBaseURI(baseURI string, subscriptionID string) ContainerServicesClient {
+	return original.NewContainerServicesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccessLevel = original.AccessLevel
@@ -921,15 +962,6 @@ type VirtualMachineUpdate = original.VirtualMachineUpdate
 type WindowsConfiguration = original.WindowsConfiguration
 type WinRMConfiguration = original.WinRMConfiguration
 type WinRMListener = original.WinRMListener
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type ResourceSkusClient = original.ResourceSkusClient
 
 func NewResourceSkusClient(subscriptionID string) ResourceSkusClient {
@@ -939,22 +971,22 @@ func NewResourceSkusClientWithBaseURI(baseURI string, subscriptionID string) Res
 	return original.NewResourceSkusClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SnapshotsClient = original.SnapshotsClient
+type VirtualMachineScaleSetsClient = original.VirtualMachineScaleSetsClient
 
-func NewSnapshotsClient(subscriptionID string) SnapshotsClient {
-	return original.NewSnapshotsClient(subscriptionID)
+func NewVirtualMachineScaleSetsClient(subscriptionID string) VirtualMachineScaleSetsClient {
+	return original.NewVirtualMachineScaleSetsClient(subscriptionID)
 }
-func NewSnapshotsClientWithBaseURI(baseURI string, subscriptionID string) SnapshotsClient {
-	return original.NewSnapshotsClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualMachineScaleSetsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetsClient {
+	return original.NewVirtualMachineScaleSetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UsageClient = original.UsageClient
+type VirtualMachineScaleSetExtensionsClient = original.VirtualMachineScaleSetExtensionsClient
 
-func NewUsageClient(subscriptionID string) UsageClient {
-	return original.NewUsageClient(subscriptionID)
+func NewVirtualMachineScaleSetExtensionsClient(subscriptionID string) VirtualMachineScaleSetExtensionsClient {
+	return original.NewVirtualMachineScaleSetExtensionsClient(subscriptionID)
 }
-func NewUsageClientWithBaseURI(baseURI string, subscriptionID string) UsageClient {
-	return original.NewUsageClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualMachineScaleSetExtensionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetExtensionsClient {
+	return original.NewVirtualMachineScaleSetExtensionsClientWithBaseURI(baseURI, subscriptionID)
 }
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
@@ -972,83 +1004,51 @@ func NewVirtualMachineExtensionImagesClientWithBaseURI(baseURI string, subscript
 	return original.NewVirtualMachineExtensionImagesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualMachineExtensionsClient = original.VirtualMachineExtensionsClient
-
-func NewVirtualMachineExtensionsClient(subscriptionID string) VirtualMachineExtensionsClient {
-	return original.NewVirtualMachineExtensionsClient(subscriptionID)
-}
-func NewVirtualMachineExtensionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineExtensionsClient {
-	return original.NewVirtualMachineExtensionsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type VirtualMachineImagesClient = original.VirtualMachineImagesClient
-
-func NewVirtualMachineImagesClient(subscriptionID string) VirtualMachineImagesClient {
-	return original.NewVirtualMachineImagesClient(subscriptionID)
-}
-func NewVirtualMachineImagesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineImagesClient {
-	return original.NewVirtualMachineImagesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type VirtualMachineRunCommandsClient = original.VirtualMachineRunCommandsClient
-
-func NewVirtualMachineRunCommandsClient(subscriptionID string) VirtualMachineRunCommandsClient {
-	return original.NewVirtualMachineRunCommandsClient(subscriptionID)
-}
-func NewVirtualMachineRunCommandsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineRunCommandsClient {
-	return original.NewVirtualMachineRunCommandsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type VirtualMachinesClient = original.VirtualMachinesClient
+type SnapshotsClient = original.SnapshotsClient
 
-func NewVirtualMachinesClient(subscriptionID string) VirtualMachinesClient {
-	return original.NewVirtualMachinesClient(subscriptionID)
+func NewSnapshotsClient(subscriptionID string) SnapshotsClient {
+	return original.NewSnapshotsClient(subscriptionID)
 }
-func NewVirtualMachinesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachinesClient {
-	return original.NewVirtualMachinesClientWithBaseURI(baseURI, subscriptionID)
+func NewSnapshotsClientWithBaseURI(baseURI string, subscriptionID string) SnapshotsClient {
+	return original.NewSnapshotsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualMachineScaleSetExtensionsClient = original.VirtualMachineScaleSetExtensionsClient
+type ImagesClient = original.ImagesClient
 
-func NewVirtualMachineScaleSetExtensionsClient(subscriptionID string) VirtualMachineScaleSetExtensionsClient {
-	return original.NewVirtualMachineScaleSetExtensionsClient(subscriptionID)
+func NewImagesClient(subscriptionID string) ImagesClient {
+	return original.NewImagesClient(subscriptionID)
 }
-func NewVirtualMachineScaleSetExtensionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetExtensionsClient {
-	return original.NewVirtualMachineScaleSetExtensionsClientWithBaseURI(baseURI, subscriptionID)
+func NewImagesClientWithBaseURI(baseURI string, subscriptionID string) ImagesClient {
+	return original.NewImagesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualMachineScaleSetRollingUpgradesClient = original.VirtualMachineScaleSetRollingUpgradesClient
+type DisksClient = original.DisksClient
 
-func NewVirtualMachineScaleSetRollingUpgradesClient(subscriptionID string) VirtualMachineScaleSetRollingUpgradesClient {
-	return original.NewVirtualMachineScaleSetRollingUpgradesClient(subscriptionID)
+func NewDisksClient(subscriptionID string) DisksClient {
+	return original.NewDisksClient(subscriptionID)
 }
-func NewVirtualMachineScaleSetRollingUpgradesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetRollingUpgradesClient {
-	return original.NewVirtualMachineScaleSetRollingUpgradesClientWithBaseURI(baseURI, subscriptionID)
+func NewDisksClientWithBaseURI(baseURI string, subscriptionID string) DisksClient {
+	return original.NewDisksClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualMachineScaleSetsClient = original.VirtualMachineScaleSetsClient
-
-func NewVirtualMachineScaleSetsClient(subscriptionID string) VirtualMachineScaleSetsClient {
-	return original.NewVirtualMachineScaleSetsClient(subscriptionID)
-}
-func NewVirtualMachineScaleSetsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetsClient {
-	return original.NewVirtualMachineScaleSetsClientWithBaseURI(baseURI, subscriptionID)
-}
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-type VirtualMachineScaleSetVMsClient = original.VirtualMachineScaleSetVMsClient
+type BaseClient = original.BaseClient
 
-func NewVirtualMachineScaleSetVMsClient(subscriptionID string) VirtualMachineScaleSetVMsClient {
-	return original.NewVirtualMachineScaleSetVMsClient(subscriptionID)
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewVirtualMachineScaleSetVMsClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineScaleSetVMsClient {
-	return original.NewVirtualMachineScaleSetVMsClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualMachineSizesClient = original.VirtualMachineSizesClient
+type VirtualMachinesClient = original.VirtualMachinesClient
 
-func NewVirtualMachineSizesClient(subscriptionID string) VirtualMachineSizesClient {
-	return original.NewVirtualMachineSizesClient(subscriptionID)
+func NewVirtualMachinesClient(subscriptionID string) VirtualMachinesClient {
+	return original.NewVirtualMachinesClient(subscriptionID)
 }
-func NewVirtualMachineSizesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineSizesClient {
-	return original.NewVirtualMachineSizesClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualMachinesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachinesClient {
+	return original.NewVirtualMachinesClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/consumption/mgmt/consumption/models.go b/profiles/preview/consumption/mgmt/consumption/models.go
index e1ee1f3c7ac2..49252d51157a 100644
--- a/profiles/preview/consumption/mgmt/consumption/models.go
+++ b/profiles/preview/consumption/mgmt/consumption/models.go
@@ -21,44 +21,40 @@ package consumption
 
 import original "github.com/Azure/azure-sdk-for-go/services/consumption/mgmt/2018-03-31/consumption"
 
-type BudgetsClient = original.BudgetsClient
+type OperationsClient = original.OperationsClient
 
-func NewBudgetsClient(subscriptionID string) BudgetsClient {
-	return original.NewBudgetsClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewBudgetsClientWithBaseURI(baseURI string, subscriptionID string) BudgetsClient {
-	return original.NewBudgetsClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type PriceSheetClient = original.PriceSheetClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewPriceSheetClient(subscriptionID string) PriceSheetClient {
+	return original.NewPriceSheetClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewPriceSheetClientWithBaseURI(baseURI string, subscriptionID string) PriceSheetClient {
+	return original.NewPriceSheetClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CostAllocationTagsClient = original.CostAllocationTagsClient
+type ReservationsSummariesClient = original.ReservationsSummariesClient
 
-func NewCostAllocationTagsClient(subscriptionID string) CostAllocationTagsClient {
-	return original.NewCostAllocationTagsClient(subscriptionID)
+func NewReservationsSummariesClient(subscriptionID string) ReservationsSummariesClient {
+	return original.NewReservationsSummariesClient(subscriptionID)
 }
-func NewCostAllocationTagsClientWithBaseURI(baseURI string, subscriptionID string) CostAllocationTagsClient {
-	return original.NewCostAllocationTagsClientWithBaseURI(baseURI, subscriptionID)
+func NewReservationsSummariesClientWithBaseURI(baseURI string, subscriptionID string) ReservationsSummariesClient {
+	return original.NewReservationsSummariesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type MarketplacesClient = original.MarketplacesClient
+type BudgetsClient = original.BudgetsClient
 
-func NewMarketplacesClient(subscriptionID string) MarketplacesClient {
-	return original.NewMarketplacesClient(subscriptionID)
+func NewBudgetsClient(subscriptionID string) BudgetsClient {
+	return original.NewBudgetsClient(subscriptionID)
 }
-func NewMarketplacesClientWithBaseURI(baseURI string, subscriptionID string) MarketplacesClient {
-	return original.NewMarketplacesClientWithBaseURI(baseURI, subscriptionID)
+func NewBudgetsClientWithBaseURI(baseURI string, subscriptionID string) BudgetsClient {
+	return original.NewBudgetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type CategoryType = original.CategoryType
@@ -158,22 +154,19 @@ type UsageDetailProperties = original.UsageDetailProperties
 type UsageDetailsListResult = original.UsageDetailsListResult
 type UsageDetailsListResultIterator = original.UsageDetailsListResultIterator
 type UsageDetailsListResultPage = original.UsageDetailsListResultPage
-type OperationsClient = original.OperationsClient
+type CostAllocationTagsClient = original.CostAllocationTagsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewCostAllocationTagsClient(subscriptionID string) CostAllocationTagsClient {
+	return original.NewCostAllocationTagsClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewCostAllocationTagsClientWithBaseURI(baseURI string, subscriptionID string) CostAllocationTagsClient {
+	return original.NewCostAllocationTagsClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type PriceSheetClient = original.PriceSheetClient
-
-func NewPriceSheetClient(subscriptionID string) PriceSheetClient {
-	return original.NewPriceSheetClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewPriceSheetClientWithBaseURI(baseURI string, subscriptionID string) PriceSheetClient {
-	return original.NewPriceSheetClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
 type ReservationRecommendationsClient = original.ReservationRecommendationsClient
@@ -185,22 +178,13 @@ func NewReservationRecommendationsClientWithBaseURI(baseURI string, subscription
 	return original.NewReservationRecommendationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ReservationsDetailsClient = original.ReservationsDetailsClient
-
-func NewReservationsDetailsClient(subscriptionID string) ReservationsDetailsClient {
-	return original.NewReservationsDetailsClient(subscriptionID)
-}
-func NewReservationsDetailsClientWithBaseURI(baseURI string, subscriptionID string) ReservationsDetailsClient {
-	return original.NewReservationsDetailsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ReservationsSummariesClient = original.ReservationsSummariesClient
+type MarketplacesClient = original.MarketplacesClient
 
-func NewReservationsSummariesClient(subscriptionID string) ReservationsSummariesClient {
-	return original.NewReservationsSummariesClient(subscriptionID)
+func NewMarketplacesClient(subscriptionID string) MarketplacesClient {
+	return original.NewMarketplacesClient(subscriptionID)
 }
-func NewReservationsSummariesClientWithBaseURI(baseURI string, subscriptionID string) ReservationsSummariesClient {
-	return original.NewReservationsSummariesClientWithBaseURI(baseURI, subscriptionID)
+func NewMarketplacesClientWithBaseURI(baseURI string, subscriptionID string) MarketplacesClient {
+	return original.NewMarketplacesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type UsageDetailsClient = original.UsageDetailsClient
@@ -211,9 +195,25 @@ func NewUsageDetailsClient(subscriptionID string) UsageDetailsClient {
 func NewUsageDetailsClientWithBaseURI(baseURI string, subscriptionID string) UsageDetailsClient {
 	return original.NewUsageDetailsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
+
+type ReservationsDetailsClient = original.ReservationsDetailsClient
+
+func NewReservationsDetailsClient(subscriptionID string) ReservationsDetailsClient {
+	return original.NewReservationsDetailsClient(subscriptionID)
+}
+func NewReservationsDetailsClientWithBaseURI(baseURI string, subscriptionID string) ReservationsDetailsClient {
+	return original.NewReservationsDetailsClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/containerinstance/mgmt/containerinstance/models.go b/profiles/preview/containerinstance/mgmt/containerinstance/models.go
index fb06fc946227..cf528ff17fad 100644
--- a/profiles/preview/containerinstance/mgmt/containerinstance/models.go
+++ b/profiles/preview/containerinstance/mgmt/containerinstance/models.go
@@ -21,26 +21,22 @@ package containerinstance
 
 import original "github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-02-01-preview/containerinstance"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ContainerGroupsClient = original.ContainerGroupsClient
+type ContainerLogsClient = original.ContainerLogsClient
 
-func NewContainerGroupsClient(subscriptionID string) ContainerGroupsClient {
-	return original.NewContainerGroupsClient(subscriptionID)
+func NewContainerLogsClient(subscriptionID string) ContainerLogsClient {
+	return original.NewContainerLogsClient(subscriptionID)
 }
-func NewContainerGroupsClientWithBaseURI(baseURI string, subscriptionID string) ContainerGroupsClient {
-	return original.NewContainerGroupsClientWithBaseURI(baseURI, subscriptionID)
+func NewContainerLogsClientWithBaseURI(baseURI string, subscriptionID string) ContainerLogsClient {
+	return original.NewContainerLogsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ContainerGroupUsageClient = original.ContainerGroupUsageClient
@@ -52,15 +48,6 @@ func NewContainerGroupUsageClientWithBaseURI(baseURI string, subscriptionID stri
 	return original.NewContainerGroupUsageClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ContainerLogsClient = original.ContainerLogsClient
-
-func NewContainerLogsClient(subscriptionID string) ContainerLogsClient {
-	return original.NewContainerLogsClient(subscriptionID)
-}
-func NewContainerLogsClientWithBaseURI(baseURI string, subscriptionID string) ContainerLogsClient {
-	return original.NewContainerLogsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type ContainerGroupNetworkProtocol = original.ContainerGroupNetworkProtocol
 
 const (
@@ -152,13 +139,21 @@ type UsageListResult = original.UsageListResult
 type UsageName = original.UsageName
 type Volume = original.Volume
 type VolumeMount = original.VolumeMount
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
+}
+
+type ContainerGroupsClient = original.ContainerGroupsClient
+
+func NewContainerGroupsClient(subscriptionID string) ContainerGroupsClient {
+	return original.NewContainerGroupsClient(subscriptionID)
+}
+func NewContainerGroupsClientWithBaseURI(baseURI string, subscriptionID string) ContainerGroupsClient {
+	return original.NewContainerGroupsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type StartContainerClient = original.StartContainerClient
@@ -169,9 +164,16 @@ func NewStartContainerClient(subscriptionID string) StartContainerClient {
 func NewStartContainerClientWithBaseURI(baseURI string, subscriptionID string) StartContainerClient {
 	return original.NewStartContainerClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/containerregistry/mgmt/containerregistry/models.go b/profiles/preview/containerregistry/mgmt/containerregistry/models.go
index 6cf52b6cbb2a..dc7f237d881a 100644
--- a/profiles/preview/containerregistry/mgmt/containerregistry/models.go
+++ b/profiles/preview/containerregistry/mgmt/containerregistry/models.go
@@ -21,17 +21,22 @@ package containerregistry
 
 import original "github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type OperationsClient = original.OperationsClient
 
-type BaseClient = original.BaseClient
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type ReplicationsClient = original.ReplicationsClient
+
+func NewReplicationsClient(subscriptionID string) ReplicationsClient {
+	return original.NewReplicationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewReplicationsClientWithBaseURI(baseURI string, subscriptionID string) ReplicationsClient {
+	return original.NewReplicationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type PasswordName = original.PasswordName
@@ -179,15 +184,6 @@ type WebhooksCreateFuture = original.WebhooksCreateFuture
 type WebhooksDeleteFuture = original.WebhooksDeleteFuture
 type WebhooksUpdateFuture = original.WebhooksUpdateFuture
 type WebhookUpdateParameters = original.WebhookUpdateParameters
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type RegistriesClient = original.RegistriesClient
 
 func NewRegistriesClient(subscriptionID string) RegistriesClient {
@@ -196,15 +192,6 @@ func NewRegistriesClient(subscriptionID string) RegistriesClient {
 func NewRegistriesClientWithBaseURI(baseURI string, subscriptionID string) RegistriesClient {
 	return original.NewRegistriesClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type ReplicationsClient = original.ReplicationsClient
-
-func NewReplicationsClient(subscriptionID string) ReplicationsClient {
-	return original.NewReplicationsClient(subscriptionID)
-}
-func NewReplicationsClientWithBaseURI(baseURI string, subscriptionID string) ReplicationsClient {
-	return original.NewReplicationsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
@@ -220,3 +207,16 @@ func NewWebhooksClient(subscriptionID string) WebhooksClient {
 func NewWebhooksClientWithBaseURI(baseURI string, subscriptionID string) WebhooksClient {
 	return original.NewWebhooksClientWithBaseURI(baseURI, subscriptionID)
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/containerservice/mgmt/containerservice/models.go b/profiles/preview/containerservice/mgmt/containerservice/models.go
index 7daf984f7cc6..3b863748994c 100644
--- a/profiles/preview/containerservice/mgmt/containerservice/models.go
+++ b/profiles/preview/containerservice/mgmt/containerservice/models.go
@@ -21,17 +21,13 @@ package containerservice
 
 import original "github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2017-09-30/containerservice"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type ManagedClustersClient = original.ManagedClustersClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewManagedClustersClient(subscriptionID string) ManagedClustersClient {
+	return original.NewManagedClustersClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewManagedClustersClientWithBaseURI(baseURI string, subscriptionID string) ManagedClustersClient {
+	return original.NewManagedClustersClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ContainerServicesClient = original.ContainerServicesClient
@@ -43,15 +39,6 @@ func NewContainerServicesClientWithBaseURI(baseURI string, subscriptionID string
 	return original.NewContainerServicesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ManagedClustersClient = original.ManagedClustersClient
-
-func NewManagedClustersClient(subscriptionID string) ManagedClustersClient {
-	return original.NewManagedClustersClient(subscriptionID)
-}
-func NewManagedClustersClientWithBaseURI(baseURI string, subscriptionID string) ManagedClustersClient {
-	return original.NewManagedClustersClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type OrchestratorTypes = original.OrchestratorTypes
 
 const (
@@ -317,3 +304,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/cosmos-db/mgmt/documentdb/models.go b/profiles/preview/cosmos-db/mgmt/documentdb/models.go
index 6e544952043e..8377ea4b69b3 100644
--- a/profiles/preview/cosmos-db/mgmt/documentdb/models.go
+++ b/profiles/preview/cosmos-db/mgmt/documentdb/models.go
@@ -21,17 +21,22 @@ package documentdb
 
 import original "github.com/Azure/azure-sdk-for-go/services/cosmos-db/mgmt/2015-04-08/documentdb"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type CollectionPartitionClient = original.CollectionPartitionClient
 
-type BaseClient = original.BaseClient
+func NewCollectionPartitionClient(subscriptionID string) CollectionPartitionClient {
+	return original.NewCollectionPartitionClient(subscriptionID)
+}
+func NewCollectionPartitionClientWithBaseURI(baseURI string, subscriptionID string) CollectionPartitionClient {
+	return original.NewCollectionPartitionClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type OperationsClient = original.OperationsClient
+
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type CollectionClient = original.CollectionClient
@@ -43,22 +48,22 @@ func NewCollectionClientWithBaseURI(baseURI string, subscriptionID string) Colle
 	return original.NewCollectionClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CollectionPartitionClient = original.CollectionPartitionClient
+type PercentileClient = original.PercentileClient
 
-func NewCollectionPartitionClient(subscriptionID string) CollectionPartitionClient {
-	return original.NewCollectionPartitionClient(subscriptionID)
+func NewPercentileClient(subscriptionID string) PercentileClient {
+	return original.NewPercentileClient(subscriptionID)
 }
-func NewCollectionPartitionClientWithBaseURI(baseURI string, subscriptionID string) CollectionPartitionClient {
-	return original.NewCollectionPartitionClientWithBaseURI(baseURI, subscriptionID)
+func NewPercentileClientWithBaseURI(baseURI string, subscriptionID string) PercentileClient {
+	return original.NewPercentileClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CollectionPartitionRegionClient = original.CollectionPartitionRegionClient
+type PercentileSourceTargetClient = original.PercentileSourceTargetClient
 
-func NewCollectionPartitionRegionClient(subscriptionID string) CollectionPartitionRegionClient {
-	return original.NewCollectionPartitionRegionClient(subscriptionID)
+func NewPercentileSourceTargetClient(subscriptionID string) PercentileSourceTargetClient {
+	return original.NewPercentileSourceTargetClient(subscriptionID)
 }
-func NewCollectionPartitionRegionClientWithBaseURI(baseURI string, subscriptionID string) CollectionPartitionRegionClient {
-	return original.NewCollectionPartitionRegionClientWithBaseURI(baseURI, subscriptionID)
+func NewPercentileSourceTargetClientWithBaseURI(baseURI string, subscriptionID string) PercentileSourceTargetClient {
+	return original.NewPercentileSourceTargetClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type CollectionRegionClient = original.CollectionRegionClient
@@ -70,33 +75,6 @@ func NewCollectionRegionClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewCollectionRegionClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DatabaseClient = original.DatabaseClient
-
-func NewDatabaseClient(subscriptionID string) DatabaseClient {
-	return original.NewDatabaseClient(subscriptionID)
-}
-func NewDatabaseClientWithBaseURI(baseURI string, subscriptionID string) DatabaseClient {
-	return original.NewDatabaseClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type DatabaseAccountRegionClient = original.DatabaseAccountRegionClient
-
-func NewDatabaseAccountRegionClient(subscriptionID string) DatabaseAccountRegionClient {
-	return original.NewDatabaseAccountRegionClient(subscriptionID)
-}
-func NewDatabaseAccountRegionClientWithBaseURI(baseURI string, subscriptionID string) DatabaseAccountRegionClient {
-	return original.NewDatabaseAccountRegionClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type DatabaseAccountsClient = original.DatabaseAccountsClient
-
-func NewDatabaseAccountsClient(subscriptionID string) DatabaseAccountsClient {
-	return original.NewDatabaseAccountsClient(subscriptionID)
-}
-func NewDatabaseAccountsClientWithBaseURI(baseURI string, subscriptionID string) DatabaseAccountsClient {
-	return original.NewDatabaseAccountsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type DatabaseAccountKind = original.DatabaseAccountKind
 
 const (
@@ -221,22 +199,28 @@ type PercentileMetricValue = original.PercentileMetricValue
 type Resource = original.Resource
 type Usage = original.Usage
 type UsagesResult = original.UsagesResult
-type OperationsClient = original.OperationsClient
+type CollectionPartitionRegionClient = original.CollectionPartitionRegionClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewCollectionPartitionRegionClient(subscriptionID string) CollectionPartitionRegionClient {
+	return original.NewCollectionPartitionRegionClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewCollectionPartitionRegionClientWithBaseURI(baseURI string, subscriptionID string) CollectionPartitionRegionClient {
+	return original.NewCollectionPartitionRegionClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
 }
 
-type PartitionKeyRangeIDClient = original.PartitionKeyRangeIDClient
+type DatabaseClient = original.DatabaseClient
 
-func NewPartitionKeyRangeIDClient(subscriptionID string) PartitionKeyRangeIDClient {
-	return original.NewPartitionKeyRangeIDClient(subscriptionID)
+func NewDatabaseClient(subscriptionID string) DatabaseClient {
+	return original.NewDatabaseClient(subscriptionID)
 }
-func NewPartitionKeyRangeIDClientWithBaseURI(baseURI string, subscriptionID string) PartitionKeyRangeIDClient {
-	return original.NewPartitionKeyRangeIDClientWithBaseURI(baseURI, subscriptionID)
+func NewDatabaseClientWithBaseURI(baseURI string, subscriptionID string) DatabaseClient {
+	return original.NewDatabaseClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type PartitionKeyRangeIDRegionClient = original.PartitionKeyRangeIDRegionClient
@@ -248,22 +232,13 @@ func NewPartitionKeyRangeIDRegionClientWithBaseURI(baseURI string, subscriptionI
 	return original.NewPartitionKeyRangeIDRegionClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type PercentileClient = original.PercentileClient
-
-func NewPercentileClient(subscriptionID string) PercentileClient {
-	return original.NewPercentileClient(subscriptionID)
-}
-func NewPercentileClientWithBaseURI(baseURI string, subscriptionID string) PercentileClient {
-	return original.NewPercentileClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type PercentileSourceTargetClient = original.PercentileSourceTargetClient
+type PartitionKeyRangeIDClient = original.PartitionKeyRangeIDClient
 
-func NewPercentileSourceTargetClient(subscriptionID string) PercentileSourceTargetClient {
-	return original.NewPercentileSourceTargetClient(subscriptionID)
+func NewPartitionKeyRangeIDClient(subscriptionID string) PartitionKeyRangeIDClient {
+	return original.NewPartitionKeyRangeIDClient(subscriptionID)
 }
-func NewPercentileSourceTargetClientWithBaseURI(baseURI string, subscriptionID string) PercentileSourceTargetClient {
-	return original.NewPercentileSourceTargetClientWithBaseURI(baseURI, subscriptionID)
+func NewPartitionKeyRangeIDClientWithBaseURI(baseURI string, subscriptionID string) PartitionKeyRangeIDClient {
+	return original.NewPartitionKeyRangeIDClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type PercentileTargetClient = original.PercentileTargetClient
@@ -274,9 +249,34 @@ func NewPercentileTargetClient(subscriptionID string) PercentileTargetClient {
 func NewPercentileTargetClientWithBaseURI(baseURI string, subscriptionID string) PercentileTargetClient {
 	return original.NewPercentileTargetClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+type DatabaseAccountRegionClient = original.DatabaseAccountRegionClient
+
+func NewDatabaseAccountRegionClient(subscriptionID string) DatabaseAccountRegionClient {
+	return original.NewDatabaseAccountRegionClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewDatabaseAccountRegionClientWithBaseURI(baseURI string, subscriptionID string) DatabaseAccountRegionClient {
+	return original.NewDatabaseAccountRegionClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
+
+type DatabaseAccountsClient = original.DatabaseAccountsClient
+
+func NewDatabaseAccountsClient(subscriptionID string) DatabaseAccountsClient {
+	return original.NewDatabaseAccountsClient(subscriptionID)
+}
+func NewDatabaseAccountsClientWithBaseURI(baseURI string, subscriptionID string) DatabaseAccountsClient {
+	return original.NewDatabaseAccountsClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/customerinsights/mgmt/customerinsights/models.go b/profiles/preview/customerinsights/mgmt/customerinsights/models.go
index c743f5304019..121b2bc6411c 100644
--- a/profiles/preview/customerinsights/mgmt/customerinsights/models.go
+++ b/profiles/preview/customerinsights/mgmt/customerinsights/models.go
@@ -21,35 +21,31 @@ package customerinsights
 
 import original "github.com/Azure/azure-sdk-for-go/services/customerinsights/mgmt/2017-04-26/customerinsights"
 
-type AuthorizationPoliciesClient = original.AuthorizationPoliciesClient
+type ConnectorMappingsClient = original.ConnectorMappingsClient
 
-func NewAuthorizationPoliciesClient(subscriptionID string) AuthorizationPoliciesClient {
-	return original.NewAuthorizationPoliciesClient(subscriptionID)
+func NewConnectorMappingsClient(subscriptionID string) ConnectorMappingsClient {
+	return original.NewConnectorMappingsClient(subscriptionID)
 }
-func NewAuthorizationPoliciesClientWithBaseURI(baseURI string, subscriptionID string) AuthorizationPoliciesClient {
-	return original.NewAuthorizationPoliciesClientWithBaseURI(baseURI, subscriptionID)
+func NewConnectorMappingsClientWithBaseURI(baseURI string, subscriptionID string) ConnectorMappingsClient {
+	return original.NewConnectorMappingsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ConnectorMappingsClient = original.ConnectorMappingsClient
+type ViewsClient = original.ViewsClient
 
-func NewConnectorMappingsClient(subscriptionID string) ConnectorMappingsClient {
-	return original.NewConnectorMappingsClient(subscriptionID)
+func NewViewsClient(subscriptionID string) ViewsClient {
+	return original.NewViewsClient(subscriptionID)
 }
-func NewConnectorMappingsClientWithBaseURI(baseURI string, subscriptionID string) ConnectorMappingsClient {
-	return original.NewConnectorMappingsClientWithBaseURI(baseURI, subscriptionID)
+func NewViewsClientWithBaseURI(baseURI string, subscriptionID string) ViewsClient {
+	return original.NewViewsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ConnectorsClient = original.ConnectorsClient
@@ -61,31 +57,22 @@ func NewConnectorsClientWithBaseURI(baseURI string, subscriptionID string) Conne
 	return original.NewConnectorsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type HubsClient = original.HubsClient
-
-func NewHubsClient(subscriptionID string) HubsClient {
-	return original.NewHubsClient(subscriptionID)
-}
-func NewHubsClientWithBaseURI(baseURI string, subscriptionID string) HubsClient {
-	return original.NewHubsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ImagesClient = original.ImagesClient
+type RoleAssignmentsClient = original.RoleAssignmentsClient
 
-func NewImagesClient(subscriptionID string) ImagesClient {
-	return original.NewImagesClient(subscriptionID)
+func NewRoleAssignmentsClient(subscriptionID string) RoleAssignmentsClient {
+	return original.NewRoleAssignmentsClient(subscriptionID)
 }
-func NewImagesClientWithBaseURI(baseURI string, subscriptionID string) ImagesClient {
-	return original.NewImagesClientWithBaseURI(baseURI, subscriptionID)
+func NewRoleAssignmentsClientWithBaseURI(baseURI string, subscriptionID string) RoleAssignmentsClient {
+	return original.NewRoleAssignmentsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type InteractionsClient = original.InteractionsClient
+type RolesClient = original.RolesClient
 
-func NewInteractionsClient(subscriptionID string) InteractionsClient {
-	return original.NewInteractionsClient(subscriptionID)
+func NewRolesClient(subscriptionID string) RolesClient {
+	return original.NewRolesClient(subscriptionID)
 }
-func NewInteractionsClientWithBaseURI(baseURI string, subscriptionID string) InteractionsClient {
-	return original.NewInteractionsClientWithBaseURI(baseURI, subscriptionID)
+func NewRolesClientWithBaseURI(baseURI string, subscriptionID string) RolesClient {
+	return original.NewRolesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type KpiClient = original.KpiClient
@@ -97,13 +84,13 @@ func NewKpiClientWithBaseURI(baseURI string, subscriptionID string) KpiClient {
 	return original.NewKpiClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LinksClient = original.LinksClient
+type RelationshipsClient = original.RelationshipsClient
 
-func NewLinksClient(subscriptionID string) LinksClient {
-	return original.NewLinksClient(subscriptionID)
+func NewRelationshipsClient(subscriptionID string) RelationshipsClient {
+	return original.NewRelationshipsClient(subscriptionID)
 }
-func NewLinksClientWithBaseURI(baseURI string, subscriptionID string) LinksClient {
-	return original.NewLinksClientWithBaseURI(baseURI, subscriptionID)
+func NewRelationshipsClientWithBaseURI(baseURI string, subscriptionID string) RelationshipsClient {
+	return original.NewRelationshipsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type CalculationWindowTypes = original.CalculationWindowTypes
@@ -534,13 +521,37 @@ type WidgetTypeListResult = original.WidgetTypeListResult
 type WidgetTypeListResultIterator = original.WidgetTypeListResultIterator
 type WidgetTypeListResultPage = original.WidgetTypeListResultPage
 type WidgetTypeResourceFormat = original.WidgetTypeResourceFormat
-type OperationsClient = original.OperationsClient
+type ProfilesClient = original.ProfilesClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewProfilesClient(subscriptionID string) ProfilesClient {
+	return original.NewProfilesClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewProfilesClientWithBaseURI(baseURI string, subscriptionID string) ProfilesClient {
+	return original.NewProfilesClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
+}
+
+type AuthorizationPoliciesClient = original.AuthorizationPoliciesClient
+
+func NewAuthorizationPoliciesClient(subscriptionID string) AuthorizationPoliciesClient {
+	return original.NewAuthorizationPoliciesClient(subscriptionID)
+}
+func NewAuthorizationPoliciesClientWithBaseURI(baseURI string, subscriptionID string) AuthorizationPoliciesClient {
+	return original.NewAuthorizationPoliciesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type HubsClient = original.HubsClient
+
+func NewHubsClient(subscriptionID string) HubsClient {
+	return original.NewHubsClient(subscriptionID)
+}
+func NewHubsClientWithBaseURI(baseURI string, subscriptionID string) HubsClient {
+	return original.NewHubsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type PredictionsClient = original.PredictionsClient
@@ -552,15 +563,6 @@ func NewPredictionsClientWithBaseURI(baseURI string, subscriptionID string) Pred
 	return original.NewPredictionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProfilesClient = original.ProfilesClient
-
-func NewProfilesClient(subscriptionID string) ProfilesClient {
-	return original.NewProfilesClient(subscriptionID)
-}
-func NewProfilesClientWithBaseURI(baseURI string, subscriptionID string) ProfilesClient {
-	return original.NewProfilesClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type RelationshipLinksClient = original.RelationshipLinksClient
 
 func NewRelationshipLinksClient(subscriptionID string) RelationshipLinksClient {
@@ -570,46 +572,31 @@ func NewRelationshipLinksClientWithBaseURI(baseURI string, subscriptionID string
 	return original.NewRelationshipLinksClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type RelationshipsClient = original.RelationshipsClient
-
-func NewRelationshipsClient(subscriptionID string) RelationshipsClient {
-	return original.NewRelationshipsClient(subscriptionID)
-}
-func NewRelationshipsClientWithBaseURI(baseURI string, subscriptionID string) RelationshipsClient {
-	return original.NewRelationshipsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type RoleAssignmentsClient = original.RoleAssignmentsClient
+type ImagesClient = original.ImagesClient
 
-func NewRoleAssignmentsClient(subscriptionID string) RoleAssignmentsClient {
-	return original.NewRoleAssignmentsClient(subscriptionID)
+func NewImagesClient(subscriptionID string) ImagesClient {
+	return original.NewImagesClient(subscriptionID)
 }
-func NewRoleAssignmentsClientWithBaseURI(baseURI string, subscriptionID string) RoleAssignmentsClient {
-	return original.NewRoleAssignmentsClientWithBaseURI(baseURI, subscriptionID)
+func NewImagesClientWithBaseURI(baseURI string, subscriptionID string) ImagesClient {
+	return original.NewImagesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type RolesClient = original.RolesClient
+type InteractionsClient = original.InteractionsClient
 
-func NewRolesClient(subscriptionID string) RolesClient {
-	return original.NewRolesClient(subscriptionID)
-}
-func NewRolesClientWithBaseURI(baseURI string, subscriptionID string) RolesClient {
-	return original.NewRolesClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+func NewInteractionsClient(subscriptionID string) InteractionsClient {
+	return original.NewInteractionsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewInteractionsClientWithBaseURI(baseURI string, subscriptionID string) InteractionsClient {
+	return original.NewInteractionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ViewsClient = original.ViewsClient
+type LinksClient = original.LinksClient
 
-func NewViewsClient(subscriptionID string) ViewsClient {
-	return original.NewViewsClient(subscriptionID)
+func NewLinksClient(subscriptionID string) LinksClient {
+	return original.NewLinksClient(subscriptionID)
 }
-func NewViewsClientWithBaseURI(baseURI string, subscriptionID string) ViewsClient {
-	return original.NewViewsClientWithBaseURI(baseURI, subscriptionID)
+func NewLinksClientWithBaseURI(baseURI string, subscriptionID string) LinksClient {
+	return original.NewLinksClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type WidgetTypesClient = original.WidgetTypesClient
@@ -620,3 +607,16 @@ func NewWidgetTypesClient(subscriptionID string) WidgetTypesClient {
 func NewWidgetTypesClientWithBaseURI(baseURI string, subscriptionID string) WidgetTypesClient {
 	return original.NewWidgetTypesClientWithBaseURI(baseURI, subscriptionID)
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/databricks/mgmt/databricks/models.go b/profiles/preview/databricks/mgmt/databricks/models.go
index 8a8d0280c581..2ad99629a7eb 100644
--- a/profiles/preview/databricks/mgmt/databricks/models.go
+++ b/profiles/preview/databricks/mgmt/databricks/models.go
@@ -21,19 +21,6 @@ package databricks
 
 import original "github.com/Azure/azure-sdk-for-go/services/databricks/mgmt/2018-04-01/databricks"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type ProvisioningState = original.ProvisioningState
 
 const (
@@ -86,3 +73,16 @@ func NewWorkspacesClient(subscriptionID string) WorkspacesClient {
 func NewWorkspacesClientWithBaseURI(baseURI string, subscriptionID string) WorkspacesClient {
 	return original.NewWorkspacesClientWithBaseURI(baseURI, subscriptionID)
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/datacatalog/mgmt/datacatalog/models.go b/profiles/preview/datacatalog/mgmt/datacatalog/models.go
index df1e0e66885c..45ee18e3245f 100644
--- a/profiles/preview/datacatalog/mgmt/datacatalog/models.go
+++ b/profiles/preview/datacatalog/mgmt/datacatalog/models.go
@@ -21,15 +21,6 @@ package datacatalog
 
 import original "github.com/Azure/azure-sdk-for-go/services/datacatalog/mgmt/2016-03-30/datacatalog"
 
-type ADCCatalogsClient = original.ADCCatalogsClient
-
-func NewADCCatalogsClient(subscriptionID string, catalogName string) ADCCatalogsClient {
-	return original.NewADCCatalogsClient(subscriptionID, catalogName)
-}
-func NewADCCatalogsClientWithBaseURI(baseURI string, subscriptionID string, catalogName string) ADCCatalogsClient {
-	return original.NewADCCatalogsClientWithBaseURI(baseURI, subscriptionID, catalogName)
-}
-
 type ADCOperationsClient = original.ADCOperationsClient
 
 func NewADCOperationsClient(subscriptionID string, catalogName string) ADCOperationsClient {
@@ -39,19 +30,6 @@ func NewADCOperationsClientWithBaseURI(baseURI string, subscriptionID string, ca
 	return original.NewADCOperationsClientWithBaseURI(baseURI, subscriptionID, catalogName)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string, catalogName string) BaseClient {
-	return original.New(subscriptionID, catalogName)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string, catalogName string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID, catalogName)
-}
-
 type SkuType = original.SkuType
 
 const (
@@ -72,10 +50,30 @@ type OperationEntity = original.OperationEntity
 type OperationEntityListResult = original.OperationEntityListResult
 type Principals = original.Principals
 type Resource = original.Resource
+type ADCCatalogsClient = original.ADCCatalogsClient
 
+func NewADCCatalogsClient(subscriptionID string, catalogName string) ADCCatalogsClient {
+	return original.NewADCCatalogsClient(subscriptionID, catalogName)
+}
+func NewADCCatalogsClientWithBaseURI(baseURI string, subscriptionID string, catalogName string) ADCCatalogsClient {
+	return original.NewADCCatalogsClientWithBaseURI(baseURI, subscriptionID, catalogName)
+}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string, catalogName string) BaseClient {
+	return original.New(subscriptionID, catalogName)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string, catalogName string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID, catalogName)
+}
diff --git a/profiles/preview/datafactory/mgmt/datafactory/models.go b/profiles/preview/datafactory/mgmt/datafactory/models.go
index 566dea8e8119..efb341e8b6a3 100644
--- a/profiles/preview/datafactory/mgmt/datafactory/models.go
+++ b/profiles/preview/datafactory/mgmt/datafactory/models.go
@@ -21,71 +21,31 @@ package datafactory
 
 import original "github.com/Azure/azure-sdk-for-go/services/datafactory/mgmt/2017-09-01-preview/datafactory"
 
-type ActivityRunsClient = original.ActivityRunsClient
-
-func NewActivityRunsClient(subscriptionID string) ActivityRunsClient {
-	return original.NewActivityRunsClient(subscriptionID)
-}
-func NewActivityRunsClientWithBaseURI(baseURI string, subscriptionID string) ActivityRunsClient {
-	return original.NewActivityRunsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type DatasetsClient = original.DatasetsClient
-
-func NewDatasetsClient(subscriptionID string) DatasetsClient {
-	return original.NewDatasetsClient(subscriptionID)
-}
-func NewDatasetsClientWithBaseURI(baseURI string, subscriptionID string) DatasetsClient {
-	return original.NewDatasetsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type FactoriesClient = original.FactoriesClient
-
-func NewFactoriesClient(subscriptionID string) FactoriesClient {
-	return original.NewFactoriesClient(subscriptionID)
-}
-func NewFactoriesClientWithBaseURI(baseURI string, subscriptionID string) FactoriesClient {
-	return original.NewFactoriesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type IntegrationRuntimeNodesClient = original.IntegrationRuntimeNodesClient
+type TriggersClient = original.TriggersClient
 
-func NewIntegrationRuntimeNodesClient(subscriptionID string) IntegrationRuntimeNodesClient {
-	return original.NewIntegrationRuntimeNodesClient(subscriptionID)
+func NewTriggersClient(subscriptionID string) TriggersClient {
+	return original.NewTriggersClient(subscriptionID)
 }
-func NewIntegrationRuntimeNodesClientWithBaseURI(baseURI string, subscriptionID string) IntegrationRuntimeNodesClient {
-	return original.NewIntegrationRuntimeNodesClientWithBaseURI(baseURI, subscriptionID)
+func NewTriggersClientWithBaseURI(baseURI string, subscriptionID string) TriggersClient {
+	return original.NewTriggersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type IntegrationRuntimesClient = original.IntegrationRuntimesClient
+type OperationsClient = original.OperationsClient
 
-func NewIntegrationRuntimesClient(subscriptionID string) IntegrationRuntimesClient {
-	return original.NewIntegrationRuntimesClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewIntegrationRuntimesClientWithBaseURI(baseURI string, subscriptionID string) IntegrationRuntimesClient {
-	return original.NewIntegrationRuntimesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LinkedServicesClient = original.LinkedServicesClient
+type PipelineRunsClient = original.PipelineRunsClient
 
-func NewLinkedServicesClient(subscriptionID string) LinkedServicesClient {
-	return original.NewLinkedServicesClient(subscriptionID)
+func NewPipelineRunsClient(subscriptionID string) PipelineRunsClient {
+	return original.NewPipelineRunsClient(subscriptionID)
 }
-func NewLinkedServicesClientWithBaseURI(baseURI string, subscriptionID string) LinkedServicesClient {
-	return original.NewLinkedServicesClientWithBaseURI(baseURI, subscriptionID)
+func NewPipelineRunsClientWithBaseURI(baseURI string, subscriptionID string) PipelineRunsClient {
+	return original.NewPipelineRunsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AuthenticationType = original.AuthenticationType
@@ -1654,22 +1614,68 @@ type ZohoLinkedService = original.ZohoLinkedService
 type ZohoLinkedServiceTypeProperties = original.ZohoLinkedServiceTypeProperties
 type ZohoObjectDataset = original.ZohoObjectDataset
 type ZohoSource = original.ZohoSource
-type OperationsClient = original.OperationsClient
+type DatasetsClient = original.DatasetsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewDatasetsClient(subscriptionID string) DatasetsClient {
+	return original.NewDatasetsClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewDatasetsClientWithBaseURI(baseURI string, subscriptionID string) DatasetsClient {
+	return original.NewDatasetsClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
 }
 
-type PipelineRunsClient = original.PipelineRunsClient
+type IntegrationRuntimesClient = original.IntegrationRuntimesClient
 
-func NewPipelineRunsClient(subscriptionID string) PipelineRunsClient {
-	return original.NewPipelineRunsClient(subscriptionID)
+func NewIntegrationRuntimesClient(subscriptionID string) IntegrationRuntimesClient {
+	return original.NewIntegrationRuntimesClient(subscriptionID)
 }
-func NewPipelineRunsClientWithBaseURI(baseURI string, subscriptionID string) PipelineRunsClient {
-	return original.NewPipelineRunsClientWithBaseURI(baseURI, subscriptionID)
+func NewIntegrationRuntimesClientWithBaseURI(baseURI string, subscriptionID string) IntegrationRuntimesClient {
+	return original.NewIntegrationRuntimesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type FactoriesClient = original.FactoriesClient
+
+func NewFactoriesClient(subscriptionID string) FactoriesClient {
+	return original.NewFactoriesClient(subscriptionID)
+}
+func NewFactoriesClientWithBaseURI(baseURI string, subscriptionID string) FactoriesClient {
+	return original.NewFactoriesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type LinkedServicesClient = original.LinkedServicesClient
+
+func NewLinkedServicesClient(subscriptionID string) LinkedServicesClient {
+	return original.NewLinkedServicesClient(subscriptionID)
+}
+func NewLinkedServicesClientWithBaseURI(baseURI string, subscriptionID string) LinkedServicesClient {
+	return original.NewLinkedServicesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ActivityRunsClient = original.ActivityRunsClient
+
+func NewActivityRunsClient(subscriptionID string) ActivityRunsClient {
+	return original.NewActivityRunsClient(subscriptionID)
+}
+func NewActivityRunsClientWithBaseURI(baseURI string, subscriptionID string) ActivityRunsClient {
+	return original.NewActivityRunsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
 type PipelinesClient = original.PipelinesClient
@@ -1681,17 +1687,11 @@ func NewPipelinesClientWithBaseURI(baseURI string, subscriptionID string) Pipeli
 	return original.NewPipelinesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TriggersClient = original.TriggersClient
+type IntegrationRuntimeNodesClient = original.IntegrationRuntimeNodesClient
 
-func NewTriggersClient(subscriptionID string) TriggersClient {
-	return original.NewTriggersClient(subscriptionID)
-}
-func NewTriggersClientWithBaseURI(baseURI string, subscriptionID string) TriggersClient {
-	return original.NewTriggersClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+func NewIntegrationRuntimeNodesClient(subscriptionID string) IntegrationRuntimeNodesClient {
+	return original.NewIntegrationRuntimeNodesClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewIntegrationRuntimeNodesClientWithBaseURI(baseURI string, subscriptionID string) IntegrationRuntimeNodesClient {
+	return original.NewIntegrationRuntimeNodesClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/datalake/analytics/catalog/models.go b/profiles/preview/datalake/analytics/catalog/models.go
index 68bb1bf1b1da..e83b63ad4164 100644
--- a/profiles/preview/datalake/analytics/catalog/models.go
+++ b/profiles/preview/datalake/analytics/catalog/models.go
@@ -21,25 +21,6 @@ package catalog
 
 import original "github.com/Azure/azure-sdk-for-go/services/datalake/analytics/2016-11-01-preview/catalog"
 
-type Client = original.Client
-
-func NewClient() Client {
-	return original.NewClient()
-}
-
-const (
-	DefaultAdlaCatalogDNSSuffix = original.DefaultAdlaCatalogDNSSuffix
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithoutDefaults(adlaCatalogDNSSuffix string) BaseClient {
-	return original.NewWithoutDefaults(adlaCatalogDNSSuffix)
-}
-
 type ACLType = original.ACLType
 
 const (
@@ -169,3 +150,22 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type Client = original.Client
+
+func NewClient() Client {
+	return original.NewClient()
+}
+
+const (
+	DefaultAdlaCatalogDNSSuffix = original.DefaultAdlaCatalogDNSSuffix
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithoutDefaults(adlaCatalogDNSSuffix string) BaseClient {
+	return original.NewWithoutDefaults(adlaCatalogDNSSuffix)
+}
diff --git a/profiles/preview/datalake/analytics/job/models.go b/profiles/preview/datalake/analytics/job/models.go
index 0ced907b02c8..44bc9c2e2e6e 100644
--- a/profiles/preview/datalake/analytics/job/models.go
+++ b/profiles/preview/datalake/analytics/job/models.go
@@ -21,17 +21,10 @@ package job
 
 import original "github.com/Azure/azure-sdk-for-go/services/datalake/analytics/2017-09-01-preview/job"
 
-const (
-	DefaultAdlaJobDNSSuffix = original.DefaultAdlaJobDNSSuffix
-)
-
-type BaseClient = original.BaseClient
+type PipelineClient = original.PipelineClient
 
-func New() BaseClient {
-	return original.New()
-}
-func NewWithoutDefaults(adlaJobDNSSuffix string) BaseClient {
-	return original.NewWithoutDefaults(adlaJobDNSSuffix)
+func NewPipelineClient() PipelineClient {
+	return original.NewPipelineClient()
 }
 
 type Client = original.Client
@@ -194,12 +187,6 @@ type UpdateFuture = original.UpdateFuture
 type UpdateJobParameters = original.UpdateJobParameters
 type USQLJobProperties = original.USQLJobProperties
 type YieldFuture = original.YieldFuture
-type PipelineClient = original.PipelineClient
-
-func NewPipelineClient() PipelineClient {
-	return original.NewPipelineClient()
-}
-
 type RecurrenceClient = original.RecurrenceClient
 
 func NewRecurrenceClient() RecurrenceClient {
@@ -211,3 +198,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultAdlaJobDNSSuffix = original.DefaultAdlaJobDNSSuffix
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithoutDefaults(adlaJobDNSSuffix string) BaseClient {
+	return original.NewWithoutDefaults(adlaJobDNSSuffix)
+}
diff --git a/profiles/preview/datalake/analytics/mgmt/account/models.go b/profiles/preview/datalake/analytics/mgmt/account/models.go
index c34c090031df..85af91dac02e 100644
--- a/profiles/preview/datalake/analytics/mgmt/account/models.go
+++ b/profiles/preview/datalake/analytics/mgmt/account/models.go
@@ -21,26 +21,22 @@ package account
 
 import original "github.com/Azure/azure-sdk-for-go/services/datalake/analytics/mgmt/2016-11-01/account"
 
-type AccountsClient = original.AccountsClient
+type DataLakeStoreAccountsClient = original.DataLakeStoreAccountsClient
 
-func NewAccountsClient(subscriptionID string) AccountsClient {
-	return original.NewAccountsClient(subscriptionID)
+func NewDataLakeStoreAccountsClient(subscriptionID string) DataLakeStoreAccountsClient {
+	return original.NewDataLakeStoreAccountsClient(subscriptionID)
 }
-func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
-	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
+func NewDataLakeStoreAccountsClientWithBaseURI(baseURI string, subscriptionID string) DataLakeStoreAccountsClient {
+	return original.NewDataLakeStoreAccountsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ComputePoliciesClient = original.ComputePoliciesClient
@@ -52,24 +48,6 @@ func NewComputePoliciesClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewComputePoliciesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DataLakeStoreAccountsClient = original.DataLakeStoreAccountsClient
-
-func NewDataLakeStoreAccountsClient(subscriptionID string) DataLakeStoreAccountsClient {
-	return original.NewDataLakeStoreAccountsClient(subscriptionID)
-}
-func NewDataLakeStoreAccountsClientWithBaseURI(baseURI string, subscriptionID string) DataLakeStoreAccountsClient {
-	return original.NewDataLakeStoreAccountsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type FirewallRulesClient = original.FirewallRulesClient
-
-func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClient(subscriptionID)
-}
-func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type LocationsClient = original.LocationsClient
 
 func NewLocationsClient(subscriptionID string) LocationsClient {
@@ -262,13 +240,21 @@ type UpdateFirewallRuleWithAccountParameters = original.UpdateFirewallRuleWithAc
 type UpdateStorageAccountParameters = original.UpdateStorageAccountParameters
 type UpdateStorageAccountProperties = original.UpdateStorageAccountProperties
 type UpdateStorageAccountWithAccountParameters = original.UpdateStorageAccountWithAccountParameters
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
+}
+
+type FirewallRulesClient = original.FirewallRulesClient
+
+func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClient(subscriptionID)
+}
+func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type StorageAccountsClient = original.StorageAccountsClient
@@ -279,9 +265,25 @@ func NewStorageAccountsClient(subscriptionID string) StorageAccountsClient {
 func NewStorageAccountsClientWithBaseURI(baseURI string, subscriptionID string) StorageAccountsClient {
 	return original.NewStorageAccountsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+type AccountsClient = original.AccountsClient
+
+func NewAccountsClient(subscriptionID string) AccountsClient {
+	return original.NewAccountsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
+	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/datalake/store/filesystem/models.go b/profiles/preview/datalake/store/filesystem/models.go
index 066e5e413e2c..9238c9a7bdcc 100644
--- a/profiles/preview/datalake/store/filesystem/models.go
+++ b/profiles/preview/datalake/store/filesystem/models.go
@@ -21,25 +21,6 @@ package filesystem
 
 import original "github.com/Azure/azure-sdk-for-go/services/datalake/store/2016-11-01/filesystem"
 
-const (
-	DefaultAdlsFileSystemDNSSuffix = original.DefaultAdlsFileSystemDNSSuffix
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithoutDefaults(adlsFileSystemDNSSuffix string) BaseClient {
-	return original.NewWithoutDefaults(adlsFileSystemDNSSuffix)
-}
-
-type Client = original.Client
-
-func NewClient() Client {
-	return original.NewClient()
-}
-
 type AppendModeType = original.AppendModeType
 
 const (
@@ -136,3 +117,22 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type Client = original.Client
+
+func NewClient() Client {
+	return original.NewClient()
+}
+
+const (
+	DefaultAdlsFileSystemDNSSuffix = original.DefaultAdlsFileSystemDNSSuffix
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithoutDefaults(adlsFileSystemDNSSuffix string) BaseClient {
+	return original.NewWithoutDefaults(adlsFileSystemDNSSuffix)
+}
diff --git a/profiles/preview/datalake/store/mgmt/account/models.go b/profiles/preview/datalake/store/mgmt/account/models.go
index 1d51ca1005cc..670c095b974d 100644
--- a/profiles/preview/datalake/store/mgmt/account/models.go
+++ b/profiles/preview/datalake/store/mgmt/account/models.go
@@ -21,35 +21,13 @@ package account
 
 import original "github.com/Azure/azure-sdk-for-go/services/datalake/store/mgmt/2016-11-01/account"
 
-type AccountsClient = original.AccountsClient
-
-func NewAccountsClient(subscriptionID string) AccountsClient {
-	return original.NewAccountsClient(subscriptionID)
-}
-func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
-	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type FirewallRulesClient = original.FirewallRulesClient
+type OperationsClient = original.OperationsClient
 
-func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type LocationsClient = original.LocationsClient
@@ -249,15 +227,6 @@ type UpdateKeyVaultMetaInfo = original.UpdateKeyVaultMetaInfo
 type UpdateTrustedIDProviderParameters = original.UpdateTrustedIDProviderParameters
 type UpdateTrustedIDProviderProperties = original.UpdateTrustedIDProviderProperties
 type UpdateTrustedIDProviderWithAccountParameters = original.UpdateTrustedIDProviderWithAccountParameters
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type TrustedIDProvidersClient = original.TrustedIDProvidersClient
 
 func NewTrustedIDProvidersClient(subscriptionID string) TrustedIDProvidersClient {
@@ -272,3 +241,34 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type FirewallRulesClient = original.FirewallRulesClient
+
+func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClient(subscriptionID)
+}
+func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type AccountsClient = original.AccountsClient
+
+func NewAccountsClient(subscriptionID string) AccountsClient {
+	return original.NewAccountsClient(subscriptionID)
+}
+func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
+	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/datamigration/mgmt/datamigration/models.go b/profiles/preview/datamigration/mgmt/datamigration/models.go
index 93ec289cb071..a32e6185621b 100644
--- a/profiles/preview/datamigration/mgmt/datamigration/models.go
+++ b/profiles/preview/datamigration/mgmt/datamigration/models.go
@@ -21,17 +21,31 @@ package datamigration
 
 import original "github.com/Azure/azure-sdk-for-go/services/datamigration/mgmt/2017-11-15-preview/datamigration"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type OperationsClient = original.OperationsClient
 
-type BaseClient = original.BaseClient
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type UsagesClient = original.UsagesClient
+
+func NewUsagesClient(subscriptionID string) UsagesClient {
+	return original.NewUsagesClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
+	return original.NewUsagesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ServicesClient = original.ServicesClient
+
+func NewServicesClient(subscriptionID string) ServicesClient {
+	return original.NewServicesClient(subscriptionID)
+}
+func NewServicesClientWithBaseURI(baseURI string, subscriptionID string) ServicesClient {
+	return original.NewServicesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AuthenticationType = original.AuthenticationType
@@ -503,24 +517,6 @@ type TaskListPage = original.TaskListPage
 type TrackedResource = original.TrackedResource
 type ValidationError = original.ValidationError
 type WaitStatistics = original.WaitStatistics
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ProjectsClient = original.ProjectsClient
-
-func NewProjectsClient(subscriptionID string) ProjectsClient {
-	return original.NewProjectsClient(subscriptionID)
-}
-func NewProjectsClientWithBaseURI(baseURI string, subscriptionID string) ProjectsClient {
-	return original.NewProjectsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type ResourceSkusClient = original.ResourceSkusClient
 
 func NewResourceSkusClient(subscriptionID string) ResourceSkusClient {
@@ -529,14 +525,20 @@ func NewResourceSkusClient(subscriptionID string) ResourceSkusClient {
 func NewResourceSkusClientWithBaseURI(baseURI string, subscriptionID string) ResourceSkusClient {
 	return original.NewResourceSkusClientWithBaseURI(baseURI, subscriptionID)
 }
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
+}
 
-type ServicesClient = original.ServicesClient
+type ProjectsClient = original.ProjectsClient
 
-func NewServicesClient(subscriptionID string) ServicesClient {
-	return original.NewServicesClient(subscriptionID)
+func NewProjectsClient(subscriptionID string) ProjectsClient {
+	return original.NewProjectsClient(subscriptionID)
 }
-func NewServicesClientWithBaseURI(baseURI string, subscriptionID string) ServicesClient {
-	return original.NewServicesClientWithBaseURI(baseURI, subscriptionID)
+func NewProjectsClientWithBaseURI(baseURI string, subscriptionID string) ProjectsClient {
+	return original.NewProjectsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type TasksClient = original.TasksClient
@@ -548,17 +550,15 @@ func NewTasksClientWithBaseURI(baseURI string, subscriptionID string) TasksClien
 	return original.NewTasksClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UsagesClient = original.UsagesClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewUsagesClient(subscriptionID string) UsagesClient {
-	return original.NewUsagesClient(subscriptionID)
-}
-func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
-	return original.NewUsagesClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/devtestlabs/mgmt/dtl/models.go b/profiles/preview/devtestlabs/mgmt/dtl/models.go
index ce0a31cbc929..26f3092ec77a 100644
--- a/profiles/preview/devtestlabs/mgmt/dtl/models.go
+++ b/profiles/preview/devtestlabs/mgmt/dtl/models.go
@@ -21,89 +21,94 @@ package dtl
 
 import original "github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2016-05-15/dtl"
 
-type ArmTemplatesClient = original.ArmTemplatesClient
+type OperationsClient = original.OperationsClient
 
-func NewArmTemplatesClient(subscriptionID string) ArmTemplatesClient {
-	return original.NewArmTemplatesClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewArmTemplatesClientWithBaseURI(baseURI string, subscriptionID string) ArmTemplatesClient {
-	return original.NewArmTemplatesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ArtifactsClient = original.ArtifactsClient
+type GlobalSchedulesClient = original.GlobalSchedulesClient
 
-func NewArtifactsClient(subscriptionID string) ArtifactsClient {
-	return original.NewArtifactsClient(subscriptionID)
+func NewGlobalSchedulesClient(subscriptionID string) GlobalSchedulesClient {
+	return original.NewGlobalSchedulesClient(subscriptionID)
 }
-func NewArtifactsClientWithBaseURI(baseURI string, subscriptionID string) ArtifactsClient {
-	return original.NewArtifactsClientWithBaseURI(baseURI, subscriptionID)
+func NewGlobalSchedulesClientWithBaseURI(baseURI string, subscriptionID string) GlobalSchedulesClient {
+	return original.NewGlobalSchedulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ArtifactSourcesClient = original.ArtifactSourcesClient
+type ProviderOperationsClient = original.ProviderOperationsClient
 
-func NewArtifactSourcesClient(subscriptionID string) ArtifactSourcesClient {
-	return original.NewArtifactSourcesClient(subscriptionID)
+func NewProviderOperationsClient(subscriptionID string) ProviderOperationsClient {
+	return original.NewProviderOperationsClient(subscriptionID)
 }
-func NewArtifactSourcesClientWithBaseURI(baseURI string, subscriptionID string) ArtifactSourcesClient {
-	return original.NewArtifactSourcesClientWithBaseURI(baseURI, subscriptionID)
+func NewProviderOperationsClientWithBaseURI(baseURI string, subscriptionID string) ProviderOperationsClient {
+	return original.NewProviderOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type NotificationChannelsClient = original.NotificationChannelsClient
 
-type BaseClient = original.BaseClient
+func NewNotificationChannelsClient(subscriptionID string) NotificationChannelsClient {
+	return original.NewNotificationChannelsClient(subscriptionID)
+}
+func NewNotificationChannelsClientWithBaseURI(baseURI string, subscriptionID string) NotificationChannelsClient {
+	return original.NewNotificationChannelsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type LabsClient = original.LabsClient
+
+func NewLabsClient(subscriptionID string) LabsClient {
+	return original.NewLabsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewLabsClientWithBaseURI(baseURI string, subscriptionID string) LabsClient {
+	return original.NewLabsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CostsClient = original.CostsClient
+type SecretsClient = original.SecretsClient
 
-func NewCostsClient(subscriptionID string) CostsClient {
-	return original.NewCostsClient(subscriptionID)
+func NewSecretsClient(subscriptionID string) SecretsClient {
+	return original.NewSecretsClient(subscriptionID)
 }
-func NewCostsClientWithBaseURI(baseURI string, subscriptionID string) CostsClient {
-	return original.NewCostsClientWithBaseURI(baseURI, subscriptionID)
+func NewSecretsClientWithBaseURI(baseURI string, subscriptionID string) SecretsClient {
+	return original.NewSecretsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CustomImagesClient = original.CustomImagesClient
+type UsersClient = original.UsersClient
 
-func NewCustomImagesClient(subscriptionID string) CustomImagesClient {
-	return original.NewCustomImagesClient(subscriptionID)
+func NewUsersClient(subscriptionID string) UsersClient {
+	return original.NewUsersClient(subscriptionID)
 }
-func NewCustomImagesClientWithBaseURI(baseURI string, subscriptionID string) CustomImagesClient {
-	return original.NewCustomImagesClientWithBaseURI(baseURI, subscriptionID)
+func NewUsersClientWithBaseURI(baseURI string, subscriptionID string) UsersClient {
+	return original.NewUsersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DisksClient = original.DisksClient
+type ArtifactsClient = original.ArtifactsClient
 
-func NewDisksClient(subscriptionID string) DisksClient {
-	return original.NewDisksClient(subscriptionID)
+func NewArtifactsClient(subscriptionID string) ArtifactsClient {
+	return original.NewArtifactsClient(subscriptionID)
 }
-func NewDisksClientWithBaseURI(baseURI string, subscriptionID string) DisksClient {
-	return original.NewDisksClientWithBaseURI(baseURI, subscriptionID)
+func NewArtifactsClientWithBaseURI(baseURI string, subscriptionID string) ArtifactsClient {
+	return original.NewArtifactsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type EnvironmentsClient = original.EnvironmentsClient
+type CostsClient = original.CostsClient
 
-func NewEnvironmentsClient(subscriptionID string) EnvironmentsClient {
-	return original.NewEnvironmentsClient(subscriptionID)
+func NewCostsClient(subscriptionID string) CostsClient {
+	return original.NewCostsClient(subscriptionID)
 }
-func NewEnvironmentsClientWithBaseURI(baseURI string, subscriptionID string) EnvironmentsClient {
-	return original.NewEnvironmentsClientWithBaseURI(baseURI, subscriptionID)
+func NewCostsClientWithBaseURI(baseURI string, subscriptionID string) CostsClient {
+	return original.NewCostsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type FormulasClient = original.FormulasClient
+type ServiceRunnersClient = original.ServiceRunnersClient
 
-func NewFormulasClient(subscriptionID string) FormulasClient {
-	return original.NewFormulasClient(subscriptionID)
+func NewServiceRunnersClient(subscriptionID string) ServiceRunnersClient {
+	return original.NewServiceRunnersClient(subscriptionID)
 }
-func NewFormulasClientWithBaseURI(baseURI string, subscriptionID string) FormulasClient {
-	return original.NewFormulasClientWithBaseURI(baseURI, subscriptionID)
+func NewServiceRunnersClientWithBaseURI(baseURI string, subscriptionID string) ServiceRunnersClient {
+	return original.NewServiceRunnersClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type GalleryImagesClient = original.GalleryImagesClient
@@ -115,24 +120,6 @@ func NewGalleryImagesClientWithBaseURI(baseURI string, subscriptionID string) Ga
 	return original.NewGalleryImagesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type GlobalSchedulesClient = original.GlobalSchedulesClient
-
-func NewGlobalSchedulesClient(subscriptionID string) GlobalSchedulesClient {
-	return original.NewGlobalSchedulesClient(subscriptionID)
-}
-func NewGlobalSchedulesClientWithBaseURI(baseURI string, subscriptionID string) GlobalSchedulesClient {
-	return original.NewGlobalSchedulesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type LabsClient = original.LabsClient
-
-func NewLabsClient(subscriptionID string) LabsClient {
-	return original.NewLabsClient(subscriptionID)
-}
-func NewLabsClientWithBaseURI(baseURI string, subscriptionID string) LabsClient {
-	return original.NewLabsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type CostThresholdStatus = original.CostThresholdStatus
 
 const (
@@ -658,31 +645,28 @@ type VirtualNetworksDeleteFuture = original.VirtualNetworksDeleteFuture
 type WeekDetails = original.WeekDetails
 type WeekDetailsFragment = original.WeekDetailsFragment
 type WindowsOsInfo = original.WindowsOsInfo
-type NotificationChannelsClient = original.NotificationChannelsClient
+type VirtualNetworksClient = original.VirtualNetworksClient
 
-func NewNotificationChannelsClient(subscriptionID string) NotificationChannelsClient {
-	return original.NewNotificationChannelsClient(subscriptionID)
+func NewVirtualNetworksClient(subscriptionID string) VirtualNetworksClient {
+	return original.NewVirtualNetworksClient(subscriptionID)
 }
-func NewNotificationChannelsClientWithBaseURI(baseURI string, subscriptionID string) NotificationChannelsClient {
-	return original.NewNotificationChannelsClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualNetworksClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksClient {
+	return original.NewVirtualNetworksClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type PoliciesClient = original.PoliciesClient
+type ArtifactSourcesClient = original.ArtifactSourcesClient
 
-func NewPoliciesClient(subscriptionID string) PoliciesClient {
-	return original.NewPoliciesClient(subscriptionID)
+func NewArtifactSourcesClient(subscriptionID string) ArtifactSourcesClient {
+	return original.NewArtifactSourcesClient(subscriptionID)
 }
-func NewPoliciesClientWithBaseURI(baseURI string, subscriptionID string) PoliciesClient {
-	return original.NewPoliciesClientWithBaseURI(baseURI, subscriptionID)
+func NewArtifactSourcesClientWithBaseURI(baseURI string, subscriptionID string) ArtifactSourcesClient {
+	return original.NewArtifactSourcesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type PolicySetsClient = original.PolicySetsClient
@@ -694,13 +678,22 @@ func NewPolicySetsClientWithBaseURI(baseURI string, subscriptionID string) Polic
 	return original.NewPolicySetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProviderOperationsClient = original.ProviderOperationsClient
+type ArmTemplatesClient = original.ArmTemplatesClient
 
-func NewProviderOperationsClient(subscriptionID string) ProviderOperationsClient {
-	return original.NewProviderOperationsClient(subscriptionID)
+func NewArmTemplatesClient(subscriptionID string) ArmTemplatesClient {
+	return original.NewArmTemplatesClient(subscriptionID)
 }
-func NewProviderOperationsClientWithBaseURI(baseURI string, subscriptionID string) ProviderOperationsClient {
-	return original.NewProviderOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewArmTemplatesClientWithBaseURI(baseURI string, subscriptionID string) ArmTemplatesClient {
+	return original.NewArmTemplatesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type VirtualMachineSchedulesClient = original.VirtualMachineSchedulesClient
+
+func NewVirtualMachineSchedulesClient(subscriptionID string) VirtualMachineSchedulesClient {
+	return original.NewVirtualMachineSchedulesClient(subscriptionID)
+}
+func NewVirtualMachineSchedulesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineSchedulesClient {
+	return original.NewVirtualMachineSchedulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type SchedulesClient = original.SchedulesClient
@@ -712,62 +705,69 @@ func NewSchedulesClientWithBaseURI(baseURI string, subscriptionID string) Schedu
 	return original.NewSchedulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SecretsClient = original.SecretsClient
+type PoliciesClient = original.PoliciesClient
 
-func NewSecretsClient(subscriptionID string) SecretsClient {
-	return original.NewSecretsClient(subscriptionID)
+func NewPoliciesClient(subscriptionID string) PoliciesClient {
+	return original.NewPoliciesClient(subscriptionID)
 }
-func NewSecretsClientWithBaseURI(baseURI string, subscriptionID string) SecretsClient {
-	return original.NewSecretsClientWithBaseURI(baseURI, subscriptionID)
+func NewPoliciesClientWithBaseURI(baseURI string, subscriptionID string) PoliciesClient {
+	return original.NewPoliciesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ServiceRunnersClient = original.ServiceRunnersClient
+type CustomImagesClient = original.CustomImagesClient
 
-func NewServiceRunnersClient(subscriptionID string) ServiceRunnersClient {
-	return original.NewServiceRunnersClient(subscriptionID)
+func NewCustomImagesClient(subscriptionID string) CustomImagesClient {
+	return original.NewCustomImagesClient(subscriptionID)
 }
-func NewServiceRunnersClientWithBaseURI(baseURI string, subscriptionID string) ServiceRunnersClient {
-	return original.NewServiceRunnersClientWithBaseURI(baseURI, subscriptionID)
+func NewCustomImagesClientWithBaseURI(baseURI string, subscriptionID string) CustomImagesClient {
+	return original.NewCustomImagesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UsersClient = original.UsersClient
+type DisksClient = original.DisksClient
 
-func NewUsersClient(subscriptionID string) UsersClient {
-	return original.NewUsersClient(subscriptionID)
+func NewDisksClient(subscriptionID string) DisksClient {
+	return original.NewDisksClient(subscriptionID)
 }
-func NewUsersClientWithBaseURI(baseURI string, subscriptionID string) UsersClient {
-	return original.NewUsersClientWithBaseURI(baseURI, subscriptionID)
+func NewDisksClientWithBaseURI(baseURI string, subscriptionID string) DisksClient {
+	return original.NewDisksClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+type EnvironmentsClient = original.EnvironmentsClient
+
+func NewEnvironmentsClient(subscriptionID string) EnvironmentsClient {
+	return original.NewEnvironmentsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewEnvironmentsClientWithBaseURI(baseURI string, subscriptionID string) EnvironmentsClient {
+	return original.NewEnvironmentsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualMachinesClient = original.VirtualMachinesClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewVirtualMachinesClient(subscriptionID string) VirtualMachinesClient {
-	return original.NewVirtualMachinesClient(subscriptionID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewVirtualMachinesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachinesClient {
-	return original.NewVirtualMachinesClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualMachineSchedulesClient = original.VirtualMachineSchedulesClient
+type FormulasClient = original.FormulasClient
 
-func NewVirtualMachineSchedulesClient(subscriptionID string) VirtualMachineSchedulesClient {
-	return original.NewVirtualMachineSchedulesClient(subscriptionID)
+func NewFormulasClient(subscriptionID string) FormulasClient {
+	return original.NewFormulasClient(subscriptionID)
 }
-func NewVirtualMachineSchedulesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachineSchedulesClient {
-	return original.NewVirtualMachineSchedulesClientWithBaseURI(baseURI, subscriptionID)
+func NewFormulasClientWithBaseURI(baseURI string, subscriptionID string) FormulasClient {
+	return original.NewFormulasClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualNetworksClient = original.VirtualNetworksClient
+type VirtualMachinesClient = original.VirtualMachinesClient
 
-func NewVirtualNetworksClient(subscriptionID string) VirtualNetworksClient {
-	return original.NewVirtualNetworksClient(subscriptionID)
+func NewVirtualMachinesClient(subscriptionID string) VirtualMachinesClient {
+	return original.NewVirtualMachinesClient(subscriptionID)
 }
-func NewVirtualNetworksClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksClient {
-	return original.NewVirtualNetworksClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualMachinesClientWithBaseURI(baseURI string, subscriptionID string) VirtualMachinesClient {
+	return original.NewVirtualMachinesClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/dns/mgmt/dns/models.go b/profiles/preview/dns/mgmt/dns/models.go
index 12d26de42070..464c2ec186f2 100644
--- a/profiles/preview/dns/mgmt/dns/models.go
+++ b/profiles/preview/dns/mgmt/dns/models.go
@@ -21,17 +21,13 @@ package dns
 
 import original "github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2018-03-01-preview/dns"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type RecordSetsClient = original.RecordSetsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewRecordSetsClient(subscriptionID string) RecordSetsClient {
+	return original.NewRecordSetsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewRecordSetsClientWithBaseURI(baseURI string, subscriptionID string) RecordSetsClient {
+	return original.NewRecordSetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type RecordType = original.RecordType
@@ -91,14 +87,7 @@ type ZoneListResultPage = original.ZoneListResultPage
 type ZoneProperties = original.ZoneProperties
 type ZonesDeleteFuture = original.ZonesDeleteFuture
 type ZoneUpdate = original.ZoneUpdate
-type RecordSetsClient = original.RecordSetsClient
 
-func NewRecordSetsClient(subscriptionID string) RecordSetsClient {
-	return original.NewRecordSetsClient(subscriptionID)
-}
-func NewRecordSetsClientWithBaseURI(baseURI string, subscriptionID string) RecordSetsClient {
-	return original.NewRecordSetsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
@@ -114,3 +103,16 @@ func NewZonesClient(subscriptionID string) ZonesClient {
 func NewZonesClientWithBaseURI(baseURI string, subscriptionID string) ZonesClient {
 	return original.NewZonesClientWithBaseURI(baseURI, subscriptionID)
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/domainservices/mgmt/aad/models.go b/profiles/preview/domainservices/mgmt/aad/models.go
index 471f8c18fed7..7c4ea9c96ab2 100644
--- a/profiles/preview/domainservices/mgmt/aad/models.go
+++ b/profiles/preview/domainservices/mgmt/aad/models.go
@@ -21,37 +21,6 @@ package aad
 
 import original "github.com/Azure/azure-sdk-for-go/services/domainservices/mgmt/2017-06-01/aad"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type DomainServiceOperationsClient = original.DomainServiceOperationsClient
-
-func NewDomainServiceOperationsClient(subscriptionID string) DomainServiceOperationsClient {
-	return original.NewDomainServiceOperationsClient(subscriptionID)
-}
-func NewDomainServiceOperationsClientWithBaseURI(baseURI string, subscriptionID string) DomainServiceOperationsClient {
-	return original.NewDomainServiceOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type DomainServicesClient = original.DomainServicesClient
-
-func NewDomainServicesClient(subscriptionID string) DomainServicesClient {
-	return original.NewDomainServicesClient(subscriptionID)
-}
-func NewDomainServicesClientWithBaseURI(baseURI string, subscriptionID string) DomainServicesClient {
-	return original.NewDomainServicesClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type ExternalAccess = original.ExternalAccess
 
 const (
@@ -86,10 +55,39 @@ type OperationDisplayInfo = original.OperationDisplayInfo
 type OperationEntity = original.OperationEntity
 type OperationEntityListResult = original.OperationEntityListResult
 type Resource = original.Resource
+type DomainServiceOperationsClient = original.DomainServiceOperationsClient
 
+func NewDomainServiceOperationsClient(subscriptionID string) DomainServiceOperationsClient {
+	return original.NewDomainServiceOperationsClient(subscriptionID)
+}
+func NewDomainServiceOperationsClientWithBaseURI(baseURI string, subscriptionID string) DomainServiceOperationsClient {
+	return original.NewDomainServiceOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+type DomainServicesClient = original.DomainServicesClient
+
+func NewDomainServicesClient(subscriptionID string) DomainServicesClient {
+	return original.NewDomainServicesClient(subscriptionID)
+}
+func NewDomainServicesClientWithBaseURI(baseURI string, subscriptionID string) DomainServicesClient {
+	return original.NewDomainServicesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/eventgrid/eventgrid/models.go b/profiles/preview/eventgrid/eventgrid/models.go
index 1019acb556c4..560ed2a9c8a4 100644
--- a/profiles/preview/eventgrid/eventgrid/models.go
+++ b/profiles/preview/eventgrid/eventgrid/models.go
@@ -21,15 +21,6 @@ package eventgrid
 
 import original "github.com/Azure/azure-sdk-for-go/services/eventgrid/2018-01-01/eventgrid"
 
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithoutDefaults() BaseClient {
-	return original.NewWithoutDefaults()
-}
-
 type ContainerRegistryEventActor = original.ContainerRegistryEventActor
 type ContainerRegistryEventData = original.ContainerRegistryEventData
 type ContainerRegistryEventRequest = original.ContainerRegistryEventRequest
@@ -62,3 +53,12 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithoutDefaults() BaseClient {
+	return original.NewWithoutDefaults()
+}
diff --git a/profiles/preview/eventgrid/mgmt/eventgrid/models.go b/profiles/preview/eventgrid/mgmt/eventgrid/models.go
index 823745389af7..5c0e547b0fc4 100644
--- a/profiles/preview/eventgrid/mgmt/eventgrid/models.go
+++ b/profiles/preview/eventgrid/mgmt/eventgrid/models.go
@@ -21,26 +21,13 @@ package eventgrid
 
 import original "github.com/Azure/azure-sdk-for-go/services/eventgrid/mgmt/2018-01-01/eventgrid"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type EventSubscriptionsClient = original.EventSubscriptionsClient
+type OperationsClient = original.OperationsClient
 
-func NewEventSubscriptionsClient(subscriptionID string) EventSubscriptionsClient {
-	return original.NewEventSubscriptionsClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewEventSubscriptionsClientWithBaseURI(baseURI string, subscriptionID string) EventSubscriptionsClient {
-	return original.NewEventSubscriptionsClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type EndpointType = original.EndpointType
@@ -146,13 +133,12 @@ type TopicUpdateParameters = original.TopicUpdateParameters
 type TrackedResource = original.TrackedResource
 type WebHookEventSubscriptionDestination = original.WebHookEventSubscriptionDestination
 type WebHookEventSubscriptionDestinationProperties = original.WebHookEventSubscriptionDestinationProperties
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
 type TopicsClient = original.TopicsClient
@@ -164,6 +150,15 @@ func NewTopicsClientWithBaseURI(baseURI string, subscriptionID string) TopicsCli
 	return original.NewTopicsClientWithBaseURI(baseURI, subscriptionID)
 }
 
+type EventSubscriptionsClient = original.EventSubscriptionsClient
+
+func NewEventSubscriptionsClient(subscriptionID string) EventSubscriptionsClient {
+	return original.NewEventSubscriptionsClient(subscriptionID)
+}
+func NewEventSubscriptionsClientWithBaseURI(baseURI string, subscriptionID string) EventSubscriptionsClient {
+	return original.NewEventSubscriptionsClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type TopicTypesClient = original.TopicTypesClient
 
 func NewTopicTypesClient(subscriptionID string) TopicTypesClient {
@@ -172,9 +167,16 @@ func NewTopicTypesClient(subscriptionID string) TopicTypesClient {
 func NewTopicTypesClientWithBaseURI(baseURI string, subscriptionID string) TopicTypesClient {
 	return original.NewTopicTypesClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/eventhub/mgmt/eventhub/models.go b/profiles/preview/eventhub/mgmt/eventhub/models.go
index c244834e1db1..4ebd556a0d9c 100644
--- a/profiles/preview/eventhub/mgmt/eventhub/models.go
+++ b/profiles/preview/eventhub/mgmt/eventhub/models.go
@@ -21,44 +21,40 @@ package eventhub
 
 import original "github.com/Azure/azure-sdk-for-go/services/eventhub/mgmt/2017-04-01/eventhub"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type RegionsClient = original.RegionsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewRegionsClient(subscriptionID string) RegionsClient {
+	return original.NewRegionsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewRegionsClientWithBaseURI(baseURI string, subscriptionID string) RegionsClient {
+	return original.NewRegionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ConsumerGroupsClient = original.ConsumerGroupsClient
+type OperationsClient = original.OperationsClient
 
-func NewConsumerGroupsClient(subscriptionID string) ConsumerGroupsClient {
-	return original.NewConsumerGroupsClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewConsumerGroupsClientWithBaseURI(baseURI string, subscriptionID string) ConsumerGroupsClient {
-	return original.NewConsumerGroupsClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DisasterRecoveryConfigsClient = original.DisasterRecoveryConfigsClient
+type NamespacesClient = original.NamespacesClient
 
-func NewDisasterRecoveryConfigsClient(subscriptionID string) DisasterRecoveryConfigsClient {
-	return original.NewDisasterRecoveryConfigsClient(subscriptionID)
+func NewNamespacesClient(subscriptionID string) NamespacesClient {
+	return original.NewNamespacesClient(subscriptionID)
 }
-func NewDisasterRecoveryConfigsClientWithBaseURI(baseURI string, subscriptionID string) DisasterRecoveryConfigsClient {
-	return original.NewDisasterRecoveryConfigsClientWithBaseURI(baseURI, subscriptionID)
+func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) NamespacesClient {
+	return original.NewNamespacesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type EventHubsClient = original.EventHubsClient
+type ConsumerGroupsClient = original.ConsumerGroupsClient
 
-func NewEventHubsClient(subscriptionID string) EventHubsClient {
-	return original.NewEventHubsClient(subscriptionID)
+func NewConsumerGroupsClient(subscriptionID string) ConsumerGroupsClient {
+	return original.NewConsumerGroupsClient(subscriptionID)
 }
-func NewEventHubsClientWithBaseURI(baseURI string, subscriptionID string) EventHubsClient {
-	return original.NewEventHubsClientWithBaseURI(baseURI, subscriptionID)
+func NewConsumerGroupsClientWithBaseURI(baseURI string, subscriptionID string) ConsumerGroupsClient {
+	return original.NewConsumerGroupsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccessRights = original.AccessRights
@@ -224,35 +220,41 @@ type RegenerateAccessKeyParameters = original.RegenerateAccessKeyParameters
 type Resource = original.Resource
 type Sku = original.Sku
 type TrackedResource = original.TrackedResource
-type NamespacesClient = original.NamespacesClient
 
-func NewNamespacesClient(subscriptionID string) NamespacesClient {
-	return original.NewNamespacesClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) NamespacesClient {
-	return original.NewNamespacesClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type OperationsClient = original.OperationsClient
+type DisasterRecoveryConfigsClient = original.DisasterRecoveryConfigsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewDisasterRecoveryConfigsClient(subscriptionID string) DisasterRecoveryConfigsClient {
+	return original.NewDisasterRecoveryConfigsClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewDisasterRecoveryConfigsClientWithBaseURI(baseURI string, subscriptionID string) DisasterRecoveryConfigsClient {
+	return original.NewDisasterRecoveryConfigsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type RegionsClient = original.RegionsClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewRegionsClient(subscriptionID string) RegionsClient {
-	return original.NewRegionsClient(subscriptionID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewRegionsClientWithBaseURI(baseURI string, subscriptionID string) RegionsClient {
-	return original.NewRegionsClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+type EventHubsClient = original.EventHubsClient
+
+func NewEventHubsClient(subscriptionID string) EventHubsClient {
+	return original.NewEventHubsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewEventHubsClientWithBaseURI(baseURI string, subscriptionID string) EventHubsClient {
+	return original.NewEventHubsClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/graphrbac/graphrbac/models.go b/profiles/preview/graphrbac/graphrbac/models.go
index f189f23e26ae..d20778073582 100644
--- a/profiles/preview/graphrbac/graphrbac/models.go
+++ b/profiles/preview/graphrbac/graphrbac/models.go
@@ -21,44 +21,22 @@ package graphrbac
 
 import original "github.com/Azure/azure-sdk-for-go/services/graphrbac/1.6/graphrbac"
 
-type ApplicationsClient = original.ApplicationsClient
-
-func NewApplicationsClient(tenantID string) ApplicationsClient {
-	return original.NewApplicationsClient(tenantID)
-}
-func NewApplicationsClientWithBaseURI(baseURI string, tenantID string) ApplicationsClient {
-	return original.NewApplicationsClientWithBaseURI(baseURI, tenantID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(tenantID string) BaseClient {
-	return original.New(tenantID)
-}
-func NewWithBaseURI(baseURI string, tenantID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, tenantID)
-}
-
-type DomainsClient = original.DomainsClient
+type ObjectsClient = original.ObjectsClient
 
-func NewDomainsClient(tenantID string) DomainsClient {
-	return original.NewDomainsClient(tenantID)
+func NewObjectsClient(tenantID string) ObjectsClient {
+	return original.NewObjectsClient(tenantID)
 }
-func NewDomainsClientWithBaseURI(baseURI string, tenantID string) DomainsClient {
-	return original.NewDomainsClientWithBaseURI(baseURI, tenantID)
+func NewObjectsClientWithBaseURI(baseURI string, tenantID string) ObjectsClient {
+	return original.NewObjectsClientWithBaseURI(baseURI, tenantID)
 }
 
-type GroupsClient = original.GroupsClient
+type UsersClient = original.UsersClient
 
-func NewGroupsClient(tenantID string) GroupsClient {
-	return original.NewGroupsClient(tenantID)
+func NewUsersClient(tenantID string) UsersClient {
+	return original.NewUsersClient(tenantID)
 }
-func NewGroupsClientWithBaseURI(baseURI string, tenantID string) GroupsClient {
-	return original.NewGroupsClientWithBaseURI(baseURI, tenantID)
+func NewUsersClientWithBaseURI(baseURI string, tenantID string) UsersClient {
+	return original.NewUsersClientWithBaseURI(baseURI, tenantID)
 }
 
 type ObjectType = original.ObjectType
@@ -140,13 +118,28 @@ type UserListResult = original.UserListResult
 type UserListResultIterator = original.UserListResultIterator
 type UserListResultPage = original.UserListResultPage
 type UserUpdateParameters = original.UserUpdateParameters
-type ObjectsClient = original.ObjectsClient
+type ApplicationsClient = original.ApplicationsClient
 
-func NewObjectsClient(tenantID string) ObjectsClient {
-	return original.NewObjectsClient(tenantID)
+func NewApplicationsClient(tenantID string) ApplicationsClient {
+	return original.NewApplicationsClient(tenantID)
 }
-func NewObjectsClientWithBaseURI(baseURI string, tenantID string) ObjectsClient {
-	return original.NewObjectsClientWithBaseURI(baseURI, tenantID)
+func NewApplicationsClientWithBaseURI(baseURI string, tenantID string) ApplicationsClient {
+	return original.NewApplicationsClientWithBaseURI(baseURI, tenantID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
+}
+
+type DomainsClient = original.DomainsClient
+
+func NewDomainsClient(tenantID string) DomainsClient {
+	return original.NewDomainsClient(tenantID)
+}
+func NewDomainsClientWithBaseURI(baseURI string, tenantID string) DomainsClient {
+	return original.NewDomainsClientWithBaseURI(baseURI, tenantID)
 }
 
 type ServicePrincipalsClient = original.ServicePrincipalsClient
@@ -158,17 +151,24 @@ func NewServicePrincipalsClientWithBaseURI(baseURI string, tenantID string) Serv
 	return original.NewServicePrincipalsClientWithBaseURI(baseURI, tenantID)
 }
 
-type UsersClient = original.UsersClient
+type GroupsClient = original.GroupsClient
 
-func NewUsersClient(tenantID string) UsersClient {
-	return original.NewUsersClient(tenantID)
+func NewGroupsClient(tenantID string) GroupsClient {
+	return original.NewGroupsClient(tenantID)
 }
-func NewUsersClientWithBaseURI(baseURI string, tenantID string) UsersClient {
-	return original.NewUsersClientWithBaseURI(baseURI, tenantID)
+func NewGroupsClientWithBaseURI(baseURI string, tenantID string) GroupsClient {
+	return original.NewGroupsClientWithBaseURI(baseURI, tenantID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(tenantID string) BaseClient {
+	return original.New(tenantID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, tenantID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, tenantID)
 }
diff --git a/profiles/preview/hanaonazure/mgmt/hanaonazure/models.go b/profiles/preview/hanaonazure/mgmt/hanaonazure/models.go
index ae80a56961ae..4e35b77997d9 100644
--- a/profiles/preview/hanaonazure/mgmt/hanaonazure/models.go
+++ b/profiles/preview/hanaonazure/mgmt/hanaonazure/models.go
@@ -21,26 +21,13 @@ package hanaonazure
 
 import original "github.com/Azure/azure-sdk-for-go/services/hanaonazure/mgmt/2017-11-03-preview/hanaonazure"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type HanaInstancesClient = original.HanaInstancesClient
+type OperationsClient = original.OperationsClient
 
-func NewHanaInstancesClient(subscriptionID string) HanaInstancesClient {
-	return original.NewHanaInstancesClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewHanaInstancesClientWithBaseURI(baseURI string, subscriptionID string) HanaInstancesClient {
-	return original.NewHanaInstancesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type HanaHardwareTypeNamesEnum = original.HanaHardwareTypeNamesEnum
@@ -84,13 +71,13 @@ type OperationList = original.OperationList
 type OSProfile = original.OSProfile
 type Resource = original.Resource
 type StorageProfile = original.StorageProfile
-type OperationsClient = original.OperationsClient
+type HanaInstancesClient = original.HanaInstancesClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewHanaInstancesClient(subscriptionID string) HanaInstancesClient {
+	return original.NewHanaInstancesClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewHanaInstancesClientWithBaseURI(baseURI string, subscriptionID string) HanaInstancesClient {
+	return original.NewHanaInstancesClientWithBaseURI(baseURI, subscriptionID)
 }
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
@@ -98,3 +85,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/hdinsight/mgmt/hdinsight/models.go b/profiles/preview/hdinsight/mgmt/hdinsight/models.go
index 6c343416868f..1b495df390f8 100644
--- a/profiles/preview/hdinsight/mgmt/hdinsight/models.go
+++ b/profiles/preview/hdinsight/mgmt/hdinsight/models.go
@@ -21,35 +21,22 @@ package hdinsight
 
 import original "github.com/Azure/azure-sdk-for-go/services/hdinsight/mgmt/2015-03-01-preview/hdinsight"
 
-type ApplicationsClient = original.ApplicationsClient
-
-func NewApplicationsClient(subscriptionID string) ApplicationsClient {
-	return original.NewApplicationsClient(subscriptionID)
-}
-func NewApplicationsClientWithBaseURI(baseURI string, subscriptionID string) ApplicationsClient {
-	return original.NewApplicationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type LocationClient = original.LocationClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewLocationClient(subscriptionID string) LocationClient {
+	return original.NewLocationClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewLocationClientWithBaseURI(baseURI string, subscriptionID string) LocationClient {
+	return original.NewLocationClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ClustersClient = original.ClustersClient
+type OperationsClient = original.OperationsClient
 
-func NewClustersClient(subscriptionID string) ClustersClient {
-	return original.NewClustersClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewClustersClientWithBaseURI(baseURI string, subscriptionID string) ClustersClient {
-	return original.NewClustersClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ConfigurationsClient = original.ConfigurationsClient
@@ -70,13 +57,22 @@ func NewExtensionClientWithBaseURI(baseURI string, subscriptionID string) Extens
 	return original.NewExtensionClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LocationClient = original.LocationClient
+type ScriptExecutionHistoryClient = original.ScriptExecutionHistoryClient
 
-func NewLocationClient(subscriptionID string) LocationClient {
-	return original.NewLocationClient(subscriptionID)
+func NewScriptExecutionHistoryClient(subscriptionID string) ScriptExecutionHistoryClient {
+	return original.NewScriptExecutionHistoryClient(subscriptionID)
 }
-func NewLocationClientWithBaseURI(baseURI string, subscriptionID string) LocationClient {
-	return original.NewLocationClientWithBaseURI(baseURI, subscriptionID)
+func NewScriptExecutionHistoryClientWithBaseURI(baseURI string, subscriptionID string) ScriptExecutionHistoryClient {
+	return original.NewScriptExecutionHistoryClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ScriptActionsClient = original.ScriptActionsClient
+
+func NewScriptActionsClient(subscriptionID string) ScriptActionsClient {
+	return original.NewScriptActionsClient(subscriptionID)
+}
+func NewScriptActionsClientWithBaseURI(baseURI string, subscriptionID string) ScriptActionsClient {
+	return original.NewScriptActionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AsyncOperationState = original.AsyncOperationState
@@ -224,35 +220,39 @@ type VersionSpec = original.VersionSpec
 type VirtualNetworkProfile = original.VirtualNetworkProfile
 type VMSizeCompatibilityFilter = original.VMSizeCompatibilityFilter
 type VMSizesCapability = original.VMSizesCapability
-type OperationsClient = original.OperationsClient
+type ApplicationsClient = original.ApplicationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewApplicationsClient(subscriptionID string) ApplicationsClient {
+	return original.NewApplicationsClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewApplicationsClientWithBaseURI(baseURI string, subscriptionID string) ApplicationsClient {
+	return original.NewApplicationsClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type ScriptActionsClient = original.ScriptActionsClient
-
-func NewScriptActionsClient(subscriptionID string) ScriptActionsClient {
-	return original.NewScriptActionsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewScriptActionsClientWithBaseURI(baseURI string, subscriptionID string) ScriptActionsClient {
-	return original.NewScriptActionsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type ScriptExecutionHistoryClient = original.ScriptExecutionHistoryClient
+type ClustersClient = original.ClustersClient
 
-func NewScriptExecutionHistoryClient(subscriptionID string) ScriptExecutionHistoryClient {
-	return original.NewScriptExecutionHistoryClient(subscriptionID)
+func NewClustersClient(subscriptionID string) ClustersClient {
+	return original.NewClustersClient(subscriptionID)
 }
-func NewScriptExecutionHistoryClientWithBaseURI(baseURI string, subscriptionID string) ScriptExecutionHistoryClient {
-	return original.NewScriptExecutionHistoryClientWithBaseURI(baseURI, subscriptionID)
+func NewClustersClientWithBaseURI(baseURI string, subscriptionID string) ClustersClient {
+	return original.NewClustersClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/iothub/mgmt/devices/models.go b/profiles/preview/iothub/mgmt/devices/models.go
index 48fb3c9fe204..6717b7663b2e 100644
--- a/profiles/preview/iothub/mgmt/devices/models.go
+++ b/profiles/preview/iothub/mgmt/devices/models.go
@@ -21,28 +21,6 @@ package devices
 
 import original "github.com/Azure/azure-sdk-for-go/services/iothub/mgmt/2018-01-22/devices"
 
-type CertificatesClient = original.CertificatesClient
-
-func NewCertificatesClient(subscriptionID string) CertificatesClient {
-	return original.NewCertificatesClient(subscriptionID)
-}
-func NewCertificatesClientWithBaseURI(baseURI string, subscriptionID string) CertificatesClient {
-	return original.NewCertificatesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type IotHubResourceClient = original.IotHubResourceClient
 
 func NewIotHubResourceClient(subscriptionID string) IotHubResourceClient {
@@ -52,6 +30,15 @@ func NewIotHubResourceClientWithBaseURI(baseURI string, subscriptionID string) I
 	return original.NewIotHubResourceClientWithBaseURI(baseURI, subscriptionID)
 }
 
+type OperationsClient = original.OperationsClient
+
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type AccessRights = original.AccessRights
 
 const (
@@ -271,17 +258,32 @@ type SharedAccessSignatureAuthorizationRuleListResultIterator = original.SharedA
 type SharedAccessSignatureAuthorizationRuleListResultPage = original.SharedAccessSignatureAuthorizationRuleListResultPage
 type StorageEndpointProperties = original.StorageEndpointProperties
 type TagsResource = original.TagsResource
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+type CertificatesClient = original.CertificatesClient
+
+func NewCertificatesClient(subscriptionID string) CertificatesClient {
+	return original.NewCertificatesClient(subscriptionID)
+}
+func NewCertificatesClientWithBaseURI(baseURI string, subscriptionID string) CertificatesClient {
+	return original.NewCertificatesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/keyvault/keyvault/models.go b/profiles/preview/keyvault/keyvault/models.go
index 998044790f98..b7467db1849e 100644
--- a/profiles/preview/keyvault/keyvault/models.go
+++ b/profiles/preview/keyvault/keyvault/models.go
@@ -21,15 +21,6 @@ package keyvault
 
 import original "github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault"
 
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithoutDefaults() BaseClient {
-	return original.NewWithoutDefaults()
-}
-
 type ActionType = original.ActionType
 
 const (
@@ -250,3 +241,12 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithoutDefaults() BaseClient {
+	return original.NewWithoutDefaults()
+}
diff --git a/profiles/preview/keyvault/mgmt/keyvault/models.go b/profiles/preview/keyvault/mgmt/keyvault/models.go
index 3bc67963b1d9..32695f744a96 100644
--- a/profiles/preview/keyvault/mgmt/keyvault/models.go
+++ b/profiles/preview/keyvault/mgmt/keyvault/models.go
@@ -21,17 +21,22 @@ package keyvault
 
 import original "github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2016-10-01/keyvault"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type OperationsClient = original.OperationsClient
 
-type BaseClient = original.BaseClient
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type VaultsClient = original.VaultsClient
+
+func NewVaultsClient(subscriptionID string) VaultsClient {
+	return original.NewVaultsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewVaultsClientWithBaseURI(baseURI string, subscriptionID string) VaultsClient {
+	return original.NewVaultsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccessPolicyUpdateKind = original.AccessPolicyUpdateKind
@@ -200,26 +205,23 @@ type VaultPatchParameters = original.VaultPatchParameters
 type VaultPatchProperties = original.VaultPatchProperties
 type VaultProperties = original.VaultProperties
 type VaultsPurgeDeletedFuture = original.VaultsPurgeDeletedFuture
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 
-type VaultsClient = original.VaultsClient
-
-func NewVaultsClient(subscriptionID string) VaultsClient {
-	return original.NewVaultsClient(subscriptionID)
-}
-func NewVaultsClientWithBaseURI(baseURI string, subscriptionID string) VaultsClient {
-	return original.NewVaultsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/location/mgmt/location/models.go b/profiles/preview/location/mgmt/location/models.go
index 79e9acefa32b..de04aa631718 100644
--- a/profiles/preview/location/mgmt/location/models.go
+++ b/profiles/preview/location/mgmt/location/models.go
@@ -21,28 +21,6 @@ package location
 
 import original "github.com/Azure/azure-sdk-for-go/services/location/mgmt/2017-01-01-preview/location"
 
-type AccountsClient = original.AccountsClient
-
-func NewAccountsClient(subscriptionID string) AccountsClient {
-	return original.NewAccountsClient(subscriptionID)
-}
-func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
-	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type KeyType = original.KeyType
 
 const (
@@ -75,3 +53,25 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type AccountsClient = original.AccountsClient
+
+func NewAccountsClient(subscriptionID string) AccountsClient {
+	return original.NewAccountsClient(subscriptionID)
+}
+func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
+	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/logic/mgmt/logic/models.go b/profiles/preview/logic/mgmt/logic/models.go
index d586f3d596d9..2eb1056798a9 100644
--- a/profiles/preview/logic/mgmt/logic/models.go
+++ b/profiles/preview/logic/mgmt/logic/models.go
@@ -21,6 +21,15 @@ package logic
 
 import original "github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2016-06-01/logic"
 
+type WorkflowRunsClient = original.WorkflowRunsClient
+
+func NewWorkflowRunsClient(subscriptionID string) WorkflowRunsClient {
+	return original.NewWorkflowRunsClient(subscriptionID)
+}
+func NewWorkflowRunsClientWithBaseURI(baseURI string, subscriptionID string) WorkflowRunsClient {
+	return original.NewWorkflowRunsClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type AgreementsClient = original.AgreementsClient
 
 func NewAgreementsClient(subscriptionID string) AgreementsClient {
@@ -30,44 +39,58 @@ func NewAgreementsClientWithBaseURI(baseURI string, subscriptionID string) Agree
 	return original.NewAgreementsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CertificatesClient = original.CertificatesClient
+type SchemasClient = original.SchemasClient
 
-func NewCertificatesClient(subscriptionID string) CertificatesClient {
-	return original.NewCertificatesClient(subscriptionID)
+func NewSchemasClient(subscriptionID string) SchemasClient {
+	return original.NewSchemasClient(subscriptionID)
 }
-func NewCertificatesClientWithBaseURI(baseURI string, subscriptionID string) CertificatesClient {
-	return original.NewCertificatesClientWithBaseURI(baseURI, subscriptionID)
+func NewSchemasClientWithBaseURI(baseURI string, subscriptionID string) SchemasClient {
+	return original.NewSchemasClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type SessionsClient = original.SessionsClient
 
-type BaseClient = original.BaseClient
+func NewSessionsClient(subscriptionID string) SessionsClient {
+	return original.NewSessionsClient(subscriptionID)
+}
+func NewSessionsClientWithBaseURI(baseURI string, subscriptionID string) SessionsClient {
+	return original.NewSessionsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type WorkflowTriggersClient = original.WorkflowTriggersClient
+
+func NewWorkflowTriggersClient(subscriptionID string) WorkflowTriggersClient {
+	return original.NewWorkflowTriggersClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewWorkflowTriggersClientWithBaseURI(baseURI string, subscriptionID string) WorkflowTriggersClient {
+	return original.NewWorkflowTriggersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type IntegrationAccountsClient = original.IntegrationAccountsClient
+type WorkflowRunActionsClient = original.WorkflowRunActionsClient
 
-func NewIntegrationAccountsClient(subscriptionID string) IntegrationAccountsClient {
-	return original.NewIntegrationAccountsClient(subscriptionID)
+func NewWorkflowRunActionsClient(subscriptionID string) WorkflowRunActionsClient {
+	return original.NewWorkflowRunActionsClient(subscriptionID)
 }
-func NewIntegrationAccountsClientWithBaseURI(baseURI string, subscriptionID string) IntegrationAccountsClient {
-	return original.NewIntegrationAccountsClientWithBaseURI(baseURI, subscriptionID)
+func NewWorkflowRunActionsClientWithBaseURI(baseURI string, subscriptionID string) WorkflowRunActionsClient {
+	return original.NewWorkflowRunActionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type MapsClient = original.MapsClient
+type PartnersClient = original.PartnersClient
 
-func NewMapsClient(subscriptionID string) MapsClient {
-	return original.NewMapsClient(subscriptionID)
+func NewPartnersClient(subscriptionID string) PartnersClient {
+	return original.NewPartnersClient(subscriptionID)
 }
-func NewMapsClientWithBaseURI(baseURI string, subscriptionID string) MapsClient {
-	return original.NewMapsClientWithBaseURI(baseURI, subscriptionID)
+func NewPartnersClientWithBaseURI(baseURI string, subscriptionID string) PartnersClient {
+	return original.NewPartnersClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type WorkflowsClient = original.WorkflowsClient
+
+func NewWorkflowsClient(subscriptionID string) WorkflowsClient {
+	return original.NewWorkflowsClient(subscriptionID)
+}
+func NewWorkflowsClientWithBaseURI(baseURI string, subscriptionID string) WorkflowsClient {
+	return original.NewWorkflowsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AgreementType = original.AgreementType
@@ -636,31 +659,13 @@ type X12SchemaReference = original.X12SchemaReference
 type X12SecuritySettings = original.X12SecuritySettings
 type X12ValidationOverride = original.X12ValidationOverride
 type X12ValidationSettings = original.X12ValidationSettings
-type PartnersClient = original.PartnersClient
-
-func NewPartnersClient(subscriptionID string) PartnersClient {
-	return original.NewPartnersClient(subscriptionID)
-}
-func NewPartnersClientWithBaseURI(baseURI string, subscriptionID string) PartnersClient {
-	return original.NewPartnersClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type SchemasClient = original.SchemasClient
-
-func NewSchemasClient(subscriptionID string) SchemasClient {
-	return original.NewSchemasClient(subscriptionID)
-}
-func NewSchemasClientWithBaseURI(baseURI string, subscriptionID string) SchemasClient {
-	return original.NewSchemasClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type SessionsClient = original.SessionsClient
+type WorkflowVersionsClient = original.WorkflowVersionsClient
 
-func NewSessionsClient(subscriptionID string) SessionsClient {
-	return original.NewSessionsClient(subscriptionID)
+func NewWorkflowVersionsClient(subscriptionID string) WorkflowVersionsClient {
+	return original.NewWorkflowVersionsClient(subscriptionID)
 }
-func NewSessionsClientWithBaseURI(baseURI string, subscriptionID string) SessionsClient {
-	return original.NewSessionsClientWithBaseURI(baseURI, subscriptionID)
+func NewWorkflowVersionsClientWithBaseURI(baseURI string, subscriptionID string) WorkflowVersionsClient {
+	return original.NewWorkflowVersionsClientWithBaseURI(baseURI, subscriptionID)
 }
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
@@ -669,31 +674,13 @@ func Version() string {
 	return original.Version()
 }
 
-type WorkflowRunActionsClient = original.WorkflowRunActionsClient
-
-func NewWorkflowRunActionsClient(subscriptionID string) WorkflowRunActionsClient {
-	return original.NewWorkflowRunActionsClient(subscriptionID)
-}
-func NewWorkflowRunActionsClientWithBaseURI(baseURI string, subscriptionID string) WorkflowRunActionsClient {
-	return original.NewWorkflowRunActionsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type WorkflowRunsClient = original.WorkflowRunsClient
-
-func NewWorkflowRunsClient(subscriptionID string) WorkflowRunsClient {
-	return original.NewWorkflowRunsClient(subscriptionID)
-}
-func NewWorkflowRunsClientWithBaseURI(baseURI string, subscriptionID string) WorkflowRunsClient {
-	return original.NewWorkflowRunsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type WorkflowsClient = original.WorkflowsClient
+type CertificatesClient = original.CertificatesClient
 
-func NewWorkflowsClient(subscriptionID string) WorkflowsClient {
-	return original.NewWorkflowsClient(subscriptionID)
+func NewCertificatesClient(subscriptionID string) CertificatesClient {
+	return original.NewCertificatesClient(subscriptionID)
 }
-func NewWorkflowsClientWithBaseURI(baseURI string, subscriptionID string) WorkflowsClient {
-	return original.NewWorkflowsClientWithBaseURI(baseURI, subscriptionID)
+func NewCertificatesClientWithBaseURI(baseURI string, subscriptionID string) CertificatesClient {
+	return original.NewCertificatesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type WorkflowTriggerHistoriesClient = original.WorkflowTriggerHistoriesClient
@@ -705,20 +692,33 @@ func NewWorkflowTriggerHistoriesClientWithBaseURI(baseURI string, subscriptionID
 	return original.NewWorkflowTriggerHistoriesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type WorkflowTriggersClient = original.WorkflowTriggersClient
+type IntegrationAccountsClient = original.IntegrationAccountsClient
 
-func NewWorkflowTriggersClient(subscriptionID string) WorkflowTriggersClient {
-	return original.NewWorkflowTriggersClient(subscriptionID)
+func NewIntegrationAccountsClient(subscriptionID string) IntegrationAccountsClient {
+	return original.NewIntegrationAccountsClient(subscriptionID)
 }
-func NewWorkflowTriggersClientWithBaseURI(baseURI string, subscriptionID string) WorkflowTriggersClient {
-	return original.NewWorkflowTriggersClientWithBaseURI(baseURI, subscriptionID)
+func NewIntegrationAccountsClientWithBaseURI(baseURI string, subscriptionID string) IntegrationAccountsClient {
+	return original.NewIntegrationAccountsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type WorkflowVersionsClient = original.WorkflowVersionsClient
+type MapsClient = original.MapsClient
 
-func NewWorkflowVersionsClient(subscriptionID string) WorkflowVersionsClient {
-	return original.NewWorkflowVersionsClient(subscriptionID)
+func NewMapsClient(subscriptionID string) MapsClient {
+	return original.NewMapsClient(subscriptionID)
 }
-func NewWorkflowVersionsClientWithBaseURI(baseURI string, subscriptionID string) WorkflowVersionsClient {
-	return original.NewWorkflowVersionsClientWithBaseURI(baseURI, subscriptionID)
+func NewMapsClientWithBaseURI(baseURI string, subscriptionID string) MapsClient {
+	return original.NewMapsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/machinelearning/mgmt/commitmentplans/models.go b/profiles/preview/machinelearning/mgmt/commitmentplans/models.go
index 0354505871b3..34fdc4f27a2e 100644
--- a/profiles/preview/machinelearning/mgmt/commitmentplans/models.go
+++ b/profiles/preview/machinelearning/mgmt/commitmentplans/models.go
@@ -21,17 +21,22 @@ package commitmentplans
 
 import original "github.com/Azure/azure-sdk-for-go/services/machinelearning/mgmt/2016-05-01-preview/commitmentplans"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type UsageHistoryClient = original.UsageHistoryClient
 
-type BaseClient = original.BaseClient
+func NewUsageHistoryClient(subscriptionID string) UsageHistoryClient {
+	return original.NewUsageHistoryClient(subscriptionID)
+}
+func NewUsageHistoryClientWithBaseURI(baseURI string, subscriptionID string) UsageHistoryClient {
+	return original.NewUsageHistoryClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type SkusClient = original.SkusClient
+
+func NewSkusClient(subscriptionID string) SkusClient {
+	return original.NewSkusClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewSkusClientWithBaseURI(baseURI string, subscriptionID string) SkusClient {
+	return original.NewSkusClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type CommitmentAssociationsClient = original.CommitmentAssociationsClient
@@ -43,15 +48,6 @@ func NewCommitmentAssociationsClientWithBaseURI(baseURI string, subscriptionID s
 	return original.NewCommitmentAssociationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type Client = original.Client
-
-func NewClient(subscriptionID string) Client {
-	return original.NewClient(subscriptionID)
-}
-func NewClientWithBaseURI(baseURI string, subscriptionID string) Client {
-	return original.NewClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type ResourceSkuRestrictionsReasonCode = original.ResourceSkuRestrictionsReasonCode
 
 const (
@@ -111,26 +107,32 @@ type SkuCapacity = original.SkuCapacity
 type SkuCost = original.SkuCost
 type SkuListResult = original.SkuListResult
 type SkuRestrictions = original.SkuRestrictions
-type SkusClient = original.SkusClient
 
-func NewSkusClient(subscriptionID string) SkusClient {
-	return original.NewSkusClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewSkusClientWithBaseURI(baseURI string, subscriptionID string) SkusClient {
-	return original.NewSkusClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type UsageHistoryClient = original.UsageHistoryClient
+type Client = original.Client
 
-func NewUsageHistoryClient(subscriptionID string) UsageHistoryClient {
-	return original.NewUsageHistoryClient(subscriptionID)
+func NewClient(subscriptionID string) Client {
+	return original.NewClient(subscriptionID)
 }
-func NewUsageHistoryClientWithBaseURI(baseURI string, subscriptionID string) UsageHistoryClient {
-	return original.NewUsageHistoryClientWithBaseURI(baseURI, subscriptionID)
+func NewClientWithBaseURI(baseURI string, subscriptionID string) Client {
+	return original.NewClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/machinelearning/mgmt/compute/models.go b/profiles/preview/machinelearning/mgmt/compute/models.go
index 8422528fa030..10ca4bb2d7b7 100644
--- a/profiles/preview/machinelearning/mgmt/compute/models.go
+++ b/profiles/preview/machinelearning/mgmt/compute/models.go
@@ -21,28 +21,6 @@ package compute
 
 import original "github.com/Azure/azure-sdk-for-go/services/machinelearning/mgmt/2017-08-01-preview/compute"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type MachineLearningComputeClient = original.MachineLearningComputeClient
-
-func NewMachineLearningComputeClient(subscriptionID string) MachineLearningComputeClient {
-	return original.NewMachineLearningComputeClient(subscriptionID)
-}
-func NewMachineLearningComputeClientWithBaseURI(baseURI string, subscriptionID string) MachineLearningComputeClient {
-	return original.NewMachineLearningComputeClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type AgentVMSizeTypes = original.AgentVMSizeTypes
 
 const (
@@ -205,6 +183,14 @@ type StorageAccountCredentials = original.StorageAccountCredentials
 type StorageAccountProperties = original.StorageAccountProperties
 type SystemService = original.SystemService
 type UpdateSystemServicesResponse = original.UpdateSystemServicesResponse
+
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
+}
+
 type OperationalizationClustersClient = original.OperationalizationClustersClient
 
 func NewOperationalizationClustersClient(subscriptionID string) OperationalizationClustersClient {
@@ -213,9 +199,25 @@ func NewOperationalizationClustersClient(subscriptionID string) Operationalizati
 func NewOperationalizationClustersClientWithBaseURI(baseURI string, subscriptionID string) OperationalizationClustersClient {
 	return original.NewOperationalizationClustersClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+type MachineLearningComputeClient = original.MachineLearningComputeClient
+
+func NewMachineLearningComputeClient(subscriptionID string) MachineLearningComputeClient {
+	return original.NewMachineLearningComputeClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewMachineLearningComputeClientWithBaseURI(baseURI string, subscriptionID string) MachineLearningComputeClient {
+	return original.NewMachineLearningComputeClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/machinelearning/mgmt/experimentation/models.go b/profiles/preview/machinelearning/mgmt/experimentation/models.go
index c3de5be51597..e9dba5af46fe 100644
--- a/profiles/preview/machinelearning/mgmt/experimentation/models.go
+++ b/profiles/preview/machinelearning/mgmt/experimentation/models.go
@@ -21,26 +21,13 @@ package experimentation
 
 import original "github.com/Azure/azure-sdk-for-go/services/machinelearning/mgmt/2017-05-01-preview/experimentation"
 
-type AccountsClient = original.AccountsClient
-
-func NewAccountsClient(subscriptionID string) AccountsClient {
-	return original.NewAccountsClient(subscriptionID)
-}
-func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
-	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ProvisioningState = original.ProvisioningState
@@ -84,13 +71,12 @@ type WorkspaceListResultPage = original.WorkspaceListResultPage
 type WorkspaceProperties = original.WorkspaceProperties
 type WorkspacePropertiesUpdateParameters = original.WorkspacePropertiesUpdateParameters
 type WorkspaceUpdateParameters = original.WorkspaceUpdateParameters
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
 type ProjectsClient = original.ProjectsClient
@@ -101,12 +87,6 @@ func NewProjectsClient(subscriptionID string) ProjectsClient {
 func NewProjectsClientWithBaseURI(baseURI string, subscriptionID string) ProjectsClient {
 	return original.NewProjectsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
-}
-func Version() string {
-	return original.Version()
-}
 
 type WorkspacesClient = original.WorkspacesClient
 
@@ -116,3 +96,25 @@ func NewWorkspacesClient(subscriptionID string) WorkspacesClient {
 func NewWorkspacesClientWithBaseURI(baseURI string, subscriptionID string) WorkspacesClient {
 	return original.NewWorkspacesClientWithBaseURI(baseURI, subscriptionID)
 }
+
+type AccountsClient = original.AccountsClient
+
+func NewAccountsClient(subscriptionID string) AccountsClient {
+	return original.NewAccountsClient(subscriptionID)
+}
+func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
+	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/machinelearning/mgmt/webservices/models.go b/profiles/preview/machinelearning/mgmt/webservices/models.go
index 467c19ae1c65..73235c319d74 100644
--- a/profiles/preview/machinelearning/mgmt/webservices/models.go
+++ b/profiles/preview/machinelearning/mgmt/webservices/models.go
@@ -21,17 +21,13 @@ package webservices
 
 import original "github.com/Azure/azure-sdk-for-go/services/machinelearning/mgmt/2017-01-01/webservices"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AssetType = original.AssetType
@@ -200,14 +196,7 @@ type ServiceInputOutputSpecification = original.ServiceInputOutputSpecification
 type StorageAccount = original.StorageAccount
 type TableSpecification = original.TableSpecification
 type WebService = original.WebService
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
@@ -215,6 +204,19 @@ func Version() string {
 	return original.Version()
 }
 
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
+
 type Client = original.Client
 
 func NewClient(subscriptionID string) Client {
diff --git a/profiles/preview/managementpartner/mgmt/managementpartner/models.go b/profiles/preview/managementpartner/mgmt/managementpartner/models.go
index fe541827d533..e649b85e02ad 100644
--- a/profiles/preview/managementpartner/mgmt/managementpartner/models.go
+++ b/profiles/preview/managementpartner/mgmt/managementpartner/models.go
@@ -21,17 +21,13 @@ package managementpartner
 
 import original "github.com/Azure/azure-sdk-for-go/services/managementpartner/mgmt/2018-02-01/managementpartner"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationClient = original.OperationClient
 
-func New() BaseClient {
-	return original.New()
+func NewOperationClient() OperationClient {
+	return original.NewOperationClient()
 }
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
+func NewOperationClientWithBaseURI(baseURI string) OperationClient {
+	return original.NewOperationClientWithBaseURI(baseURI)
 }
 
 type Code = original.Code
@@ -66,13 +62,12 @@ type OperationListPage = original.OperationListPage
 type OperationResponse = original.OperationResponse
 type PartnerProperties = original.PartnerProperties
 type PartnerResponse = original.PartnerResponse
-type OperationClient = original.OperationClient
 
-func NewOperationClient() OperationClient {
-	return original.NewOperationClient()
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewOperationClientWithBaseURI(baseURI string) OperationClient {
-	return original.NewOperationClientWithBaseURI(baseURI)
+func Version() string {
+	return original.Version()
 }
 
 type PartnerClient = original.PartnerClient
@@ -83,9 +78,16 @@ func NewPartnerClient() PartnerClient {
 func NewPartnerClientWithBaseURI(baseURI string) PartnerClient {
 	return original.NewPartnerClientWithBaseURI(baseURI)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
 }
diff --git a/profiles/preview/marketplaceordering/mgmt/marketplaceordering/models.go b/profiles/preview/marketplaceordering/mgmt/marketplaceordering/models.go
index a27e3943f27e..8dd0fee8a548 100644
--- a/profiles/preview/marketplaceordering/mgmt/marketplaceordering/models.go
+++ b/profiles/preview/marketplaceordering/mgmt/marketplaceordering/models.go
@@ -21,17 +21,13 @@ package marketplaceordering
 
 import original "github.com/Azure/azure-sdk-for-go/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type MarketplaceAgreementsClient = original.MarketplaceAgreementsClient
@@ -53,17 +49,23 @@ type OperationListResult = original.OperationListResult
 type OperationListResultIterator = original.OperationListResultIterator
 type OperationListResultPage = original.OperationListResultPage
 type Resource = original.Resource
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/mediaservices/mgmt/media/models.go b/profiles/preview/mediaservices/mgmt/media/models.go
index 499a78fc1cf5..54a906993dd7 100644
--- a/profiles/preview/mediaservices/mgmt/media/models.go
+++ b/profiles/preview/mediaservices/mgmt/media/models.go
@@ -21,17 +21,22 @@ package media
 
 import original "github.com/Azure/azure-sdk-for-go/services/mediaservices/mgmt/2015-10-01/media"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type ServiceClient = original.ServiceClient
 
-type BaseClient = original.BaseClient
+func NewServiceClient(subscriptionID string) ServiceClient {
+	return original.NewServiceClient(subscriptionID)
+}
+func NewServiceClientWithBaseURI(baseURI string, subscriptionID string) ServiceClient {
+	return original.NewServiceClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type OperationsClient = original.OperationsClient
+
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type EntityNameUnavailabilityReason = original.EntityNameUnavailabilityReason
@@ -83,26 +88,23 @@ type ServiceKeys = original.ServiceKeys
 type ServiceProperties = original.ServiceProperties
 type StorageAccount = original.StorageAccount
 type SyncStorageKeysInput = original.SyncStorageKeysInput
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 
-type ServiceClient = original.ServiceClient
-
-func NewServiceClient(subscriptionID string) ServiceClient {
-	return original.NewServiceClient(subscriptionID)
-}
-func NewServiceClientWithBaseURI(baseURI string, subscriptionID string) ServiceClient {
-	return original.NewServiceClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/migrate/mgmt/migrate/models.go b/profiles/preview/migrate/mgmt/migrate/models.go
index 2f630e371880..6c42e1c01536 100644
--- a/profiles/preview/migrate/mgmt/migrate/models.go
+++ b/profiles/preview/migrate/mgmt/migrate/models.go
@@ -21,13 +21,13 @@ package migrate
 
 import original "github.com/Azure/azure-sdk-for-go/services/migrate/mgmt/2018-02-02/migrate"
 
-type AssessedMachinesClient = original.AssessedMachinesClient
+type OperationsClient = original.OperationsClient
 
-func NewAssessedMachinesClient(subscriptionID string, acceptLanguage string) AssessedMachinesClient {
-	return original.NewAssessedMachinesClient(subscriptionID, acceptLanguage)
+func NewOperationsClient(subscriptionID string, acceptLanguage string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID, acceptLanguage)
 }
-func NewAssessedMachinesClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) AssessedMachinesClient {
-	return original.NewAssessedMachinesClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
 }
 
 type AssessmentsClient = original.AssessmentsClient
@@ -39,37 +39,6 @@ func NewAssessmentsClientWithBaseURI(baseURI string, subscriptionID string, acce
 	return original.NewAssessmentsClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string, acceptLanguage string) BaseClient {
-	return original.New(subscriptionID, acceptLanguage)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID, acceptLanguage)
-}
-
-type GroupsClient = original.GroupsClient
-
-func NewGroupsClient(subscriptionID string, acceptLanguage string) GroupsClient {
-	return original.NewGroupsClient(subscriptionID, acceptLanguage)
-}
-func NewGroupsClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) GroupsClient {
-	return original.NewGroupsClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
-}
-
-type MachinesClient = original.MachinesClient
-
-func NewMachinesClient(subscriptionID string, acceptLanguage string) MachinesClient {
-	return original.NewMachinesClient(subscriptionID, acceptLanguage)
-}
-func NewMachinesClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) MachinesClient {
-	return original.NewMachinesClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
-}
-
 type AssessmentSizingCriterion = original.AssessmentSizingCriterion
 
 const (
@@ -579,13 +548,12 @@ type Project = original.Project
 type ProjectKey = original.ProjectKey
 type ProjectProperties = original.ProjectProperties
 type ProjectResultList = original.ProjectResultList
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string, acceptLanguage string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID, acceptLanguage)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
+func Version() string {
+	return original.Version()
 }
 
 type ProjectsClient = original.ProjectsClient
@@ -596,9 +564,43 @@ func NewProjectsClient(subscriptionID string, acceptLanguage string) ProjectsCli
 func NewProjectsClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) ProjectsClient {
 	return original.NewProjectsClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+type MachinesClient = original.MachinesClient
+
+func NewMachinesClient(subscriptionID string, acceptLanguage string) MachinesClient {
+	return original.NewMachinesClient(subscriptionID, acceptLanguage)
 }
-func Version() string {
-	return original.Version()
+func NewMachinesClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) MachinesClient {
+	return original.NewMachinesClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
+}
+
+type GroupsClient = original.GroupsClient
+
+func NewGroupsClient(subscriptionID string, acceptLanguage string) GroupsClient {
+	return original.NewGroupsClient(subscriptionID, acceptLanguage)
+}
+func NewGroupsClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) GroupsClient {
+	return original.NewGroupsClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string, acceptLanguage string) BaseClient {
+	return original.New(subscriptionID, acceptLanguage)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID, acceptLanguage)
+}
+
+type AssessedMachinesClient = original.AssessedMachinesClient
+
+func NewAssessedMachinesClient(subscriptionID string, acceptLanguage string) AssessedMachinesClient {
+	return original.NewAssessedMachinesClient(subscriptionID, acceptLanguage)
+}
+func NewAssessedMachinesClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) AssessedMachinesClient {
+	return original.NewAssessedMachinesClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
 }
diff --git a/profiles/preview/mobileengagement/mgmt/mobileengagement/models.go b/profiles/preview/mobileengagement/mgmt/mobileengagement/models.go
index e586a015f798..e9108b4d1c9f 100644
--- a/profiles/preview/mobileengagement/mgmt/mobileengagement/models.go
+++ b/profiles/preview/mobileengagement/mgmt/mobileengagement/models.go
@@ -21,46 +21,6 @@ package mobileengagement
 
 import original "github.com/Azure/azure-sdk-for-go/services/mobileengagement/mgmt/2014-12-01/mobileengagement"
 
-type AppCollectionsClient = original.AppCollectionsClient
-
-func NewAppCollectionsClient(subscriptionID string) AppCollectionsClient {
-	return original.NewAppCollectionsClient(subscriptionID)
-}
-func NewAppCollectionsClientWithBaseURI(baseURI string, subscriptionID string) AppCollectionsClient {
-	return original.NewAppCollectionsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type AppsClient = original.AppsClient
-
-func NewAppsClient(subscriptionID string) AppsClient {
-	return original.NewAppsClient(subscriptionID)
-}
-func NewAppsClientWithBaseURI(baseURI string, subscriptionID string) AppsClient {
-	return original.NewAppsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type CampaignsClient = original.CampaignsClient
-
-func NewCampaignsClient(subscriptionID string) CampaignsClient {
-	return original.NewCampaignsClient(subscriptionID)
-}
-func NewCampaignsClientWithBaseURI(baseURI string, subscriptionID string) CampaignsClient {
-	return original.NewCampaignsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type DevicesClient = original.DevicesClient
 
 func NewDevicesClient(subscriptionID string) DevicesClient {
@@ -70,6 +30,15 @@ func NewDevicesClientWithBaseURI(baseURI string, subscriptionID string) DevicesC
 	return original.NewDevicesClientWithBaseURI(baseURI, subscriptionID)
 }
 
+type ImportTasksClient = original.ImportTasksClient
+
+func NewImportTasksClient(subscriptionID string) ImportTasksClient {
+	return original.NewImportTasksClient(subscriptionID)
+}
+func NewImportTasksClientWithBaseURI(baseURI string, subscriptionID string) ImportTasksClient {
+	return original.NewImportTasksClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type ExportTasksClient = original.ExportTasksClient
 
 func NewExportTasksClient(subscriptionID string) ExportTasksClient {
@@ -79,13 +48,22 @@ func NewExportTasksClientWithBaseURI(baseURI string, subscriptionID string) Expo
 	return original.NewExportTasksClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ImportTasksClient = original.ImportTasksClient
+type AppCollectionsClient = original.AppCollectionsClient
 
-func NewImportTasksClient(subscriptionID string) ImportTasksClient {
-	return original.NewImportTasksClient(subscriptionID)
+func NewAppCollectionsClient(subscriptionID string) AppCollectionsClient {
+	return original.NewAppCollectionsClient(subscriptionID)
 }
-func NewImportTasksClientWithBaseURI(baseURI string, subscriptionID string) ImportTasksClient {
-	return original.NewImportTasksClientWithBaseURI(baseURI, subscriptionID)
+func NewAppCollectionsClientWithBaseURI(baseURI string, subscriptionID string) AppCollectionsClient {
+	return original.NewAppCollectionsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type AppsClient = original.AppsClient
+
+func NewAppsClient(subscriptionID string) AppsClient {
+	return original.NewAppsClient(subscriptionID)
+}
+func NewAppsClientWithBaseURI(baseURI string, subscriptionID string) AppsClient {
+	return original.NewAppsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AudienceOperators = original.AudienceOperators
@@ -408,6 +386,21 @@ type ScreenSizeCriterion = original.ScreenSizeCriterion
 type SegmentCriterion = original.SegmentCriterion
 type StringTagCriterion = original.StringTagCriterion
 type SupportedPlatformsListResult = original.SupportedPlatformsListResult
+type CampaignsClient = original.CampaignsClient
+
+func NewCampaignsClient(subscriptionID string) CampaignsClient {
+	return original.NewCampaignsClient(subscriptionID)
+}
+func NewCampaignsClientWithBaseURI(baseURI string, subscriptionID string) CampaignsClient {
+	return original.NewCampaignsClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
+}
+
 type SupportedPlatformsClient = original.SupportedPlatformsClient
 
 func NewSupportedPlatformsClient(subscriptionID string) SupportedPlatformsClient {
@@ -416,9 +409,16 @@ func NewSupportedPlatformsClient(subscriptionID string) SupportedPlatformsClient
 func NewSupportedPlatformsClientWithBaseURI(baseURI string, subscriptionID string) SupportedPlatformsClient {
 	return original.NewSupportedPlatformsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/monitor/mgmt/insights/models.go b/profiles/preview/monitor/mgmt/insights/models.go
index 40d94f983a56..5d278acb93d2 100644
--- a/profiles/preview/monitor/mgmt/insights/models.go
+++ b/profiles/preview/monitor/mgmt/insights/models.go
@@ -21,49 +21,31 @@ package insights
 
 import original "github.com/Azure/azure-sdk-for-go/services/monitor/mgmt/2018-03-01/insights"
 
-type ActionGroupsClient = original.ActionGroupsClient
-
-func NewActionGroupsClient(subscriptionID string) ActionGroupsClient {
-	return original.NewActionGroupsClient(subscriptionID)
-}
-func NewActionGroupsClientWithBaseURI(baseURI string, subscriptionID string) ActionGroupsClient {
-	return original.NewActionGroupsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ActivityLogAlertsClient = original.ActivityLogAlertsClient
-
-func NewActivityLogAlertsClient(subscriptionID string) ActivityLogAlertsClient {
-	return original.NewActivityLogAlertsClient(subscriptionID)
-}
-func NewActivityLogAlertsClientWithBaseURI(baseURI string, subscriptionID string) ActivityLogAlertsClient {
-	return original.NewActivityLogAlertsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ActivityLogsClient = original.ActivityLogsClient
+type OperationsClient = original.OperationsClient
 
-func NewActivityLogsClient(subscriptionID string) ActivityLogsClient {
-	return original.NewActivityLogsClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewActivityLogsClientWithBaseURI(baseURI string, subscriptionID string) ActivityLogsClient {
-	return original.NewActivityLogsClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type AlertRuleIncidentsClient = original.AlertRuleIncidentsClient
+type MetricBaselineClient = original.MetricBaselineClient
 
-func NewAlertRuleIncidentsClient(subscriptionID string) AlertRuleIncidentsClient {
-	return original.NewAlertRuleIncidentsClient(subscriptionID)
+func NewMetricBaselineClient(subscriptionID string) MetricBaselineClient {
+	return original.NewMetricBaselineClient(subscriptionID)
 }
-func NewAlertRuleIncidentsClientWithBaseURI(baseURI string, subscriptionID string) AlertRuleIncidentsClient {
-	return original.NewAlertRuleIncidentsClientWithBaseURI(baseURI, subscriptionID)
+func NewMetricBaselineClientWithBaseURI(baseURI string, subscriptionID string) MetricBaselineClient {
+	return original.NewMetricBaselineClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type AlertRulesClient = original.AlertRulesClient
+type ActionGroupsClient = original.ActionGroupsClient
 
-func NewAlertRulesClient(subscriptionID string) AlertRulesClient {
-	return original.NewAlertRulesClient(subscriptionID)
+func NewActionGroupsClient(subscriptionID string) ActionGroupsClient {
+	return original.NewActionGroupsClient(subscriptionID)
 }
-func NewAlertRulesClientWithBaseURI(baseURI string, subscriptionID string) AlertRulesClient {
-	return original.NewAlertRulesClientWithBaseURI(baseURI, subscriptionID)
+func NewActionGroupsClientWithBaseURI(baseURI string, subscriptionID string) ActionGroupsClient {
+	return original.NewActionGroupsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AutoscaleSettingsClient = original.AutoscaleSettingsClient
@@ -75,17 +57,13 @@ func NewAutoscaleSettingsClientWithBaseURI(baseURI string, subscriptionID string
 	return original.NewAutoscaleSettingsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type AlertRulesClient = original.AlertRulesClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewAlertRulesClient(subscriptionID string) AlertRulesClient {
+	return original.NewAlertRulesClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewAlertRulesClientWithBaseURI(baseURI string, subscriptionID string) AlertRulesClient {
+	return original.NewAlertRulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type DiagnosticSettingsClient = original.DiagnosticSettingsClient
@@ -97,60 +75,6 @@ func NewDiagnosticSettingsClientWithBaseURI(baseURI string, subscriptionID strin
 	return original.NewDiagnosticSettingsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DiagnosticSettingsCategoryClient = original.DiagnosticSettingsCategoryClient
-
-func NewDiagnosticSettingsCategoryClient(subscriptionID string) DiagnosticSettingsCategoryClient {
-	return original.NewDiagnosticSettingsCategoryClient(subscriptionID)
-}
-func NewDiagnosticSettingsCategoryClientWithBaseURI(baseURI string, subscriptionID string) DiagnosticSettingsCategoryClient {
-	return original.NewDiagnosticSettingsCategoryClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type EventCategoriesClient = original.EventCategoriesClient
-
-func NewEventCategoriesClient(subscriptionID string) EventCategoriesClient {
-	return original.NewEventCategoriesClient(subscriptionID)
-}
-func NewEventCategoriesClientWithBaseURI(baseURI string, subscriptionID string) EventCategoriesClient {
-	return original.NewEventCategoriesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type LogProfilesClient = original.LogProfilesClient
-
-func NewLogProfilesClient(subscriptionID string) LogProfilesClient {
-	return original.NewLogProfilesClient(subscriptionID)
-}
-func NewLogProfilesClientWithBaseURI(baseURI string, subscriptionID string) LogProfilesClient {
-	return original.NewLogProfilesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type MetricBaselineClient = original.MetricBaselineClient
-
-func NewMetricBaselineClient(subscriptionID string) MetricBaselineClient {
-	return original.NewMetricBaselineClient(subscriptionID)
-}
-func NewMetricBaselineClientWithBaseURI(baseURI string, subscriptionID string) MetricBaselineClient {
-	return original.NewMetricBaselineClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type MetricDefinitionsClient = original.MetricDefinitionsClient
-
-func NewMetricDefinitionsClient(subscriptionID string) MetricDefinitionsClient {
-	return original.NewMetricDefinitionsClient(subscriptionID)
-}
-func NewMetricDefinitionsClientWithBaseURI(baseURI string, subscriptionID string) MetricDefinitionsClient {
-	return original.NewMetricDefinitionsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type MetricsClient = original.MetricsClient
-
-func NewMetricsClient(subscriptionID string) MetricsClient {
-	return original.NewMetricsClient(subscriptionID)
-}
-func NewMetricsClientWithBaseURI(baseURI string, subscriptionID string) MetricsClient {
-	return original.NewMetricsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type AggregationType = original.AggregationType
 
 const (
@@ -494,13 +418,37 @@ type TimeWindow = original.TimeWindow
 type VoiceReceiver = original.VoiceReceiver
 type WebhookNotification = original.WebhookNotification
 type WebhookReceiver = original.WebhookReceiver
-type OperationsClient = original.OperationsClient
+type ActivityLogAlertsClient = original.ActivityLogAlertsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewActivityLogAlertsClient(subscriptionID string) ActivityLogAlertsClient {
+	return original.NewActivityLogAlertsClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewActivityLogAlertsClientWithBaseURI(baseURI string, subscriptionID string) ActivityLogAlertsClient {
+	return original.NewActivityLogAlertsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ActivityLogsClient = original.ActivityLogsClient
+
+func NewActivityLogsClient(subscriptionID string) ActivityLogsClient {
+	return original.NewActivityLogsClient(subscriptionID)
+}
+func NewActivityLogsClientWithBaseURI(baseURI string, subscriptionID string) ActivityLogsClient {
+	return original.NewActivityLogsClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
+}
+
+type EventCategoriesClient = original.EventCategoriesClient
+
+func NewEventCategoriesClient(subscriptionID string) EventCategoriesClient {
+	return original.NewEventCategoriesClient(subscriptionID)
+}
+func NewEventCategoriesClientWithBaseURI(baseURI string, subscriptionID string) EventCategoriesClient {
+	return original.NewEventCategoriesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type TenantActivityLogsClient = original.TenantActivityLogsClient
@@ -511,9 +459,61 @@ func NewTenantActivityLogsClient(subscriptionID string) TenantActivityLogsClient
 func NewTenantActivityLogsClientWithBaseURI(baseURI string, subscriptionID string) TenantActivityLogsClient {
 	return original.NewTenantActivityLogsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+type DiagnosticSettingsCategoryClient = original.DiagnosticSettingsCategoryClient
+
+func NewDiagnosticSettingsCategoryClient(subscriptionID string) DiagnosticSettingsCategoryClient {
+	return original.NewDiagnosticSettingsCategoryClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewDiagnosticSettingsCategoryClientWithBaseURI(baseURI string, subscriptionID string) DiagnosticSettingsCategoryClient {
+	return original.NewDiagnosticSettingsCategoryClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type AlertRuleIncidentsClient = original.AlertRuleIncidentsClient
+
+func NewAlertRuleIncidentsClient(subscriptionID string) AlertRuleIncidentsClient {
+	return original.NewAlertRuleIncidentsClient(subscriptionID)
+}
+func NewAlertRuleIncidentsClientWithBaseURI(baseURI string, subscriptionID string) AlertRuleIncidentsClient {
+	return original.NewAlertRuleIncidentsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
+
+type MetricsClient = original.MetricsClient
+
+func NewMetricsClient(subscriptionID string) MetricsClient {
+	return original.NewMetricsClient(subscriptionID)
+}
+func NewMetricsClientWithBaseURI(baseURI string, subscriptionID string) MetricsClient {
+	return original.NewMetricsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type LogProfilesClient = original.LogProfilesClient
+
+func NewLogProfilesClient(subscriptionID string) LogProfilesClient {
+	return original.NewLogProfilesClient(subscriptionID)
+}
+func NewLogProfilesClientWithBaseURI(baseURI string, subscriptionID string) LogProfilesClient {
+	return original.NewLogProfilesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type MetricDefinitionsClient = original.MetricDefinitionsClient
+
+func NewMetricDefinitionsClient(subscriptionID string) MetricDefinitionsClient {
+	return original.NewMetricDefinitionsClient(subscriptionID)
+}
+func NewMetricDefinitionsClientWithBaseURI(baseURI string, subscriptionID string) MetricDefinitionsClient {
+	return original.NewMetricDefinitionsClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/msi/mgmt/msi/models.go b/profiles/preview/msi/mgmt/msi/models.go
index d5c9db1e9b22..072534046fd3 100644
--- a/profiles/preview/msi/mgmt/msi/models.go
+++ b/profiles/preview/msi/mgmt/msi/models.go
@@ -21,17 +21,13 @@ package msi
 
 import original "github.com/Azure/azure-sdk-for-go/services/msi/mgmt/2015-08-31-preview/msi"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type UserAssignedIdentities = original.UserAssignedIdentities
@@ -56,15 +52,6 @@ type OperationListResultPage = original.OperationListResultPage
 type UserAssignedIdentitiesListResult = original.UserAssignedIdentitiesListResult
 type UserAssignedIdentitiesListResultIterator = original.UserAssignedIdentitiesListResultIterator
 type UserAssignedIdentitiesListResultPage = original.UserAssignedIdentitiesListResultPage
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type UserAssignedIdentitiesClient = original.UserAssignedIdentitiesClient
 
 func NewUserAssignedIdentitiesClient(subscriptionID string) UserAssignedIdentitiesClient {
@@ -79,3 +66,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/mysql/mgmt/mysql/models.go b/profiles/preview/mysql/mgmt/mysql/models.go
index 956528529e8c..fe001b74a9b3 100644
--- a/profiles/preview/mysql/mgmt/mysql/models.go
+++ b/profiles/preview/mysql/mgmt/mysql/models.go
@@ -21,26 +21,13 @@ package mysql
 
 import original "github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql"
 
-type CheckNameAvailabilityClient = original.CheckNameAvailabilityClient
-
-func NewCheckNameAvailabilityClient(subscriptionID string) CheckNameAvailabilityClient {
-	return original.NewCheckNameAvailabilityClient(subscriptionID)
-}
-func NewCheckNameAvailabilityClientWithBaseURI(baseURI string, subscriptionID string) CheckNameAvailabilityClient {
-	return original.NewCheckNameAvailabilityClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ConfigurationsClient = original.ConfigurationsClient
@@ -52,22 +39,13 @@ func NewConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) C
 	return original.NewConfigurationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DatabasesClient = original.DatabasesClient
-
-func NewDatabasesClient(subscriptionID string) DatabasesClient {
-	return original.NewDatabasesClient(subscriptionID)
-}
-func NewDatabasesClientWithBaseURI(baseURI string, subscriptionID string) DatabasesClient {
-	return original.NewDatabasesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type FirewallRulesClient = original.FirewallRulesClient
+type ServersClient = original.ServersClient
 
-func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClient(subscriptionID)
+func NewServersClient(subscriptionID string) ServersClient {
+	return original.NewServersClient(subscriptionID)
 }
-func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
+func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersClient {
+	return original.NewServersClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type LocationBasedPerformanceTierClient = original.LocationBasedPerformanceTierClient
@@ -79,15 +57,6 @@ func NewLocationBasedPerformanceTierClientWithBaseURI(baseURI string, subscripti
 	return original.NewLocationBasedPerformanceTierClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LogFilesClient = original.LogFilesClient
-
-func NewLogFilesClient(subscriptionID string) LogFilesClient {
-	return original.NewLogFilesClient(subscriptionID)
-}
-func NewLogFilesClientWithBaseURI(baseURI string, subscriptionID string) LogFilesClient {
-	return original.NewLogFilesClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type CreateMode = original.CreateMode
 
 const (
@@ -213,22 +182,13 @@ type ServerUpdateParametersProperties = original.ServerUpdateParametersPropertie
 type Sku = original.Sku
 type StorageProfile = original.StorageProfile
 type TrackedResource = original.TrackedResource
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ServersClient = original.ServersClient
+type DatabasesClient = original.DatabasesClient
 
-func NewServersClient(subscriptionID string) ServersClient {
-	return original.NewServersClient(subscriptionID)
+func NewDatabasesClient(subscriptionID string) DatabasesClient {
+	return original.NewDatabasesClient(subscriptionID)
 }
-func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersClient {
-	return original.NewServersClientWithBaseURI(baseURI, subscriptionID)
+func NewDatabasesClientWithBaseURI(baseURI string, subscriptionID string) DatabasesClient {
+	return original.NewDatabasesClientWithBaseURI(baseURI, subscriptionID)
 }
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
@@ -236,3 +196,43 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type FirewallRulesClient = original.FirewallRulesClient
+
+func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClient(subscriptionID)
+}
+func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type CheckNameAvailabilityClient = original.CheckNameAvailabilityClient
+
+func NewCheckNameAvailabilityClient(subscriptionID string) CheckNameAvailabilityClient {
+	return original.NewCheckNameAvailabilityClient(subscriptionID)
+}
+func NewCheckNameAvailabilityClientWithBaseURI(baseURI string, subscriptionID string) CheckNameAvailabilityClient {
+	return original.NewCheckNameAvailabilityClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type LogFilesClient = original.LogFilesClient
+
+func NewLogFilesClient(subscriptionID string) LogFilesClient {
+	return original.NewLogFilesClient(subscriptionID)
+}
+func NewLogFilesClientWithBaseURI(baseURI string, subscriptionID string) LogFilesClient {
+	return original.NewLogFilesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/network/mgmt/network/models.go b/profiles/preview/network/mgmt/network/models.go
index 5701062891c0..4f2f2645661d 100644
--- a/profiles/preview/network/mgmt/network/models.go
+++ b/profiles/preview/network/mgmt/network/models.go
@@ -21,80 +21,67 @@ package network
 
 import original "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-02-01/network"
 
-type ApplicationGatewaysClient = original.ApplicationGatewaysClient
-
-func NewApplicationGatewaysClient(subscriptionID string) ApplicationGatewaysClient {
-	return original.NewApplicationGatewaysClient(subscriptionID)
-}
-func NewApplicationGatewaysClientWithBaseURI(baseURI string, subscriptionID string) ApplicationGatewaysClient {
-	return original.NewApplicationGatewaysClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ApplicationSecurityGroupsClient = original.ApplicationSecurityGroupsClient
+type PublicIPAddressesClient = original.PublicIPAddressesClient
 
-func NewApplicationSecurityGroupsClient(subscriptionID string) ApplicationSecurityGroupsClient {
-	return original.NewApplicationSecurityGroupsClient(subscriptionID)
+func NewPublicIPAddressesClient(subscriptionID string) PublicIPAddressesClient {
+	return original.NewPublicIPAddressesClient(subscriptionID)
 }
-func NewApplicationSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) ApplicationSecurityGroupsClient {
-	return original.NewApplicationSecurityGroupsClientWithBaseURI(baseURI, subscriptionID)
+func NewPublicIPAddressesClientWithBaseURI(baseURI string, subscriptionID string) PublicIPAddressesClient {
+	return original.NewPublicIPAddressesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type AvailableEndpointServicesClient = original.AvailableEndpointServicesClient
+type ExpressRouteServiceProvidersClient = original.ExpressRouteServiceProvidersClient
 
-func NewAvailableEndpointServicesClient(subscriptionID string) AvailableEndpointServicesClient {
-	return original.NewAvailableEndpointServicesClient(subscriptionID)
+func NewExpressRouteServiceProvidersClient(subscriptionID string) ExpressRouteServiceProvidersClient {
+	return original.NewExpressRouteServiceProvidersClient(subscriptionID)
 }
-func NewAvailableEndpointServicesClientWithBaseURI(baseURI string, subscriptionID string) AvailableEndpointServicesClient {
-	return original.NewAvailableEndpointServicesClientWithBaseURI(baseURI, subscriptionID)
+func NewExpressRouteServiceProvidersClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteServiceProvidersClient {
+	return original.NewExpressRouteServiceProvidersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type BgpServiceCommunitiesClient = original.BgpServiceCommunitiesClient
+type SubnetsClient = original.SubnetsClient
 
-func NewBgpServiceCommunitiesClient(subscriptionID string) BgpServiceCommunitiesClient {
-	return original.NewBgpServiceCommunitiesClient(subscriptionID)
+func NewSubnetsClient(subscriptionID string) SubnetsClient {
+	return original.NewSubnetsClient(subscriptionID)
 }
-func NewBgpServiceCommunitiesClientWithBaseURI(baseURI string, subscriptionID string) BgpServiceCommunitiesClient {
-	return original.NewBgpServiceCommunitiesClientWithBaseURI(baseURI, subscriptionID)
+func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsClient {
+	return original.NewSubnetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ConnectionMonitorsClient = original.ConnectionMonitorsClient
+type InterfaceLoadBalancersClient = original.InterfaceLoadBalancersClient
 
-func NewConnectionMonitorsClient(subscriptionID string) ConnectionMonitorsClient {
-	return original.NewConnectionMonitorsClient(subscriptionID)
+func NewInterfaceLoadBalancersClient(subscriptionID string) InterfaceLoadBalancersClient {
+	return original.NewInterfaceLoadBalancersClient(subscriptionID)
 }
-func NewConnectionMonitorsClientWithBaseURI(baseURI string, subscriptionID string) ConnectionMonitorsClient {
-	return original.NewConnectionMonitorsClientWithBaseURI(baseURI, subscriptionID)
+func NewInterfaceLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) InterfaceLoadBalancersClient {
+	return original.NewInterfaceLoadBalancersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DdosProtectionPlansClient = original.DdosProtectionPlansClient
+type UsagesClient = original.UsagesClient
 
-func NewDdosProtectionPlansClient(subscriptionID string) DdosProtectionPlansClient {
-	return original.NewDdosProtectionPlansClient(subscriptionID)
+func NewUsagesClient(subscriptionID string) UsagesClient {
+	return original.NewUsagesClient(subscriptionID)
 }
-func NewDdosProtectionPlansClientWithBaseURI(baseURI string, subscriptionID string) DdosProtectionPlansClient {
-	return original.NewDdosProtectionPlansClientWithBaseURI(baseURI, subscriptionID)
+func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
+	return original.NewUsagesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DefaultSecurityRulesClient = original.DefaultSecurityRulesClient
+type VirtualNetworkGatewayConnectionsClient = original.VirtualNetworkGatewayConnectionsClient
 
-func NewDefaultSecurityRulesClient(subscriptionID string) DefaultSecurityRulesClient {
-	return original.NewDefaultSecurityRulesClient(subscriptionID)
+func NewVirtualNetworkGatewayConnectionsClient(subscriptionID string) VirtualNetworkGatewayConnectionsClient {
+	return original.NewVirtualNetworkGatewayConnectionsClient(subscriptionID)
 }
-func NewDefaultSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) DefaultSecurityRulesClient {
-	return original.NewDefaultSecurityRulesClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewayConnectionsClient {
+	return original.NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ExpressRouteCircuitAuthorizationsClient = original.ExpressRouteCircuitAuthorizationsClient
@@ -106,33 +93,6 @@ func NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI string, subsc
 	return original.NewExpressRouteCircuitAuthorizationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ExpressRouteCircuitConnectionsClient = original.ExpressRouteCircuitConnectionsClient
-
-func NewExpressRouteCircuitConnectionsClient(subscriptionID string) ExpressRouteCircuitConnectionsClient {
-	return original.NewExpressRouteCircuitConnectionsClient(subscriptionID)
-}
-func NewExpressRouteCircuitConnectionsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitConnectionsClient {
-	return original.NewExpressRouteCircuitConnectionsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ExpressRouteCircuitPeeringsClient = original.ExpressRouteCircuitPeeringsClient
-
-func NewExpressRouteCircuitPeeringsClient(subscriptionID string) ExpressRouteCircuitPeeringsClient {
-	return original.NewExpressRouteCircuitPeeringsClient(subscriptionID)
-}
-func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitPeeringsClient {
-	return original.NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ExpressRouteCircuitsClient = original.ExpressRouteCircuitsClient
-
-func NewExpressRouteCircuitsClient(subscriptionID string) ExpressRouteCircuitsClient {
-	return original.NewExpressRouteCircuitsClient(subscriptionID)
-}
-func NewExpressRouteCircuitsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitsClient {
-	return original.NewExpressRouteCircuitsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type ExpressRouteCrossConnectionPeeringsClient = original.ExpressRouteCrossConnectionPeeringsClient
 
 func NewExpressRouteCrossConnectionPeeringsClient(subscriptionID string) ExpressRouteCrossConnectionPeeringsClient {
@@ -142,58 +102,22 @@ func NewExpressRouteCrossConnectionPeeringsClientWithBaseURI(baseURI string, sub
 	return original.NewExpressRouteCrossConnectionPeeringsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ExpressRouteCrossConnectionsClient = original.ExpressRouteCrossConnectionsClient
-
-func NewExpressRouteCrossConnectionsClient(subscriptionID string) ExpressRouteCrossConnectionsClient {
-	return original.NewExpressRouteCrossConnectionsClient(subscriptionID)
-}
-func NewExpressRouteCrossConnectionsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCrossConnectionsClient {
-	return original.NewExpressRouteCrossConnectionsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ExpressRouteServiceProvidersClient = original.ExpressRouteServiceProvidersClient
-
-func NewExpressRouteServiceProvidersClient(subscriptionID string) ExpressRouteServiceProvidersClient {
-	return original.NewExpressRouteServiceProvidersClient(subscriptionID)
-}
-func NewExpressRouteServiceProvidersClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteServiceProvidersClient {
-	return original.NewExpressRouteServiceProvidersClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type InboundNatRulesClient = original.InboundNatRulesClient
-
-func NewInboundNatRulesClient(subscriptionID string) InboundNatRulesClient {
-	return original.NewInboundNatRulesClient(subscriptionID)
-}
-func NewInboundNatRulesClientWithBaseURI(baseURI string, subscriptionID string) InboundNatRulesClient {
-	return original.NewInboundNatRulesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type InterfaceIPConfigurationsClient = original.InterfaceIPConfigurationsClient
-
-func NewInterfaceIPConfigurationsClient(subscriptionID string) InterfaceIPConfigurationsClient {
-	return original.NewInterfaceIPConfigurationsClient(subscriptionID)
-}
-func NewInterfaceIPConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) InterfaceIPConfigurationsClient {
-	return original.NewInterfaceIPConfigurationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type InterfaceLoadBalancersClient = original.InterfaceLoadBalancersClient
+type ConnectionMonitorsClient = original.ConnectionMonitorsClient
 
-func NewInterfaceLoadBalancersClient(subscriptionID string) InterfaceLoadBalancersClient {
-	return original.NewInterfaceLoadBalancersClient(subscriptionID)
+func NewConnectionMonitorsClient(subscriptionID string) ConnectionMonitorsClient {
+	return original.NewConnectionMonitorsClient(subscriptionID)
 }
-func NewInterfaceLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) InterfaceLoadBalancersClient {
-	return original.NewInterfaceLoadBalancersClientWithBaseURI(baseURI, subscriptionID)
+func NewConnectionMonitorsClientWithBaseURI(baseURI string, subscriptionID string) ConnectionMonitorsClient {
+	return original.NewConnectionMonitorsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type InterfacesClient = original.InterfacesClient
+type LoadBalancerLoadBalancingRulesClient = original.LoadBalancerLoadBalancingRulesClient
 
-func NewInterfacesClient(subscriptionID string) InterfacesClient {
-	return original.NewInterfacesClient(subscriptionID)
+func NewLoadBalancerLoadBalancingRulesClient(subscriptionID string) LoadBalancerLoadBalancingRulesClient {
+	return original.NewLoadBalancerLoadBalancingRulesClient(subscriptionID)
 }
-func NewInterfacesClientWithBaseURI(baseURI string, subscriptionID string) InterfacesClient {
-	return original.NewInterfacesClientWithBaseURI(baseURI, subscriptionID)
+func NewLoadBalancerLoadBalancingRulesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerLoadBalancingRulesClient {
+	return original.NewLoadBalancerLoadBalancingRulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type LoadBalancerBackendAddressPoolsClient = original.LoadBalancerBackendAddressPoolsClient
@@ -205,40 +129,40 @@ func NewLoadBalancerBackendAddressPoolsClientWithBaseURI(baseURI string, subscri
 	return original.NewLoadBalancerBackendAddressPoolsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LoadBalancerFrontendIPConfigurationsClient = original.LoadBalancerFrontendIPConfigurationsClient
+type VirtualNetworkPeeringsClient = original.VirtualNetworkPeeringsClient
 
-func NewLoadBalancerFrontendIPConfigurationsClient(subscriptionID string) LoadBalancerFrontendIPConfigurationsClient {
-	return original.NewLoadBalancerFrontendIPConfigurationsClient(subscriptionID)
+func NewVirtualNetworkPeeringsClient(subscriptionID string) VirtualNetworkPeeringsClient {
+	return original.NewVirtualNetworkPeeringsClient(subscriptionID)
 }
-func NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerFrontendIPConfigurationsClient {
-	return original.NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(baseURI, subscriptionID)
+func NewVirtualNetworkPeeringsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkPeeringsClient {
+	return original.NewVirtualNetworkPeeringsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LoadBalancerLoadBalancingRulesClient = original.LoadBalancerLoadBalancingRulesClient
+type ApplicationSecurityGroupsClient = original.ApplicationSecurityGroupsClient
 
-func NewLoadBalancerLoadBalancingRulesClient(subscriptionID string) LoadBalancerLoadBalancingRulesClient {
-	return original.NewLoadBalancerLoadBalancingRulesClient(subscriptionID)
+func NewApplicationSecurityGroupsClient(subscriptionID string) ApplicationSecurityGroupsClient {
+	return original.NewApplicationSecurityGroupsClient(subscriptionID)
 }
-func NewLoadBalancerLoadBalancingRulesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerLoadBalancingRulesClient {
-	return original.NewLoadBalancerLoadBalancingRulesClientWithBaseURI(baseURI, subscriptionID)
+func NewApplicationSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) ApplicationSecurityGroupsClient {
+	return original.NewApplicationSecurityGroupsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LoadBalancerNetworkInterfacesClient = original.LoadBalancerNetworkInterfacesClient
+type ExpressRouteCrossConnectionsClient = original.ExpressRouteCrossConnectionsClient
 
-func NewLoadBalancerNetworkInterfacesClient(subscriptionID string) LoadBalancerNetworkInterfacesClient {
-	return original.NewLoadBalancerNetworkInterfacesClient(subscriptionID)
+func NewExpressRouteCrossConnectionsClient(subscriptionID string) ExpressRouteCrossConnectionsClient {
+	return original.NewExpressRouteCrossConnectionsClient(subscriptionID)
 }
-func NewLoadBalancerNetworkInterfacesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerNetworkInterfacesClient {
-	return original.NewLoadBalancerNetworkInterfacesClientWithBaseURI(baseURI, subscriptionID)
+func NewExpressRouteCrossConnectionsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCrossConnectionsClient {
+	return original.NewExpressRouteCrossConnectionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LoadBalancerProbesClient = original.LoadBalancerProbesClient
+type InterfacesClient = original.InterfacesClient
 
-func NewLoadBalancerProbesClient(subscriptionID string) LoadBalancerProbesClient {
-	return original.NewLoadBalancerProbesClient(subscriptionID)
+func NewInterfacesClient(subscriptionID string) InterfacesClient {
+	return original.NewInterfacesClient(subscriptionID)
 }
-func NewLoadBalancerProbesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerProbesClient {
-	return original.NewLoadBalancerProbesClientWithBaseURI(baseURI, subscriptionID)
+func NewInterfacesClientWithBaseURI(baseURI string, subscriptionID string) InterfacesClient {
+	return original.NewInterfacesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type LoadBalancersClient = original.LoadBalancersClient
@@ -250,15 +174,6 @@ func NewLoadBalancersClientWithBaseURI(baseURI string, subscriptionID string) Lo
 	return original.NewLoadBalancersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LocalNetworkGatewaysClient = original.LocalNetworkGatewaysClient
-
-func NewLocalNetworkGatewaysClient(subscriptionID string) LocalNetworkGatewaysClient {
-	return original.NewLocalNetworkGatewaysClient(subscriptionID)
-}
-func NewLocalNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) LocalNetworkGatewaysClient {
-	return original.NewLocalNetworkGatewaysClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type Access = original.Access
 
 const (
@@ -1657,31 +1572,49 @@ type WatchersGetVMSecurityRulesFuture = original.WatchersGetVMSecurityRulesFutur
 type WatchersListAvailableProvidersFuture = original.WatchersListAvailableProvidersFuture
 type WatchersSetFlowLogConfigurationFuture = original.WatchersSetFlowLogConfigurationFuture
 type WatchersVerifyIPFlowFuture = original.WatchersVerifyIPFlowFuture
-type OperationsClient = original.OperationsClient
+type InterfaceIPConfigurationsClient = original.InterfaceIPConfigurationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewInterfaceIPConfigurationsClient(subscriptionID string) InterfaceIPConfigurationsClient {
+	return original.NewInterfaceIPConfigurationsClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewInterfaceIPConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) InterfaceIPConfigurationsClient {
+	return original.NewInterfaceIPConfigurationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type PacketCapturesClient = original.PacketCapturesClient
+type LoadBalancerFrontendIPConfigurationsClient = original.LoadBalancerFrontendIPConfigurationsClient
 
-func NewPacketCapturesClient(subscriptionID string) PacketCapturesClient {
-	return original.NewPacketCapturesClient(subscriptionID)
+func NewLoadBalancerFrontendIPConfigurationsClient(subscriptionID string) LoadBalancerFrontendIPConfigurationsClient {
+	return original.NewLoadBalancerFrontendIPConfigurationsClient(subscriptionID)
 }
-func NewPacketCapturesClientWithBaseURI(baseURI string, subscriptionID string) PacketCapturesClient {
-	return original.NewPacketCapturesClientWithBaseURI(baseURI, subscriptionID)
+func NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerFrontendIPConfigurationsClient {
+	return original.NewLoadBalancerFrontendIPConfigurationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type PublicIPAddressesClient = original.PublicIPAddressesClient
+type ExpressRouteCircuitPeeringsClient = original.ExpressRouteCircuitPeeringsClient
 
-func NewPublicIPAddressesClient(subscriptionID string) PublicIPAddressesClient {
-	return original.NewPublicIPAddressesClient(subscriptionID)
+func NewExpressRouteCircuitPeeringsClient(subscriptionID string) ExpressRouteCircuitPeeringsClient {
+	return original.NewExpressRouteCircuitPeeringsClient(subscriptionID)
 }
-func NewPublicIPAddressesClientWithBaseURI(baseURI string, subscriptionID string) PublicIPAddressesClient {
-	return original.NewPublicIPAddressesClientWithBaseURI(baseURI, subscriptionID)
+func NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitPeeringsClient {
+	return original.NewExpressRouteCircuitPeeringsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type BgpServiceCommunitiesClient = original.BgpServiceCommunitiesClient
+
+func NewBgpServiceCommunitiesClient(subscriptionID string) BgpServiceCommunitiesClient {
+	return original.NewBgpServiceCommunitiesClient(subscriptionID)
+}
+func NewBgpServiceCommunitiesClientWithBaseURI(baseURI string, subscriptionID string) BgpServiceCommunitiesClient {
+	return original.NewBgpServiceCommunitiesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type VirtualNetworksClient = original.VirtualNetworksClient
+
+func NewVirtualNetworksClient(subscriptionID string) VirtualNetworksClient {
+	return original.NewVirtualNetworksClient(subscriptionID)
+}
+func NewVirtualNetworksClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksClient {
+	return original.NewVirtualNetworksClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type RouteFilterRulesClient = original.RouteFilterRulesClient
@@ -1692,83 +1625,92 @@ func NewRouteFilterRulesClient(subscriptionID string) RouteFilterRulesClient {
 func NewRouteFilterRulesClientWithBaseURI(baseURI string, subscriptionID string) RouteFilterRulesClient {
 	return original.NewRouteFilterRulesClientWithBaseURI(baseURI, subscriptionID)
 }
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
+}
 
-type RouteFiltersClient = original.RouteFiltersClient
+type ExpressRouteCircuitsClient = original.ExpressRouteCircuitsClient
 
-func NewRouteFiltersClient(subscriptionID string) RouteFiltersClient {
-	return original.NewRouteFiltersClient(subscriptionID)
+func NewExpressRouteCircuitsClient(subscriptionID string) ExpressRouteCircuitsClient {
+	return original.NewExpressRouteCircuitsClient(subscriptionID)
 }
-func NewRouteFiltersClientWithBaseURI(baseURI string, subscriptionID string) RouteFiltersClient {
-	return original.NewRouteFiltersClientWithBaseURI(baseURI, subscriptionID)
+func NewExpressRouteCircuitsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitsClient {
+	return original.NewExpressRouteCircuitsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type RoutesClient = original.RoutesClient
+type PacketCapturesClient = original.PacketCapturesClient
 
-func NewRoutesClient(subscriptionID string) RoutesClient {
-	return original.NewRoutesClient(subscriptionID)
+func NewPacketCapturesClient(subscriptionID string) PacketCapturesClient {
+	return original.NewPacketCapturesClient(subscriptionID)
 }
-func NewRoutesClientWithBaseURI(baseURI string, subscriptionID string) RoutesClient {
-	return original.NewRoutesClientWithBaseURI(baseURI, subscriptionID)
+func NewPacketCapturesClientWithBaseURI(baseURI string, subscriptionID string) PacketCapturesClient {
+	return original.NewPacketCapturesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type RouteTablesClient = original.RouteTablesClient
+type LoadBalancerProbesClient = original.LoadBalancerProbesClient
 
-func NewRouteTablesClient(subscriptionID string) RouteTablesClient {
-	return original.NewRouteTablesClient(subscriptionID)
+func NewLoadBalancerProbesClient(subscriptionID string) LoadBalancerProbesClient {
+	return original.NewLoadBalancerProbesClient(subscriptionID)
 }
-func NewRouteTablesClientWithBaseURI(baseURI string, subscriptionID string) RouteTablesClient {
-	return original.NewRouteTablesClientWithBaseURI(baseURI, subscriptionID)
+func NewLoadBalancerProbesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerProbesClient {
+	return original.NewLoadBalancerProbesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SecurityGroupsClient = original.SecurityGroupsClient
+type ApplicationGatewaysClient = original.ApplicationGatewaysClient
 
-func NewSecurityGroupsClient(subscriptionID string) SecurityGroupsClient {
-	return original.NewSecurityGroupsClient(subscriptionID)
+func NewApplicationGatewaysClient(subscriptionID string) ApplicationGatewaysClient {
+	return original.NewApplicationGatewaysClient(subscriptionID)
 }
-func NewSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) SecurityGroupsClient {
-	return original.NewSecurityGroupsClientWithBaseURI(baseURI, subscriptionID)
+func NewApplicationGatewaysClientWithBaseURI(baseURI string, subscriptionID string) ApplicationGatewaysClient {
+	return original.NewApplicationGatewaysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SecurityRulesClient = original.SecurityRulesClient
+type DdosProtectionPlansClient = original.DdosProtectionPlansClient
 
-func NewSecurityRulesClient(subscriptionID string) SecurityRulesClient {
-	return original.NewSecurityRulesClient(subscriptionID)
+func NewDdosProtectionPlansClient(subscriptionID string) DdosProtectionPlansClient {
+	return original.NewDdosProtectionPlansClient(subscriptionID)
 }
-func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) SecurityRulesClient {
-	return original.NewSecurityRulesClientWithBaseURI(baseURI, subscriptionID)
+func NewDdosProtectionPlansClientWithBaseURI(baseURI string, subscriptionID string) DdosProtectionPlansClient {
+	return original.NewDdosProtectionPlansClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SubnetsClient = original.SubnetsClient
+type ExpressRouteCircuitConnectionsClient = original.ExpressRouteCircuitConnectionsClient
 
-func NewSubnetsClient(subscriptionID string) SubnetsClient {
-	return original.NewSubnetsClient(subscriptionID)
+func NewExpressRouteCircuitConnectionsClient(subscriptionID string) ExpressRouteCircuitConnectionsClient {
+	return original.NewExpressRouteCircuitConnectionsClient(subscriptionID)
 }
-func NewSubnetsClientWithBaseURI(baseURI string, subscriptionID string) SubnetsClient {
-	return original.NewSubnetsClientWithBaseURI(baseURI, subscriptionID)
+func NewExpressRouteCircuitConnectionsClientWithBaseURI(baseURI string, subscriptionID string) ExpressRouteCircuitConnectionsClient {
+	return original.NewExpressRouteCircuitConnectionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UsagesClient = original.UsagesClient
+type LocalNetworkGatewaysClient = original.LocalNetworkGatewaysClient
 
-func NewUsagesClient(subscriptionID string) UsagesClient {
-	return original.NewUsagesClient(subscriptionID)
+func NewLocalNetworkGatewaysClient(subscriptionID string) LocalNetworkGatewaysClient {
+	return original.NewLocalNetworkGatewaysClient(subscriptionID)
 }
-func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
-	return original.NewUsagesClientWithBaseURI(baseURI, subscriptionID)
+func NewLocalNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID string) LocalNetworkGatewaysClient {
+	return original.NewLocalNetworkGatewaysClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+type RouteFiltersClient = original.RouteFiltersClient
+
+func NewRouteFiltersClient(subscriptionID string) RouteFiltersClient {
+	return original.NewRouteFiltersClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewRouteFiltersClientWithBaseURI(baseURI string, subscriptionID string) RouteFiltersClient {
+	return original.NewRouteFiltersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualNetworkGatewayConnectionsClient = original.VirtualNetworkGatewayConnectionsClient
+type InboundNatRulesClient = original.InboundNatRulesClient
 
-func NewVirtualNetworkGatewayConnectionsClient(subscriptionID string) VirtualNetworkGatewayConnectionsClient {
-	return original.NewVirtualNetworkGatewayConnectionsClient(subscriptionID)
+func NewInboundNatRulesClient(subscriptionID string) InboundNatRulesClient {
+	return original.NewInboundNatRulesClient(subscriptionID)
 }
-func NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkGatewayConnectionsClient {
-	return original.NewVirtualNetworkGatewayConnectionsClientWithBaseURI(baseURI, subscriptionID)
+func NewInboundNatRulesClientWithBaseURI(baseURI string, subscriptionID string) InboundNatRulesClient {
+	return original.NewInboundNatRulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type VirtualNetworkGatewaysClient = original.VirtualNetworkGatewaysClient
@@ -1780,22 +1722,22 @@ func NewVirtualNetworkGatewaysClientWithBaseURI(baseURI string, subscriptionID s
 	return original.NewVirtualNetworkGatewaysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualNetworkPeeringsClient = original.VirtualNetworkPeeringsClient
+type SecurityRulesClient = original.SecurityRulesClient
 
-func NewVirtualNetworkPeeringsClient(subscriptionID string) VirtualNetworkPeeringsClient {
-	return original.NewVirtualNetworkPeeringsClient(subscriptionID)
+func NewSecurityRulesClient(subscriptionID string) SecurityRulesClient {
+	return original.NewSecurityRulesClient(subscriptionID)
 }
-func NewVirtualNetworkPeeringsClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworkPeeringsClient {
-	return original.NewVirtualNetworkPeeringsClientWithBaseURI(baseURI, subscriptionID)
+func NewSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) SecurityRulesClient {
+	return original.NewSecurityRulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VirtualNetworksClient = original.VirtualNetworksClient
+type LoadBalancerNetworkInterfacesClient = original.LoadBalancerNetworkInterfacesClient
 
-func NewVirtualNetworksClient(subscriptionID string) VirtualNetworksClient {
-	return original.NewVirtualNetworksClient(subscriptionID)
+func NewLoadBalancerNetworkInterfacesClient(subscriptionID string) LoadBalancerNetworkInterfacesClient {
+	return original.NewLoadBalancerNetworkInterfacesClient(subscriptionID)
 }
-func NewVirtualNetworksClientWithBaseURI(baseURI string, subscriptionID string) VirtualNetworksClient {
-	return original.NewVirtualNetworksClientWithBaseURI(baseURI, subscriptionID)
+func NewLoadBalancerNetworkInterfacesClientWithBaseURI(baseURI string, subscriptionID string) LoadBalancerNetworkInterfacesClient {
+	return original.NewLoadBalancerNetworkInterfacesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type WatchersClient = original.WatchersClient
@@ -1806,3 +1748,61 @@ func NewWatchersClient(subscriptionID string) WatchersClient {
 func NewWatchersClientWithBaseURI(baseURI string, subscriptionID string) WatchersClient {
 	return original.NewWatchersClientWithBaseURI(baseURI, subscriptionID)
 }
+
+type RoutesClient = original.RoutesClient
+
+func NewRoutesClient(subscriptionID string) RoutesClient {
+	return original.NewRoutesClient(subscriptionID)
+}
+func NewRoutesClientWithBaseURI(baseURI string, subscriptionID string) RoutesClient {
+	return original.NewRoutesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type RouteTablesClient = original.RouteTablesClient
+
+func NewRouteTablesClient(subscriptionID string) RouteTablesClient {
+	return original.NewRouteTablesClient(subscriptionID)
+}
+func NewRouteTablesClientWithBaseURI(baseURI string, subscriptionID string) RouteTablesClient {
+	return original.NewRouteTablesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type DefaultSecurityRulesClient = original.DefaultSecurityRulesClient
+
+func NewDefaultSecurityRulesClient(subscriptionID string) DefaultSecurityRulesClient {
+	return original.NewDefaultSecurityRulesClient(subscriptionID)
+}
+func NewDefaultSecurityRulesClientWithBaseURI(baseURI string, subscriptionID string) DefaultSecurityRulesClient {
+	return original.NewDefaultSecurityRulesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
+
+type SecurityGroupsClient = original.SecurityGroupsClient
+
+func NewSecurityGroupsClient(subscriptionID string) SecurityGroupsClient {
+	return original.NewSecurityGroupsClient(subscriptionID)
+}
+func NewSecurityGroupsClientWithBaseURI(baseURI string, subscriptionID string) SecurityGroupsClient {
+	return original.NewSecurityGroupsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type AvailableEndpointServicesClient = original.AvailableEndpointServicesClient
+
+func NewAvailableEndpointServicesClient(subscriptionID string) AvailableEndpointServicesClient {
+	return original.NewAvailableEndpointServicesClient(subscriptionID)
+}
+func NewAvailableEndpointServicesClientWithBaseURI(baseURI string, subscriptionID string) AvailableEndpointServicesClient {
+	return original.NewAvailableEndpointServicesClientWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/notificationhubs/mgmt/notificationhubs/models.go b/profiles/preview/notificationhubs/mgmt/notificationhubs/models.go
index 4483256f8b3e..3338b409ab22 100644
--- a/profiles/preview/notificationhubs/mgmt/notificationhubs/models.go
+++ b/profiles/preview/notificationhubs/mgmt/notificationhubs/models.go
@@ -21,26 +21,31 @@ package notificationhubs
 
 import original "github.com/Azure/azure-sdk-for-go/services/notificationhubs/mgmt/2017-04-01/notificationhubs"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type Client = original.Client
 
-type BaseClient = original.BaseClient
+func NewClient(subscriptionID string) Client {
+	return original.NewClient(subscriptionID)
+}
+func NewClientWithBaseURI(baseURI string, subscriptionID string) Client {
+	return original.NewClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type NameClient = original.NameClient
+
+func NewNameClient(subscriptionID string) NameClient {
+	return original.NewNameClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewNameClientWithBaseURI(baseURI string, subscriptionID string) NameClient {
+	return original.NewNameClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type HubsClient = original.HubsClient
+type NamespacesClient = original.NamespacesClient
 
-func NewHubsClient(subscriptionID string) HubsClient {
-	return original.NewHubsClient(subscriptionID)
+func NewNamespacesClient(subscriptionID string) NamespacesClient {
+	return original.NewNamespacesClient(subscriptionID)
 }
-func NewHubsClientWithBaseURI(baseURI string, subscriptionID string) HubsClient {
-	return original.NewHubsClientWithBaseURI(baseURI, subscriptionID)
+func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) NamespacesClient {
+	return original.NewNamespacesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccessRights = original.AccessRights
@@ -121,35 +126,32 @@ type Sku = original.Sku
 type SubResource = original.SubResource
 type WnsCredential = original.WnsCredential
 type WnsCredentialProperties = original.WnsCredentialProperties
-type NameClient = original.NameClient
 
-func NewNameClient(subscriptionID string) NameClient {
-	return original.NewNameClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewNameClientWithBaseURI(baseURI string, subscriptionID string) NameClient {
-	return original.NewNameClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type NamespacesClient = original.NamespacesClient
+type HubsClient = original.HubsClient
 
-func NewNamespacesClient(subscriptionID string) NamespacesClient {
-	return original.NewNamespacesClient(subscriptionID)
+func NewHubsClient(subscriptionID string) HubsClient {
+	return original.NewHubsClient(subscriptionID)
 }
-func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) NamespacesClient {
-	return original.NewNamespacesClientWithBaseURI(baseURI, subscriptionID)
+func NewHubsClientWithBaseURI(baseURI string, subscriptionID string) HubsClient {
+	return original.NewHubsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type Client = original.Client
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewClient(subscriptionID string) Client {
-	return original.NewClient(subscriptionID)
-}
-func NewClientWithBaseURI(baseURI string, subscriptionID string) Client {
-	return original.NewClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/operationalinsights/mgmt/operationalinsights/models.go b/profiles/preview/operationalinsights/mgmt/operationalinsights/models.go
index faf7c0ecddfa..72d066448be2 100644
--- a/profiles/preview/operationalinsights/mgmt/operationalinsights/models.go
+++ b/profiles/preview/operationalinsights/mgmt/operationalinsights/models.go
@@ -21,35 +21,13 @@ package operationalinsights
 
 import original "github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/operationalinsights"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type DataSourcesClient = original.DataSourcesClient
-
-func NewDataSourcesClient(subscriptionID string) DataSourcesClient {
-	return original.NewDataSourcesClient(subscriptionID)
-}
-func NewDataSourcesClientWithBaseURI(baseURI string, subscriptionID string) DataSourcesClient {
-	return original.NewDataSourcesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type LinkedServicesClient = original.LinkedServicesClient
+type OperationsClient = original.OperationsClient
 
-func NewLinkedServicesClient(subscriptionID string) LinkedServicesClient {
-	return original.NewLinkedServicesClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewLinkedServicesClientWithBaseURI(baseURI string, subscriptionID string) LinkedServicesClient {
-	return original.NewLinkedServicesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type DataSourceKind = original.DataSourceKind
@@ -136,14 +114,7 @@ type WorkspaceListResult = original.WorkspaceListResult
 type WorkspaceListUsagesResult = original.WorkspaceListUsagesResult
 type WorkspaceProperties = original.WorkspaceProperties
 type WorkspacesCreateOrUpdateFuture = original.WorkspacesCreateOrUpdateFuture
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
@@ -151,6 +122,15 @@ func Version() string {
 	return original.Version()
 }
 
+type LinkedServicesClient = original.LinkedServicesClient
+
+func NewLinkedServicesClient(subscriptionID string) LinkedServicesClient {
+	return original.NewLinkedServicesClient(subscriptionID)
+}
+func NewLinkedServicesClientWithBaseURI(baseURI string, subscriptionID string) LinkedServicesClient {
+	return original.NewLinkedServicesClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type WorkspacesClient = original.WorkspacesClient
 
 func NewWorkspacesClient(subscriptionID string) WorkspacesClient {
@@ -159,3 +139,25 @@ func NewWorkspacesClient(subscriptionID string) WorkspacesClient {
 func NewWorkspacesClientWithBaseURI(baseURI string, subscriptionID string) WorkspacesClient {
 	return original.NewWorkspacesClientWithBaseURI(baseURI, subscriptionID)
 }
+
+type DataSourcesClient = original.DataSourcesClient
+
+func NewDataSourcesClient(subscriptionID string) DataSourcesClient {
+	return original.NewDataSourcesClient(subscriptionID)
+}
+func NewDataSourcesClientWithBaseURI(baseURI string, subscriptionID string) DataSourcesClient {
+	return original.NewDataSourcesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/operationalinsights/mgmt/servicemap/models.go b/profiles/preview/operationalinsights/mgmt/servicemap/models.go
index 58ee576868c2..72028bd3f1a6 100644
--- a/profiles/preview/operationalinsights/mgmt/servicemap/models.go
+++ b/profiles/preview/operationalinsights/mgmt/servicemap/models.go
@@ -21,19 +21,6 @@ package servicemap
 
 import original "github.com/Azure/azure-sdk-for-go/services/operationalinsights/mgmt/2015-11-01-preview/servicemap"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type ClientGroupsClient = original.ClientGroupsClient
 
 func NewClientGroupsClient(subscriptionID string) ClientGroupsClient {
@@ -43,31 +30,13 @@ func NewClientGroupsClientWithBaseURI(baseURI string, subscriptionID string) Cli
 	return original.NewClientGroupsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type MachineGroupsClient = original.MachineGroupsClient
-
-func NewMachineGroupsClient(subscriptionID string) MachineGroupsClient {
-	return original.NewMachineGroupsClient(subscriptionID)
-}
-func NewMachineGroupsClientWithBaseURI(baseURI string, subscriptionID string) MachineGroupsClient {
-	return original.NewMachineGroupsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type MachinesClient = original.MachinesClient
-
-func NewMachinesClient(subscriptionID string) MachinesClient {
-	return original.NewMachinesClient(subscriptionID)
-}
-func NewMachinesClientWithBaseURI(baseURI string, subscriptionID string) MachinesClient {
-	return original.NewMachinesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type MapsClient = original.MapsClient
+type SummariesClient = original.SummariesClient
 
-func NewMapsClient(subscriptionID string) MapsClient {
-	return original.NewMapsClient(subscriptionID)
+func NewSummariesClient(subscriptionID string) SummariesClient {
+	return original.NewSummariesClient(subscriptionID)
 }
-func NewMapsClientWithBaseURI(baseURI string, subscriptionID string) MapsClient {
-	return original.NewMapsClientWithBaseURI(baseURI, subscriptionID)
+func NewSummariesClientWithBaseURI(baseURI string, subscriptionID string) SummariesClient {
+	return original.NewSummariesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type Accuracy = original.Accuracy
@@ -411,13 +380,12 @@ type Summary = original.Summary
 type SummaryProperties = original.SummaryProperties
 type Timezone = original.Timezone
 type VirtualMachineConfiguration = original.VirtualMachineConfiguration
-type PortsClient = original.PortsClient
 
-func NewPortsClient(subscriptionID string) PortsClient {
-	return original.NewPortsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewPortsClientWithBaseURI(baseURI string, subscriptionID string) PortsClient {
-	return original.NewPortsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
 type ProcessesClient = original.ProcessesClient
@@ -429,17 +397,51 @@ func NewProcessesClientWithBaseURI(baseURI string, subscriptionID string) Proces
 	return original.NewProcessesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SummariesClient = original.SummariesClient
+type MachinesClient = original.MachinesClient
 
-func NewSummariesClient(subscriptionID string) SummariesClient {
-	return original.NewSummariesClient(subscriptionID)
+func NewMachinesClient(subscriptionID string) MachinesClient {
+	return original.NewMachinesClient(subscriptionID)
 }
-func NewSummariesClientWithBaseURI(baseURI string, subscriptionID string) SummariesClient {
-	return original.NewSummariesClientWithBaseURI(baseURI, subscriptionID)
+func NewMachinesClientWithBaseURI(baseURI string, subscriptionID string) MachinesClient {
+	return original.NewMachinesClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+type PortsClient = original.PortsClient
+
+func NewPortsClient(subscriptionID string) PortsClient {
+	return original.NewPortsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewPortsClientWithBaseURI(baseURI string, subscriptionID string) PortsClient {
+	return original.NewPortsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type MachineGroupsClient = original.MachineGroupsClient
+
+func NewMachineGroupsClient(subscriptionID string) MachineGroupsClient {
+	return original.NewMachineGroupsClient(subscriptionID)
+}
+func NewMachineGroupsClientWithBaseURI(baseURI string, subscriptionID string) MachineGroupsClient {
+	return original.NewMachineGroupsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type MapsClient = original.MapsClient
+
+func NewMapsClient(subscriptionID string) MapsClient {
+	return original.NewMapsClient(subscriptionID)
+}
+func NewMapsClientWithBaseURI(baseURI string, subscriptionID string) MapsClient {
+	return original.NewMapsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/operationsmanagement/mgmt/operationsmanagement/models.go b/profiles/preview/operationsmanagement/mgmt/operationsmanagement/models.go
index f15b2a9535af..d7e52b03fce7 100644
--- a/profiles/preview/operationsmanagement/mgmt/operationsmanagement/models.go
+++ b/profiles/preview/operationsmanagement/mgmt/operationsmanagement/models.go
@@ -21,19 +21,6 @@ package operationsmanagement
 
 import original "github.com/Azure/azure-sdk-for-go/services/operationsmanagement/mgmt/2015-11-01-preview/operationsmanagement"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string, providerName string, resourceType string, resourceName string) BaseClient {
-	return original.New(subscriptionID, providerName, resourceType, resourceName)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string, providerName string, resourceType string, resourceName string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID, providerName, resourceType, resourceName)
-}
-
 type ManagementAssociationsClient = original.ManagementAssociationsClient
 
 func NewManagementAssociationsClient(subscriptionID string, providerName string, resourceType string, resourceName string) ManagementAssociationsClient {
@@ -43,13 +30,22 @@ func NewManagementAssociationsClientWithBaseURI(baseURI string, subscriptionID s
 	return original.NewManagementAssociationsClientWithBaseURI(baseURI, subscriptionID, providerName, resourceType, resourceName)
 }
 
-type ManagementConfigurationsClient = original.ManagementConfigurationsClient
+type OperationsClient = original.OperationsClient
 
-func NewManagementConfigurationsClient(subscriptionID string, providerName string, resourceType string, resourceName string) ManagementConfigurationsClient {
-	return original.NewManagementConfigurationsClient(subscriptionID, providerName, resourceType, resourceName)
+func NewOperationsClient(subscriptionID string, providerName string, resourceType string, resourceName string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID, providerName, resourceType, resourceName)
 }
-func NewManagementConfigurationsClientWithBaseURI(baseURI string, subscriptionID string, providerName string, resourceType string, resourceName string) ManagementConfigurationsClient {
-	return original.NewManagementConfigurationsClientWithBaseURI(baseURI, subscriptionID, providerName, resourceType, resourceName)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string, providerName string, resourceType string, resourceName string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID, providerName, resourceType, resourceName)
+}
+
+type SolutionsClient = original.SolutionsClient
+
+func NewSolutionsClient(subscriptionID string, providerName string, resourceType string, resourceName string) SolutionsClient {
+	return original.NewSolutionsClient(subscriptionID, providerName, resourceType, resourceName)
+}
+func NewSolutionsClientWithBaseURI(baseURI string, subscriptionID string, providerName string, resourceType string, resourceName string) SolutionsClient {
+	return original.NewSolutionsClientWithBaseURI(baseURI, subscriptionID, providerName, resourceType, resourceName)
 }
 
 type ArmTemplateParameter = original.ArmTemplateParameter
@@ -68,26 +64,32 @@ type Solution = original.Solution
 type SolutionPlan = original.SolutionPlan
 type SolutionProperties = original.SolutionProperties
 type SolutionPropertiesList = original.SolutionPropertiesList
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string, providerName string, resourceType string, resourceName string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID, providerName, resourceType, resourceName)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string, providerName string, resourceType string, resourceName string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID, providerName, resourceType, resourceName)
+func Version() string {
+	return original.Version()
 }
 
-type SolutionsClient = original.SolutionsClient
+type ManagementConfigurationsClient = original.ManagementConfigurationsClient
 
-func NewSolutionsClient(subscriptionID string, providerName string, resourceType string, resourceName string) SolutionsClient {
-	return original.NewSolutionsClient(subscriptionID, providerName, resourceType, resourceName)
+func NewManagementConfigurationsClient(subscriptionID string, providerName string, resourceType string, resourceName string) ManagementConfigurationsClient {
+	return original.NewManagementConfigurationsClient(subscriptionID, providerName, resourceType, resourceName)
 }
-func NewSolutionsClientWithBaseURI(baseURI string, subscriptionID string, providerName string, resourceType string, resourceName string) SolutionsClient {
-	return original.NewSolutionsClientWithBaseURI(baseURI, subscriptionID, providerName, resourceType, resourceName)
+func NewManagementConfigurationsClientWithBaseURI(baseURI string, subscriptionID string, providerName string, resourceType string, resourceName string) ManagementConfigurationsClient {
+	return original.NewManagementConfigurationsClientWithBaseURI(baseURI, subscriptionID, providerName, resourceType, resourceName)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string, providerName string, resourceType string, resourceName string) BaseClient {
+	return original.New(subscriptionID, providerName, resourceType, resourceName)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string, providerName string, resourceType string, resourceName string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID, providerName, resourceType, resourceName)
 }
diff --git a/profiles/preview/policyinsights/mgmt/policyinsights/models.go b/profiles/preview/policyinsights/mgmt/policyinsights/models.go
index 71298066fca7..7a29d6913170 100644
--- a/profiles/preview/policyinsights/mgmt/policyinsights/models.go
+++ b/profiles/preview/policyinsights/mgmt/policyinsights/models.go
@@ -21,17 +21,22 @@ package policyinsights
 
 import original "github.com/Azure/azure-sdk-for-go/services/policyinsights/mgmt/2017-12-12-preview/policyinsights"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type OperationsClient = original.OperationsClient
 
-type BaseClient = original.BaseClient
+func NewOperationsClient() OperationsClient {
+	return original.NewOperationsClient()
+}
+func NewOperationsClientWithBaseURI(baseURI string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI)
+}
 
-func New() BaseClient {
-	return original.New()
+type PolicyStatesClient = original.PolicyStatesClient
+
+func NewPolicyStatesClient() PolicyStatesClient {
+	return original.NewPolicyStatesClient()
 }
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
+func NewPolicyStatesClientWithBaseURI(baseURI string) PolicyStatesClient {
+	return original.NewPolicyStatesClientWithBaseURI(baseURI)
 }
 
 type PolicyStatesResource = original.PolicyStatesResource
@@ -60,15 +65,6 @@ type String = original.String
 type SummarizeResults = original.SummarizeResults
 type Summary = original.Summary
 type SummaryResults = original.SummaryResults
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient() OperationsClient {
-	return original.NewOperationsClient()
-}
-func NewOperationsClientWithBaseURI(baseURI string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI)
-}
-
 type PolicyEventsClient = original.PolicyEventsClient
 
 func NewPolicyEventsClient() PolicyEventsClient {
@@ -77,18 +73,22 @@ func NewPolicyEventsClient() PolicyEventsClient {
 func NewPolicyEventsClientWithBaseURI(baseURI string) PolicyEventsClient {
 	return original.NewPolicyEventsClientWithBaseURI(baseURI)
 }
-
-type PolicyStatesClient = original.PolicyStatesClient
-
-func NewPolicyStatesClient() PolicyStatesClient {
-	return original.NewPolicyStatesClient()
-}
-func NewPolicyStatesClientWithBaseURI(baseURI string) PolicyStatesClient {
-	return original.NewPolicyStatesClientWithBaseURI(baseURI)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
diff --git a/profiles/preview/postgresql/mgmt/postgresql/models.go b/profiles/preview/postgresql/mgmt/postgresql/models.go
index 796a3f49995b..d2de628af88a 100644
--- a/profiles/preview/postgresql/mgmt/postgresql/models.go
+++ b/profiles/preview/postgresql/mgmt/postgresql/models.go
@@ -21,26 +21,13 @@ package postgresql
 
 import original "github.com/Azure/azure-sdk-for-go/services/postgresql/mgmt/2017-12-01/postgresql"
 
-type CheckNameAvailabilityClient = original.CheckNameAvailabilityClient
-
-func NewCheckNameAvailabilityClient(subscriptionID string) CheckNameAvailabilityClient {
-	return original.NewCheckNameAvailabilityClient(subscriptionID)
-}
-func NewCheckNameAvailabilityClientWithBaseURI(baseURI string, subscriptionID string) CheckNameAvailabilityClient {
-	return original.NewCheckNameAvailabilityClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ConfigurationsClient = original.ConfigurationsClient
@@ -52,22 +39,13 @@ func NewConfigurationsClientWithBaseURI(baseURI string, subscriptionID string) C
 	return original.NewConfigurationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DatabasesClient = original.DatabasesClient
-
-func NewDatabasesClient(subscriptionID string) DatabasesClient {
-	return original.NewDatabasesClient(subscriptionID)
-}
-func NewDatabasesClientWithBaseURI(baseURI string, subscriptionID string) DatabasesClient {
-	return original.NewDatabasesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type FirewallRulesClient = original.FirewallRulesClient
+type ServersClient = original.ServersClient
 
-func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClient(subscriptionID)
+func NewServersClient(subscriptionID string) ServersClient {
+	return original.NewServersClient(subscriptionID)
 }
-func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
+func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersClient {
+	return original.NewServersClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type LocationBasedPerformanceTierClient = original.LocationBasedPerformanceTierClient
@@ -79,15 +57,6 @@ func NewLocationBasedPerformanceTierClientWithBaseURI(baseURI string, subscripti
 	return original.NewLocationBasedPerformanceTierClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LogFilesClient = original.LogFilesClient
-
-func NewLogFilesClient(subscriptionID string) LogFilesClient {
-	return original.NewLogFilesClient(subscriptionID)
-}
-func NewLogFilesClientWithBaseURI(baseURI string, subscriptionID string) LogFilesClient {
-	return original.NewLogFilesClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type CreateMode = original.CreateMode
 
 const (
@@ -213,22 +182,13 @@ type ServerUpdateParametersProperties = original.ServerUpdateParametersPropertie
 type Sku = original.Sku
 type StorageProfile = original.StorageProfile
 type TrackedResource = original.TrackedResource
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ServersClient = original.ServersClient
+type DatabasesClient = original.DatabasesClient
 
-func NewServersClient(subscriptionID string) ServersClient {
-	return original.NewServersClient(subscriptionID)
+func NewDatabasesClient(subscriptionID string) DatabasesClient {
+	return original.NewDatabasesClient(subscriptionID)
 }
-func NewServersClientWithBaseURI(baseURI string, subscriptionID string) ServersClient {
-	return original.NewServersClientWithBaseURI(baseURI, subscriptionID)
+func NewDatabasesClientWithBaseURI(baseURI string, subscriptionID string) DatabasesClient {
+	return original.NewDatabasesClientWithBaseURI(baseURI, subscriptionID)
 }
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
@@ -236,3 +196,43 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type FirewallRulesClient = original.FirewallRulesClient
+
+func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClient(subscriptionID)
+}
+func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type CheckNameAvailabilityClient = original.CheckNameAvailabilityClient
+
+func NewCheckNameAvailabilityClient(subscriptionID string) CheckNameAvailabilityClient {
+	return original.NewCheckNameAvailabilityClient(subscriptionID)
+}
+func NewCheckNameAvailabilityClientWithBaseURI(baseURI string, subscriptionID string) CheckNameAvailabilityClient {
+	return original.NewCheckNameAvailabilityClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type LogFilesClient = original.LogFilesClient
+
+func NewLogFilesClient(subscriptionID string) LogFilesClient {
+	return original.NewLogFilesClient(subscriptionID)
+}
+func NewLogFilesClientWithBaseURI(baseURI string, subscriptionID string) LogFilesClient {
+	return original.NewLogFilesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/powerbidedicated/mgmt/powerbidedicated/models.go b/profiles/preview/powerbidedicated/mgmt/powerbidedicated/models.go
index 19d11ada135c..57d85c58631e 100644
--- a/profiles/preview/powerbidedicated/mgmt/powerbidedicated/models.go
+++ b/profiles/preview/powerbidedicated/mgmt/powerbidedicated/models.go
@@ -21,26 +21,13 @@ package powerbidedicated
 
 import original "github.com/Azure/azure-sdk-for-go/services/powerbidedicated/mgmt/2017-10-01/powerbidedicated"
 
-type CapacitiesClient = original.CapacitiesClient
-
-func NewCapacitiesClient(subscriptionID string) CapacitiesClient {
-	return original.NewCapacitiesClient(subscriptionID)
-}
-func NewCapacitiesClientWithBaseURI(baseURI string, subscriptionID string) CapacitiesClient {
-	return original.NewCapacitiesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ProvisioningState = original.ProvisioningState
@@ -117,17 +104,32 @@ type ResourceSku = original.ResourceSku
 type SkuDetailsForExistingResource = original.SkuDetailsForExistingResource
 type SkuEnumerationForExistingResourceResult = original.SkuEnumerationForExistingResourceResult
 type SkuEnumerationForNewResourceResult = original.SkuEnumerationForNewResourceResult
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+type CapacitiesClient = original.CapacitiesClient
+
+func NewCapacitiesClient(subscriptionID string) CapacitiesClient {
+	return original.NewCapacitiesClient(subscriptionID)
+}
+func NewCapacitiesClientWithBaseURI(baseURI string, subscriptionID string) CapacitiesClient {
+	return original.NewCapacitiesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/powerbiembedded/mgmt/powerbiembedded/models.go b/profiles/preview/powerbiembedded/mgmt/powerbiembedded/models.go
index 69921ce5b8f7..e8c8592fd8ae 100644
--- a/profiles/preview/powerbiembedded/mgmt/powerbiembedded/models.go
+++ b/profiles/preview/powerbiembedded/mgmt/powerbiembedded/models.go
@@ -21,17 +21,13 @@ package powerbiembedded
 
 import original "github.com/Azure/azure-sdk-for-go/services/powerbiembedded/mgmt/2016-01-29/powerbiembedded"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type WorkspaceCollectionsClient = original.WorkspaceCollectionsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewWorkspaceCollectionsClient(subscriptionID string) WorkspaceCollectionsClient {
+	return original.NewWorkspaceCollectionsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewWorkspaceCollectionsClientWithBaseURI(baseURI string, subscriptionID string) WorkspaceCollectionsClient {
+	return original.NewWorkspaceCollectionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccessKeyName = original.AccessKeyName
@@ -82,15 +78,6 @@ func Version() string {
 	return original.Version()
 }
 
-type WorkspaceCollectionsClient = original.WorkspaceCollectionsClient
-
-func NewWorkspaceCollectionsClient(subscriptionID string) WorkspaceCollectionsClient {
-	return original.NewWorkspaceCollectionsClient(subscriptionID)
-}
-func NewWorkspaceCollectionsClientWithBaseURI(baseURI string, subscriptionID string) WorkspaceCollectionsClient {
-	return original.NewWorkspaceCollectionsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type WorkspacesClient = original.WorkspacesClient
 
 func NewWorkspacesClient(subscriptionID string) WorkspacesClient {
@@ -99,3 +86,16 @@ func NewWorkspacesClient(subscriptionID string) WorkspacesClient {
 func NewWorkspacesClientWithBaseURI(baseURI string, subscriptionID string) WorkspacesClient {
 	return original.NewWorkspacesClientWithBaseURI(baseURI, subscriptionID)
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/preview/apimanagement/ctrl/apimanagement/models.go b/profiles/preview/preview/apimanagement/ctrl/apimanagement/models.go
index 4a9bbbb49b9e..fd8c2a40ceac 100644
--- a/profiles/preview/preview/apimanagement/ctrl/apimanagement/models.go
+++ b/profiles/preview/preview/apimanagement/ctrl/apimanagement/models.go
@@ -21,109 +21,88 @@ package apimanagement
 
 import original "github.com/Azure/azure-sdk-for-go/services/preview/apimanagement/ctrl/2017-03-01/apimanagement"
 
-type APIClient = original.APIClient
-
-func NewAPIClient() APIClient {
-	return original.NewAPIClient()
-}
-
-type APIExportClient = original.APIExportClient
-
-func NewAPIExportClient() APIExportClient {
-	return original.NewAPIExportClient()
-}
-
-type APIOperationClient = original.APIOperationClient
-
-func NewAPIOperationClient() APIOperationClient {
-	return original.NewAPIOperationClient()
-}
-
-type APIOperationPolicyClient = original.APIOperationPolicyClient
+type BackendClient = original.BackendClient
 
-func NewAPIOperationPolicyClient() APIOperationPolicyClient {
-	return original.NewAPIOperationPolicyClient()
+func NewBackendClient() BackendClient {
+	return original.NewBackendClient()
 }
 
-type APIPolicyClient = original.APIPolicyClient
+type RegionsClient = original.RegionsClient
 
-func NewAPIPolicyClient() APIPolicyClient {
-	return original.NewAPIPolicyClient()
+func NewRegionsClient() RegionsClient {
+	return original.NewRegionsClient()
 }
 
-type APIProductClient = original.APIProductClient
+type UserGroupClient = original.UserGroupClient
 
-func NewAPIProductClient() APIProductClient {
-	return original.NewAPIProductClient()
+func NewUserGroupClient() UserGroupClient {
+	return original.NewUserGroupClient()
 }
 
-type APISchemaClient = original.APISchemaClient
+type ProductAPIClient = original.ProductAPIClient
 
-func NewAPISchemaClient() APISchemaClient {
-	return original.NewAPISchemaClient()
+func NewProductAPIClient() ProductAPIClient {
+	return original.NewProductAPIClient()
 }
 
-type AuthorizationServerClient = original.AuthorizationServerClient
+type SignUpSettingsClient = original.SignUpSettingsClient
 
-func NewAuthorizationServerClient() AuthorizationServerClient {
-	return original.NewAuthorizationServerClient()
+func NewSignUpSettingsClient() SignUpSettingsClient {
+	return original.NewSignUpSettingsClient()
 }
 
-type BackendClient = original.BackendClient
+type PropertyClient = original.PropertyClient
 
-func NewBackendClient() BackendClient {
-	return original.NewBackendClient()
+func NewPropertyClient() PropertyClient {
+	return original.NewPropertyClient()
 }
 
-type CertificateClient = original.CertificateClient
+type TenantConfigurationClient = original.TenantConfigurationClient
 
-func NewCertificateClient() CertificateClient {
-	return original.NewCertificateClient()
+func NewTenantConfigurationClient() TenantConfigurationClient {
+	return original.NewTenantConfigurationClient()
 }
 
-type BaseClient = original.BaseClient
+type PolicySnippetsClient = original.PolicySnippetsClient
 
-func New() BaseClient {
-	return original.New()
-}
-func NewWithoutDefaults() BaseClient {
-	return original.NewWithoutDefaults()
+func NewPolicySnippetsClient() PolicySnippetsClient {
+	return original.NewPolicySnippetsClient()
 }
 
-type DelegationSettingsClient = original.DelegationSettingsClient
+type AuthorizationServerClient = original.AuthorizationServerClient
 
-func NewDelegationSettingsClient() DelegationSettingsClient {
-	return original.NewDelegationSettingsClient()
+func NewAuthorizationServerClient() AuthorizationServerClient {
+	return original.NewAuthorizationServerClient()
 }
 
-type EmailTemplateClient = original.EmailTemplateClient
+type IdentityProviderClient = original.IdentityProviderClient
 
-func NewEmailTemplateClient() EmailTemplateClient {
-	return original.NewEmailTemplateClient()
+func NewIdentityProviderClient() IdentityProviderClient {
+	return original.NewIdentityProviderClient()
 }
 
-type GroupClient = original.GroupClient
+type UserSubscriptionClient = original.UserSubscriptionClient
 
-func NewGroupClient() GroupClient {
-	return original.NewGroupClient()
+func NewUserSubscriptionClient() UserSubscriptionClient {
+	return original.NewUserSubscriptionClient()
 }
 
-type GroupUserClient = original.GroupUserClient
+type UserIdentitiesClient = original.UserIdentitiesClient
 
-func NewGroupUserClient() GroupUserClient {
-	return original.NewGroupUserClient()
+func NewUserIdentitiesClient() UserIdentitiesClient {
+	return original.NewUserIdentitiesClient()
 }
 
-type IdentityProviderClient = original.IdentityProviderClient
+type TenantAccessClient = original.TenantAccessClient
 
-func NewIdentityProviderClient() IdentityProviderClient {
-	return original.NewIdentityProviderClient()
+func NewTenantAccessClient() TenantAccessClient {
+	return original.NewTenantAccessClient()
 }
 
-type LoggerClient = original.LoggerClient
+type ProductClient = original.ProductClient
 
-func NewLoggerClient() LoggerClient {
-	return original.NewLoggerClient()
+func NewProductClient() ProductClient {
+	return original.NewProductClient()
 }
 
 type APIType = original.APIType
@@ -518,82 +497,94 @@ type UserTokenParameters = original.UserTokenParameters
 type UserTokenResult = original.UserTokenResult
 type UserUpdateParameters = original.UserUpdateParameters
 type X509CertificateName = original.X509CertificateName
-type OpenIDConnectProviderClient = original.OpenIDConnectProviderClient
+type ProductGroupClient = original.ProductGroupClient
 
-func NewOpenIDConnectProviderClient() OpenIDConnectProviderClient {
-	return original.NewOpenIDConnectProviderClient()
+func NewProductGroupClient() ProductGroupClient {
+	return original.NewProductGroupClient()
 }
 
-type PolicyClient = original.PolicyClient
+type EmailTemplateClient = original.EmailTemplateClient
 
-func NewPolicyClient() PolicyClient {
-	return original.NewPolicyClient()
+func NewEmailTemplateClient() EmailTemplateClient {
+	return original.NewEmailTemplateClient()
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
 }
 
-type PolicySnippetsClient = original.PolicySnippetsClient
+type OpenIDConnectProviderClient = original.OpenIDConnectProviderClient
 
-func NewPolicySnippetsClient() PolicySnippetsClient {
-	return original.NewPolicySnippetsClient()
+func NewOpenIDConnectProviderClient() OpenIDConnectProviderClient {
+	return original.NewOpenIDConnectProviderClient()
 }
 
-type ProductClient = original.ProductClient
+type QuotaByCounterKeysClient = original.QuotaByCounterKeysClient
 
-func NewProductClient() ProductClient {
-	return original.NewProductClient()
+func NewQuotaByCounterKeysClient() QuotaByCounterKeysClient {
+	return original.NewQuotaByCounterKeysClient()
 }
 
-type ProductAPIClient = original.ProductAPIClient
+type SubscriptionClient = original.SubscriptionClient
 
-func NewProductAPIClient() ProductAPIClient {
-	return original.NewProductAPIClient()
+func NewSubscriptionClient() SubscriptionClient {
+	return original.NewSubscriptionClient()
 }
 
-type ProductGroupClient = original.ProductGroupClient
+type DelegationSettingsClient = original.DelegationSettingsClient
 
-func NewProductGroupClient() ProductGroupClient {
-	return original.NewProductGroupClient()
+func NewDelegationSettingsClient() DelegationSettingsClient {
+	return original.NewDelegationSettingsClient()
 }
 
-type ProductPolicyClient = original.ProductPolicyClient
+type LoggerClient = original.LoggerClient
 
-func NewProductPolicyClient() ProductPolicyClient {
-	return original.NewProductPolicyClient()
+func NewLoggerClient() LoggerClient {
+	return original.NewLoggerClient()
 }
 
-type ProductSubscriptionsClient = original.ProductSubscriptionsClient
+type APIOperationPolicyClient = original.APIOperationPolicyClient
 
-func NewProductSubscriptionsClient() ProductSubscriptionsClient {
-	return original.NewProductSubscriptionsClient()
+func NewAPIOperationPolicyClient() APIOperationPolicyClient {
+	return original.NewAPIOperationPolicyClient()
 }
 
-type PropertyClient = original.PropertyClient
+type CertificateClient = original.CertificateClient
 
-func NewPropertyClient() PropertyClient {
-	return original.NewPropertyClient()
+func NewCertificateClient() CertificateClient {
+	return original.NewCertificateClient()
 }
 
-type QuotaByCounterKeysClient = original.QuotaByCounterKeysClient
+type APIPolicyClient = original.APIPolicyClient
 
-func NewQuotaByCounterKeysClient() QuotaByCounterKeysClient {
-	return original.NewQuotaByCounterKeysClient()
+func NewAPIPolicyClient() APIPolicyClient {
+	return original.NewAPIPolicyClient()
 }
 
-type QuotaByPeriodKeysClient = original.QuotaByPeriodKeysClient
+type ReportsClient = original.ReportsClient
 
-func NewQuotaByPeriodKeysClient() QuotaByPeriodKeysClient {
-	return original.NewQuotaByPeriodKeysClient()
+func NewReportsClient() ReportsClient {
+	return original.NewReportsClient()
 }
 
-type RegionsClient = original.RegionsClient
+type APIProductClient = original.APIProductClient
 
-func NewRegionsClient() RegionsClient {
-	return original.NewRegionsClient()
+func NewAPIProductClient() APIProductClient {
+	return original.NewAPIProductClient()
 }
 
-type ReportsClient = original.ReportsClient
+type APISchemaClient = original.APISchemaClient
 
-func NewReportsClient() ReportsClient {
-	return original.NewReportsClient()
+func NewAPISchemaClient() APISchemaClient {
+	return original.NewAPISchemaClient()
+}
+
+type ProductSubscriptionsClient = original.ProductSubscriptionsClient
+
+func NewProductSubscriptionsClient() ProductSubscriptionsClient {
+	return original.NewProductSubscriptionsClient()
 }
 
 type SignInSettingsClient = original.SignInSettingsClient
@@ -602,34 +593,34 @@ func NewSignInSettingsClient() SignInSettingsClient {
 	return original.NewSignInSettingsClient()
 }
 
-type SignUpSettingsClient = original.SignUpSettingsClient
+type GroupUserClient = original.GroupUserClient
 
-func NewSignUpSettingsClient() SignUpSettingsClient {
-	return original.NewSignUpSettingsClient()
+func NewGroupUserClient() GroupUserClient {
+	return original.NewGroupUserClient()
 }
 
-type SubscriptionClient = original.SubscriptionClient
+type APIExportClient = original.APIExportClient
 
-func NewSubscriptionClient() SubscriptionClient {
-	return original.NewSubscriptionClient()
+func NewAPIExportClient() APIExportClient {
+	return original.NewAPIExportClient()
 }
 
-type TenantAccessClient = original.TenantAccessClient
+type GroupClient = original.GroupClient
 
-func NewTenantAccessClient() TenantAccessClient {
-	return original.NewTenantAccessClient()
+func NewGroupClient() GroupClient {
+	return original.NewGroupClient()
 }
 
-type TenantAccessGitClient = original.TenantAccessGitClient
+type APIClient = original.APIClient
 
-func NewTenantAccessGitClient() TenantAccessGitClient {
-	return original.NewTenantAccessGitClient()
+func NewAPIClient() APIClient {
+	return original.NewAPIClient()
 }
 
-type TenantConfigurationClient = original.TenantConfigurationClient
+type TenantAccessGitClient = original.TenantAccessGitClient
 
-func NewTenantConfigurationClient() TenantConfigurationClient {
-	return original.NewTenantConfigurationClient()
+func NewTenantAccessGitClient() TenantAccessGitClient {
+	return original.NewTenantAccessGitClient()
 }
 
 type UserClient = original.UserClient
@@ -638,26 +629,35 @@ func NewUserClient() UserClient {
 	return original.NewUserClient()
 }
 
-type UserGroupClient = original.UserGroupClient
+type ProductPolicyClient = original.ProductPolicyClient
 
-func NewUserGroupClient() UserGroupClient {
-	return original.NewUserGroupClient()
+func NewProductPolicyClient() ProductPolicyClient {
+	return original.NewProductPolicyClient()
 }
 
-type UserIdentitiesClient = original.UserIdentitiesClient
+type BaseClient = original.BaseClient
 
-func NewUserIdentitiesClient() UserIdentitiesClient {
-	return original.NewUserIdentitiesClient()
+func New() BaseClient {
+	return original.New()
+}
+func NewWithoutDefaults() BaseClient {
+	return original.NewWithoutDefaults()
 }
 
-type UserSubscriptionClient = original.UserSubscriptionClient
+type APIOperationClient = original.APIOperationClient
 
-func NewUserSubscriptionClient() UserSubscriptionClient {
-	return original.NewUserSubscriptionClient()
+func NewAPIOperationClient() APIOperationClient {
+	return original.NewAPIOperationClient()
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+type PolicyClient = original.PolicyClient
+
+func NewPolicyClient() PolicyClient {
+	return original.NewPolicyClient()
 }
-func Version() string {
-	return original.Version()
+
+type QuotaByPeriodKeysClient = original.QuotaByPeriodKeysClient
+
+func NewQuotaByPeriodKeysClient() QuotaByPeriodKeysClient {
+	return original.NewQuotaByPeriodKeysClient()
 }
diff --git a/profiles/preview/preview/apimanagement/mgmt/apimanagement/models.go b/profiles/preview/preview/apimanagement/mgmt/apimanagement/models.go
index 068f121617d0..c15558742e17 100644
--- a/profiles/preview/preview/apimanagement/mgmt/apimanagement/models.go
+++ b/profiles/preview/preview/apimanagement/mgmt/apimanagement/models.go
@@ -21,85 +21,85 @@ package apimanagement
 
 import original "github.com/Azure/azure-sdk-for-go/services/preview/apimanagement/mgmt/2018-01-01/apimanagement"
 
-type APIClient = original.APIClient
+type BackendClient = original.BackendClient
 
-func NewAPIClient(subscriptionID string) APIClient {
-	return original.NewAPIClient(subscriptionID)
+func NewBackendClient(subscriptionID string) BackendClient {
+	return original.NewBackendClient(subscriptionID)
 }
-func NewAPIClientWithBaseURI(baseURI string, subscriptionID string) APIClient {
-	return original.NewAPIClientWithBaseURI(baseURI, subscriptionID)
+func NewBackendClientWithBaseURI(baseURI string, subscriptionID string) BackendClient {
+	return original.NewBackendClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIDiagnosticClient = original.APIDiagnosticClient
+type ServiceClient = original.ServiceClient
 
-func NewAPIDiagnosticClient(subscriptionID string) APIDiagnosticClient {
-	return original.NewAPIDiagnosticClient(subscriptionID)
+func NewServiceClient(subscriptionID string) ServiceClient {
+	return original.NewServiceClient(subscriptionID)
 }
-func NewAPIDiagnosticClientWithBaseURI(baseURI string, subscriptionID string) APIDiagnosticClient {
-	return original.NewAPIDiagnosticClientWithBaseURI(baseURI, subscriptionID)
+func NewServiceClientWithBaseURI(baseURI string, subscriptionID string) ServiceClient {
+	return original.NewServiceClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIDiagnosticLoggerClient = original.APIDiagnosticLoggerClient
+type RegionsClient = original.RegionsClient
 
-func NewAPIDiagnosticLoggerClient(subscriptionID string) APIDiagnosticLoggerClient {
-	return original.NewAPIDiagnosticLoggerClient(subscriptionID)
+func NewRegionsClient(subscriptionID string) RegionsClient {
+	return original.NewRegionsClient(subscriptionID)
 }
-func NewAPIDiagnosticLoggerClientWithBaseURI(baseURI string, subscriptionID string) APIDiagnosticLoggerClient {
-	return original.NewAPIDiagnosticLoggerClientWithBaseURI(baseURI, subscriptionID)
+func NewRegionsClientWithBaseURI(baseURI string, subscriptionID string) RegionsClient {
+	return original.NewRegionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIExportClient = original.APIExportClient
+type OperationsClient = original.OperationsClient
 
-func NewAPIExportClient(subscriptionID string) APIExportClient {
-	return original.NewAPIExportClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewAPIExportClientWithBaseURI(baseURI string, subscriptionID string) APIExportClient {
-	return original.NewAPIExportClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIOperationClient = original.APIOperationClient
+type UserGroupClient = original.UserGroupClient
 
-func NewAPIOperationClient(subscriptionID string) APIOperationClient {
-	return original.NewAPIOperationClient(subscriptionID)
+func NewUserGroupClient(subscriptionID string) UserGroupClient {
+	return original.NewUserGroupClient(subscriptionID)
 }
-func NewAPIOperationClientWithBaseURI(baseURI string, subscriptionID string) APIOperationClient {
-	return original.NewAPIOperationClientWithBaseURI(baseURI, subscriptionID)
+func NewUserGroupClientWithBaseURI(baseURI string, subscriptionID string) UserGroupClient {
+	return original.NewUserGroupClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIOperationPolicyClient = original.APIOperationPolicyClient
+type ProductAPIClient = original.ProductAPIClient
 
-func NewAPIOperationPolicyClient(subscriptionID string) APIOperationPolicyClient {
-	return original.NewAPIOperationPolicyClient(subscriptionID)
+func NewProductAPIClient(subscriptionID string) ProductAPIClient {
+	return original.NewProductAPIClient(subscriptionID)
 }
-func NewAPIOperationPolicyClientWithBaseURI(baseURI string, subscriptionID string) APIOperationPolicyClient {
-	return original.NewAPIOperationPolicyClientWithBaseURI(baseURI, subscriptionID)
+func NewProductAPIClientWithBaseURI(baseURI string, subscriptionID string) ProductAPIClient {
+	return original.NewProductAPIClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIPolicyClient = original.APIPolicyClient
+type SignUpSettingsClient = original.SignUpSettingsClient
 
-func NewAPIPolicyClient(subscriptionID string) APIPolicyClient {
-	return original.NewAPIPolicyClient(subscriptionID)
+func NewSignUpSettingsClient(subscriptionID string) SignUpSettingsClient {
+	return original.NewSignUpSettingsClient(subscriptionID)
 }
-func NewAPIPolicyClientWithBaseURI(baseURI string, subscriptionID string) APIPolicyClient {
-	return original.NewAPIPolicyClientWithBaseURI(baseURI, subscriptionID)
+func NewSignUpSettingsClientWithBaseURI(baseURI string, subscriptionID string) SignUpSettingsClient {
+	return original.NewSignUpSettingsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIProductClient = original.APIProductClient
+type APIDiagnosticClient = original.APIDiagnosticClient
 
-func NewAPIProductClient(subscriptionID string) APIProductClient {
-	return original.NewAPIProductClient(subscriptionID)
+func NewAPIDiagnosticClient(subscriptionID string) APIDiagnosticClient {
+	return original.NewAPIDiagnosticClient(subscriptionID)
 }
-func NewAPIProductClientWithBaseURI(baseURI string, subscriptionID string) APIProductClient {
-	return original.NewAPIProductClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIDiagnosticClientWithBaseURI(baseURI string, subscriptionID string) APIDiagnosticClient {
+	return original.NewAPIDiagnosticClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIReleaseClient = original.APIReleaseClient
+type PropertyClient = original.PropertyClient
 
-func NewAPIReleaseClient(subscriptionID string) APIReleaseClient {
-	return original.NewAPIReleaseClient(subscriptionID)
+func NewPropertyClient(subscriptionID string) PropertyClient {
+	return original.NewPropertyClient(subscriptionID)
 }
-func NewAPIReleaseClientWithBaseURI(baseURI string, subscriptionID string) APIReleaseClient {
-	return original.NewAPIReleaseClientWithBaseURI(baseURI, subscriptionID)
+func NewPropertyClientWithBaseURI(baseURI string, subscriptionID string) PropertyClient {
+	return original.NewPropertyClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type APIRevisionsClient = original.APIRevisionsClient
@@ -111,22 +111,31 @@ func NewAPIRevisionsClientWithBaseURI(baseURI string, subscriptionID string) API
 	return original.NewAPIRevisionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APISchemaClient = original.APISchemaClient
+type OperationClient = original.OperationClient
 
-func NewAPISchemaClient(subscriptionID string) APISchemaClient {
-	return original.NewAPISchemaClient(subscriptionID)
+func NewOperationClient(subscriptionID string) OperationClient {
+	return original.NewOperationClient(subscriptionID)
 }
-func NewAPISchemaClientWithBaseURI(baseURI string, subscriptionID string) APISchemaClient {
-	return original.NewAPISchemaClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationClientWithBaseURI(baseURI string, subscriptionID string) OperationClient {
+	return original.NewOperationClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type APIVersionSetClient = original.APIVersionSetClient
+type TenantConfigurationClient = original.TenantConfigurationClient
 
-func NewAPIVersionSetClient(subscriptionID string) APIVersionSetClient {
-	return original.NewAPIVersionSetClient(subscriptionID)
+func NewTenantConfigurationClient(subscriptionID string) TenantConfigurationClient {
+	return original.NewTenantConfigurationClient(subscriptionID)
 }
-func NewAPIVersionSetClientWithBaseURI(baseURI string, subscriptionID string) APIVersionSetClient {
-	return original.NewAPIVersionSetClientWithBaseURI(baseURI, subscriptionID)
+func NewTenantConfigurationClientWithBaseURI(baseURI string, subscriptionID string) TenantConfigurationClient {
+	return original.NewTenantConfigurationClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type PolicySnippetsClient = original.PolicySnippetsClient
+
+func NewPolicySnippetsClient(subscriptionID string) PolicySnippetsClient {
+	return original.NewPolicySnippetsClient(subscriptionID)
+}
+func NewPolicySnippetsClientWithBaseURI(baseURI string, subscriptionID string) PolicySnippetsClient {
+	return original.NewPolicySnippetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AuthorizationServerClient = original.AuthorizationServerClient
@@ -138,107 +147,49 @@ func NewAuthorizationServerClientWithBaseURI(baseURI string, subscriptionID stri
 	return original.NewAuthorizationServerClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type BackendClient = original.BackendClient
-
-func NewBackendClient(subscriptionID string) BackendClient {
-	return original.NewBackendClient(subscriptionID)
-}
-func NewBackendClientWithBaseURI(baseURI string, subscriptionID string) BackendClient {
-	return original.NewBackendClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type CertificateClient = original.CertificateClient
-
-func NewCertificateClient(subscriptionID string) CertificateClient {
-	return original.NewCertificateClient(subscriptionID)
-}
-func NewCertificateClientWithBaseURI(baseURI string, subscriptionID string) CertificateClient {
-	return original.NewCertificateClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type DelegationSettingsClient = original.DelegationSettingsClient
-
-func NewDelegationSettingsClient(subscriptionID string) DelegationSettingsClient {
-	return original.NewDelegationSettingsClient(subscriptionID)
-}
-func NewDelegationSettingsClientWithBaseURI(baseURI string, subscriptionID string) DelegationSettingsClient {
-	return original.NewDelegationSettingsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type DiagnosticClient = original.DiagnosticClient
-
-func NewDiagnosticClient(subscriptionID string) DiagnosticClient {
-	return original.NewDiagnosticClient(subscriptionID)
-}
-func NewDiagnosticClientWithBaseURI(baseURI string, subscriptionID string) DiagnosticClient {
-	return original.NewDiagnosticClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type DiagnosticLoggerClient = original.DiagnosticLoggerClient
-
-func NewDiagnosticLoggerClient(subscriptionID string) DiagnosticLoggerClient {
-	return original.NewDiagnosticLoggerClient(subscriptionID)
-}
-func NewDiagnosticLoggerClientWithBaseURI(baseURI string, subscriptionID string) DiagnosticLoggerClient {
-	return original.NewDiagnosticLoggerClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type EmailTemplateClient = original.EmailTemplateClient
+type IdentityProviderClient = original.IdentityProviderClient
 
-func NewEmailTemplateClient(subscriptionID string) EmailTemplateClient {
-	return original.NewEmailTemplateClient(subscriptionID)
+func NewIdentityProviderClient(subscriptionID string) IdentityProviderClient {
+	return original.NewIdentityProviderClient(subscriptionID)
 }
-func NewEmailTemplateClientWithBaseURI(baseURI string, subscriptionID string) EmailTemplateClient {
-	return original.NewEmailTemplateClientWithBaseURI(baseURI, subscriptionID)
+func NewIdentityProviderClientWithBaseURI(baseURI string, subscriptionID string) IdentityProviderClient {
+	return original.NewIdentityProviderClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type GroupClient = original.GroupClient
+type UserSubscriptionClient = original.UserSubscriptionClient
 
-func NewGroupClient(subscriptionID string) GroupClient {
-	return original.NewGroupClient(subscriptionID)
+func NewUserSubscriptionClient(subscriptionID string) UserSubscriptionClient {
+	return original.NewUserSubscriptionClient(subscriptionID)
 }
-func NewGroupClientWithBaseURI(baseURI string, subscriptionID string) GroupClient {
-	return original.NewGroupClientWithBaseURI(baseURI, subscriptionID)
+func NewUserSubscriptionClientWithBaseURI(baseURI string, subscriptionID string) UserSubscriptionClient {
+	return original.NewUserSubscriptionClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type GroupUserClient = original.GroupUserClient
+type UserIdentitiesClient = original.UserIdentitiesClient
 
-func NewGroupUserClient(subscriptionID string) GroupUserClient {
-	return original.NewGroupUserClient(subscriptionID)
+func NewUserIdentitiesClient(subscriptionID string) UserIdentitiesClient {
+	return original.NewUserIdentitiesClient(subscriptionID)
 }
-func NewGroupUserClientWithBaseURI(baseURI string, subscriptionID string) GroupUserClient {
-	return original.NewGroupUserClientWithBaseURI(baseURI, subscriptionID)
+func NewUserIdentitiesClientWithBaseURI(baseURI string, subscriptionID string) UserIdentitiesClient {
+	return original.NewUserIdentitiesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type IdentityProviderClient = original.IdentityProviderClient
+type TenantAccessClient = original.TenantAccessClient
 
-func NewIdentityProviderClient(subscriptionID string) IdentityProviderClient {
-	return original.NewIdentityProviderClient(subscriptionID)
+func NewTenantAccessClient(subscriptionID string) TenantAccessClient {
+	return original.NewTenantAccessClient(subscriptionID)
 }
-func NewIdentityProviderClientWithBaseURI(baseURI string, subscriptionID string) IdentityProviderClient {
-	return original.NewIdentityProviderClientWithBaseURI(baseURI, subscriptionID)
+func NewTenantAccessClientWithBaseURI(baseURI string, subscriptionID string) TenantAccessClient {
+	return original.NewTenantAccessClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LoggerClient = original.LoggerClient
+type ProductClient = original.ProductClient
 
-func NewLoggerClient(subscriptionID string) LoggerClient {
-	return original.NewLoggerClient(subscriptionID)
+func NewProductClient(subscriptionID string) ProductClient {
+	return original.NewProductClient(subscriptionID)
 }
-func NewLoggerClientWithBaseURI(baseURI string, subscriptionID string) LoggerClient {
-	return original.NewLoggerClientWithBaseURI(baseURI, subscriptionID)
+func NewProductClientWithBaseURI(baseURI string, subscriptionID string) ProductClient {
+	return original.NewProductClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type APIType = original.APIType
@@ -923,13 +874,22 @@ type UserUpdateParameters = original.UserUpdateParameters
 type UserUpdateParametersProperties = original.UserUpdateParametersProperties
 type VirtualNetworkConfiguration = original.VirtualNetworkConfiguration
 type X509CertificateName = original.X509CertificateName
-type NetworkStatusClient = original.NetworkStatusClient
+type ProductGroupClient = original.ProductGroupClient
 
-func NewNetworkStatusClient(subscriptionID string) NetworkStatusClient {
-	return original.NewNetworkStatusClient(subscriptionID)
+func NewProductGroupClient(subscriptionID string) ProductGroupClient {
+	return original.NewProductGroupClient(subscriptionID)
 }
-func NewNetworkStatusClientWithBaseURI(baseURI string, subscriptionID string) NetworkStatusClient {
-	return original.NewNetworkStatusClientWithBaseURI(baseURI, subscriptionID)
+func NewProductGroupClientWithBaseURI(baseURI string, subscriptionID string) ProductGroupClient {
+	return original.NewProductGroupClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type EmailTemplateClient = original.EmailTemplateClient
+
+func NewEmailTemplateClient(subscriptionID string) EmailTemplateClient {
+	return original.NewEmailTemplateClient(subscriptionID)
+}
+func NewEmailTemplateClientWithBaseURI(baseURI string, subscriptionID string) EmailTemplateClient {
+	return original.NewEmailTemplateClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type NotificationClient = original.NotificationClient
@@ -941,15 +901,6 @@ func NewNotificationClientWithBaseURI(baseURI string, subscriptionID string) Not
 	return original.NewNotificationClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type NotificationRecipientEmailClient = original.NotificationRecipientEmailClient
-
-func NewNotificationRecipientEmailClient(subscriptionID string) NotificationRecipientEmailClient {
-	return original.NewNotificationRecipientEmailClient(subscriptionID)
-}
-func NewNotificationRecipientEmailClientWithBaseURI(baseURI string, subscriptionID string) NotificationRecipientEmailClient {
-	return original.NewNotificationRecipientEmailClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type NotificationRecipientUserClient = original.NotificationRecipientUserClient
 
 func NewNotificationRecipientUserClient(subscriptionID string) NotificationRecipientUserClient {
@@ -959,148 +910,163 @@ func NewNotificationRecipientUserClientWithBaseURI(baseURI string, subscriptionI
 	return original.NewNotificationRecipientUserClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type OpenIDConnectProviderClient = original.OpenIDConnectProviderClient
+type APIDiagnosticLoggerClient = original.APIDiagnosticLoggerClient
 
-func NewOpenIDConnectProviderClient(subscriptionID string) OpenIDConnectProviderClient {
-	return original.NewOpenIDConnectProviderClient(subscriptionID)
+func NewAPIDiagnosticLoggerClient(subscriptionID string) APIDiagnosticLoggerClient {
+	return original.NewAPIDiagnosticLoggerClient(subscriptionID)
 }
-func NewOpenIDConnectProviderClientWithBaseURI(baseURI string, subscriptionID string) OpenIDConnectProviderClient {
-	return original.NewOpenIDConnectProviderClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIDiagnosticLoggerClientWithBaseURI(baseURI string, subscriptionID string) APIDiagnosticLoggerClient {
+	return original.NewAPIDiagnosticLoggerClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type OperationClient = original.OperationClient
+type TagClient = original.TagClient
 
-func NewOperationClient(subscriptionID string) OperationClient {
-	return original.NewOperationClient(subscriptionID)
+func NewTagClient(subscriptionID string) TagClient {
+	return original.NewTagClient(subscriptionID)
 }
-func NewOperationClientWithBaseURI(baseURI string, subscriptionID string) OperationClient {
-	return original.NewOperationClientWithBaseURI(baseURI, subscriptionID)
+func NewTagClientWithBaseURI(baseURI string, subscriptionID string) TagClient {
+	return original.NewTagClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
 }
 
-type OperationsClient = original.OperationsClient
+type DiagnosticClient = original.DiagnosticClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewDiagnosticClient(subscriptionID string) DiagnosticClient {
+	return original.NewDiagnosticClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewDiagnosticClientWithBaseURI(baseURI string, subscriptionID string) DiagnosticClient {
+	return original.NewDiagnosticClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type PolicyClient = original.PolicyClient
+type OpenIDConnectProviderClient = original.OpenIDConnectProviderClient
 
-func NewPolicyClient(subscriptionID string) PolicyClient {
-	return original.NewPolicyClient(subscriptionID)
+func NewOpenIDConnectProviderClient(subscriptionID string) OpenIDConnectProviderClient {
+	return original.NewOpenIDConnectProviderClient(subscriptionID)
 }
-func NewPolicyClientWithBaseURI(baseURI string, subscriptionID string) PolicyClient {
-	return original.NewPolicyClientWithBaseURI(baseURI, subscriptionID)
+func NewOpenIDConnectProviderClientWithBaseURI(baseURI string, subscriptionID string) OpenIDConnectProviderClient {
+	return original.NewOpenIDConnectProviderClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type PolicySnippetsClient = original.PolicySnippetsClient
+type QuotaByCounterKeysClient = original.QuotaByCounterKeysClient
 
-func NewPolicySnippetsClient(subscriptionID string) PolicySnippetsClient {
-	return original.NewPolicySnippetsClient(subscriptionID)
+func NewQuotaByCounterKeysClient(subscriptionID string) QuotaByCounterKeysClient {
+	return original.NewQuotaByCounterKeysClient(subscriptionID)
 }
-func NewPolicySnippetsClientWithBaseURI(baseURI string, subscriptionID string) PolicySnippetsClient {
-	return original.NewPolicySnippetsClientWithBaseURI(baseURI, subscriptionID)
+func NewQuotaByCounterKeysClientWithBaseURI(baseURI string, subscriptionID string) QuotaByCounterKeysClient {
+	return original.NewQuotaByCounterKeysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProductClient = original.ProductClient
+type SubscriptionClient = original.SubscriptionClient
 
-func NewProductClient(subscriptionID string) ProductClient {
-	return original.NewProductClient(subscriptionID)
+func NewSubscriptionClient(subscriptionID string) SubscriptionClient {
+	return original.NewSubscriptionClient(subscriptionID)
 }
-func NewProductClientWithBaseURI(baseURI string, subscriptionID string) ProductClient {
-	return original.NewProductClientWithBaseURI(baseURI, subscriptionID)
+func NewSubscriptionClientWithBaseURI(baseURI string, subscriptionID string) SubscriptionClient {
+	return original.NewSubscriptionClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProductAPIClient = original.ProductAPIClient
+type DelegationSettingsClient = original.DelegationSettingsClient
 
-func NewProductAPIClient(subscriptionID string) ProductAPIClient {
-	return original.NewProductAPIClient(subscriptionID)
+func NewDelegationSettingsClient(subscriptionID string) DelegationSettingsClient {
+	return original.NewDelegationSettingsClient(subscriptionID)
 }
-func NewProductAPIClientWithBaseURI(baseURI string, subscriptionID string) ProductAPIClient {
-	return original.NewProductAPIClientWithBaseURI(baseURI, subscriptionID)
+func NewDelegationSettingsClientWithBaseURI(baseURI string, subscriptionID string) DelegationSettingsClient {
+	return original.NewDelegationSettingsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProductGroupClient = original.ProductGroupClient
+type LoggerClient = original.LoggerClient
 
-func NewProductGroupClient(subscriptionID string) ProductGroupClient {
-	return original.NewProductGroupClient(subscriptionID)
+func NewLoggerClient(subscriptionID string) LoggerClient {
+	return original.NewLoggerClient(subscriptionID)
 }
-func NewProductGroupClientWithBaseURI(baseURI string, subscriptionID string) ProductGroupClient {
-	return original.NewProductGroupClientWithBaseURI(baseURI, subscriptionID)
+func NewLoggerClientWithBaseURI(baseURI string, subscriptionID string) LoggerClient {
+	return original.NewLoggerClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProductPolicyClient = original.ProductPolicyClient
+type APIOperationPolicyClient = original.APIOperationPolicyClient
 
-func NewProductPolicyClient(subscriptionID string) ProductPolicyClient {
-	return original.NewProductPolicyClient(subscriptionID)
+func NewAPIOperationPolicyClient(subscriptionID string) APIOperationPolicyClient {
+	return original.NewAPIOperationPolicyClient(subscriptionID)
 }
-func NewProductPolicyClientWithBaseURI(baseURI string, subscriptionID string) ProductPolicyClient {
-	return original.NewProductPolicyClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIOperationPolicyClientWithBaseURI(baseURI string, subscriptionID string) APIOperationPolicyClient {
+	return original.NewAPIOperationPolicyClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProductSubscriptionsClient = original.ProductSubscriptionsClient
+type CertificateClient = original.CertificateClient
 
-func NewProductSubscriptionsClient(subscriptionID string) ProductSubscriptionsClient {
-	return original.NewProductSubscriptionsClient(subscriptionID)
+func NewCertificateClient(subscriptionID string) CertificateClient {
+	return original.NewCertificateClient(subscriptionID)
 }
-func NewProductSubscriptionsClientWithBaseURI(baseURI string, subscriptionID string) ProductSubscriptionsClient {
-	return original.NewProductSubscriptionsClientWithBaseURI(baseURI, subscriptionID)
+func NewCertificateClientWithBaseURI(baseURI string, subscriptionID string) CertificateClient {
+	return original.NewCertificateClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type PropertyClient = original.PropertyClient
+type APIPolicyClient = original.APIPolicyClient
 
-func NewPropertyClient(subscriptionID string) PropertyClient {
-	return original.NewPropertyClient(subscriptionID)
+func NewAPIPolicyClient(subscriptionID string) APIPolicyClient {
+	return original.NewAPIPolicyClient(subscriptionID)
 }
-func NewPropertyClientWithBaseURI(baseURI string, subscriptionID string) PropertyClient {
-	return original.NewPropertyClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIPolicyClientWithBaseURI(baseURI string, subscriptionID string) APIPolicyClient {
+	return original.NewAPIPolicyClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type QuotaByCounterKeysClient = original.QuotaByCounterKeysClient
+type ReportsClient = original.ReportsClient
 
-func NewQuotaByCounterKeysClient(subscriptionID string) QuotaByCounterKeysClient {
-	return original.NewQuotaByCounterKeysClient(subscriptionID)
+func NewReportsClient(subscriptionID string) ReportsClient {
+	return original.NewReportsClient(subscriptionID)
 }
-func NewQuotaByCounterKeysClientWithBaseURI(baseURI string, subscriptionID string) QuotaByCounterKeysClient {
-	return original.NewQuotaByCounterKeysClientWithBaseURI(baseURI, subscriptionID)
+func NewReportsClientWithBaseURI(baseURI string, subscriptionID string) ReportsClient {
+	return original.NewReportsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type QuotaByPeriodKeysClient = original.QuotaByPeriodKeysClient
+type APIProductClient = original.APIProductClient
 
-func NewQuotaByPeriodKeysClient(subscriptionID string) QuotaByPeriodKeysClient {
-	return original.NewQuotaByPeriodKeysClient(subscriptionID)
+func NewAPIProductClient(subscriptionID string) APIProductClient {
+	return original.NewAPIProductClient(subscriptionID)
 }
-func NewQuotaByPeriodKeysClientWithBaseURI(baseURI string, subscriptionID string) QuotaByPeriodKeysClient {
-	return original.NewQuotaByPeriodKeysClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIProductClientWithBaseURI(baseURI string, subscriptionID string) APIProductClient {
+	return original.NewAPIProductClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type RegionsClient = original.RegionsClient
+type APISchemaClient = original.APISchemaClient
 
-func NewRegionsClient(subscriptionID string) RegionsClient {
-	return original.NewRegionsClient(subscriptionID)
+func NewAPISchemaClient(subscriptionID string) APISchemaClient {
+	return original.NewAPISchemaClient(subscriptionID)
 }
-func NewRegionsClientWithBaseURI(baseURI string, subscriptionID string) RegionsClient {
-	return original.NewRegionsClientWithBaseURI(baseURI, subscriptionID)
+func NewAPISchemaClientWithBaseURI(baseURI string, subscriptionID string) APISchemaClient {
+	return original.NewAPISchemaClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ReportsClient = original.ReportsClient
+type ProductSubscriptionsClient = original.ProductSubscriptionsClient
 
-func NewReportsClient(subscriptionID string) ReportsClient {
-	return original.NewReportsClient(subscriptionID)
+func NewProductSubscriptionsClient(subscriptionID string) ProductSubscriptionsClient {
+	return original.NewProductSubscriptionsClient(subscriptionID)
 }
-func NewReportsClientWithBaseURI(baseURI string, subscriptionID string) ReportsClient {
-	return original.NewReportsClientWithBaseURI(baseURI, subscriptionID)
+func NewProductSubscriptionsClientWithBaseURI(baseURI string, subscriptionID string) ProductSubscriptionsClient {
+	return original.NewProductSubscriptionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ServiceClient = original.ServiceClient
+type TagResourceClient = original.TagResourceClient
 
-func NewServiceClient(subscriptionID string) ServiceClient {
-	return original.NewServiceClient(subscriptionID)
+func NewTagResourceClient(subscriptionID string) TagResourceClient {
+	return original.NewTagResourceClient(subscriptionID)
 }
-func NewServiceClientWithBaseURI(baseURI string, subscriptionID string) ServiceClient {
-	return original.NewServiceClientWithBaseURI(baseURI, subscriptionID)
+func NewTagResourceClientWithBaseURI(baseURI string, subscriptionID string) TagResourceClient {
+	return original.NewTagResourceClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type APIVersionSetClient = original.APIVersionSetClient
+
+func NewAPIVersionSetClient(subscriptionID string) APIVersionSetClient {
+	return original.NewAPIVersionSetClient(subscriptionID)
+}
+func NewAPIVersionSetClientWithBaseURI(baseURI string, subscriptionID string) APIVersionSetClient {
+	return original.NewAPIVersionSetClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type SignInSettingsClient = original.SignInSettingsClient
@@ -1112,58 +1078,49 @@ func NewSignInSettingsClientWithBaseURI(baseURI string, subscriptionID string) S
 	return original.NewSignInSettingsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SignUpSettingsClient = original.SignUpSettingsClient
-
-func NewSignUpSettingsClient(subscriptionID string) SignUpSettingsClient {
-	return original.NewSignUpSettingsClient(subscriptionID)
-}
-func NewSignUpSettingsClientWithBaseURI(baseURI string, subscriptionID string) SignUpSettingsClient {
-	return original.NewSignUpSettingsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type SubscriptionClient = original.SubscriptionClient
+type GroupUserClient = original.GroupUserClient
 
-func NewSubscriptionClient(subscriptionID string) SubscriptionClient {
-	return original.NewSubscriptionClient(subscriptionID)
+func NewGroupUserClient(subscriptionID string) GroupUserClient {
+	return original.NewGroupUserClient(subscriptionID)
 }
-func NewSubscriptionClientWithBaseURI(baseURI string, subscriptionID string) SubscriptionClient {
-	return original.NewSubscriptionClientWithBaseURI(baseURI, subscriptionID)
+func NewGroupUserClientWithBaseURI(baseURI string, subscriptionID string) GroupUserClient {
+	return original.NewGroupUserClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TagClient = original.TagClient
+type APIReleaseClient = original.APIReleaseClient
 
-func NewTagClient(subscriptionID string) TagClient {
-	return original.NewTagClient(subscriptionID)
+func NewAPIReleaseClient(subscriptionID string) APIReleaseClient {
+	return original.NewAPIReleaseClient(subscriptionID)
 }
-func NewTagClientWithBaseURI(baseURI string, subscriptionID string) TagClient {
-	return original.NewTagClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIReleaseClientWithBaseURI(baseURI string, subscriptionID string) APIReleaseClient {
+	return original.NewAPIReleaseClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TagDescriptionClient = original.TagDescriptionClient
+type APIExportClient = original.APIExportClient
 
-func NewTagDescriptionClient(subscriptionID string) TagDescriptionClient {
-	return original.NewTagDescriptionClient(subscriptionID)
+func NewAPIExportClient(subscriptionID string) APIExportClient {
+	return original.NewAPIExportClient(subscriptionID)
 }
-func NewTagDescriptionClientWithBaseURI(baseURI string, subscriptionID string) TagDescriptionClient {
-	return original.NewTagDescriptionClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIExportClientWithBaseURI(baseURI string, subscriptionID string) APIExportClient {
+	return original.NewAPIExportClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TagResourceClient = original.TagResourceClient
+type GroupClient = original.GroupClient
 
-func NewTagResourceClient(subscriptionID string) TagResourceClient {
-	return original.NewTagResourceClient(subscriptionID)
+func NewGroupClient(subscriptionID string) GroupClient {
+	return original.NewGroupClient(subscriptionID)
 }
-func NewTagResourceClientWithBaseURI(baseURI string, subscriptionID string) TagResourceClient {
-	return original.NewTagResourceClientWithBaseURI(baseURI, subscriptionID)
+func NewGroupClientWithBaseURI(baseURI string, subscriptionID string) GroupClient {
+	return original.NewGroupClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TenantAccessClient = original.TenantAccessClient
+type APIClient = original.APIClient
 
-func NewTenantAccessClient(subscriptionID string) TenantAccessClient {
-	return original.NewTenantAccessClient(subscriptionID)
+func NewAPIClient(subscriptionID string) APIClient {
+	return original.NewAPIClient(subscriptionID)
 }
-func NewTenantAccessClientWithBaseURI(baseURI string, subscriptionID string) TenantAccessClient {
-	return original.NewTenantAccessClientWithBaseURI(baseURI, subscriptionID)
+func NewAPIClientWithBaseURI(baseURI string, subscriptionID string) APIClient {
+	return original.NewAPIClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type TenantAccessGitClient = original.TenantAccessGitClient
@@ -1175,15 +1132,6 @@ func NewTenantAccessGitClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewTenantAccessGitClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TenantConfigurationClient = original.TenantConfigurationClient
-
-func NewTenantConfigurationClient(subscriptionID string) TenantConfigurationClient {
-	return original.NewTenantConfigurationClient(subscriptionID)
-}
-func NewTenantConfigurationClientWithBaseURI(baseURI string, subscriptionID string) TenantConfigurationClient {
-	return original.NewTenantConfigurationClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type UserClient = original.UserClient
 
 func NewUserClient(subscriptionID string) UserClient {
@@ -1193,35 +1141,87 @@ func NewUserClientWithBaseURI(baseURI string, subscriptionID string) UserClient
 	return original.NewUserClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UserGroupClient = original.UserGroupClient
+type ProductPolicyClient = original.ProductPolicyClient
 
-func NewUserGroupClient(subscriptionID string) UserGroupClient {
-	return original.NewUserGroupClient(subscriptionID)
+func NewProductPolicyClient(subscriptionID string) ProductPolicyClient {
+	return original.NewProductPolicyClient(subscriptionID)
 }
-func NewUserGroupClientWithBaseURI(baseURI string, subscriptionID string) UserGroupClient {
-	return original.NewUserGroupClientWithBaseURI(baseURI, subscriptionID)
+func NewProductPolicyClientWithBaseURI(baseURI string, subscriptionID string) ProductPolicyClient {
+	return original.NewProductPolicyClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UserIdentitiesClient = original.UserIdentitiesClient
+type DiagnosticLoggerClient = original.DiagnosticLoggerClient
 
-func NewUserIdentitiesClient(subscriptionID string) UserIdentitiesClient {
-	return original.NewUserIdentitiesClient(subscriptionID)
+func NewDiagnosticLoggerClient(subscriptionID string) DiagnosticLoggerClient {
+	return original.NewDiagnosticLoggerClient(subscriptionID)
 }
-func NewUserIdentitiesClientWithBaseURI(baseURI string, subscriptionID string) UserIdentitiesClient {
-	return original.NewUserIdentitiesClientWithBaseURI(baseURI, subscriptionID)
+func NewDiagnosticLoggerClientWithBaseURI(baseURI string, subscriptionID string) DiagnosticLoggerClient {
+	return original.NewDiagnosticLoggerClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UserSubscriptionClient = original.UserSubscriptionClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewUserSubscriptionClient(subscriptionID string) UserSubscriptionClient {
-	return original.NewUserSubscriptionClient(subscriptionID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewUserSubscriptionClientWithBaseURI(baseURI string, subscriptionID string) UserSubscriptionClient {
-	return original.NewUserSubscriptionClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+type NotificationRecipientEmailClient = original.NotificationRecipientEmailClient
+
+func NewNotificationRecipientEmailClient(subscriptionID string) NotificationRecipientEmailClient {
+	return original.NewNotificationRecipientEmailClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewNotificationRecipientEmailClientWithBaseURI(baseURI string, subscriptionID string) NotificationRecipientEmailClient {
+	return original.NewNotificationRecipientEmailClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type APIOperationClient = original.APIOperationClient
+
+func NewAPIOperationClient(subscriptionID string) APIOperationClient {
+	return original.NewAPIOperationClient(subscriptionID)
+}
+func NewAPIOperationClientWithBaseURI(baseURI string, subscriptionID string) APIOperationClient {
+	return original.NewAPIOperationClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type PolicyClient = original.PolicyClient
+
+func NewPolicyClient(subscriptionID string) PolicyClient {
+	return original.NewPolicyClient(subscriptionID)
+}
+func NewPolicyClientWithBaseURI(baseURI string, subscriptionID string) PolicyClient {
+	return original.NewPolicyClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type QuotaByPeriodKeysClient = original.QuotaByPeriodKeysClient
+
+func NewQuotaByPeriodKeysClient(subscriptionID string) QuotaByPeriodKeysClient {
+	return original.NewQuotaByPeriodKeysClient(subscriptionID)
+}
+func NewQuotaByPeriodKeysClientWithBaseURI(baseURI string, subscriptionID string) QuotaByPeriodKeysClient {
+	return original.NewQuotaByPeriodKeysClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type TagDescriptionClient = original.TagDescriptionClient
+
+func NewTagDescriptionClient(subscriptionID string) TagDescriptionClient {
+	return original.NewTagDescriptionClient(subscriptionID)
+}
+func NewTagDescriptionClientWithBaseURI(baseURI string, subscriptionID string) TagDescriptionClient {
+	return original.NewTagDescriptionClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type NetworkStatusClient = original.NetworkStatusClient
+
+func NewNetworkStatusClient(subscriptionID string) NetworkStatusClient {
+	return original.NewNetworkStatusClient(subscriptionID)
+}
+func NewNetworkStatusClientWithBaseURI(baseURI string, subscriptionID string) NetworkStatusClient {
+	return original.NewNetworkStatusClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/preview/datamigration/mgmt/datamigration/models.go b/profiles/preview/preview/datamigration/mgmt/datamigration/models.go
index be62a1efcaad..8278f134f706 100644
--- a/profiles/preview/preview/datamigration/mgmt/datamigration/models.go
+++ b/profiles/preview/preview/datamigration/mgmt/datamigration/models.go
@@ -21,17 +21,31 @@ package datamigration
 
 import original "github.com/Azure/azure-sdk-for-go/services/preview/datamigration/mgmt/2018-03-31-preview/datamigration"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type OperationsClient = original.OperationsClient
 
-type BaseClient = original.BaseClient
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type UsagesClient = original.UsagesClient
+
+func NewUsagesClient(subscriptionID string) UsagesClient {
+	return original.NewUsagesClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
+	return original.NewUsagesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ServicesClient = original.ServicesClient
+
+func NewServicesClient(subscriptionID string) ServicesClient {
+	return original.NewServicesClient(subscriptionID)
+}
+func NewServicesClientWithBaseURI(baseURI string, subscriptionID string) ServicesClient {
+	return original.NewServicesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AuthenticationType = original.AuthenticationType
@@ -581,24 +595,6 @@ type ValidateMigrationInputSQLServerSQLMITaskOutput = original.ValidateMigration
 type ValidateMigrationInputSQLServerSQLMITaskProperties = original.ValidateMigrationInputSQLServerSQLMITaskProperties
 type ValidationError = original.ValidationError
 type WaitStatistics = original.WaitStatistics
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ProjectsClient = original.ProjectsClient
-
-func NewProjectsClient(subscriptionID string) ProjectsClient {
-	return original.NewProjectsClient(subscriptionID)
-}
-func NewProjectsClientWithBaseURI(baseURI string, subscriptionID string) ProjectsClient {
-	return original.NewProjectsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type ResourceSkusClient = original.ResourceSkusClient
 
 func NewResourceSkusClient(subscriptionID string) ResourceSkusClient {
@@ -607,14 +603,20 @@ func NewResourceSkusClient(subscriptionID string) ResourceSkusClient {
 func NewResourceSkusClientWithBaseURI(baseURI string, subscriptionID string) ResourceSkusClient {
 	return original.NewResourceSkusClientWithBaseURI(baseURI, subscriptionID)
 }
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
+}
 
-type ServicesClient = original.ServicesClient
+type ProjectsClient = original.ProjectsClient
 
-func NewServicesClient(subscriptionID string) ServicesClient {
-	return original.NewServicesClient(subscriptionID)
+func NewProjectsClient(subscriptionID string) ProjectsClient {
+	return original.NewProjectsClient(subscriptionID)
 }
-func NewServicesClientWithBaseURI(baseURI string, subscriptionID string) ServicesClient {
-	return original.NewServicesClientWithBaseURI(baseURI, subscriptionID)
+func NewProjectsClientWithBaseURI(baseURI string, subscriptionID string) ProjectsClient {
+	return original.NewProjectsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type TasksClient = original.TasksClient
@@ -626,17 +628,15 @@ func NewTasksClientWithBaseURI(baseURI string, subscriptionID string) TasksClien
 	return original.NewTasksClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UsagesClient = original.UsagesClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewUsagesClient(subscriptionID string) UsagesClient {
-	return original.NewUsagesClient(subscriptionID)
-}
-func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
-	return original.NewUsagesClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/preview/dns/mgmt/dns/models.go b/profiles/preview/preview/dns/mgmt/dns/models.go
index 7f11f1c6b28e..b3b308b5e390 100644
--- a/profiles/preview/preview/dns/mgmt/dns/models.go
+++ b/profiles/preview/preview/dns/mgmt/dns/models.go
@@ -21,17 +21,13 @@ package dns
 
 import original "github.com/Azure/azure-sdk-for-go/services/preview/dns/mgmt/2018-03-01-preview/dns"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type RecordSetsClient = original.RecordSetsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewRecordSetsClient(subscriptionID string) RecordSetsClient {
+	return original.NewRecordSetsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewRecordSetsClientWithBaseURI(baseURI string, subscriptionID string) RecordSetsClient {
+	return original.NewRecordSetsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type RecordType = original.RecordType
@@ -91,14 +87,7 @@ type ZoneListResultPage = original.ZoneListResultPage
 type ZoneProperties = original.ZoneProperties
 type ZonesDeleteFuture = original.ZonesDeleteFuture
 type ZoneUpdate = original.ZoneUpdate
-type RecordSetsClient = original.RecordSetsClient
 
-func NewRecordSetsClient(subscriptionID string) RecordSetsClient {
-	return original.NewRecordSetsClient(subscriptionID)
-}
-func NewRecordSetsClientWithBaseURI(baseURI string, subscriptionID string) RecordSetsClient {
-	return original.NewRecordSetsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
@@ -114,3 +103,16 @@ func NewZonesClient(subscriptionID string) ZonesClient {
 func NewZonesClientWithBaseURI(baseURI string, subscriptionID string) ZonesClient {
 	return original.NewZonesClientWithBaseURI(baseURI, subscriptionID)
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/preview/eventhub/mgmt/eventhub/models.go b/profiles/preview/preview/eventhub/mgmt/eventhub/models.go
index 86a27cf488f0..88df562cb32d 100644
--- a/profiles/preview/preview/eventhub/mgmt/eventhub/models.go
+++ b/profiles/preview/preview/eventhub/mgmt/eventhub/models.go
@@ -21,26 +21,13 @@ package eventhub
 
 import original "github.com/Azure/azure-sdk-for-go/services/preview/eventhub/mgmt/2018-01-01-preview/eventhub"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type ClustersClient = original.ClustersClient
+type OperationsClient = original.OperationsClient
 
-func NewClustersClient(subscriptionID string) ClustersClient {
-	return original.NewClustersClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewClustersClientWithBaseURI(baseURI string, subscriptionID string) ClustersClient {
-	return original.NewClustersClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ConfigurationClient = original.ConfigurationClient
@@ -68,17 +55,32 @@ type OperationListResultIterator = original.OperationListResultIterator
 type OperationListResultPage = original.OperationListResultPage
 type Resource = original.Resource
 type TrackedResource = original.TrackedResource
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+type ClustersClient = original.ClustersClient
+
+func NewClustersClient(subscriptionID string) ClustersClient {
+	return original.NewClustersClient(subscriptionID)
+}
+func NewClustersClientWithBaseURI(baseURI string, subscriptionID string) ClustersClient {
+	return original.NewClustersClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/preview/iotspaces/mgmt/iotspaces/models.go b/profiles/preview/preview/iotspaces/mgmt/iotspaces/models.go
index be6de2e8b9dc..6c41b2591087 100644
--- a/profiles/preview/preview/iotspaces/mgmt/iotspaces/models.go
+++ b/profiles/preview/preview/iotspaces/mgmt/iotspaces/models.go
@@ -24,19 +24,6 @@ import (
 	uuid "github.com/satori/go.uuid"
 )
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID uuid.UUID) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID uuid.UUID) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type Client = original.Client
 
 func NewClient(subscriptionID uuid.UUID) Client {
@@ -46,6 +33,15 @@ func NewClientWithBaseURI(baseURI string, subscriptionID uuid.UUID) Client {
 	return original.NewClientWithBaseURI(baseURI, subscriptionID)
 }
 
+type OperationsClient = original.OperationsClient
+
+func NewOperationsClient(subscriptionID uuid.UUID) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID uuid.UUID) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type NameUnavailabilityReason = original.NameUnavailabilityReason
 
 const (
@@ -104,17 +100,23 @@ type Resource = original.Resource
 type SkuInfo = original.SkuInfo
 type StorageContainerProperties = original.StorageContainerProperties
 type UpdateFuture = original.UpdateFuture
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID uuid.UUID) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID uuid.UUID) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID uuid.UUID) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID uuid.UUID) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/preview/subscription/mgmt/subscription/models.go b/profiles/preview/preview/subscription/mgmt/subscription/models.go
index aeb2f1ae7e78..98585773a4f6 100644
--- a/profiles/preview/preview/subscription/mgmt/subscription/models.go
+++ b/profiles/preview/preview/subscription/mgmt/subscription/models.go
@@ -21,26 +21,22 @@ package subscription
 
 import original "github.com/Azure/azure-sdk-for-go/services/preview/subscription/mgmt/2018-03-01-preview/subscription"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type TenantsClient = original.TenantsClient
 
-func New() BaseClient {
-	return original.New()
+func NewTenantsClient() TenantsClient {
+	return original.NewTenantsClient()
 }
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
+func NewTenantsClientWithBaseURI(baseURI string) TenantsClient {
+	return original.NewTenantsClientWithBaseURI(baseURI)
 }
 
-type FactoryClient = original.FactoryClient
+type OperationsClient = original.OperationsClient
 
-func NewFactoryClient() FactoryClient {
-	return original.NewFactoryClient()
+func NewOperationsClient() OperationsClient {
+	return original.NewOperationsClient()
 }
-func NewFactoryClientWithBaseURI(baseURI string) FactoryClient {
-	return original.NewFactoryClientWithBaseURI(baseURI)
+func NewOperationsClientWithBaseURI(baseURI string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI)
 }
 
 type OfferType = original.OfferType
@@ -101,15 +97,6 @@ type TenantIDDescription = original.TenantIDDescription
 type TenantListResult = original.TenantListResult
 type TenantListResultIterator = original.TenantListResultIterator
 type TenantListResultPage = original.TenantListResultPage
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient() OperationsClient {
-	return original.NewOperationsClient()
-}
-func NewOperationsClientWithBaseURI(baseURI string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI)
-}
-
 type OperationsGroupClient = original.OperationsGroupClient
 
 func NewOperationsGroupClient() OperationsGroupClient {
@@ -127,18 +114,31 @@ func NewSubscriptionsClient() SubscriptionsClient {
 func NewSubscriptionsClientWithBaseURI(baseURI string) SubscriptionsClient {
 	return original.NewSubscriptionsClientWithBaseURI(baseURI)
 }
-
-type TenantsClient = original.TenantsClient
-
-func NewTenantsClient() TenantsClient {
-	return original.NewTenantsClient()
-}
-func NewTenantsClientWithBaseURI(baseURI string) TenantsClient {
-	return original.NewTenantsClientWithBaseURI(baseURI)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+type FactoryClient = original.FactoryClient
+
+func NewFactoryClient() FactoryClient {
+	return original.NewFactoryClient()
+}
+func NewFactoryClientWithBaseURI(baseURI string) FactoryClient {
+	return original.NewFactoryClientWithBaseURI(baseURI)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
diff --git a/profiles/preview/provisioningservices/mgmt/iothub/models.go b/profiles/preview/provisioningservices/mgmt/iothub/models.go
index db28565fe68a..203ae4041229 100644
--- a/profiles/preview/provisioningservices/mgmt/iothub/models.go
+++ b/profiles/preview/provisioningservices/mgmt/iothub/models.go
@@ -21,26 +21,13 @@ package iothub
 
 import original "github.com/Azure/azure-sdk-for-go/services/provisioningservices/mgmt/2018-01-22/iothub"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type DpsCertificateClient = original.DpsCertificateClient
+type OperationsClient = original.OperationsClient
 
-func NewDpsCertificateClient(subscriptionID string) DpsCertificateClient {
-	return original.NewDpsCertificateClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewDpsCertificateClientWithBaseURI(baseURI string, subscriptionID string) DpsCertificateClient {
-	return original.NewDpsCertificateClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type IotDpsResourceClient = original.IotDpsResourceClient
@@ -169,13 +156,13 @@ type TagsResource = original.TagsResource
 type VerificationCodeRequest = original.VerificationCodeRequest
 type VerificationCodeResponse = original.VerificationCodeResponse
 type VerificationCodeResponseProperties = original.VerificationCodeResponseProperties
-type OperationsClient = original.OperationsClient
+type DpsCertificateClient = original.DpsCertificateClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewDpsCertificateClient(subscriptionID string) DpsCertificateClient {
+	return original.NewDpsCertificateClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewDpsCertificateClientWithBaseURI(baseURI string, subscriptionID string) DpsCertificateClient {
+	return original.NewDpsCertificateClientWithBaseURI(baseURI, subscriptionID)
 }
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
@@ -183,3 +170,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/recoveryservices/mgmt/backup/models.go b/profiles/preview/recoveryservices/mgmt/backup/models.go
index 8d1d24fbb716..68f3dba6f488 100644
--- a/profiles/preview/recoveryservices/mgmt/backup/models.go
+++ b/profiles/preview/recoveryservices/mgmt/backup/models.go
@@ -21,80 +21,130 @@ package backup
 
 import original "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2017-07-01/backup"
 
-type BackupsClient = original.BackupsClient
+type ItemLevelRecoveryConnectionsClient = original.ItemLevelRecoveryConnectionsClient
 
-func NewBackupsClient(subscriptionID string) BackupsClient {
-	return original.NewBackupsClient(subscriptionID)
+func NewItemLevelRecoveryConnectionsClient(subscriptionID string) ItemLevelRecoveryConnectionsClient {
+	return original.NewItemLevelRecoveryConnectionsClient(subscriptionID)
 }
-func NewBackupsClientWithBaseURI(baseURI string, subscriptionID string) BackupsClient {
-	return original.NewBackupsClientWithBaseURI(baseURI, subscriptionID)
+func NewItemLevelRecoveryConnectionsClientWithBaseURI(baseURI string, subscriptionID string) ItemLevelRecoveryConnectionsClient {
+	return original.NewItemLevelRecoveryConnectionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type ProtectableContainersClient = original.ProtectableContainersClient
 
-type BaseClient = original.BaseClient
+func NewProtectableContainersClient(subscriptionID string) ProtectableContainersClient {
+	return original.NewProtectableContainersClient(subscriptionID)
+}
+func NewProtectableContainersClientWithBaseURI(baseURI string, subscriptionID string) ProtectableContainersClient {
+	return original.NewProtectableContainersClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type OperationResultsClient = original.OperationResultsClient
+
+func NewOperationResultsClient(subscriptionID string) OperationResultsClient {
+	return original.NewOperationResultsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) OperationResultsClient {
+	return original.NewOperationResultsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type EnginesClient = original.EnginesClient
+type OperationsClient = original.OperationsClient
 
-func NewEnginesClient(subscriptionID string) EnginesClient {
-	return original.NewEnginesClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewEnginesClientWithBaseURI(baseURI string, subscriptionID string) EnginesClient {
-	return original.NewEnginesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ExportJobsOperationResultsClient = original.ExportJobsOperationResultsClient
+type ProtectedItemOperationResultsClient = original.ProtectedItemOperationResultsClient
 
-func NewExportJobsOperationResultsClient(subscriptionID string) ExportJobsOperationResultsClient {
-	return original.NewExportJobsOperationResultsClient(subscriptionID)
+func NewProtectedItemOperationResultsClient(subscriptionID string) ProtectedItemOperationResultsClient {
+	return original.NewProtectedItemOperationResultsClient(subscriptionID)
 }
-func NewExportJobsOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ExportJobsOperationResultsClient {
-	return original.NewExportJobsOperationResultsClientWithBaseURI(baseURI, subscriptionID)
+func NewProtectedItemOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ProtectedItemOperationResultsClient {
+	return original.NewProtectedItemOperationResultsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type FeatureSupportClient = original.FeatureSupportClient
+type ProtectionContainersGroupClient = original.ProtectionContainersGroupClient
 
-func NewFeatureSupportClient(subscriptionID string) FeatureSupportClient {
-	return original.NewFeatureSupportClient(subscriptionID)
+func NewProtectionContainersGroupClient(subscriptionID string) ProtectionContainersGroupClient {
+	return original.NewProtectionContainersGroupClient(subscriptionID)
 }
-func NewFeatureSupportClientWithBaseURI(baseURI string, subscriptionID string) FeatureSupportClient {
-	return original.NewFeatureSupportClientWithBaseURI(baseURI, subscriptionID)
+func NewProtectionContainersGroupClientWithBaseURI(baseURI string, subscriptionID string) ProtectionContainersGroupClient {
+	return original.NewProtectionContainersGroupClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ItemLevelRecoveryConnectionsClient = original.ItemLevelRecoveryConnectionsClient
+type ProtectionPolicyOperationStatusesClient = original.ProtectionPolicyOperationStatusesClient
 
-func NewItemLevelRecoveryConnectionsClient(subscriptionID string) ItemLevelRecoveryConnectionsClient {
-	return original.NewItemLevelRecoveryConnectionsClient(subscriptionID)
+func NewProtectionPolicyOperationStatusesClient(subscriptionID string) ProtectionPolicyOperationStatusesClient {
+	return original.NewProtectionPolicyOperationStatusesClient(subscriptionID)
 }
-func NewItemLevelRecoveryConnectionsClientWithBaseURI(baseURI string, subscriptionID string) ItemLevelRecoveryConnectionsClient {
-	return original.NewItemLevelRecoveryConnectionsClientWithBaseURI(baseURI, subscriptionID)
+func NewProtectionPolicyOperationStatusesClientWithBaseURI(baseURI string, subscriptionID string) ProtectionPolicyOperationStatusesClient {
+	return original.NewProtectionPolicyOperationStatusesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type JobCancellationsClient = original.JobCancellationsClient
+type ProtectedItemsGroupClient = original.ProtectedItemsGroupClient
 
-func NewJobCancellationsClient(subscriptionID string) JobCancellationsClient {
-	return original.NewJobCancellationsClient(subscriptionID)
+func NewProtectedItemsGroupClient(subscriptionID string) ProtectedItemsGroupClient {
+	return original.NewProtectedItemsGroupClient(subscriptionID)
 }
-func NewJobCancellationsClientWithBaseURI(baseURI string, subscriptionID string) JobCancellationsClient {
-	return original.NewJobCancellationsClientWithBaseURI(baseURI, subscriptionID)
+func NewProtectedItemsGroupClientWithBaseURI(baseURI string, subscriptionID string) ProtectedItemsGroupClient {
+	return original.NewProtectedItemsGroupClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type JobDetailsClient = original.JobDetailsClient
+type ProtectionContainerOperationResultsClient = original.ProtectionContainerOperationResultsClient
 
-func NewJobDetailsClient(subscriptionID string) JobDetailsClient {
-	return original.NewJobDetailsClient(subscriptionID)
+func NewProtectionContainerOperationResultsClient(subscriptionID string) ProtectionContainerOperationResultsClient {
+	return original.NewProtectionContainerOperationResultsClient(subscriptionID)
 }
-func NewJobDetailsClientWithBaseURI(baseURI string, subscriptionID string) JobDetailsClient {
-	return original.NewJobDetailsClientWithBaseURI(baseURI, subscriptionID)
+func NewProtectionContainerOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ProtectionContainerOperationResultsClient {
+	return original.NewProtectionContainerOperationResultsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ProtectionContainerRefreshOperationResultsClient = original.ProtectionContainerRefreshOperationResultsClient
+
+func NewProtectionContainerRefreshOperationResultsClient(subscriptionID string) ProtectionContainerRefreshOperationResultsClient {
+	return original.NewProtectionContainerRefreshOperationResultsClient(subscriptionID)
+}
+func NewProtectionContainerRefreshOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ProtectionContainerRefreshOperationResultsClient {
+	return original.NewProtectionContainerRefreshOperationResultsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ProtectionContainersClient = original.ProtectionContainersClient
+
+func NewProtectionContainersClient(subscriptionID string) ProtectionContainersClient {
+	return original.NewProtectionContainersClient(subscriptionID)
+}
+func NewProtectionContainersClientWithBaseURI(baseURI string, subscriptionID string) ProtectionContainersClient {
+	return original.NewProtectionContainersClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type StatusClient = original.StatusClient
+
+func NewStatusClient(subscriptionID string) StatusClient {
+	return original.NewStatusClient(subscriptionID)
+}
+func NewStatusClientWithBaseURI(baseURI string, subscriptionID string) StatusClient {
+	return original.NewStatusClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ResourceStorageConfigsClient = original.ResourceStorageConfigsClient
+
+func NewResourceStorageConfigsClient(subscriptionID string) ResourceStorageConfigsClient {
+	return original.NewResourceStorageConfigsClient(subscriptionID)
+}
+func NewResourceStorageConfigsClientWithBaseURI(baseURI string, subscriptionID string) ResourceStorageConfigsClient {
+	return original.NewResourceStorageConfigsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ProtectionPolicyOperationResultsClient = original.ProtectionPolicyOperationResultsClient
+
+func NewProtectionPolicyOperationResultsClient(subscriptionID string) ProtectionPolicyOperationResultsClient {
+	return original.NewProtectionPolicyOperationResultsClient(subscriptionID)
+}
+func NewProtectionPolicyOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ProtectionPolicyOperationResultsClient {
+	return original.NewProtectionPolicyOperationResultsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type JobOperationResultsClient = original.JobOperationResultsClient
@@ -106,6 +156,15 @@ func NewJobOperationResultsClientWithBaseURI(baseURI string, subscriptionID stri
 	return original.NewJobOperationResultsClientWithBaseURI(baseURI, subscriptionID)
 }
 
+type EnginesClient = original.EnginesClient
+
+func NewEnginesClient(subscriptionID string) EnginesClient {
+	return original.NewEnginesClient(subscriptionID)
+}
+func NewEnginesClientWithBaseURI(baseURI string, subscriptionID string) EnginesClient {
+	return original.NewEnginesClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type JobsClient = original.JobsClient
 
 func NewJobsClient(subscriptionID string) JobsClient {
@@ -115,13 +174,13 @@ func NewJobsClientWithBaseURI(baseURI string, subscriptionID string) JobsClient
 	return original.NewJobsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type JobsGroupClient = original.JobsGroupClient
+type BackupsClient = original.BackupsClient
 
-func NewJobsGroupClient(subscriptionID string) JobsGroupClient {
-	return original.NewJobsGroupClient(subscriptionID)
+func NewBackupsClient(subscriptionID string) BackupsClient {
+	return original.NewBackupsClient(subscriptionID)
 }
-func NewJobsGroupClientWithBaseURI(baseURI string, subscriptionID string) JobsGroupClient {
-	return original.NewJobsGroupClientWithBaseURI(baseURI, subscriptionID)
+func NewBackupsClientWithBaseURI(baseURI string, subscriptionID string) BackupsClient {
+	return original.NewBackupsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AzureFileShareType = original.AzureFileShareType
@@ -1336,67 +1395,37 @@ type WorkloadProtectableItemResourceList = original.WorkloadProtectableItemResou
 type WorkloadProtectableItemResourceListIterator = original.WorkloadProtectableItemResourceListIterator
 type WorkloadProtectableItemResourceListPage = original.WorkloadProtectableItemResourceListPage
 type YearlyRetentionSchedule = original.YearlyRetentionSchedule
-type OperationResultsClient = original.OperationResultsClient
-
-func NewOperationResultsClient(subscriptionID string) OperationResultsClient {
-	return original.NewOperationResultsClient(subscriptionID)
-}
-func NewOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) OperationResultsClient {
-	return original.NewOperationResultsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type OperationStatusesClient = original.OperationStatusesClient
-
-func NewOperationStatusesClient(subscriptionID string) OperationStatusesClient {
-	return original.NewOperationStatusesClient(subscriptionID)
-}
-func NewOperationStatusesClientWithBaseURI(baseURI string, subscriptionID string) OperationStatusesClient {
-	return original.NewOperationStatusesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type PoliciesClient = original.PoliciesClient
+type ProtectionPoliciesClient = original.ProtectionPoliciesClient
 
-func NewPoliciesClient(subscriptionID string) PoliciesClient {
-	return original.NewPoliciesClient(subscriptionID)
+func NewProtectionPoliciesClient(subscriptionID string) ProtectionPoliciesClient {
+	return original.NewProtectionPoliciesClient(subscriptionID)
 }
-func NewPoliciesClientWithBaseURI(baseURI string, subscriptionID string) PoliciesClient {
-	return original.NewPoliciesClientWithBaseURI(baseURI, subscriptionID)
+func NewProtectionPoliciesClientWithBaseURI(baseURI string, subscriptionID string) ProtectionPoliciesClient {
+	return original.NewProtectionPoliciesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProtectableContainersClient = original.ProtectableContainersClient
+type UsageSummariesClient = original.UsageSummariesClient
 
-func NewProtectableContainersClient(subscriptionID string) ProtectableContainersClient {
-	return original.NewProtectableContainersClient(subscriptionID)
+func NewUsageSummariesClient(subscriptionID string) UsageSummariesClient {
+	return original.NewUsageSummariesClient(subscriptionID)
 }
-func NewProtectableContainersClientWithBaseURI(baseURI string, subscriptionID string) ProtectableContainersClient {
-	return original.NewProtectableContainersClientWithBaseURI(baseURI, subscriptionID)
+func NewUsageSummariesClientWithBaseURI(baseURI string, subscriptionID string) UsageSummariesClient {
+	return original.NewUsageSummariesClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type ProtectableItemsClient = original.ProtectableItemsClient
-
-func NewProtectableItemsClient(subscriptionID string) ProtectableItemsClient {
-	return original.NewProtectableItemsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewProtectableItemsClientWithBaseURI(baseURI string, subscriptionID string) ProtectableItemsClient {
-	return original.NewProtectableItemsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type ProtectedItemOperationResultsClient = original.ProtectedItemOperationResultsClient
+type SecurityPINsClient = original.SecurityPINsClient
 
-func NewProtectedItemOperationResultsClient(subscriptionID string) ProtectedItemOperationResultsClient {
-	return original.NewProtectedItemOperationResultsClient(subscriptionID)
+func NewSecurityPINsClient(subscriptionID string) SecurityPINsClient {
+	return original.NewSecurityPINsClient(subscriptionID)
 }
-func NewProtectedItemOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ProtectedItemOperationResultsClient {
-	return original.NewProtectedItemOperationResultsClientWithBaseURI(baseURI, subscriptionID)
+func NewSecurityPINsClientWithBaseURI(baseURI string, subscriptionID string) SecurityPINsClient {
+	return original.NewSecurityPINsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ProtectedItemOperationStatusesClient = original.ProtectedItemOperationStatusesClient
@@ -1408,94 +1437,67 @@ func NewProtectedItemOperationStatusesClientWithBaseURI(baseURI string, subscrip
 	return original.NewProtectedItemOperationStatusesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProtectedItemsClient = original.ProtectedItemsClient
-
-func NewProtectedItemsClient(subscriptionID string) ProtectedItemsClient {
-	return original.NewProtectedItemsClient(subscriptionID)
-}
-func NewProtectedItemsClientWithBaseURI(baseURI string, subscriptionID string) ProtectedItemsClient {
-	return original.NewProtectedItemsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ProtectedItemsGroupClient = original.ProtectedItemsGroupClient
-
-func NewProtectedItemsGroupClient(subscriptionID string) ProtectedItemsGroupClient {
-	return original.NewProtectedItemsGroupClient(subscriptionID)
-}
-func NewProtectedItemsGroupClientWithBaseURI(baseURI string, subscriptionID string) ProtectedItemsGroupClient {
-	return original.NewProtectedItemsGroupClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ProtectionContainerOperationResultsClient = original.ProtectionContainerOperationResultsClient
-
-func NewProtectionContainerOperationResultsClient(subscriptionID string) ProtectionContainerOperationResultsClient {
-	return original.NewProtectionContainerOperationResultsClient(subscriptionID)
-}
-func NewProtectionContainerOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ProtectionContainerOperationResultsClient {
-	return original.NewProtectionContainerOperationResultsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type ProtectionContainerRefreshOperationResultsClient = original.ProtectionContainerRefreshOperationResultsClient
+type ExportJobsOperationResultsClient = original.ExportJobsOperationResultsClient
 
-func NewProtectionContainerRefreshOperationResultsClient(subscriptionID string) ProtectionContainerRefreshOperationResultsClient {
-	return original.NewProtectionContainerRefreshOperationResultsClient(subscriptionID)
+func NewExportJobsOperationResultsClient(subscriptionID string) ExportJobsOperationResultsClient {
+	return original.NewExportJobsOperationResultsClient(subscriptionID)
 }
-func NewProtectionContainerRefreshOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ProtectionContainerRefreshOperationResultsClient {
-	return original.NewProtectionContainerRefreshOperationResultsClientWithBaseURI(baseURI, subscriptionID)
+func NewExportJobsOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ExportJobsOperationResultsClient {
+	return original.NewExportJobsOperationResultsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProtectionContainersClient = original.ProtectionContainersClient
+type ResourceVaultConfigsClient = original.ResourceVaultConfigsClient
 
-func NewProtectionContainersClient(subscriptionID string) ProtectionContainersClient {
-	return original.NewProtectionContainersClient(subscriptionID)
+func NewResourceVaultConfigsClient(subscriptionID string) ResourceVaultConfigsClient {
+	return original.NewResourceVaultConfigsClient(subscriptionID)
 }
-func NewProtectionContainersClientWithBaseURI(baseURI string, subscriptionID string) ProtectionContainersClient {
-	return original.NewProtectionContainersClientWithBaseURI(baseURI, subscriptionID)
+func NewResourceVaultConfigsClientWithBaseURI(baseURI string, subscriptionID string) ResourceVaultConfigsClient {
+	return original.NewResourceVaultConfigsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProtectionContainersGroupClient = original.ProtectionContainersGroupClient
+type RestoresClient = original.RestoresClient
 
-func NewProtectionContainersGroupClient(subscriptionID string) ProtectionContainersGroupClient {
-	return original.NewProtectionContainersGroupClient(subscriptionID)
+func NewRestoresClient(subscriptionID string) RestoresClient {
+	return original.NewRestoresClient(subscriptionID)
 }
-func NewProtectionContainersGroupClientWithBaseURI(baseURI string, subscriptionID string) ProtectionContainersGroupClient {
-	return original.NewProtectionContainersGroupClientWithBaseURI(baseURI, subscriptionID)
+func NewRestoresClientWithBaseURI(baseURI string, subscriptionID string) RestoresClient {
+	return original.NewRestoresClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProtectionIntentClient = original.ProtectionIntentClient
+type JobCancellationsClient = original.JobCancellationsClient
 
-func NewProtectionIntentClient(subscriptionID string) ProtectionIntentClient {
-	return original.NewProtectionIntentClient(subscriptionID)
+func NewJobCancellationsClient(subscriptionID string) JobCancellationsClient {
+	return original.NewJobCancellationsClient(subscriptionID)
 }
-func NewProtectionIntentClientWithBaseURI(baseURI string, subscriptionID string) ProtectionIntentClient {
-	return original.NewProtectionIntentClientWithBaseURI(baseURI, subscriptionID)
+func NewJobCancellationsClientWithBaseURI(baseURI string, subscriptionID string) JobCancellationsClient {
+	return original.NewJobCancellationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProtectionPoliciesClient = original.ProtectionPoliciesClient
+type OperationStatusesClient = original.OperationStatusesClient
 
-func NewProtectionPoliciesClient(subscriptionID string) ProtectionPoliciesClient {
-	return original.NewProtectionPoliciesClient(subscriptionID)
+func NewOperationStatusesClient(subscriptionID string) OperationStatusesClient {
+	return original.NewOperationStatusesClient(subscriptionID)
 }
-func NewProtectionPoliciesClientWithBaseURI(baseURI string, subscriptionID string) ProtectionPoliciesClient {
-	return original.NewProtectionPoliciesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationStatusesClientWithBaseURI(baseURI string, subscriptionID string) OperationStatusesClient {
+	return original.NewOperationStatusesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProtectionPolicyOperationResultsClient = original.ProtectionPolicyOperationResultsClient
+type FeatureSupportClient = original.FeatureSupportClient
 
-func NewProtectionPolicyOperationResultsClient(subscriptionID string) ProtectionPolicyOperationResultsClient {
-	return original.NewProtectionPolicyOperationResultsClient(subscriptionID)
+func NewFeatureSupportClient(subscriptionID string) FeatureSupportClient {
+	return original.NewFeatureSupportClient(subscriptionID)
 }
-func NewProtectionPolicyOperationResultsClientWithBaseURI(baseURI string, subscriptionID string) ProtectionPolicyOperationResultsClient {
-	return original.NewProtectionPolicyOperationResultsClientWithBaseURI(baseURI, subscriptionID)
+func NewFeatureSupportClientWithBaseURI(baseURI string, subscriptionID string) FeatureSupportClient {
+	return original.NewFeatureSupportClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ProtectionPolicyOperationStatusesClient = original.ProtectionPolicyOperationStatusesClient
+type ProtectableItemsClient = original.ProtectableItemsClient
 
-func NewProtectionPolicyOperationStatusesClient(subscriptionID string) ProtectionPolicyOperationStatusesClient {
-	return original.NewProtectionPolicyOperationStatusesClient(subscriptionID)
+func NewProtectableItemsClient(subscriptionID string) ProtectableItemsClient {
+	return original.NewProtectableItemsClient(subscriptionID)
 }
-func NewProtectionPolicyOperationStatusesClientWithBaseURI(baseURI string, subscriptionID string) ProtectionPolicyOperationStatusesClient {
-	return original.NewProtectionPolicyOperationStatusesClientWithBaseURI(baseURI, subscriptionID)
+func NewProtectableItemsClientWithBaseURI(baseURI string, subscriptionID string) ProtectableItemsClient {
+	return original.NewProtectableItemsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type RecoveryPointsClient = original.RecoveryPointsClient
@@ -1507,71 +1509,69 @@ func NewRecoveryPointsClientWithBaseURI(baseURI string, subscriptionID string) R
 	return original.NewRecoveryPointsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ResourceStorageConfigsClient = original.ResourceStorageConfigsClient
+type WorkloadItemsClient = original.WorkloadItemsClient
 
-func NewResourceStorageConfigsClient(subscriptionID string) ResourceStorageConfigsClient {
-	return original.NewResourceStorageConfigsClient(subscriptionID)
+func NewWorkloadItemsClient(subscriptionID string) WorkloadItemsClient {
+	return original.NewWorkloadItemsClient(subscriptionID)
 }
-func NewResourceStorageConfigsClientWithBaseURI(baseURI string, subscriptionID string) ResourceStorageConfigsClient {
-	return original.NewResourceStorageConfigsClientWithBaseURI(baseURI, subscriptionID)
+func NewWorkloadItemsClientWithBaseURI(baseURI string, subscriptionID string) WorkloadItemsClient {
+	return original.NewWorkloadItemsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ResourceVaultConfigsClient = original.ResourceVaultConfigsClient
+type ProtectedItemsClient = original.ProtectedItemsClient
 
-func NewResourceVaultConfigsClient(subscriptionID string) ResourceVaultConfigsClient {
-	return original.NewResourceVaultConfigsClient(subscriptionID)
+func NewProtectedItemsClient(subscriptionID string) ProtectedItemsClient {
+	return original.NewProtectedItemsClient(subscriptionID)
 }
-func NewResourceVaultConfigsClientWithBaseURI(baseURI string, subscriptionID string) ResourceVaultConfigsClient {
-	return original.NewResourceVaultConfigsClientWithBaseURI(baseURI, subscriptionID)
+func NewProtectedItemsClientWithBaseURI(baseURI string, subscriptionID string) ProtectedItemsClient {
+	return original.NewProtectedItemsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type RestoresClient = original.RestoresClient
+type PoliciesClient = original.PoliciesClient
 
-func NewRestoresClient(subscriptionID string) RestoresClient {
-	return original.NewRestoresClient(subscriptionID)
+func NewPoliciesClient(subscriptionID string) PoliciesClient {
+	return original.NewPoliciesClient(subscriptionID)
 }
-func NewRestoresClientWithBaseURI(baseURI string, subscriptionID string) RestoresClient {
-	return original.NewRestoresClientWithBaseURI(baseURI, subscriptionID)
+func NewPoliciesClientWithBaseURI(baseURI string, subscriptionID string) PoliciesClient {
+	return original.NewPoliciesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SecurityPINsClient = original.SecurityPINsClient
+type JobDetailsClient = original.JobDetailsClient
 
-func NewSecurityPINsClient(subscriptionID string) SecurityPINsClient {
-	return original.NewSecurityPINsClient(subscriptionID)
+func NewJobDetailsClient(subscriptionID string) JobDetailsClient {
+	return original.NewJobDetailsClient(subscriptionID)
 }
-func NewSecurityPINsClientWithBaseURI(baseURI string, subscriptionID string) SecurityPINsClient {
-	return original.NewSecurityPINsClientWithBaseURI(baseURI, subscriptionID)
+func NewJobDetailsClientWithBaseURI(baseURI string, subscriptionID string) JobDetailsClient {
+	return original.NewJobDetailsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type StatusClient = original.StatusClient
+type ProtectionIntentClient = original.ProtectionIntentClient
 
-func NewStatusClient(subscriptionID string) StatusClient {
-	return original.NewStatusClient(subscriptionID)
+func NewProtectionIntentClient(subscriptionID string) ProtectionIntentClient {
+	return original.NewProtectionIntentClient(subscriptionID)
 }
-func NewStatusClientWithBaseURI(baseURI string, subscriptionID string) StatusClient {
-	return original.NewStatusClientWithBaseURI(baseURI, subscriptionID)
+func NewProtectionIntentClientWithBaseURI(baseURI string, subscriptionID string) ProtectionIntentClient {
+	return original.NewProtectionIntentClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UsageSummariesClient = original.UsageSummariesClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewUsageSummariesClient(subscriptionID string) UsageSummariesClient {
-	return original.NewUsageSummariesClient(subscriptionID)
-}
-func NewUsageSummariesClientWithBaseURI(baseURI string, subscriptionID string) UsageSummariesClient {
-	return original.NewUsageSummariesClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
-type WorkloadItemsClient = original.WorkloadItemsClient
+type JobsGroupClient = original.JobsGroupClient
 
-func NewWorkloadItemsClient(subscriptionID string) WorkloadItemsClient {
-	return original.NewWorkloadItemsClient(subscriptionID)
+func NewJobsGroupClient(subscriptionID string) JobsGroupClient {
+	return original.NewJobsGroupClient(subscriptionID)
 }
-func NewWorkloadItemsClientWithBaseURI(baseURI string, subscriptionID string) WorkloadItemsClient {
-	return original.NewWorkloadItemsClientWithBaseURI(baseURI, subscriptionID)
+func NewJobsGroupClientWithBaseURI(baseURI string, subscriptionID string) JobsGroupClient {
+	return original.NewJobsGroupClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/recoveryservices/mgmt/recoveryservices/models.go b/profiles/preview/recoveryservices/mgmt/recoveryservices/models.go
index 2fc9397a1fd0..53078e8d4b8e 100644
--- a/profiles/preview/recoveryservices/mgmt/recoveryservices/models.go
+++ b/profiles/preview/recoveryservices/mgmt/recoveryservices/models.go
@@ -21,17 +21,40 @@ package recoveryservices
 
 import original "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2016-06-01/recoveryservices"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type OperationsClient = original.OperationsClient
 
-type BaseClient = original.BaseClient
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type UsagesClient = original.UsagesClient
+
+func NewUsagesClient(subscriptionID string) UsagesClient {
+	return original.NewUsagesClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
+	return original.NewUsagesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type VaultCertificatesClient = original.VaultCertificatesClient
+
+func NewVaultCertificatesClient(subscriptionID string) VaultCertificatesClient {
+	return original.NewVaultCertificatesClient(subscriptionID)
+}
+func NewVaultCertificatesClientWithBaseURI(baseURI string, subscriptionID string) VaultCertificatesClient {
+	return original.NewVaultCertificatesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type VaultsClient = original.VaultsClient
+
+func NewVaultsClient(subscriptionID string) VaultsClient {
+	return original.NewVaultsClient(subscriptionID)
+}
+func NewVaultsClientWithBaseURI(baseURI string, subscriptionID string) VaultsClient {
+	return original.NewVaultsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AuthType = original.AuthType
@@ -145,15 +168,6 @@ type VaultListPage = original.VaultListPage
 type VaultProperties = original.VaultProperties
 type VaultUsage = original.VaultUsage
 type VaultUsageList = original.VaultUsageList
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type RegisteredIdentitiesClient = original.RegisteredIdentitiesClient
 
 func NewRegisteredIdentitiesClient(subscriptionID string) RegisteredIdentitiesClient {
@@ -162,32 +176,11 @@ func NewRegisteredIdentitiesClient(subscriptionID string) RegisteredIdentitiesCl
 func NewRegisteredIdentitiesClientWithBaseURI(baseURI string, subscriptionID string) RegisteredIdentitiesClient {
 	return original.NewRegisteredIdentitiesClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type ReplicationUsagesClient = original.ReplicationUsagesClient
-
-func NewReplicationUsagesClient(subscriptionID string) ReplicationUsagesClient {
-	return original.NewReplicationUsagesClient(subscriptionID)
-}
-func NewReplicationUsagesClientWithBaseURI(baseURI string, subscriptionID string) ReplicationUsagesClient {
-	return original.NewReplicationUsagesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type UsagesClient = original.UsagesClient
-
-func NewUsagesClient(subscriptionID string) UsagesClient {
-	return original.NewUsagesClient(subscriptionID)
-}
-func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesClient {
-	return original.NewUsagesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type VaultCertificatesClient = original.VaultCertificatesClient
-
-func NewVaultCertificatesClient(subscriptionID string) VaultCertificatesClient {
-	return original.NewVaultCertificatesClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewVaultCertificatesClientWithBaseURI(baseURI string, subscriptionID string) VaultCertificatesClient {
-	return original.NewVaultCertificatesClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
 type VaultExtendedInfoClient = original.VaultExtendedInfoClient
@@ -199,17 +192,24 @@ func NewVaultExtendedInfoClientWithBaseURI(baseURI string, subscriptionID string
 	return original.NewVaultExtendedInfoClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VaultsClient = original.VaultsClient
+type ReplicationUsagesClient = original.ReplicationUsagesClient
 
-func NewVaultsClient(subscriptionID string) VaultsClient {
-	return original.NewVaultsClient(subscriptionID)
+func NewReplicationUsagesClient(subscriptionID string) ReplicationUsagesClient {
+	return original.NewReplicationUsagesClient(subscriptionID)
 }
-func NewVaultsClientWithBaseURI(baseURI string, subscriptionID string) VaultsClient {
-	return original.NewVaultsClientWithBaseURI(baseURI, subscriptionID)
+func NewReplicationUsagesClientWithBaseURI(baseURI string, subscriptionID string) ReplicationUsagesClient {
+	return original.NewReplicationUsagesClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/recoveryservices/mgmt/siterecovery/models.go b/profiles/preview/recoveryservices/mgmt/siterecovery/models.go
index 23031ca12cb3..fd8092e832f9 100644
--- a/profiles/preview/recoveryservices/mgmt/siterecovery/models.go
+++ b/profiles/preview/recoveryservices/mgmt/siterecovery/models.go
@@ -21,17 +21,94 @@ package siterecovery
 
 import original "github.com/Azure/azure-sdk-for-go/services/recoveryservices/mgmt/2018-01-10/siterecovery"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type TargetComputeSizesClient = original.TargetComputeSizesClient
 
-type BaseClient = original.BaseClient
+func NewTargetComputeSizesClient(subscriptionID string, resourceGroupName string, resourceName string) TargetComputeSizesClient {
+	return original.NewTargetComputeSizesClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewTargetComputeSizesClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) TargetComputeSizesClient {
+	return original.NewTargetComputeSizesClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
 
-func New(subscriptionID string, resourceGroupName string, resourceName string) BaseClient {
-	return original.New(subscriptionID, resourceGroupName, resourceName)
+type ReplicationPoliciesClient = original.ReplicationPoliciesClient
+
+func NewReplicationPoliciesClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationPoliciesClient {
+	return original.NewReplicationPoliciesClient(subscriptionID, resourceGroupName, resourceName)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+func NewReplicationPoliciesClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationPoliciesClient {
+	return original.NewReplicationPoliciesClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
+type ReplicationVaultHealthClient = original.ReplicationVaultHealthClient
+
+func NewReplicationVaultHealthClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationVaultHealthClient {
+	return original.NewReplicationVaultHealthClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewReplicationVaultHealthClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationVaultHealthClient {
+	return original.NewReplicationVaultHealthClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
+type OperationsClient = original.OperationsClient
+
+func NewOperationsClient(subscriptionID string, resourceGroupName string, resourceName string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
+type ReplicationProtectedItemsClient = original.ReplicationProtectedItemsClient
+
+func NewReplicationProtectedItemsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectedItemsClient {
+	return original.NewReplicationProtectedItemsClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewReplicationProtectedItemsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectedItemsClient {
+	return original.NewReplicationProtectedItemsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
+type ReplicationStorageClassificationsClient = original.ReplicationStorageClassificationsClient
+
+func NewReplicationStorageClassificationsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationStorageClassificationsClient {
+	return original.NewReplicationStorageClassificationsClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewReplicationStorageClassificationsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationStorageClassificationsClient {
+	return original.NewReplicationStorageClassificationsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
+type ReplicationRecoveryServicesProvidersClient = original.ReplicationRecoveryServicesProvidersClient
+
+func NewReplicationRecoveryServicesProvidersClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationRecoveryServicesProvidersClient {
+	return original.NewReplicationRecoveryServicesProvidersClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewReplicationRecoveryServicesProvidersClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationRecoveryServicesProvidersClient {
+	return original.NewReplicationRecoveryServicesProvidersClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
+type ReplicationJobsClient = original.ReplicationJobsClient
+
+func NewReplicationJobsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationJobsClient {
+	return original.NewReplicationJobsClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewReplicationJobsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationJobsClient {
+	return original.NewReplicationJobsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
+type ReplicationProtectableItemsClient = original.ReplicationProtectableItemsClient
+
+func NewReplicationProtectableItemsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectableItemsClient {
+	return original.NewReplicationProtectableItemsClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewReplicationProtectableItemsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectableItemsClient {
+	return original.NewReplicationProtectableItemsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
+type ReplicationProtectionContainerMappingsClient = original.ReplicationProtectionContainerMappingsClient
+
+func NewReplicationProtectionContainerMappingsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectionContainerMappingsClient {
+	return original.NewReplicationProtectionContainerMappingsClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewReplicationProtectionContainerMappingsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectionContainerMappingsClient {
+	return original.NewReplicationProtectionContainerMappingsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
 
 type A2ARpRecoveryPointType = original.A2ARpRecoveryPointType
@@ -1108,22 +1185,21 @@ type VMwareDetails = original.VMwareDetails
 type VMwareV2FabricCreationInput = original.VMwareV2FabricCreationInput
 type VMwareV2FabricSpecificDetails = original.VMwareV2FabricSpecificDetails
 type VMwareVirtualMachineDetails = original.VMwareVirtualMachineDetails
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string, resourceGroupName string, resourceName string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID, resourceGroupName, resourceName)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+func Version() string {
+	return original.Version()
 }
 
-type RecoveryPointsClient = original.RecoveryPointsClient
+type ReplicationNetworkMappingsClient = original.ReplicationNetworkMappingsClient
 
-func NewRecoveryPointsClient(subscriptionID string, resourceGroupName string, resourceName string) RecoveryPointsClient {
-	return original.NewRecoveryPointsClient(subscriptionID, resourceGroupName, resourceName)
+func NewReplicationNetworkMappingsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationNetworkMappingsClient {
+	return original.NewReplicationNetworkMappingsClient(subscriptionID, resourceGroupName, resourceName)
 }
-func NewRecoveryPointsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) RecoveryPointsClient {
-	return original.NewRecoveryPointsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+func NewReplicationNetworkMappingsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationNetworkMappingsClient {
+	return original.NewReplicationNetworkMappingsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
 
 type ReplicationAlertSettingsClient = original.ReplicationAlertSettingsClient
@@ -1135,6 +1211,15 @@ func NewReplicationAlertSettingsClientWithBaseURI(baseURI string, subscriptionID
 	return original.NewReplicationAlertSettingsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
 
+type RecoveryPointsClient = original.RecoveryPointsClient
+
+func NewRecoveryPointsClient(subscriptionID string, resourceGroupName string, resourceName string) RecoveryPointsClient {
+	return original.NewRecoveryPointsClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewRecoveryPointsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) RecoveryPointsClient {
+	return original.NewRecoveryPointsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
 type ReplicationEventsClient = original.ReplicationEventsClient
 
 func NewReplicationEventsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationEventsClient {
@@ -1144,87 +1229,6 @@ func NewReplicationEventsClientWithBaseURI(baseURI string, subscriptionID string
 	return original.NewReplicationEventsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
 
-type ReplicationFabricsClient = original.ReplicationFabricsClient
-
-func NewReplicationFabricsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationFabricsClient {
-	return original.NewReplicationFabricsClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationFabricsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationFabricsClient {
-	return original.NewReplicationFabricsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
-type ReplicationJobsClient = original.ReplicationJobsClient
-
-func NewReplicationJobsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationJobsClient {
-	return original.NewReplicationJobsClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationJobsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationJobsClient {
-	return original.NewReplicationJobsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
-type ReplicationLogicalNetworksClient = original.ReplicationLogicalNetworksClient
-
-func NewReplicationLogicalNetworksClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationLogicalNetworksClient {
-	return original.NewReplicationLogicalNetworksClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationLogicalNetworksClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationLogicalNetworksClient {
-	return original.NewReplicationLogicalNetworksClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
-type ReplicationNetworkMappingsClient = original.ReplicationNetworkMappingsClient
-
-func NewReplicationNetworkMappingsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationNetworkMappingsClient {
-	return original.NewReplicationNetworkMappingsClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationNetworkMappingsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationNetworkMappingsClient {
-	return original.NewReplicationNetworkMappingsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
-type ReplicationNetworksClient = original.ReplicationNetworksClient
-
-func NewReplicationNetworksClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationNetworksClient {
-	return original.NewReplicationNetworksClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationNetworksClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationNetworksClient {
-	return original.NewReplicationNetworksClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
-type ReplicationPoliciesClient = original.ReplicationPoliciesClient
-
-func NewReplicationPoliciesClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationPoliciesClient {
-	return original.NewReplicationPoliciesClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationPoliciesClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationPoliciesClient {
-	return original.NewReplicationPoliciesClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
-type ReplicationProtectableItemsClient = original.ReplicationProtectableItemsClient
-
-func NewReplicationProtectableItemsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectableItemsClient {
-	return original.NewReplicationProtectableItemsClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationProtectableItemsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectableItemsClient {
-	return original.NewReplicationProtectableItemsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
-type ReplicationProtectedItemsClient = original.ReplicationProtectedItemsClient
-
-func NewReplicationProtectedItemsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectedItemsClient {
-	return original.NewReplicationProtectedItemsClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationProtectedItemsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectedItemsClient {
-	return original.NewReplicationProtectedItemsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
-type ReplicationProtectionContainerMappingsClient = original.ReplicationProtectionContainerMappingsClient
-
-func NewReplicationProtectionContainerMappingsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectionContainerMappingsClient {
-	return original.NewReplicationProtectionContainerMappingsClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationProtectionContainerMappingsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectionContainerMappingsClient {
-	return original.NewReplicationProtectionContainerMappingsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
 type ReplicationProtectionContainersClient = original.ReplicationProtectionContainersClient
 
 func NewReplicationProtectionContainersClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationProtectionContainersClient {
@@ -1234,6 +1238,15 @@ func NewReplicationProtectionContainersClientWithBaseURI(baseURI string, subscri
 	return original.NewReplicationProtectionContainersClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
 
+type ReplicationFabricsClient = original.ReplicationFabricsClient
+
+func NewReplicationFabricsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationFabricsClient {
+	return original.NewReplicationFabricsClient(subscriptionID, resourceGroupName, resourceName)
+}
+func NewReplicationFabricsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationFabricsClient {
+	return original.NewReplicationFabricsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
 type ReplicationRecoveryPlansClient = original.ReplicationRecoveryPlansClient
 
 func NewReplicationRecoveryPlansClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationRecoveryPlansClient {
@@ -1243,15 +1256,6 @@ func NewReplicationRecoveryPlansClientWithBaseURI(baseURI string, subscriptionID
 	return original.NewReplicationRecoveryPlansClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
 
-type ReplicationRecoveryServicesProvidersClient = original.ReplicationRecoveryServicesProvidersClient
-
-func NewReplicationRecoveryServicesProvidersClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationRecoveryServicesProvidersClient {
-	return original.NewReplicationRecoveryServicesProvidersClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewReplicationRecoveryServicesProvidersClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationRecoveryServicesProvidersClient {
-	return original.NewReplicationRecoveryServicesProvidersClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-
 type ReplicationStorageClassificationMappingsClient = original.ReplicationStorageClassificationMappingsClient
 
 func NewReplicationStorageClassificationMappingsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationStorageClassificationMappingsClient {
@@ -1261,22 +1265,35 @@ func NewReplicationStorageClassificationMappingsClientWithBaseURI(baseURI string
 	return original.NewReplicationStorageClassificationMappingsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
 
-type ReplicationStorageClassificationsClient = original.ReplicationStorageClassificationsClient
+type ReplicationNetworksClient = original.ReplicationNetworksClient
 
-func NewReplicationStorageClassificationsClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationStorageClassificationsClient {
-	return original.NewReplicationStorageClassificationsClient(subscriptionID, resourceGroupName, resourceName)
+func NewReplicationNetworksClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationNetworksClient {
+	return original.NewReplicationNetworksClient(subscriptionID, resourceGroupName, resourceName)
 }
-func NewReplicationStorageClassificationsClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationStorageClassificationsClient {
-	return original.NewReplicationStorageClassificationsClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+func NewReplicationNetworksClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationNetworksClient {
+	return original.NewReplicationNetworksClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
 
-type ReplicationVaultHealthClient = original.ReplicationVaultHealthClient
+type ReplicationLogicalNetworksClient = original.ReplicationLogicalNetworksClient
 
-func NewReplicationVaultHealthClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationVaultHealthClient {
-	return original.NewReplicationVaultHealthClient(subscriptionID, resourceGroupName, resourceName)
+func NewReplicationLogicalNetworksClient(subscriptionID string, resourceGroupName string, resourceName string) ReplicationLogicalNetworksClient {
+	return original.NewReplicationLogicalNetworksClient(subscriptionID, resourceGroupName, resourceName)
 }
-func NewReplicationVaultHealthClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationVaultHealthClient {
-	return original.NewReplicationVaultHealthClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+func NewReplicationLogicalNetworksClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationLogicalNetworksClient {
+	return original.NewReplicationLogicalNetworksClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string, resourceGroupName string, resourceName string) BaseClient {
+	return original.New(subscriptionID, resourceGroupName, resourceName)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
 
 type ReplicationvCentersClient = original.ReplicationvCentersClient
@@ -1287,18 +1304,3 @@ func NewReplicationvCentersClient(subscriptionID string, resourceGroupName strin
 func NewReplicationvCentersClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) ReplicationvCentersClient {
 	return original.NewReplicationvCentersClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
 }
-
-type TargetComputeSizesClient = original.TargetComputeSizesClient
-
-func NewTargetComputeSizesClient(subscriptionID string, resourceGroupName string, resourceName string) TargetComputeSizesClient {
-	return original.NewTargetComputeSizesClient(subscriptionID, resourceGroupName, resourceName)
-}
-func NewTargetComputeSizesClientWithBaseURI(baseURI string, subscriptionID string, resourceGroupName string, resourceName string) TargetComputeSizesClient {
-	return original.NewTargetComputeSizesClientWithBaseURI(baseURI, subscriptionID, resourceGroupName, resourceName)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
-}
-func Version() string {
-	return original.Version()
-}
diff --git a/profiles/preview/redis/mgmt/redis/models.go b/profiles/preview/redis/mgmt/redis/models.go
index 235c0e706156..659e5c55a7ab 100644
--- a/profiles/preview/redis/mgmt/redis/models.go
+++ b/profiles/preview/redis/mgmt/redis/models.go
@@ -21,35 +21,22 @@ package redis
 
 import original "github.com/Azure/azure-sdk-for-go/services/redis/mgmt/2018-03-01/redis"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type FirewallRulesClient = original.FirewallRulesClient
+type OperationsClient = original.OperationsClient
 
-func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
-	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type LinkedServerClient = original.LinkedServerClient
+type Client = original.Client
 
-func NewLinkedServerClient(subscriptionID string) LinkedServerClient {
-	return original.NewLinkedServerClient(subscriptionID)
+func NewClient(subscriptionID string) Client {
+	return original.NewClient(subscriptionID)
 }
-func NewLinkedServerClientWithBaseURI(baseURI string, subscriptionID string) LinkedServerClient {
-	return original.NewLinkedServerClientWithBaseURI(baseURI, subscriptionID)
+func NewClientWithBaseURI(baseURI string, subscriptionID string) Client {
+	return original.NewClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type DayOfWeek = original.DayOfWeek
@@ -210,35 +197,48 @@ type TrackedResource = original.TrackedResource
 type UpdateParameters = original.UpdateParameters
 type UpdateProperties = original.UpdateProperties
 type UpgradeNotification = original.UpgradeNotification
-type OperationsClient = original.OperationsClient
+type LinkedServerClient = original.LinkedServerClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewLinkedServerClient(subscriptionID string) LinkedServerClient {
+	return original.NewLinkedServerClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewLinkedServerClientWithBaseURI(baseURI string, subscriptionID string) LinkedServerClient {
+	return original.NewLinkedServerClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
 }
 
-type PatchSchedulesClient = original.PatchSchedulesClient
+type FirewallRulesClient = original.FirewallRulesClient
 
-func NewPatchSchedulesClient(subscriptionID string) PatchSchedulesClient {
-	return original.NewPatchSchedulesClient(subscriptionID)
+func NewFirewallRulesClient(subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClient(subscriptionID)
 }
-func NewPatchSchedulesClientWithBaseURI(baseURI string, subscriptionID string) PatchSchedulesClient {
-	return original.NewPatchSchedulesClientWithBaseURI(baseURI, subscriptionID)
+func NewFirewallRulesClientWithBaseURI(baseURI string, subscriptionID string) FirewallRulesClient {
+	return original.NewFirewallRulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type Client = original.Client
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewClient(subscriptionID string) Client {
-	return original.NewClient(subscriptionID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewClientWithBaseURI(baseURI string, subscriptionID string) Client {
-	return original.NewClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+type PatchSchedulesClient = original.PatchSchedulesClient
+
+func NewPatchSchedulesClient(subscriptionID string) PatchSchedulesClient {
+	return original.NewPatchSchedulesClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewPatchSchedulesClientWithBaseURI(baseURI string, subscriptionID string) PatchSchedulesClient {
+	return original.NewPatchSchedulesClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/relay/mgmt/relay/models.go b/profiles/preview/relay/mgmt/relay/models.go
index 561e5f526d19..ecd6a8cc9d50 100644
--- a/profiles/preview/relay/mgmt/relay/models.go
+++ b/profiles/preview/relay/mgmt/relay/models.go
@@ -21,17 +21,31 @@ package relay
 
 import original "github.com/Azure/azure-sdk-for-go/services/relay/mgmt/2017-04-01/relay"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type OperationsClient = original.OperationsClient
 
-type BaseClient = original.BaseClient
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
+}
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type WCFRelaysClient = original.WCFRelaysClient
+
+func NewWCFRelaysClient(subscriptionID string) WCFRelaysClient {
+	return original.NewWCFRelaysClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewWCFRelaysClientWithBaseURI(baseURI string, subscriptionID string) WCFRelaysClient {
+	return original.NewWCFRelaysClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type NamespacesClient = original.NamespacesClient
+
+func NewNamespacesClient(subscriptionID string) NamespacesClient {
+	return original.NewNamespacesClient(subscriptionID)
+}
+func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) NamespacesClient {
+	return original.NewNamespacesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type HybridConnectionsClient = original.HybridConnectionsClient
@@ -154,23 +168,7 @@ type WcfRelayProperties = original.WcfRelayProperties
 type WcfRelaysListResult = original.WcfRelaysListResult
 type WcfRelaysListResultIterator = original.WcfRelaysListResultIterator
 type WcfRelaysListResultPage = original.WcfRelaysListResultPage
-type NamespacesClient = original.NamespacesClient
-
-func NewNamespacesClient(subscriptionID string) NamespacesClient {
-	return original.NewNamespacesClient(subscriptionID)
-}
-func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) NamespacesClient {
-	return original.NewNamespacesClientWithBaseURI(baseURI, subscriptionID)
-}
 
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
@@ -178,11 +176,15 @@ func Version() string {
 	return original.Version()
 }
 
-type WCFRelaysClient = original.WCFRelaysClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewWCFRelaysClient(subscriptionID string) WCFRelaysClient {
-	return original.NewWCFRelaysClient(subscriptionID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewWCFRelaysClientWithBaseURI(baseURI string, subscriptionID string) WCFRelaysClient {
-	return original.NewWCFRelaysClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/reservations/mgmt/reservations/models.go b/profiles/preview/reservations/mgmt/reservations/models.go
index 35762a523ad0..fe8c5eb5db0c 100644
--- a/profiles/preview/reservations/mgmt/reservations/models.go
+++ b/profiles/preview/reservations/mgmt/reservations/models.go
@@ -21,17 +21,13 @@ package reservations
 
 import original "github.com/Azure/azure-sdk-for-go/services/reservations/mgmt/2017-11-01/reservations"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationClient = original.OperationClient
 
-func New() BaseClient {
-	return original.New()
+func NewOperationClient() OperationClient {
+	return original.NewOperationClient()
 }
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
+func NewOperationClientWithBaseURI(baseURI string) OperationClient {
+	return original.NewOperationClientWithBaseURI(baseURI)
 }
 
 type AppliedScopeType = original.AppliedScopeType
@@ -274,15 +270,6 @@ type SplitFuture = original.SplitFuture
 type SplitProperties = original.SplitProperties
 type SplitPropertiesType = original.SplitPropertiesType
 type SplitRequest = original.SplitRequest
-type OperationClient = original.OperationClient
-
-func NewOperationClient() OperationClient {
-	return original.NewOperationClient()
-}
-func NewOperationClientWithBaseURI(baseURI string) OperationClient {
-	return original.NewOperationClientWithBaseURI(baseURI)
-}
-
 type OrderClient = original.OrderClient
 
 func NewOrderClient() OrderClient {
@@ -291,6 +278,25 @@ func NewOrderClient() OrderClient {
 func NewOrderClientWithBaseURI(baseURI string) OrderClient {
 	return original.NewOrderClientWithBaseURI(baseURI)
 }
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
 
 type Client = original.Client
 
@@ -300,9 +306,3 @@ func NewClient() Client {
 func NewClientWithBaseURI(baseURI string) Client {
 	return original.NewClientWithBaseURI(baseURI)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
-}
-func Version() string {
-	return original.Version()
-}
diff --git a/profiles/preview/resourcehealth/mgmt/resourcehealth/models.go b/profiles/preview/resourcehealth/mgmt/resourcehealth/models.go
index c484bab65849..7c1fcbf34c6e 100644
--- a/profiles/preview/resourcehealth/mgmt/resourcehealth/models.go
+++ b/profiles/preview/resourcehealth/mgmt/resourcehealth/models.go
@@ -21,26 +21,13 @@ package resourcehealth
 
 import original "github.com/Azure/azure-sdk-for-go/services/resourcehealth/mgmt/2017-07-01/resourcehealth"
 
-type AvailabilityStatusesClient = original.AvailabilityStatusesClient
-
-func NewAvailabilityStatusesClient(subscriptionID string) AvailabilityStatusesClient {
-	return original.NewAvailabilityStatusesClient(subscriptionID)
-}
-func NewAvailabilityStatusesClientWithBaseURI(baseURI string, subscriptionID string) AvailabilityStatusesClient {
-	return original.NewAvailabilityStatusesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AvailabilityStateValues = original.AvailabilityStateValues
@@ -80,17 +67,32 @@ type RecommendedAction = original.RecommendedAction
 type ServiceImpactingEvent = original.ServiceImpactingEvent
 type ServiceImpactingEventIncidentProperties = original.ServiceImpactingEventIncidentProperties
 type ServiceImpactingEventStatus = original.ServiceImpactingEventStatus
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+type AvailabilityStatusesClient = original.AvailabilityStatusesClient
+
+func NewAvailabilityStatusesClient(subscriptionID string) AvailabilityStatusesClient {
+	return original.NewAvailabilityStatusesClient(subscriptionID)
+}
+func NewAvailabilityStatusesClientWithBaseURI(baseURI string, subscriptionID string) AvailabilityStatusesClient {
+	return original.NewAvailabilityStatusesClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/resources/mgmt/features/models.go b/profiles/preview/resources/mgmt/features/models.go
index 062a0960fd58..790912bca369 100644
--- a/profiles/preview/resources/mgmt/features/models.go
+++ b/profiles/preview/resources/mgmt/features/models.go
@@ -21,19 +21,6 @@ package features
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2015-12-01/features"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type Client = original.Client
 
 func NewClient(subscriptionID string) Client {
@@ -55,3 +42,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/resources/mgmt/links/models.go b/profiles/preview/resources/mgmt/links/models.go
index 68c9433a031f..cc70c066a5d3 100644
--- a/profiles/preview/resources/mgmt/links/models.go
+++ b/profiles/preview/resources/mgmt/links/models.go
@@ -21,17 +21,13 @@ package links
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-09-01/links"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type ResourceLinksClient = original.ResourceLinksClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewResourceLinksClient(subscriptionID string) ResourceLinksClient {
+	return original.NewResourceLinksClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewResourceLinksClientWithBaseURI(baseURI string, subscriptionID string) ResourceLinksClient {
+	return original.NewResourceLinksClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type Filter = original.Filter
@@ -50,17 +46,23 @@ type ResourceLinkProperties = original.ResourceLinkProperties
 type ResourceLinkResult = original.ResourceLinkResult
 type ResourceLinkResultIterator = original.ResourceLinkResultIterator
 type ResourceLinkResultPage = original.ResourceLinkResultPage
-type ResourceLinksClient = original.ResourceLinksClient
 
-func NewResourceLinksClient(subscriptionID string) ResourceLinksClient {
-	return original.NewResourceLinksClient(subscriptionID)
-}
-func NewResourceLinksClientWithBaseURI(baseURI string, subscriptionID string) ResourceLinksClient {
-	return original.NewResourceLinksClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/resources/mgmt/locks/models.go b/profiles/preview/resources/mgmt/locks/models.go
index 9073e39dae4a..861c14a3c936 100644
--- a/profiles/preview/resources/mgmt/locks/models.go
+++ b/profiles/preview/resources/mgmt/locks/models.go
@@ -21,19 +21,6 @@ package locks
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-09-01/locks"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type ManagementLocksClient = original.ManagementLocksClient
 
 func NewManagementLocksClient(subscriptionID string) ManagementLocksClient {
@@ -68,3 +55,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/resources/mgmt/managedapplications/models.go b/profiles/preview/resources/mgmt/managedapplications/models.go
index 4a8d63561712..8dbccfb3335f 100644
--- a/profiles/preview/resources/mgmt/managedapplications/models.go
+++ b/profiles/preview/resources/mgmt/managedapplications/models.go
@@ -21,15 +21,6 @@ package managedapplications
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-09-01-preview/managedapplications"
 
-type ApplianceDefinitionsClient = original.ApplianceDefinitionsClient
-
-func NewApplianceDefinitionsClient(subscriptionID string) ApplianceDefinitionsClient {
-	return original.NewApplianceDefinitionsClient(subscriptionID)
-}
-func NewApplianceDefinitionsClientWithBaseURI(baseURI string, subscriptionID string) ApplianceDefinitionsClient {
-	return original.NewApplianceDefinitionsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type AppliancesClient = original.AppliancesClient
 
 func NewAppliancesClient(subscriptionID string) AppliancesClient {
@@ -39,17 +30,13 @@ func NewAppliancesClientWithBaseURI(baseURI string, subscriptionID string) Appli
 	return original.NewAppliancesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type ApplianceDefinitionsClient = original.ApplianceDefinitionsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewApplianceDefinitionsClient(subscriptionID string) ApplianceDefinitionsClient {
+	return original.NewApplianceDefinitionsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewApplianceDefinitionsClientWithBaseURI(baseURI string, subscriptionID string) ApplianceDefinitionsClient {
+	return original.NewApplianceDefinitionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ApplianceArtifactType = original.ApplianceArtifactType
@@ -141,3 +128,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/resources/mgmt/management/models.go b/profiles/preview/resources/mgmt/management/models.go
index 062f514690bd..3f060b44f3a4 100644
--- a/profiles/preview/resources/mgmt/management/models.go
+++ b/profiles/preview/resources/mgmt/management/models.go
@@ -21,35 +21,13 @@ package managementgroups
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-01-01-preview/management"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(operationResultID string, skiptoken string) BaseClient {
-	return original.New(operationResultID, skiptoken)
-}
-func NewWithBaseURI(baseURI string, operationResultID string, skiptoken string) BaseClient {
-	return original.NewWithBaseURI(baseURI, operationResultID, skiptoken)
-}
-
-type EntitiesClient = original.EntitiesClient
-
-func NewEntitiesClient(operationResultID string, skiptoken string) EntitiesClient {
-	return original.NewEntitiesClient(operationResultID, skiptoken)
-}
-func NewEntitiesClientWithBaseURI(baseURI string, operationResultID string, skiptoken string) EntitiesClient {
-	return original.NewEntitiesClientWithBaseURI(baseURI, operationResultID, skiptoken)
-}
-
-type Client = original.Client
+type OperationsClient = original.OperationsClient
 
-func NewClient(operationResultID string, skiptoken string) Client {
-	return original.NewClient(operationResultID, skiptoken)
+func NewOperationsClient(operationResultID string, skiptoken string) OperationsClient {
+	return original.NewOperationsClient(operationResultID, skiptoken)
 }
-func NewClientWithBaseURI(baseURI string, operationResultID string, skiptoken string) Client {
-	return original.NewClientWithBaseURI(baseURI, operationResultID, skiptoken)
+func NewOperationsClientWithBaseURI(baseURI string, operationResultID string, skiptoken string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, operationResultID, skiptoken)
 }
 
 type Permissions = original.Permissions
@@ -169,15 +147,6 @@ type ParentGroupInfo = original.ParentGroupInfo
 type PatchManagementGroupRequest = original.PatchManagementGroupRequest
 type Properties = original.Properties
 type SetObject = original.SetObject
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(operationResultID string, skiptoken string) OperationsClient {
-	return original.NewOperationsClient(operationResultID, skiptoken)
-}
-func NewOperationsClientWithBaseURI(baseURI string, operationResultID string, skiptoken string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, operationResultID, skiptoken)
-}
-
 type SubscriptionsClient = original.SubscriptionsClient
 
 func NewSubscriptionsClient(operationResultID string, skiptoken string) SubscriptionsClient {
@@ -192,3 +161,34 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type EntitiesClient = original.EntitiesClient
+
+func NewEntitiesClient(operationResultID string, skiptoken string) EntitiesClient {
+	return original.NewEntitiesClient(operationResultID, skiptoken)
+}
+func NewEntitiesClientWithBaseURI(baseURI string, operationResultID string, skiptoken string) EntitiesClient {
+	return original.NewEntitiesClientWithBaseURI(baseURI, operationResultID, skiptoken)
+}
+
+type Client = original.Client
+
+func NewClient(operationResultID string, skiptoken string) Client {
+	return original.NewClient(operationResultID, skiptoken)
+}
+func NewClientWithBaseURI(baseURI string, operationResultID string, skiptoken string) Client {
+	return original.NewClientWithBaseURI(baseURI, operationResultID, skiptoken)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(operationResultID string, skiptoken string) BaseClient {
+	return original.New(operationResultID, skiptoken)
+}
+func NewWithBaseURI(baseURI string, operationResultID string, skiptoken string) BaseClient {
+	return original.NewWithBaseURI(baseURI, operationResultID, skiptoken)
+}
diff --git a/profiles/preview/resources/mgmt/policy/models.go b/profiles/preview/resources/mgmt/policy/models.go
index c30bf7faffe8..a04ea1b2f7ce 100644
--- a/profiles/preview/resources/mgmt/policy/models.go
+++ b/profiles/preview/resources/mgmt/policy/models.go
@@ -21,28 +21,6 @@ package policy
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-06-01-preview/policy"
 
-type AssignmentsClient = original.AssignmentsClient
-
-func NewAssignmentsClient(subscriptionID string) AssignmentsClient {
-	return original.NewAssignmentsClient(subscriptionID)
-}
-func NewAssignmentsClientWithBaseURI(baseURI string, subscriptionID string) AssignmentsClient {
-	return original.NewAssignmentsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type DefinitionsClient = original.DefinitionsClient
 
 func NewDefinitionsClient(subscriptionID string) DefinitionsClient {
@@ -94,6 +72,36 @@ type SetDefinitionListResultIterator = original.SetDefinitionListResultIterator
 type SetDefinitionListResultPage = original.SetDefinitionListResultPage
 type SetDefinitionProperties = original.SetDefinitionProperties
 type Sku = original.Sku
+
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
+
+type AssignmentsClient = original.AssignmentsClient
+
+func NewAssignmentsClient(subscriptionID string) AssignmentsClient {
+	return original.NewAssignmentsClient(subscriptionID)
+}
+func NewAssignmentsClientWithBaseURI(baseURI string, subscriptionID string) AssignmentsClient {
+	return original.NewAssignmentsClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type SetDefinitionsClient = original.SetDefinitionsClient
 
 func NewSetDefinitionsClient(subscriptionID string) SetDefinitionsClient {
@@ -102,9 +110,3 @@ func NewSetDefinitionsClient(subscriptionID string) SetDefinitionsClient {
 func NewSetDefinitionsClientWithBaseURI(baseURI string, subscriptionID string) SetDefinitionsClient {
 	return original.NewSetDefinitionsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
-}
-func Version() string {
-	return original.Version()
-}
diff --git a/profiles/preview/resources/mgmt/resources/models.go b/profiles/preview/resources/mgmt/resources/models.go
index 1994e9abf415..20980f930e3d 100644
--- a/profiles/preview/resources/mgmt/resources/models.go
+++ b/profiles/preview/resources/mgmt/resources/models.go
@@ -21,44 +21,22 @@ package resources
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-02-01/resources"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type DeploymentOperationsClient = original.DeploymentOperationsClient
-
-func NewDeploymentOperationsClient(subscriptionID string) DeploymentOperationsClient {
-	return original.NewDeploymentOperationsClient(subscriptionID)
-}
-func NewDeploymentOperationsClientWithBaseURI(baseURI string, subscriptionID string) DeploymentOperationsClient {
-	return original.NewDeploymentOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type DeploymentsClient = original.DeploymentsClient
+type TagsClient = original.TagsClient
 
-func NewDeploymentsClient(subscriptionID string) DeploymentsClient {
-	return original.NewDeploymentsClient(subscriptionID)
+func NewTagsClient(subscriptionID string) TagsClient {
+	return original.NewTagsClient(subscriptionID)
 }
-func NewDeploymentsClientWithBaseURI(baseURI string, subscriptionID string) DeploymentsClient {
-	return original.NewDeploymentsClientWithBaseURI(baseURI, subscriptionID)
+func NewTagsClientWithBaseURI(baseURI string, subscriptionID string) TagsClient {
+	return original.NewTagsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type GroupsClient = original.GroupsClient
+type Client = original.Client
 
-func NewGroupsClient(subscriptionID string) GroupsClient {
-	return original.NewGroupsClient(subscriptionID)
+func NewClient(subscriptionID string) Client {
+	return original.NewClient(subscriptionID)
 }
-func NewGroupsClientWithBaseURI(baseURI string, subscriptionID string) GroupsClient {
-	return original.NewGroupsClientWithBaseURI(baseURI, subscriptionID)
+func NewClientWithBaseURI(baseURI string, subscriptionID string) Client {
+	return original.NewClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type DeploymentMode = original.DeploymentMode
@@ -166,35 +144,59 @@ type TemplateLink = original.TemplateLink
 type UpdateByIDFuture = original.UpdateByIDFuture
 type UpdateFuture = original.UpdateFuture
 type ValidateMoveResourcesFuture = original.ValidateMoveResourcesFuture
-type ProvidersClient = original.ProvidersClient
 
-func NewProvidersClient(subscriptionID string) ProvidersClient {
-	return original.NewProvidersClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewProvidersClientWithBaseURI(baseURI string, subscriptionID string) ProvidersClient {
-	return original.NewProvidersClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type Client = original.Client
+type DeploymentOperationsClient = original.DeploymentOperationsClient
 
-func NewClient(subscriptionID string) Client {
-	return original.NewClient(subscriptionID)
+func NewDeploymentOperationsClient(subscriptionID string) DeploymentOperationsClient {
+	return original.NewDeploymentOperationsClient(subscriptionID)
 }
-func NewClientWithBaseURI(baseURI string, subscriptionID string) Client {
-	return original.NewClientWithBaseURI(baseURI, subscriptionID)
+func NewDeploymentOperationsClientWithBaseURI(baseURI string, subscriptionID string) DeploymentOperationsClient {
+	return original.NewDeploymentOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TagsClient = original.TagsClient
+type DeploymentsClient = original.DeploymentsClient
 
-func NewTagsClient(subscriptionID string) TagsClient {
-	return original.NewTagsClient(subscriptionID)
+func NewDeploymentsClient(subscriptionID string) DeploymentsClient {
+	return original.NewDeploymentsClient(subscriptionID)
 }
-func NewTagsClientWithBaseURI(baseURI string, subscriptionID string) TagsClient {
-	return original.NewTagsClientWithBaseURI(baseURI, subscriptionID)
+func NewDeploymentsClientWithBaseURI(baseURI string, subscriptionID string) DeploymentsClient {
+	return original.NewDeploymentsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+type GroupsClient = original.GroupsClient
+
+func NewGroupsClient(subscriptionID string) GroupsClient {
+	return original.NewGroupsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewGroupsClientWithBaseURI(baseURI string, subscriptionID string) GroupsClient {
+	return original.NewGroupsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ProvidersClient = original.ProvidersClient
+
+func NewProvidersClient(subscriptionID string) ProvidersClient {
+	return original.NewProvidersClient(subscriptionID)
+}
+func NewProvidersClientWithBaseURI(baseURI string, subscriptionID string) ProvidersClient {
+	return original.NewProvidersClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/resources/mgmt/subscriptions/models.go b/profiles/preview/resources/mgmt/subscriptions/models.go
index dd618c94a872..ee3a66081de7 100644
--- a/profiles/preview/resources/mgmt/subscriptions/models.go
+++ b/profiles/preview/resources/mgmt/subscriptions/models.go
@@ -21,17 +21,13 @@ package subscriptions
 
 import original "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-06-01/subscriptions"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type TenantsClient = original.TenantsClient
 
-func New() BaseClient {
-	return original.New()
+func NewTenantsClient() TenantsClient {
+	return original.NewTenantsClient()
 }
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
+func NewTenantsClientWithBaseURI(baseURI string) TenantsClient {
+	return original.NewTenantsClientWithBaseURI(baseURI)
 }
 
 type SpendingLimit = original.SpendingLimit
@@ -79,18 +75,22 @@ func NewClient() Client {
 func NewClientWithBaseURI(baseURI string) Client {
 	return original.NewClientWithBaseURI(baseURI)
 }
-
-type TenantsClient = original.TenantsClient
-
-func NewTenantsClient() TenantsClient {
-	return original.NewTenantsClient()
-}
-func NewTenantsClientWithBaseURI(baseURI string) TenantsClient {
-	return original.NewTenantsClientWithBaseURI(baseURI)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
diff --git a/profiles/preview/scheduler/mgmt/scheduler/models.go b/profiles/preview/scheduler/mgmt/scheduler/models.go
index 74bb36c09671..d9bf45454951 100644
--- a/profiles/preview/scheduler/mgmt/scheduler/models.go
+++ b/profiles/preview/scheduler/mgmt/scheduler/models.go
@@ -21,17 +21,13 @@ package scheduler
 
 import original "github.com/Azure/azure-sdk-for-go/services/scheduler/mgmt/2016-03-01/scheduler"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type JobsClient = original.JobsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewJobsClient(subscriptionID string) JobsClient {
+	return original.NewJobsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewJobsClientWithBaseURI(baseURI string, subscriptionID string) JobsClient {
+	return original.NewJobsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type JobCollectionsClient = original.JobCollectionsClient
@@ -43,15 +39,6 @@ func NewJobCollectionsClientWithBaseURI(baseURI string, subscriptionID string) J
 	return original.NewJobCollectionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type JobsClient = original.JobsClient
-
-func NewJobsClient(subscriptionID string) JobsClient {
-	return original.NewJobsClient(subscriptionID)
-}
-func NewJobsClientWithBaseURI(baseURI string, subscriptionID string) JobsClient {
-	return original.NewJobsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type DayOfWeek = original.DayOfWeek
 
 const (
@@ -270,3 +257,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/search/mgmt/search/models.go b/profiles/preview/search/mgmt/search/models.go
index 4e8c976d7122..6c9e34042bcc 100644
--- a/profiles/preview/search/mgmt/search/models.go
+++ b/profiles/preview/search/mgmt/search/models.go
@@ -21,26 +21,31 @@ package search
 
 import original "github.com/Azure/azure-sdk-for-go/services/search/mgmt/2015-08-19/search"
 
-type AdminKeysClient = original.AdminKeysClient
+type OperationsClient = original.OperationsClient
 
-func NewAdminKeysClient(subscriptionID string) AdminKeysClient {
-	return original.NewAdminKeysClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewAdminKeysClientWithBaseURI(baseURI string, subscriptionID string) AdminKeysClient {
-	return original.NewAdminKeysClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type ServicesClient = original.ServicesClient
 
-type BaseClient = original.BaseClient
+func NewServicesClient(subscriptionID string) ServicesClient {
+	return original.NewServicesClient(subscriptionID)
+}
+func NewServicesClientWithBaseURI(baseURI string, subscriptionID string) ServicesClient {
+	return original.NewServicesClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type AdminKeysClient = original.AdminKeysClient
+
+func NewAdminKeysClient(subscriptionID string) AdminKeysClient {
+	return original.NewAdminKeysClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewAdminKeysClientWithBaseURI(baseURI string, subscriptionID string) AdminKeysClient {
+	return original.NewAdminKeysClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AdminKeyKind = original.AdminKeyKind
@@ -133,13 +138,12 @@ type ServiceListResult = original.ServiceListResult
 type ServiceProperties = original.ServiceProperties
 type ServicesCreateOrUpdateFuture = original.ServicesCreateOrUpdateFuture
 type Sku = original.Sku
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
 type QueryKeysClient = original.QueryKeysClient
@@ -151,17 +155,15 @@ func NewQueryKeysClientWithBaseURI(baseURI string, subscriptionID string) QueryK
 	return original.NewQueryKeysClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ServicesClient = original.ServicesClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewServicesClient(subscriptionID string) ServicesClient {
-	return original.NewServicesClient(subscriptionID)
-}
-func NewServicesClientWithBaseURI(baseURI string, subscriptionID string) ServicesClient {
-	return original.NewServicesClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/servermanagement/mgmt/servermanagement/models.go b/profiles/preview/servermanagement/mgmt/servermanagement/models.go
index c749d845e72b..4cb4d8ebb5f7 100644
--- a/profiles/preview/servermanagement/mgmt/servermanagement/models.go
+++ b/profiles/preview/servermanagement/mgmt/servermanagement/models.go
@@ -21,19 +21,6 @@ package servermanagement
 
 import original "github.com/Azure/azure-sdk-for-go/services/servermanagement/mgmt/2016-07-01-preview/servermanagement"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type GatewayClient = original.GatewayClient
 
 func NewGatewayClient(subscriptionID string) GatewayClient {
@@ -43,6 +30,15 @@ func NewGatewayClientWithBaseURI(baseURI string, subscriptionID string) GatewayC
 	return original.NewGatewayClientWithBaseURI(baseURI, subscriptionID)
 }
 
+type SessionClient = original.SessionClient
+
+func NewSessionClient(subscriptionID string) SessionClient {
+	return original.NewSessionClient(subscriptionID)
+}
+func NewSessionClientWithBaseURI(baseURI string, subscriptionID string) SessionClient {
+	return original.NewSessionClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type CredentialDataFormat = original.CredentialDataFormat
 
 const (
@@ -156,13 +152,12 @@ type SessionParametersProperties = original.SessionParametersProperties
 type SessionResource = original.SessionResource
 type SessionResourceProperties = original.SessionResourceProperties
 type VersionServermanagement = original.VersionServermanagement
-type NodeClient = original.NodeClient
 
-func NewNodeClient(subscriptionID string) NodeClient {
-	return original.NewNodeClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewNodeClientWithBaseURI(baseURI string, subscriptionID string) NodeClient {
-	return original.NewNodeClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
 type PowerShellClient = original.PowerShellClient
@@ -174,17 +169,24 @@ func NewPowerShellClientWithBaseURI(baseURI string, subscriptionID string) Power
 	return original.NewPowerShellClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SessionClient = original.SessionClient
+type NodeClient = original.NodeClient
 
-func NewSessionClient(subscriptionID string) SessionClient {
-	return original.NewSessionClient(subscriptionID)
+func NewNodeClient(subscriptionID string) NodeClient {
+	return original.NewNodeClient(subscriptionID)
 }
-func NewSessionClientWithBaseURI(baseURI string, subscriptionID string) SessionClient {
-	return original.NewSessionClientWithBaseURI(baseURI, subscriptionID)
+func NewNodeClientWithBaseURI(baseURI string, subscriptionID string) NodeClient {
+	return original.NewNodeClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/servicebus/mgmt/servicebus/models.go b/profiles/preview/servicebus/mgmt/servicebus/models.go
index e7fac4edd39c..34a867436098 100644
--- a/profiles/preview/servicebus/mgmt/servicebus/models.go
+++ b/profiles/preview/servicebus/mgmt/servicebus/models.go
@@ -21,35 +21,31 @@ package servicebus
 
 import original "github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type RegionsClient = original.RegionsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewRegionsClient(subscriptionID string) RegionsClient {
+	return original.NewRegionsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewRegionsClientWithBaseURI(baseURI string, subscriptionID string) RegionsClient {
+	return original.NewRegionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DisasterRecoveryConfigsClient = original.DisasterRecoveryConfigsClient
+type OperationsClient = original.OperationsClient
 
-func NewDisasterRecoveryConfigsClient(subscriptionID string) DisasterRecoveryConfigsClient {
-	return original.NewDisasterRecoveryConfigsClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewDisasterRecoveryConfigsClientWithBaseURI(baseURI string, subscriptionID string) DisasterRecoveryConfigsClient {
-	return original.NewDisasterRecoveryConfigsClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type EventHubsClient = original.EventHubsClient
+type NamespacesClient = original.NamespacesClient
 
-func NewEventHubsClient(subscriptionID string) EventHubsClient {
-	return original.NewEventHubsClient(subscriptionID)
+func NewNamespacesClient(subscriptionID string) NamespacesClient {
+	return original.NewNamespacesClient(subscriptionID)
 }
-func NewEventHubsClientWithBaseURI(baseURI string, subscriptionID string) EventHubsClient {
-	return original.NewEventHubsClientWithBaseURI(baseURI, subscriptionID)
+func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) NamespacesClient {
+	return original.NewNamespacesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccessRights = original.AccessRights
@@ -249,22 +245,22 @@ type SBTopicProperties = original.SBTopicProperties
 type SQLFilter = original.SQLFilter
 type SQLRuleAction = original.SQLRuleAction
 type TrackedResource = original.TrackedResource
-type NamespacesClient = original.NamespacesClient
+type QueuesClient = original.QueuesClient
 
-func NewNamespacesClient(subscriptionID string) NamespacesClient {
-	return original.NewNamespacesClient(subscriptionID)
+func NewQueuesClient(subscriptionID string) QueuesClient {
+	return original.NewQueuesClient(subscriptionID)
 }
-func NewNamespacesClientWithBaseURI(baseURI string, subscriptionID string) NamespacesClient {
-	return original.NewNamespacesClientWithBaseURI(baseURI, subscriptionID)
+func NewQueuesClientWithBaseURI(baseURI string, subscriptionID string) QueuesClient {
+	return original.NewQueuesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type OperationsClient = original.OperationsClient
+type SubscriptionsClient = original.SubscriptionsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewSubscriptionsClient(subscriptionID string) SubscriptionsClient {
+	return original.NewSubscriptionsClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewSubscriptionsClientWithBaseURI(baseURI string, subscriptionID string) SubscriptionsClient {
+	return original.NewSubscriptionsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type PremiumMessagingRegionsClient = original.PremiumMessagingRegionsClient
@@ -275,23 +271,20 @@ func NewPremiumMessagingRegionsClient(subscriptionID string) PremiumMessagingReg
 func NewPremiumMessagingRegionsClientWithBaseURI(baseURI string, subscriptionID string) PremiumMessagingRegionsClient {
 	return original.NewPremiumMessagingRegionsClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type QueuesClient = original.QueuesClient
-
-func NewQueuesClient(subscriptionID string) QueuesClient {
-	return original.NewQueuesClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewQueuesClientWithBaseURI(baseURI string, subscriptionID string) QueuesClient {
-	return original.NewQueuesClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type RegionsClient = original.RegionsClient
+type TopicsClient = original.TopicsClient
 
-func NewRegionsClient(subscriptionID string) RegionsClient {
-	return original.NewRegionsClient(subscriptionID)
+func NewTopicsClient(subscriptionID string) TopicsClient {
+	return original.NewTopicsClient(subscriptionID)
 }
-func NewRegionsClientWithBaseURI(baseURI string, subscriptionID string) RegionsClient {
-	return original.NewRegionsClientWithBaseURI(baseURI, subscriptionID)
+func NewTopicsClientWithBaseURI(baseURI string, subscriptionID string) TopicsClient {
+	return original.NewTopicsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type RulesClient = original.RulesClient
@@ -303,26 +296,33 @@ func NewRulesClientWithBaseURI(baseURI string, subscriptionID string) RulesClien
 	return original.NewRulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SubscriptionsClient = original.SubscriptionsClient
+type DisasterRecoveryConfigsClient = original.DisasterRecoveryConfigsClient
 
-func NewSubscriptionsClient(subscriptionID string) SubscriptionsClient {
-	return original.NewSubscriptionsClient(subscriptionID)
+func NewDisasterRecoveryConfigsClient(subscriptionID string) DisasterRecoveryConfigsClient {
+	return original.NewDisasterRecoveryConfigsClient(subscriptionID)
 }
-func NewSubscriptionsClientWithBaseURI(baseURI string, subscriptionID string) SubscriptionsClient {
-	return original.NewSubscriptionsClientWithBaseURI(baseURI, subscriptionID)
+func NewDisasterRecoveryConfigsClientWithBaseURI(baseURI string, subscriptionID string) DisasterRecoveryConfigsClient {
+	return original.NewDisasterRecoveryConfigsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TopicsClient = original.TopicsClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewTopicsClient(subscriptionID string) TopicsClient {
-	return original.NewTopicsClient(subscriptionID)
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func NewTopicsClientWithBaseURI(baseURI string, subscriptionID string) TopicsClient {
-	return original.NewTopicsClientWithBaseURI(baseURI, subscriptionID)
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+type EventHubsClient = original.EventHubsClient
+
+func NewEventHubsClient(subscriptionID string) EventHubsClient {
+	return original.NewEventHubsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewEventHubsClientWithBaseURI(baseURI string, subscriptionID string) EventHubsClient {
+	return original.NewEventHubsClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/servicefabric/mgmt/servicefabric/models.go b/profiles/preview/servicefabric/mgmt/servicefabric/models.go
index 0a33d1d9efa0..c50b4c17efbe 100644
--- a/profiles/preview/servicefabric/mgmt/servicefabric/models.go
+++ b/profiles/preview/servicefabric/mgmt/servicefabric/models.go
@@ -21,53 +21,49 @@ package servicefabric
 
 import original "github.com/Azure/azure-sdk-for-go/services/servicefabric/mgmt/2017-07-01-preview/servicefabric"
 
-type ApplicationClient = original.ApplicationClient
+type ServiceClient = original.ServiceClient
 
-func NewApplicationClient() ApplicationClient {
-	return original.NewApplicationClient()
+func NewServiceClient() ServiceClient {
+	return original.NewServiceClient()
 }
-func NewApplicationClientWithBaseURI(baseURI string) ApplicationClient {
-	return original.NewApplicationClientWithBaseURI(baseURI)
+func NewServiceClientWithBaseURI(baseURI string) ServiceClient {
+	return original.NewServiceClientWithBaseURI(baseURI)
 }
 
-type ApplicationTypeClient = original.ApplicationTypeClient
+type ClusterVersionsClient = original.ClusterVersionsClient
 
-func NewApplicationTypeClient() ApplicationTypeClient {
-	return original.NewApplicationTypeClient()
+func NewClusterVersionsClient() ClusterVersionsClient {
+	return original.NewClusterVersionsClient()
 }
-func NewApplicationTypeClientWithBaseURI(baseURI string) ApplicationTypeClient {
-	return original.NewApplicationTypeClientWithBaseURI(baseURI)
+func NewClusterVersionsClientWithBaseURI(baseURI string) ClusterVersionsClient {
+	return original.NewClusterVersionsClientWithBaseURI(baseURI)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New() BaseClient {
-	return original.New()
+func NewOperationsClient() OperationsClient {
+	return original.NewOperationsClient()
 }
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
+func NewOperationsClientWithBaseURI(baseURI string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI)
 }
 
-type ClustersClient = original.ClustersClient
+type ApplicationClient = original.ApplicationClient
 
-func NewClustersClient() ClustersClient {
-	return original.NewClustersClient()
+func NewApplicationClient() ApplicationClient {
+	return original.NewApplicationClient()
 }
-func NewClustersClientWithBaseURI(baseURI string) ClustersClient {
-	return original.NewClustersClientWithBaseURI(baseURI)
+func NewApplicationClientWithBaseURI(baseURI string) ApplicationClient {
+	return original.NewApplicationClientWithBaseURI(baseURI)
 }
 
-type ClusterVersionsClient = original.ClusterVersionsClient
+type ApplicationTypeClient = original.ApplicationTypeClient
 
-func NewClusterVersionsClient() ClusterVersionsClient {
-	return original.NewClusterVersionsClient()
+func NewApplicationTypeClient() ApplicationTypeClient {
+	return original.NewApplicationTypeClient()
 }
-func NewClusterVersionsClientWithBaseURI(baseURI string) ClusterVersionsClient {
-	return original.NewClusterVersionsClientWithBaseURI(baseURI)
+func NewApplicationTypeClientWithBaseURI(baseURI string) ApplicationTypeClient {
+	return original.NewApplicationTypeClientWithBaseURI(baseURI)
 }
 
 type ClusterState = original.ClusterState
@@ -355,23 +351,7 @@ type VersionProperties = original.VersionProperties
 type VersionPutFuture = original.VersionPutFuture
 type VersionResource = original.VersionResource
 type VersionResourceList = original.VersionResourceList
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient() OperationsClient {
-	return original.NewOperationsClient()
-}
-func NewOperationsClientWithBaseURI(baseURI string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI)
-}
-
-type ServiceClient = original.ServiceClient
-
-func NewServiceClient() ServiceClient {
-	return original.NewServiceClient()
-}
-func NewServiceClientWithBaseURI(baseURI string) ServiceClient {
-	return original.NewServiceClientWithBaseURI(baseURI)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
@@ -387,3 +367,25 @@ func NewVersionClient() VersionClient {
 func NewVersionClientWithBaseURI(baseURI string) VersionClient {
 	return original.NewVersionClientWithBaseURI(baseURI)
 }
+
+type ClustersClient = original.ClustersClient
+
+func NewClustersClient() ClustersClient {
+	return original.NewClustersClient()
+}
+func NewClustersClientWithBaseURI(baseURI string) ClustersClient {
+	return original.NewClustersClientWithBaseURI(baseURI)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
diff --git a/profiles/preview/servicefabric/servicefabric/models.go b/profiles/preview/servicefabric/servicefabric/models.go
index 10e044fd426b..be871eeb1970 100644
--- a/profiles/preview/servicefabric/servicefabric/models.go
+++ b/profiles/preview/servicefabric/servicefabric/models.go
@@ -21,19 +21,6 @@ package servicefabric
 
 import original "github.com/Azure/azure-sdk-for-go/services/servicefabric/6.1/servicefabric"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New() BaseClient {
-	return original.New()
-}
-func NewWithBaseURI(baseURI string) BaseClient {
-	return original.NewWithBaseURI(baseURI)
-}
-
 type ApplicationDefinitionKind = original.ApplicationDefinitionKind
 
 const (
@@ -1783,3 +1770,16 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New() BaseClient {
+	return original.New()
+}
+func NewWithBaseURI(baseURI string) BaseClient {
+	return original.NewWithBaseURI(baseURI)
+}
diff --git a/profiles/preview/sql/mgmt/sql/models.go b/profiles/preview/sql/mgmt/sql/models.go
index e8fa24cfa2af..e09d42385590 100644
--- a/profiles/preview/sql/mgmt/sql/models.go
+++ b/profiles/preview/sql/mgmt/sql/models.go
@@ -21,19 +21,6 @@ package sql
 
 import original "github.com/Azure/azure-sdk-for-go/services/sql/mgmt/2017-10-01-preview/sql"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
 type DatabaseOperationsClient = original.DatabaseOperationsClient
 
 func NewDatabaseOperationsClient(subscriptionID string) DatabaseOperationsClient {
@@ -43,15 +30,6 @@ func NewDatabaseOperationsClientWithBaseURI(baseURI string, subscriptionID strin
 	return original.NewDatabaseOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ElasticPoolOperationsClient = original.ElasticPoolOperationsClient
-
-func NewElasticPoolOperationsClient(subscriptionID string) ElasticPoolOperationsClient {
-	return original.NewElasticPoolOperationsClient(subscriptionID)
-}
-func NewElasticPoolOperationsClientWithBaseURI(baseURI string, subscriptionID string) ElasticPoolOperationsClient {
-	return original.NewElasticPoolOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type ManagementOperationState = original.ManagementOperationState
 
 const (
@@ -86,3 +64,25 @@ func UserAgent() string {
 func Version() string {
 	return original.Version()
 }
+
+type ElasticPoolOperationsClient = original.ElasticPoolOperationsClient
+
+func NewElasticPoolOperationsClient(subscriptionID string) ElasticPoolOperationsClient {
+	return original.NewElasticPoolOperationsClient(subscriptionID)
+}
+func NewElasticPoolOperationsClientWithBaseURI(baseURI string, subscriptionID string) ElasticPoolOperationsClient {
+	return original.NewElasticPoolOperationsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/storage/mgmt/storage/models.go b/profiles/preview/storage/mgmt/storage/models.go
index b23b67af20fb..7635e5ddbdfe 100644
--- a/profiles/preview/storage/mgmt/storage/models.go
+++ b/profiles/preview/storage/mgmt/storage/models.go
@@ -21,26 +21,31 @@ package storage
 
 import original "github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2017-10-01/storage"
 
-type AccountsClient = original.AccountsClient
+type OperationsClient = original.OperationsClient
 
-func NewAccountsClient(subscriptionID string) AccountsClient {
-	return original.NewAccountsClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
-	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
+type SkusClient = original.SkusClient
 
-type BaseClient = original.BaseClient
+func NewSkusClient(subscriptionID string) SkusClient {
+	return original.NewSkusClient(subscriptionID)
+}
+func NewSkusClientWithBaseURI(baseURI string, subscriptionID string) SkusClient {
+	return original.NewSkusClientWithBaseURI(baseURI, subscriptionID)
+}
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+type UsageClient = original.UsageClient
+
+func NewUsageClient(subscriptionID string) UsageClient {
+	return original.NewUsageClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewUsageClientWithBaseURI(baseURI string, subscriptionID string) UsageClient {
+	return original.NewUsageClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccessTier = original.AccessTier
@@ -329,35 +334,32 @@ type Usage = original.Usage
 type UsageListResult = original.UsageListResult
 type UsageName = original.UsageName
 type VirtualNetworkRule = original.VirtualNetworkRule
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
-type SkusClient = original.SkusClient
+type AccountsClient = original.AccountsClient
 
-func NewSkusClient(subscriptionID string) SkusClient {
-	return original.NewSkusClient(subscriptionID)
+func NewAccountsClient(subscriptionID string) AccountsClient {
+	return original.NewAccountsClient(subscriptionID)
 }
-func NewSkusClientWithBaseURI(baseURI string, subscriptionID string) SkusClient {
-	return original.NewSkusClientWithBaseURI(baseURI, subscriptionID)
+func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
+	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type UsageClient = original.UsageClient
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-func NewUsageClient(subscriptionID string) UsageClient {
-	return original.NewUsageClient(subscriptionID)
-}
-func NewUsageClientWithBaseURI(baseURI string, subscriptionID string) UsageClient {
-	return original.NewUsageClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/storageimportexport/mgmt/storageimportexport/models.go b/profiles/preview/storageimportexport/mgmt/storageimportexport/models.go
index f5a92a5036a8..2046931fba4b 100644
--- a/profiles/preview/storageimportexport/mgmt/storageimportexport/models.go
+++ b/profiles/preview/storageimportexport/mgmt/storageimportexport/models.go
@@ -21,26 +21,22 @@ package storageimportexport
 
 import original "github.com/Azure/azure-sdk-for-go/services/storageimportexport/mgmt/2016-11-01/storageimportexport"
 
-type BitLockerKeysClient = original.BitLockerKeysClient
+type OperationsClient = original.OperationsClient
 
-func NewBitLockerKeysClient(subscriptionID string, acceptLanguage string) BitLockerKeysClient {
-	return original.NewBitLockerKeysClient(subscriptionID, acceptLanguage)
+func NewOperationsClient(subscriptionID string, acceptLanguage string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID, acceptLanguage)
 }
-func NewBitLockerKeysClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) BitLockerKeysClient {
-	return original.NewBitLockerKeysClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type LocationsClient = original.LocationsClient
 
-func New(subscriptionID string, acceptLanguage string) BaseClient {
-	return original.New(subscriptionID, acceptLanguage)
+func NewLocationsClient(subscriptionID string, acceptLanguage string) LocationsClient {
+	return original.NewLocationsClient(subscriptionID, acceptLanguage)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID, acceptLanguage)
+func NewLocationsClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) LocationsClient {
+	return original.NewLocationsClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
 }
 
 type JobsClient = original.JobsClient
@@ -52,15 +48,6 @@ func NewJobsClientWithBaseURI(baseURI string, subscriptionID string, acceptLangu
 	return original.NewJobsClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
 }
 
-type LocationsClient = original.LocationsClient
-
-func NewLocationsClient(subscriptionID string, acceptLanguage string) LocationsClient {
-	return original.NewLocationsClient(subscriptionID, acceptLanguage)
-}
-func NewLocationsClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) LocationsClient {
-	return original.NewLocationsClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
-}
-
 type DriveState = original.DriveState
 
 const (
@@ -103,17 +90,32 @@ type ReturnShipping = original.ReturnShipping
 type ShippingInformation = original.ShippingInformation
 type UpdateJobParameters = original.UpdateJobParameters
 type UpdateJobParametersProperties = original.UpdateJobParametersProperties
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string, acceptLanguage string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID, acceptLanguage)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+type BitLockerKeysClient = original.BitLockerKeysClient
+
+func NewBitLockerKeysClient(subscriptionID string, acceptLanguage string) BitLockerKeysClient {
+	return original.NewBitLockerKeysClient(subscriptionID, acceptLanguage)
+}
+func NewBitLockerKeysClientWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) BitLockerKeysClient {
+	return original.NewBitLockerKeysClientWithBaseURI(baseURI, subscriptionID, acceptLanguage)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string, acceptLanguage string) BaseClient {
+	return original.New(subscriptionID, acceptLanguage)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string, acceptLanguage string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID, acceptLanguage)
+}
diff --git a/profiles/preview/storsimple8000series/mgmt/storsimple/models.go b/profiles/preview/storsimple8000series/mgmt/storsimple/models.go
index a9cc00b1962b..243d63e02c2a 100644
--- a/profiles/preview/storsimple8000series/mgmt/storsimple/models.go
+++ b/profiles/preview/storsimple8000series/mgmt/storsimple/models.go
@@ -21,71 +21,58 @@ package storsimple
 
 import original "github.com/Azure/azure-sdk-for-go/services/storsimple8000series/mgmt/2017-06-01/storsimple"
 
-type AccessControlRecordsClient = original.AccessControlRecordsClient
-
-func NewAccessControlRecordsClient(subscriptionID string) AccessControlRecordsClient {
-	return original.NewAccessControlRecordsClient(subscriptionID)
-}
-func NewAccessControlRecordsClientWithBaseURI(baseURI string, subscriptionID string) AccessControlRecordsClient {
-	return original.NewAccessControlRecordsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type AlertsClient = original.AlertsClient
+type DevicesClient = original.DevicesClient
 
-func NewAlertsClient(subscriptionID string) AlertsClient {
-	return original.NewAlertsClient(subscriptionID)
+func NewDevicesClient(subscriptionID string) DevicesClient {
+	return original.NewDevicesClient(subscriptionID)
 }
-func NewAlertsClientWithBaseURI(baseURI string, subscriptionID string) AlertsClient {
-	return original.NewAlertsClientWithBaseURI(baseURI, subscriptionID)
+func NewDevicesClientWithBaseURI(baseURI string, subscriptionID string) DevicesClient {
+	return original.NewDevicesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type BackupPoliciesClient = original.BackupPoliciesClient
+type StorageAccountCredentialsClient = original.StorageAccountCredentialsClient
 
-func NewBackupPoliciesClient(subscriptionID string) BackupPoliciesClient {
-	return original.NewBackupPoliciesClient(subscriptionID)
+func NewStorageAccountCredentialsClient(subscriptionID string) StorageAccountCredentialsClient {
+	return original.NewStorageAccountCredentialsClient(subscriptionID)
 }
-func NewBackupPoliciesClientWithBaseURI(baseURI string, subscriptionID string) BackupPoliciesClient {
-	return original.NewBackupPoliciesClientWithBaseURI(baseURI, subscriptionID)
+func NewStorageAccountCredentialsClientWithBaseURI(baseURI string, subscriptionID string) StorageAccountCredentialsClient {
+	return original.NewStorageAccountCredentialsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type BackupsClient = original.BackupsClient
+type HardwareComponentGroupsClient = original.HardwareComponentGroupsClient
 
-func NewBackupsClient(subscriptionID string) BackupsClient {
-	return original.NewBackupsClient(subscriptionID)
+func NewHardwareComponentGroupsClient(subscriptionID string) HardwareComponentGroupsClient {
+	return original.NewHardwareComponentGroupsClient(subscriptionID)
 }
-func NewBackupsClientWithBaseURI(baseURI string, subscriptionID string) BackupsClient {
-	return original.NewBackupsClientWithBaseURI(baseURI, subscriptionID)
+func NewHardwareComponentGroupsClientWithBaseURI(baseURI string, subscriptionID string) HardwareComponentGroupsClient {
+	return original.NewHardwareComponentGroupsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type BackupSchedulesClient = original.BackupSchedulesClient
+type AccessControlRecordsClient = original.AccessControlRecordsClient
 
-func NewBackupSchedulesClient(subscriptionID string) BackupSchedulesClient {
-	return original.NewBackupSchedulesClient(subscriptionID)
+func NewAccessControlRecordsClient(subscriptionID string) AccessControlRecordsClient {
+	return original.NewAccessControlRecordsClient(subscriptionID)
 }
-func NewBackupSchedulesClientWithBaseURI(baseURI string, subscriptionID string) BackupSchedulesClient {
-	return original.NewBackupSchedulesClientWithBaseURI(baseURI, subscriptionID)
+func NewAccessControlRecordsClientWithBaseURI(baseURI string, subscriptionID string) AccessControlRecordsClient {
+	return original.NewAccessControlRecordsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type BandwidthSettingsClient = original.BandwidthSettingsClient
+type VolumesClient = original.VolumesClient
 
-func NewBandwidthSettingsClient(subscriptionID string) BandwidthSettingsClient {
-	return original.NewBandwidthSettingsClient(subscriptionID)
+func NewVolumesClient(subscriptionID string) VolumesClient {
+	return original.NewVolumesClient(subscriptionID)
 }
-func NewBandwidthSettingsClientWithBaseURI(baseURI string, subscriptionID string) BandwidthSettingsClient {
-	return original.NewBandwidthSettingsClientWithBaseURI(baseURI, subscriptionID)
+func NewVolumesClientWithBaseURI(baseURI string, subscriptionID string) VolumesClient {
+	return original.NewVolumesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type CloudAppliancesClient = original.CloudAppliancesClient
@@ -97,13 +84,13 @@ func NewCloudAppliancesClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewCloudAppliancesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DevicesClient = original.DevicesClient
+type BackupSchedulesClient = original.BackupSchedulesClient
 
-func NewDevicesClient(subscriptionID string) DevicesClient {
-	return original.NewDevicesClient(subscriptionID)
+func NewBackupSchedulesClient(subscriptionID string) BackupSchedulesClient {
+	return original.NewBackupSchedulesClient(subscriptionID)
 }
-func NewDevicesClientWithBaseURI(baseURI string, subscriptionID string) DevicesClient {
-	return original.NewDevicesClientWithBaseURI(baseURI, subscriptionID)
+func NewBackupSchedulesClientWithBaseURI(baseURI string, subscriptionID string) BackupSchedulesClient {
+	return original.NewBackupSchedulesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type DeviceSettingsClient = original.DeviceSettingsClient
@@ -115,15 +102,6 @@ func NewDeviceSettingsClientWithBaseURI(baseURI string, subscriptionID string) D
 	return original.NewDeviceSettingsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type HardwareComponentGroupsClient = original.HardwareComponentGroupsClient
-
-func NewHardwareComponentGroupsClient(subscriptionID string) HardwareComponentGroupsClient {
-	return original.NewHardwareComponentGroupsClient(subscriptionID)
-}
-func NewHardwareComponentGroupsClientWithBaseURI(baseURI string, subscriptionID string) HardwareComponentGroupsClient {
-	return original.NewHardwareComponentGroupsClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type JobsClient = original.JobsClient
 
 func NewJobsClient(subscriptionID string) JobsClient {
@@ -133,13 +111,22 @@ func NewJobsClientWithBaseURI(baseURI string, subscriptionID string) JobsClient
 	return original.NewJobsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ManagersClient = original.ManagersClient
+type AlertsClient = original.AlertsClient
 
-func NewManagersClient(subscriptionID string) ManagersClient {
-	return original.NewManagersClient(subscriptionID)
+func NewAlertsClient(subscriptionID string) AlertsClient {
+	return original.NewAlertsClient(subscriptionID)
 }
-func NewManagersClientWithBaseURI(baseURI string, subscriptionID string) ManagersClient {
-	return original.NewManagersClientWithBaseURI(baseURI, subscriptionID)
+func NewAlertsClientWithBaseURI(baseURI string, subscriptionID string) AlertsClient {
+	return original.NewAlertsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type BackupsClient = original.BackupsClient
+
+func NewBackupsClient(subscriptionID string) BackupsClient {
+	return original.NewBackupsClient(subscriptionID)
+}
+func NewBackupsClientWithBaseURI(baseURI string, subscriptionID string) BackupsClient {
+	return original.NewBackupsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AlertEmailNotificationStatus = original.AlertEmailNotificationStatus
@@ -919,22 +906,13 @@ type VolumeProperties = original.VolumeProperties
 type VolumesCreateOrUpdateFuture = original.VolumesCreateOrUpdateFuture
 type VolumesDeleteFuture = original.VolumesDeleteFuture
 type WebproxySettings = original.WebproxySettings
-type OperationsClient = original.OperationsClient
-
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
-}
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type StorageAccountCredentialsClient = original.StorageAccountCredentialsClient
+type BackupPoliciesClient = original.BackupPoliciesClient
 
-func NewStorageAccountCredentialsClient(subscriptionID string) StorageAccountCredentialsClient {
-	return original.NewStorageAccountCredentialsClient(subscriptionID)
+func NewBackupPoliciesClient(subscriptionID string) BackupPoliciesClient {
+	return original.NewBackupPoliciesClient(subscriptionID)
 }
-func NewStorageAccountCredentialsClientWithBaseURI(baseURI string, subscriptionID string) StorageAccountCredentialsClient {
-	return original.NewStorageAccountCredentialsClientWithBaseURI(baseURI, subscriptionID)
+func NewBackupPoliciesClientWithBaseURI(baseURI string, subscriptionID string) BackupPoliciesClient {
+	return original.NewBackupPoliciesClientWithBaseURI(baseURI, subscriptionID)
 }
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
@@ -952,11 +930,33 @@ func NewVolumeContainersClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewVolumeContainersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type VolumesClient = original.VolumesClient
+type BandwidthSettingsClient = original.BandwidthSettingsClient
 
-func NewVolumesClient(subscriptionID string) VolumesClient {
-	return original.NewVolumesClient(subscriptionID)
+func NewBandwidthSettingsClient(subscriptionID string) BandwidthSettingsClient {
+	return original.NewBandwidthSettingsClient(subscriptionID)
 }
-func NewVolumesClientWithBaseURI(baseURI string, subscriptionID string) VolumesClient {
-	return original.NewVolumesClientWithBaseURI(baseURI, subscriptionID)
+func NewBandwidthSettingsClientWithBaseURI(baseURI string, subscriptionID string) BandwidthSettingsClient {
+	return original.NewBandwidthSettingsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
+
+type ManagersClient = original.ManagersClient
+
+func NewManagersClient(subscriptionID string) ManagersClient {
+	return original.NewManagersClient(subscriptionID)
+}
+func NewManagersClientWithBaseURI(baseURI string, subscriptionID string) ManagersClient {
+	return original.NewManagersClientWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/streamanalytics/mgmt/streamanalytics/models.go b/profiles/preview/streamanalytics/mgmt/streamanalytics/models.go
index e00d9e3076f9..e3d22f065c00 100644
--- a/profiles/preview/streamanalytics/mgmt/streamanalytics/models.go
+++ b/profiles/preview/streamanalytics/mgmt/streamanalytics/models.go
@@ -21,26 +21,22 @@ package streamanalytics
 
 import original "github.com/Azure/azure-sdk-for-go/services/streamanalytics/mgmt/2016-03-01/streamanalytics"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type FunctionsClient = original.FunctionsClient
+type TransformationsClient = original.TransformationsClient
 
-func NewFunctionsClient(subscriptionID string) FunctionsClient {
-	return original.NewFunctionsClient(subscriptionID)
+func NewTransformationsClient(subscriptionID string) TransformationsClient {
+	return original.NewTransformationsClient(subscriptionID)
 }
-func NewFunctionsClientWithBaseURI(baseURI string, subscriptionID string) FunctionsClient {
-	return original.NewFunctionsClientWithBaseURI(baseURI, subscriptionID)
+func NewTransformationsClientWithBaseURI(baseURI string, subscriptionID string) TransformationsClient {
+	return original.NewTransformationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type InputsClient = original.InputsClient
@@ -353,13 +349,28 @@ type SubscriptionQuotaProperties = original.SubscriptionQuotaProperties
 type SubscriptionQuotasListResult = original.SubscriptionQuotasListResult
 type Transformation = original.Transformation
 type TransformationProperties = original.TransformationProperties
-type OperationsClient = original.OperationsClient
+type FunctionsClient = original.FunctionsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func NewFunctionsClient(subscriptionID string) FunctionsClient {
+	return original.NewFunctionsClient(subscriptionID)
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func NewFunctionsClientWithBaseURI(baseURI string, subscriptionID string) FunctionsClient {
+	return original.NewFunctionsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type SubscriptionsClient = original.SubscriptionsClient
+
+func NewSubscriptionsClient(subscriptionID string) SubscriptionsClient {
+	return original.NewSubscriptionsClient(subscriptionID)
+}
+func NewSubscriptionsClientWithBaseURI(baseURI string, subscriptionID string) SubscriptionsClient {
+	return original.NewSubscriptionsClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
 }
 
 type OutputsClient = original.OutputsClient
@@ -380,26 +391,15 @@ func NewStreamingJobsClientWithBaseURI(baseURI string, subscriptionID string) St
 	return original.NewStreamingJobsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type SubscriptionsClient = original.SubscriptionsClient
-
-func NewSubscriptionsClient(subscriptionID string) SubscriptionsClient {
-	return original.NewSubscriptionsClient(subscriptionID)
-}
-func NewSubscriptionsClientWithBaseURI(baseURI string, subscriptionID string) SubscriptionsClient {
-	return original.NewSubscriptionsClientWithBaseURI(baseURI, subscriptionID)
-}
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
 
-type TransformationsClient = original.TransformationsClient
+type BaseClient = original.BaseClient
 
-func NewTransformationsClient(subscriptionID string) TransformationsClient {
-	return original.NewTransformationsClient(subscriptionID)
-}
-func NewTransformationsClientWithBaseURI(baseURI string, subscriptionID string) TransformationsClient {
-	return original.NewTransformationsClientWithBaseURI(baseURI, subscriptionID)
-}
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/timeseriesinsights/mgmt/timeseriesinsights/models.go b/profiles/preview/timeseriesinsights/mgmt/timeseriesinsights/models.go
index 9e8abe4f3fb8..cafda30e2364 100644
--- a/profiles/preview/timeseriesinsights/mgmt/timeseriesinsights/models.go
+++ b/profiles/preview/timeseriesinsights/mgmt/timeseriesinsights/models.go
@@ -21,35 +21,13 @@ package timeseriesinsights
 
 import original "github.com/Azure/azure-sdk-for-go/services/timeseriesinsights/mgmt/2017-11-15/timeseriesinsights"
 
-type AccessPoliciesClient = original.AccessPoliciesClient
-
-func NewAccessPoliciesClient(subscriptionID string) AccessPoliciesClient {
-	return original.NewAccessPoliciesClient(subscriptionID)
-}
-func NewAccessPoliciesClientWithBaseURI(baseURI string, subscriptionID string) AccessPoliciesClient {
-	return original.NewAccessPoliciesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type EnvironmentsClient = original.EnvironmentsClient
+type OperationsClient = original.OperationsClient
 
-func NewEnvironmentsClient(subscriptionID string) EnvironmentsClient {
-	return original.NewEnvironmentsClient(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewEnvironmentsClientWithBaseURI(baseURI string, subscriptionID string) EnvironmentsClient {
-	return original.NewEnvironmentsClientWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type EventSourcesClient = original.EventSourcesClient
@@ -61,6 +39,15 @@ func NewEventSourcesClientWithBaseURI(baseURI string, subscriptionID string) Eve
 	return original.NewEventSourcesClientWithBaseURI(baseURI, subscriptionID)
 }
 
+type AccessPoliciesClient = original.AccessPoliciesClient
+
+func NewAccessPoliciesClient(subscriptionID string) AccessPoliciesClient {
+	return original.NewAccessPoliciesClient(subscriptionID)
+}
+func NewAccessPoliciesClientWithBaseURI(baseURI string, subscriptionID string) AccessPoliciesClient {
+	return original.NewAccessPoliciesClientWithBaseURI(baseURI, subscriptionID)
+}
+
 type AccessPolicyRole = original.AccessPolicyRole
 
 const (
@@ -246,13 +233,34 @@ type Resource = original.Resource
 type ResourceProperties = original.ResourceProperties
 type Sku = original.Sku
 type TrackedResource = original.TrackedResource
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
+}
+
+type EnvironmentsClient = original.EnvironmentsClient
+
+func NewEnvironmentsClient(subscriptionID string) EnvironmentsClient {
+	return original.NewEnvironmentsClient(subscriptionID)
+}
+func NewEnvironmentsClientWithBaseURI(baseURI string, subscriptionID string) EnvironmentsClient {
+	return original.NewEnvironmentsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
 
 type ReferenceDataSetsClient = original.ReferenceDataSetsClient
@@ -263,9 +271,3 @@ func NewReferenceDataSetsClient(subscriptionID string) ReferenceDataSetsClient {
 func NewReferenceDataSetsClientWithBaseURI(baseURI string, subscriptionID string) ReferenceDataSetsClient {
 	return original.NewReferenceDataSetsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
-}
-func Version() string {
-	return original.Version()
-}
diff --git a/profiles/preview/trafficmanager/mgmt/trafficmanager/models.go b/profiles/preview/trafficmanager/mgmt/trafficmanager/models.go
index 4d7319ba25bd..ee50f7e927b5 100644
--- a/profiles/preview/trafficmanager/mgmt/trafficmanager/models.go
+++ b/profiles/preview/trafficmanager/mgmt/trafficmanager/models.go
@@ -21,26 +21,13 @@ package trafficmanager
 
 import original "github.com/Azure/azure-sdk-for-go/services/trafficmanager/mgmt/2017-09-01-preview/trafficmanager"
 
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
-
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
-}
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
-}
-
-type EndpointsClient = original.EndpointsClient
+type UserMetricsKeysClient = original.UserMetricsKeysClient
 
-func NewEndpointsClient(subscriptionID string) EndpointsClient {
-	return original.NewEndpointsClient(subscriptionID)
+func NewUserMetricsKeysClient(subscriptionID string) UserMetricsKeysClient {
+	return original.NewUserMetricsKeysClient(subscriptionID)
 }
-func NewEndpointsClientWithBaseURI(baseURI string, subscriptionID string) EndpointsClient {
-	return original.NewEndpointsClientWithBaseURI(baseURI, subscriptionID)
+func NewUserMetricsKeysClientWithBaseURI(baseURI string, subscriptionID string) UserMetricsKeysClient {
+	return original.NewUserMetricsKeysClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type GeographicHierarchiesClient = original.GeographicHierarchiesClient
@@ -52,15 +39,6 @@ func NewGeographicHierarchiesClientWithBaseURI(baseURI string, subscriptionID st
 	return original.NewGeographicHierarchiesClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type HeatMapClient = original.HeatMapClient
-
-func NewHeatMapClient(subscriptionID string) HeatMapClient {
-	return original.NewHeatMapClient(subscriptionID)
-}
-func NewHeatMapClientWithBaseURI(baseURI string, subscriptionID string) HeatMapClient {
-	return original.NewHeatMapClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type EndpointMonitorStatus = original.EndpointMonitorStatus
 
 const (
@@ -169,18 +147,40 @@ func NewProfilesClient(subscriptionID string) ProfilesClient {
 func NewProfilesClientWithBaseURI(baseURI string, subscriptionID string) ProfilesClient {
 	return original.NewProfilesClientWithBaseURI(baseURI, subscriptionID)
 }
-
-type UserMetricsKeysClient = original.UserMetricsKeysClient
-
-func NewUserMetricsKeysClient(subscriptionID string) UserMetricsKeysClient {
-	return original.NewUserMetricsKeysClient(subscriptionID)
-}
-func NewUserMetricsKeysClientWithBaseURI(baseURI string, subscriptionID string) UserMetricsKeysClient {
-	return original.NewUserMetricsKeysClientWithBaseURI(baseURI, subscriptionID)
-}
 func UserAgent() string {
 	return original.UserAgent() + " profiles/preview"
 }
 func Version() string {
 	return original.Version()
 }
+
+type EndpointsClient = original.EndpointsClient
+
+func NewEndpointsClient(subscriptionID string) EndpointsClient {
+	return original.NewEndpointsClient(subscriptionID)
+}
+func NewEndpointsClientWithBaseURI(baseURI string, subscriptionID string) EndpointsClient {
+	return original.NewEndpointsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type HeatMapClient = original.HeatMapClient
+
+func NewHeatMapClient(subscriptionID string) HeatMapClient {
+	return original.NewHeatMapClient(subscriptionID)
+}
+func NewHeatMapClientWithBaseURI(baseURI string, subscriptionID string) HeatMapClient {
+	return original.NewHeatMapClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
diff --git a/profiles/preview/visualstudio/mgmt/visualstudio/models.go b/profiles/preview/visualstudio/mgmt/visualstudio/models.go
index 04a0bc3fac74..fecbde3eb844 100644
--- a/profiles/preview/visualstudio/mgmt/visualstudio/models.go
+++ b/profiles/preview/visualstudio/mgmt/visualstudio/models.go
@@ -21,26 +21,13 @@ package visualstudio
 
 import original "github.com/Azure/azure-sdk-for-go/services/visualstudio/mgmt/2014-04-01-preview/visualstudio"
 
-type AccountsClient = original.AccountsClient
-
-func NewAccountsClient(subscriptionID string) AccountsClient {
-	return original.NewAccountsClient(subscriptionID)
-}
-func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
-	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type OperationsClient = original.OperationsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewOperationsClient(subscriptionID string) OperationsClient {
+	return original.NewOperationsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
+	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type ExtensionsClient = original.ExtensionsClient
@@ -68,13 +55,12 @@ type ProjectResource = original.ProjectResource
 type ProjectResourceListResult = original.ProjectResourceListResult
 type ProjectsCreateFuture = original.ProjectsCreateFuture
 type Resource = original.Resource
-type OperationsClient = original.OperationsClient
 
-func NewOperationsClient(subscriptionID string) OperationsClient {
-	return original.NewOperationsClient(subscriptionID)
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
 }
-func NewOperationsClientWithBaseURI(baseURI string, subscriptionID string) OperationsClient {
-	return original.NewOperationsClientWithBaseURI(baseURI, subscriptionID)
+func Version() string {
+	return original.Version()
 }
 
 type ProjectsClient = original.ProjectsClient
@@ -85,9 +71,25 @@ func NewProjectsClient(subscriptionID string) ProjectsClient {
 func NewProjectsClientWithBaseURI(baseURI string, subscriptionID string) ProjectsClient {
 	return original.NewProjectsClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+type AccountsClient = original.AccountsClient
+
+func NewAccountsClient(subscriptionID string) AccountsClient {
+	return original.NewAccountsClient(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewAccountsClientWithBaseURI(baseURI string, subscriptionID string) AccountsClient {
+	return original.NewAccountsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
+}
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
 }
diff --git a/profiles/preview/web/mgmt/web/models.go b/profiles/preview/web/mgmt/web/models.go
index fbcd70c81f84..0b6edefbb391 100644
--- a/profiles/preview/web/mgmt/web/models.go
+++ b/profiles/preview/web/mgmt/web/models.go
@@ -21,24 +21,6 @@ package web
 
 import original "github.com/Azure/azure-sdk-for-go/services/web/mgmt/2016-09-01/web"
 
-type AppsClient = original.AppsClient
-
-func NewAppsClient(subscriptionID string) AppsClient {
-	return original.NewAppsClient(subscriptionID)
-}
-func NewAppsClientWithBaseURI(baseURI string, subscriptionID string) AppsClient {
-	return original.NewAppsClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type AppServiceCertificateOrdersClient = original.AppServiceCertificateOrdersClient
-
-func NewAppServiceCertificateOrdersClient(subscriptionID string) AppServiceCertificateOrdersClient {
-	return original.NewAppServiceCertificateOrdersClient(subscriptionID)
-}
-func NewAppServiceCertificateOrdersClientWithBaseURI(baseURI string, subscriptionID string) AppServiceCertificateOrdersClient {
-	return original.NewAppServiceCertificateOrdersClientWithBaseURI(baseURI, subscriptionID)
-}
-
 type AppServiceEnvironmentsClient = original.AppServiceEnvironmentsClient
 
 func NewAppServiceEnvironmentsClient(subscriptionID string) AppServiceEnvironmentsClient {
@@ -48,13 +30,13 @@ func NewAppServiceEnvironmentsClientWithBaseURI(baseURI string, subscriptionID s
 	return original.NewAppServiceEnvironmentsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type AppServicePlansClient = original.AppServicePlansClient
+type ProviderClient = original.ProviderClient
 
-func NewAppServicePlansClient(subscriptionID string) AppServicePlansClient {
-	return original.NewAppServicePlansClient(subscriptionID)
+func NewProviderClient(subscriptionID string) ProviderClient {
+	return original.NewProviderClient(subscriptionID)
 }
-func NewAppServicePlansClientWithBaseURI(baseURI string, subscriptionID string) AppServicePlansClient {
-	return original.NewAppServicePlansClientWithBaseURI(baseURI, subscriptionID)
+func NewProviderClientWithBaseURI(baseURI string, subscriptionID string) ProviderClient {
+	return original.NewProviderClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type BillingMetersClient = original.BillingMetersClient
@@ -66,44 +48,22 @@ func NewBillingMetersClientWithBaseURI(baseURI string, subscriptionID string) Bi
 	return original.NewBillingMetersClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type CertificateRegistrationProviderClient = original.CertificateRegistrationProviderClient
-
-func NewCertificateRegistrationProviderClient(subscriptionID string) CertificateRegistrationProviderClient {
-	return original.NewCertificateRegistrationProviderClient(subscriptionID)
-}
-func NewCertificateRegistrationProviderClientWithBaseURI(baseURI string, subscriptionID string) CertificateRegistrationProviderClient {
-	return original.NewCertificateRegistrationProviderClientWithBaseURI(baseURI, subscriptionID)
-}
-
-type CertificatesClient = original.CertificatesClient
-
-func NewCertificatesClient(subscriptionID string) CertificatesClient {
-	return original.NewCertificatesClient(subscriptionID)
-}
-func NewCertificatesClientWithBaseURI(baseURI string, subscriptionID string) CertificatesClient {
-	return original.NewCertificatesClientWithBaseURI(baseURI, subscriptionID)
-}
-
-const (
-	DefaultBaseURI = original.DefaultBaseURI
-)
-
-type BaseClient = original.BaseClient
+type TopLevelDomainsClient = original.TopLevelDomainsClient
 
-func New(subscriptionID string) BaseClient {
-	return original.New(subscriptionID)
+func NewTopLevelDomainsClient(subscriptionID string) TopLevelDomainsClient {
+	return original.NewTopLevelDomainsClient(subscriptionID)
 }
-func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
-	return original.NewWithBaseURI(baseURI, subscriptionID)
+func NewTopLevelDomainsClientWithBaseURI(baseURI string, subscriptionID string) TopLevelDomainsClient {
+	return original.NewTopLevelDomainsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DeletedWebAppsClient = original.DeletedWebAppsClient
+type AppServicePlansClient = original.AppServicePlansClient
 
-func NewDeletedWebAppsClient(subscriptionID string) DeletedWebAppsClient {
-	return original.NewDeletedWebAppsClient(subscriptionID)
+func NewAppServicePlansClient(subscriptionID string) AppServicePlansClient {
+	return original.NewAppServicePlansClient(subscriptionID)
 }
-func NewDeletedWebAppsClientWithBaseURI(baseURI string, subscriptionID string) DeletedWebAppsClient {
-	return original.NewDeletedWebAppsClientWithBaseURI(baseURI, subscriptionID)
+func NewAppServicePlansClientWithBaseURI(baseURI string, subscriptionID string) AppServicePlansClient {
+	return original.NewAppServicePlansClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type DiagnosticsClient = original.DiagnosticsClient
@@ -124,13 +84,13 @@ func NewDomainRegistrationProviderClientWithBaseURI(baseURI string, subscription
 	return original.NewDomainRegistrationProviderClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type DomainsClient = original.DomainsClient
+type AppsClient = original.AppsClient
 
-func NewDomainsClient(subscriptionID string) DomainsClient {
-	return original.NewDomainsClient(subscriptionID)
+func NewAppsClient(subscriptionID string) AppsClient {
+	return original.NewAppsClient(subscriptionID)
 }
-func NewDomainsClientWithBaseURI(baseURI string, subscriptionID string) DomainsClient {
-	return original.NewDomainsClientWithBaseURI(baseURI, subscriptionID)
+func NewAppsClientWithBaseURI(baseURI string, subscriptionID string) AppsClient {
+	return original.NewAppsClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type AccessControlEntryAction = original.AccessControlEntryAction
@@ -1410,13 +1370,28 @@ type WorkerPoolCollection = original.WorkerPoolCollection
 type WorkerPoolCollectionIterator = original.WorkerPoolCollectionIterator
 type WorkerPoolCollectionPage = original.WorkerPoolCollectionPage
 type WorkerPoolResource = original.WorkerPoolResource
-type ProviderClient = original.ProviderClient
+type CertificateRegistrationProviderClient = original.CertificateRegistrationProviderClient
 
-func NewProviderClient(subscriptionID string) ProviderClient {
-	return original.NewProviderClient(subscriptionID)
+func NewCertificateRegistrationProviderClient(subscriptionID string) CertificateRegistrationProviderClient {
+	return original.NewCertificateRegistrationProviderClient(subscriptionID)
 }
-func NewProviderClientWithBaseURI(baseURI string, subscriptionID string) ProviderClient {
-	return original.NewProviderClientWithBaseURI(baseURI, subscriptionID)
+func NewCertificateRegistrationProviderClientWithBaseURI(baseURI string, subscriptionID string) CertificateRegistrationProviderClient {
+	return original.NewCertificateRegistrationProviderClientWithBaseURI(baseURI, subscriptionID)
+}
+func UserAgent() string {
+	return original.UserAgent() + " profiles/preview"
+}
+func Version() string {
+	return original.Version()
+}
+
+type CertificatesClient = original.CertificatesClient
+
+func NewCertificatesClient(subscriptionID string) CertificatesClient {
+	return original.NewCertificatesClient(subscriptionID)
+}
+func NewCertificatesClientWithBaseURI(baseURI string, subscriptionID string) CertificatesClient {
+	return original.NewCertificatesClientWithBaseURI(baseURI, subscriptionID)
 }
 
 type RecommendationsClient = original.RecommendationsClient
@@ -1428,26 +1403,51 @@ func NewRecommendationsClientWithBaseURI(baseURI string, subscriptionID string)
 	return original.NewRecommendationsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type ResourceHealthMetadataClient = original.ResourceHealthMetadataClient
+type DomainsClient = original.DomainsClient
 
-func NewResourceHealthMetadataClient(subscriptionID string) ResourceHealthMetadataClient {
-	return original.NewResourceHealthMetadataClient(subscriptionID)
+func NewDomainsClient(subscriptionID string) DomainsClient {
+	return original.NewDomainsClient(subscriptionID)
 }
-func NewResourceHealthMetadataClientWithBaseURI(baseURI string, subscriptionID string) ResourceHealthMetadataClient {
-	return original.NewResourceHealthMetadataClientWithBaseURI(baseURI, subscriptionID)
+func NewDomainsClientWithBaseURI(baseURI string, subscriptionID string) DomainsClient {
+	return original.NewDomainsClientWithBaseURI(baseURI, subscriptionID)
 }
 
-type TopLevelDomainsClient = original.TopLevelDomainsClient
+type AppServiceCertificateOrdersClient = original.AppServiceCertificateOrdersClient
 
-func NewTopLevelDomainsClient(subscriptionID string) TopLevelDomainsClient {
-	return original.NewTopLevelDomainsClient(subscriptionID)
+func NewAppServiceCertificateOrdersClient(subscriptionID string) AppServiceCertificateOrdersClient {
+	return original.NewAppServiceCertificateOrdersClient(subscriptionID)
 }
-func NewTopLevelDomainsClientWithBaseURI(baseURI string, subscriptionID string) TopLevelDomainsClient {
-	return original.NewTopLevelDomainsClientWithBaseURI(baseURI, subscriptionID)
+func NewAppServiceCertificateOrdersClientWithBaseURI(baseURI string, subscriptionID string) AppServiceCertificateOrdersClient {
+	return original.NewAppServiceCertificateOrdersClientWithBaseURI(baseURI, subscriptionID)
 }
-func UserAgent() string {
-	return original.UserAgent() + " profiles/preview"
+
+const (
+	DefaultBaseURI = original.DefaultBaseURI
+)
+
+type BaseClient = original.BaseClient
+
+func New(subscriptionID string) BaseClient {
+	return original.New(subscriptionID)
 }
-func Version() string {
-	return original.Version()
+func NewWithBaseURI(baseURI string, subscriptionID string) BaseClient {
+	return original.NewWithBaseURI(baseURI, subscriptionID)
+}
+
+type DeletedWebAppsClient = original.DeletedWebAppsClient
+
+func NewDeletedWebAppsClient(subscriptionID string) DeletedWebAppsClient {
+	return original.NewDeletedWebAppsClient(subscriptionID)
+}
+func NewDeletedWebAppsClientWithBaseURI(baseURI string, subscriptionID string) DeletedWebAppsClient {
+	return original.NewDeletedWebAppsClientWithBaseURI(baseURI, subscriptionID)
+}
+
+type ResourceHealthMetadataClient = original.ResourceHealthMetadataClient
+
+func NewResourceHealthMetadataClient(subscriptionID string) ResourceHealthMetadataClient {
+	return original.NewResourceHealthMetadataClient(subscriptionID)
+}
+func NewResourceHealthMetadataClientWithBaseURI(baseURI string, subscriptionID string) ResourceHealthMetadataClient {
+	return original.NewResourceHealthMetadataClientWithBaseURI(baseURI, subscriptionID)
 }