diff --git a/sdk/appservice/mgmt-v2016_03_01/pom.xml b/sdk/appservice/mgmt-v2016_03_01/pom.xml
index ea60b275d9e3..1bf8c7d46385 100644
--- a/sdk/appservice/mgmt-v2016_03_01/pom.xml
+++ b/sdk/appservice/mgmt-v2016_03_01/pom.xml
@@ -11,11 +11,11 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.3.0</version>
-        <relativePath>../../parents/azure-arm-parent</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
-    <artifactId>azure-mgmt-appservice</artifactId>
-    <version>1.0.0-beta-2</version>
+    <artifactId>azure-mgmt-web</artifactId>
+    <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for Web Management</name>
     <description>This package contains Microsoft Web Management SDK.</description>
@@ -71,6 +71,8 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/AnalysisDefinition.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/AnalysisDefinition.java
index edfe33751fac..66d383a614fa 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/AnalysisDefinition.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/AnalysisDefinition.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AnalysisDefinitionInner;
 
 /**
  * Type representing AnalysisDefinition.
  */
-public interface AnalysisDefinition extends HasInner<AnalysisDefinitionInner>, HasManager<AppServiceManager> {
+public interface AnalysisDefinition extends HasInner<AnalysisDefinitionInner>, HasManager<WebManager> {
     /**
      * @return the description value.
      */
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/ApplicationStack.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/ApplicationStack.java
index 2b7e1a6f92d5..665174ff6282 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/ApplicationStack.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/ApplicationStack.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.ApplicationStackInner;
 import java.util.List;
 
 /**
  * Type representing ApplicationStack.
  */
-public interface ApplicationStack extends HasInner<ApplicationStackInner>, HasManager<AppServiceManager> {
+public interface ApplicationStack extends HasInner<ApplicationStackInner>, HasManager<WebManager> {
     /**
      * @return the dependency value.
      */
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/BillingMeter.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/BillingMeter.java
index c5e3d1e71302..1d1a88afa936 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/BillingMeter.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/BillingMeter.java
@@ -11,12 +11,12 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.BillingMeterInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 
 /**
  * Type representing BillingMeter.
  */
-public interface BillingMeter extends HasInner<BillingMeterInner>, HasManager<AppServiceManager> {
+public interface BillingMeter extends HasInner<BillingMeterInner>, HasManager<WebManager> {
     /**
      * @return the billingLocation value.
      */
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/Certificate.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/Certificate.java
index d1481bb108ea..372839adfbc3 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/Certificate.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/Certificate.java
@@ -17,7 +17,7 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import java.util.List;
 import org.joda.time.DateTime;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.CertificateInner;
@@ -25,7 +25,7 @@
 /**
  * Type representing Certificate.
  */
-public interface Certificate extends HasInner<CertificateInner>, Resource, GroupableResourceCore<AppServiceManager, CertificateInner>, HasResourceGroup, Refreshable<Certificate>, Updatable<Certificate.Update>, HasManager<AppServiceManager> {
+public interface Certificate extends HasInner<CertificateInner>, Resource, GroupableResourceCore<WebManager, CertificateInner>, HasResourceGroup, Refreshable<Certificate>, Updatable<Certificate.Update>, HasManager<WebManager> {
     /**
      * @return the cerBlob value.
      */
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/CsmOperationDescription.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/CsmOperationDescription.java
index 4151455c6d49..e31b1a4e033f 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/CsmOperationDescription.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/CsmOperationDescription.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.CsmOperationDescriptionInner;
 
 /**
  * Type representing CsmOperationDescription.
  */
-public interface CsmOperationDescription extends HasInner<CsmOperationDescriptionInner>, HasManager<AppServiceManager> {
+public interface CsmOperationDescription extends HasInner<CsmOperationDescriptionInner>, HasManager<WebManager> {
     /**
      * @return the display value.
      */
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DeletedSite.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DeletedSite.java
index 3c43ee63642d..964d94ad85ca 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DeletedSite.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DeletedSite.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.DeletedSiteInner;
 
 /**
  * Type representing DeletedSite.
  */
-public interface DeletedSite extends HasInner<DeletedSiteInner>, HasManager<AppServiceManager> {
+public interface DeletedSite extends HasInner<DeletedSiteInner>, HasManager<WebManager> {
     /**
      * @return the deletedTimestamp value.
      */
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DetectorDefinition.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DetectorDefinition.java
index 05498b7112be..c50b66b34dba 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DetectorDefinition.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DetectorDefinition.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.DetectorDefinitionInner;
 
 /**
  * Type representing DetectorDefinition.
  */
-public interface DetectorDefinition extends HasInner<DetectorDefinitionInner>, HasManager<AppServiceManager> {
+public interface DetectorDefinition extends HasInner<DetectorDefinitionInner>, HasManager<WebManager> {
     /**
      * @return the description value.
      */
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DetectorResponse.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DetectorResponse.java
index 27ee8c59f92a..b8dbcff79953 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DetectorResponse.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DetectorResponse.java
@@ -13,13 +13,13 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import java.util.List;
 
 /**
  * Type representing DetectorResponse.
  */
-public interface DetectorResponse extends HasInner<DetectorResponseInner>, Indexable, Refreshable<DetectorResponse>, HasManager<AppServiceManager> {
+public interface DetectorResponse extends HasInner<DetectorResponseInner>, Indexable, Refreshable<DetectorResponse>, HasManager<WebManager> {
     /**
      * @return the dataset value.
      */
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticAnalysis.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticAnalysis.java
index ef113eae9265..567a0240dbf6 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticAnalysis.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticAnalysis.java
@@ -13,14 +13,14 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import java.util.List;
 import org.joda.time.DateTime;
 
 /**
  * Type representing DiagnosticAnalysis.
  */
-public interface DiagnosticAnalysis extends HasInner<DiagnosticAnalysisInner>, Indexable, Refreshable<DiagnosticAnalysis>, HasManager<AppServiceManager> {
+public interface DiagnosticAnalysis extends HasInner<DiagnosticAnalysisInner>, Indexable, Refreshable<DiagnosticAnalysis>, HasManager<WebManager> {
     /**
      * @return the abnormalTimePeriods value.
      */
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticCategory.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticCategory.java
index ae9ce2cecfd8..0925814107e7 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticCategory.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticCategory.java
@@ -13,12 +13,12 @@
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 
 /**
  * Type representing DiagnosticCategory.
  */
-public interface DiagnosticCategory extends HasInner<DiagnosticCategoryInner>, Indexable, Refreshable<DiagnosticCategory>, HasManager<AppServiceManager> {
+public interface DiagnosticCategory extends HasInner<DiagnosticCategoryInner>, Indexable, Refreshable<DiagnosticCategory>, HasManager<WebManager> {
     /**
      * @return the description value.
      */
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticDetectorResponse.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticDetectorResponse.java
index e8930ebe1209..8c3bbc219e0c 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticDetectorResponse.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/DiagnosticDetectorResponse.java
@@ -10,7 +10,7 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.DiagnosticDetectorResponseInner;
 import java.util.List;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.DetectorDefinitionInner;
@@ -19,7 +19,7 @@
 /**
  * Type representing DiagnosticDetectorResponse.
  */
-public interface DiagnosticDetectorResponse extends HasInner<DiagnosticDetectorResponseInner>, HasManager<AppServiceManager> {
+public interface DiagnosticDetectorResponse extends HasInner<DiagnosticDetectorResponseInner>, HasManager<WebManager> {
     /**
      * @return the abnormalTimePeriods value.
      */
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/Recommendation.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/Recommendation.java
index 0bd4b2cdf51a..4495e9d9e540 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/Recommendation.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/Recommendation.java
@@ -11,7 +11,7 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.RecommendationInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import org.joda.time.DateTime;
 import java.util.UUID;
 import java.util.List;
@@ -19,7 +19,7 @@
 /**
  * Type representing Recommendation.
  */
-public interface Recommendation extends HasInner<RecommendationInner>, HasManager<AppServiceManager> {
+public interface Recommendation extends HasInner<RecommendationInner>, HasManager<WebManager> {
     /**
      * @return the actionName value.
      */
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/RecommendationRule.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/RecommendationRule.java
index 15408267f21c..f6b9b2792025 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/RecommendationRule.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/RecommendationRule.java
@@ -10,7 +10,7 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.RecommendationRuleInner;
 import java.util.UUID;
 import java.util.List;
@@ -18,7 +18,7 @@
 /**
  * Type representing RecommendationRule.
  */
-public interface RecommendationRule extends HasInner<RecommendationRuleInner>, HasManager<AppServiceManager> {
+public interface RecommendationRule extends HasInner<RecommendationRuleInner>, HasManager<WebManager> {
     /**
      * @return the actionName value.
      */
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/ResourceHealthMetadata.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/ResourceHealthMetadata.java
index 622451af120c..2ecfa43c81a1 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/ResourceHealthMetadata.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/ResourceHealthMetadata.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.appservice.v2016_03_01.implementation.AppServiceManager;
+import com.microsoft.azure.management.appservice.v2016_03_01.implementation.WebManager;
 import com.microsoft.azure.management.appservice.v2016_03_01.implementation.ResourceHealthMetadataInner;
 
 /**
  * Type representing ResourceHealthMetadata.
  */
-public interface ResourceHealthMetadata extends HasInner<ResourceHealthMetadataInner>, HasManager<AppServiceManager> {
+public interface ResourceHealthMetadata extends HasInner<ResourceHealthMetadataInner>, HasManager<WebManager> {
     /**
      * @return the category value.
      */
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/AnalysisDefinitionImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/AnalysisDefinitionImpl.java
index 763192721fd9..05b2769de911 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/AnalysisDefinitionImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/AnalysisDefinitionImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class AnalysisDefinitionImpl extends WrapperImpl<AnalysisDefinitionInner> implements AnalysisDefinition {
-    private final AppServiceManager manager;
-    AnalysisDefinitionImpl(AnalysisDefinitionInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    AnalysisDefinitionImpl(AnalysisDefinitionInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ApplicationStackImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ApplicationStackImpl.java
index 56377d323cd4..327ba44c8e62 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ApplicationStackImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ApplicationStackImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.StackMajorVersion;
 
 class ApplicationStackImpl extends WrapperImpl<ApplicationStackInner> implements ApplicationStack {
-    private final AppServiceManager manager;
-    ApplicationStackImpl(ApplicationStackInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    ApplicationStackImpl(ApplicationStackInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/BillingMeterImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/BillingMeterImpl.java
index 3c858d4e48c9..53f5da990982 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/BillingMeterImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/BillingMeterImpl.java
@@ -14,15 +14,15 @@
 import rx.Observable;
 
 class BillingMeterImpl extends WrapperImpl<BillingMeterInner> implements BillingMeter {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    BillingMeterImpl(BillingMeterInner inner,  AppServiceManager manager) {
+    BillingMeterImpl(BillingMeterInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/BillingMetersImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/BillingMetersImpl.java
index 140807a072d7..c7b46dece5e4 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/BillingMetersImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/BillingMetersImpl.java
@@ -20,9 +20,9 @@
 
 class BillingMetersImpl extends WrapperImpl<BillingMetersInner> implements BillingMeters {
     private PagedListConverter<BillingMeterInner, BillingMeter> converter;
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    BillingMetersImpl(AppServiceManager manager) {
+    BillingMetersImpl(WebManager manager) {
         super(manager.inner().billingMeters());
         this.manager = manager;
         this.converter = new PagedListConverter<BillingMeterInner, BillingMeter>() {
@@ -33,7 +33,7 @@ public Observable<BillingMeter> typeConvertAsync(BillingMeterInner inner) {
         };
     }
 
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CertificateImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CertificateImpl.java
index d50bef8c2c14..1283afabc7ea 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CertificateImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CertificateImpl.java
@@ -18,9 +18,9 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.KeyVaultSecretStatus;
 import rx.functions.Func1;
 
-class CertificateImpl extends GroupableResourceCoreImpl<Certificate, CertificateInner, CertificateImpl, AppServiceManager> implements Certificate, Certificate.Definition, Certificate.Update {
+class CertificateImpl extends GroupableResourceCoreImpl<Certificate, CertificateInner, CertificateImpl, WebManager> implements Certificate, Certificate.Definition, Certificate.Update {
     private CertificatePatchResource updateParameter;
-    CertificateImpl(String name, CertificateInner inner, AppServiceManager manager) {
+    CertificateImpl(String name, CertificateInner inner, WebManager manager) {
         super(name, inner, manager);
         this.updateParameter = new CertificatePatchResource();
     }
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CertificatesImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CertificatesImpl.java
index 90a9f9e7df2d..6aee259e33b6 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CertificatesImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CertificatesImpl.java
@@ -23,8 +23,8 @@
 import com.microsoft.azure.PagedList;
 import com.microsoft.azure.Page;
 
-class CertificatesImpl extends GroupableResourcesCoreImpl<Certificate, CertificateImpl, CertificateInner, CertificatesInner, AppServiceManager>  implements Certificates {
-    protected CertificatesImpl(AppServiceManager manager) {
+class CertificatesImpl extends GroupableResourcesCoreImpl<Certificate, CertificateImpl, CertificateInner, CertificatesInner, WebManager>  implements Certificates {
+    protected CertificatesImpl(WebManager manager) {
         super(manager.inner().certificates(), manager);
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CsmOperationDescriptionImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CsmOperationDescriptionImpl.java
index bb5ce402ef4d..08215370c3d9 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CsmOperationDescriptionImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/CsmOperationDescriptionImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.CsmOperationDescriptionProperties;
 
 class CsmOperationDescriptionImpl extends WrapperImpl<CsmOperationDescriptionInner> implements CsmOperationDescription {
-    private final AppServiceManager manager;
-    CsmOperationDescriptionImpl(CsmOperationDescriptionInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    CsmOperationDescriptionImpl(CsmOperationDescriptionInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DeletedSiteImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DeletedSiteImpl.java
index fd1053715363..7359b1ede40c 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DeletedSiteImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DeletedSiteImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class DeletedSiteImpl extends WrapperImpl<DeletedSiteInner> implements DeletedSite {
-    private final AppServiceManager manager;
-    DeletedSiteImpl(DeletedSiteInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    DeletedSiteImpl(DeletedSiteInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DeletedWebAppsImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DeletedWebAppsImpl.java
index 658ad6aae41d..ca47be22d4f7 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DeletedWebAppsImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DeletedWebAppsImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.DeletedSite;
 
 class DeletedWebAppsImpl extends WrapperImpl<DeletedWebAppsInner> implements DeletedWebApps {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    DeletedWebAppsImpl(AppServiceManager manager) {
+    DeletedWebAppsImpl(WebManager manager) {
         super(manager.inner().deletedWebApps());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DetectorDefinitionImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DetectorDefinitionImpl.java
index d6b2a88082c5..c6d2c993d154 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DetectorDefinitionImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DetectorDefinitionImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class DetectorDefinitionImpl extends WrapperImpl<DetectorDefinitionInner> implements DetectorDefinition {
-    private final AppServiceManager manager;
-    DetectorDefinitionImpl(DetectorDefinitionInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    DetectorDefinitionImpl(DetectorDefinitionInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DetectorResponseImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DetectorResponseImpl.java
index 5974c558594f..a86ea2858df2 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DetectorResponseImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DetectorResponseImpl.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.DetectorInfo;
 
 class DetectorResponseImpl extends IndexableRefreshableWrapperImpl<DetectorResponse, DetectorResponseInner> implements DetectorResponse {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String name;
     private String detectorName;
 
-    DetectorResponseImpl(DetectorResponseInner inner,  AppServiceManager manager) {
+    DetectorResponseImpl(DetectorResponseInner inner,  WebManager manager) {
         super(null, inner);
         this.manager = manager;
         // set resource ancestor and positional variables
@@ -31,7 +31,7 @@ class DetectorResponseImpl extends IndexableRefreshableWrapperImpl<DetectorRespo
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticAnalysisImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticAnalysisImpl.java
index 9acf6817ae6c..6ab714ef1b99 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticAnalysisImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticAnalysisImpl.java
@@ -19,13 +19,13 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.AnalysisData;
 
 class DiagnosticAnalysisImpl extends IndexableRefreshableWrapperImpl<DiagnosticAnalysis, DiagnosticAnalysisInner> implements DiagnosticAnalysis {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String siteName;
     private String diagnosticCategory;
     private String analysisName;
 
-    DiagnosticAnalysisImpl(DiagnosticAnalysisInner inner,  AppServiceManager manager) {
+    DiagnosticAnalysisImpl(DiagnosticAnalysisInner inner,  WebManager manager) {
         super(null, inner);
         this.manager = manager;
         // set resource ancestor and positional variables
@@ -36,7 +36,7 @@ class DiagnosticAnalysisImpl extends IndexableRefreshableWrapperImpl<DiagnosticA
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticCategoryImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticCategoryImpl.java
index 0cd5667260c1..1b76fcc4949e 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticCategoryImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticCategoryImpl.java
@@ -13,12 +13,12 @@
 import rx.Observable;
 
 class DiagnosticCategoryImpl extends IndexableRefreshableWrapperImpl<DiagnosticCategory, DiagnosticCategoryInner> implements DiagnosticCategory {
-    private final AppServiceManager manager;
+    private final WebManager manager;
     private String resourceGroupName;
     private String siteName;
     private String diagnosticCategory;
 
-    DiagnosticCategoryImpl(DiagnosticCategoryInner inner,  AppServiceManager manager) {
+    DiagnosticCategoryImpl(DiagnosticCategoryInner inner,  WebManager manager) {
         super(null, inner);
         this.manager = manager;
         // set resource ancestor and positional variables
@@ -28,7 +28,7 @@ class DiagnosticCategoryImpl extends IndexableRefreshableWrapperImpl<DiagnosticC
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticDetectorResponseImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticDetectorResponseImpl.java
index 6f69574bb66d..082c07d50edb 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticDetectorResponseImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticDetectorResponseImpl.java
@@ -18,14 +18,14 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.ResponseMetaData;
 
 class DiagnosticDetectorResponseImpl extends WrapperImpl<DiagnosticDetectorResponseInner> implements DiagnosticDetectorResponse {
-    private final AppServiceManager manager;
-    DiagnosticDetectorResponseImpl(DiagnosticDetectorResponseInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    DiagnosticDetectorResponseImpl(DiagnosticDetectorResponseInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticsImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticsImpl.java
index 6d3e99954167..77936bc451e1 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticsImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/DiagnosticsImpl.java
@@ -22,14 +22,14 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.AnalysisDefinition;
 
 class DiagnosticsImpl extends WrapperImpl<DiagnosticsInner> implements Diagnostics {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    DiagnosticsImpl(AppServiceManager manager) {
+    DiagnosticsImpl(WebManager manager) {
         super(manager.inner().diagnostics());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
@@ -89,10 +89,14 @@ public DiagnosticCategory call(DiagnosticCategoryInner inner) {
     public Observable<DiagnosticCategory> getSiteDiagnosticCategoryAsync(String resourceGroupName, String siteName, String diagnosticCategory) {
         DiagnosticsInner client = this.inner();
         return client.getSiteDiagnosticCategoryAsync(resourceGroupName, siteName, diagnosticCategory)
-        .map(new Func1<DiagnosticCategoryInner, DiagnosticCategory>() {
+        .flatMap(new Func1<DiagnosticCategoryInner, Observable<DiagnosticCategory>>() {
             @Override
-            public DiagnosticCategory call(DiagnosticCategoryInner inner) {
-                return wrapModel(inner);
+            public Observable<DiagnosticCategory> call(DiagnosticCategoryInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((DiagnosticCategory)wrapModel(inner));
+                }
             }
        });
     }
@@ -126,10 +130,14 @@ private Observable<DiagnosticAnalysisInner> getDiagnosticAnalysisInnerUsingDiagn
     public Observable<DetectorResponse> getHostingEnvironmentDetectorResponseAsync(String resourceGroupName, String name, String detectorName) {
         DiagnosticsInner client = this.inner();
         return client.getHostingEnvironmentDetectorResponseAsync(resourceGroupName, name, detectorName)
-        .map(new Func1<DetectorResponseInner, DetectorResponse>() {
+        .flatMap(new Func1<DetectorResponseInner, Observable<DetectorResponse>>() {
             @Override
-            public DetectorResponse call(DetectorResponseInner inner) {
-                return wrapDetectorResponseModel(inner);
+            public Observable<DetectorResponse> call(DetectorResponseInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((DetectorResponse)wrapDetectorResponseModel(inner));
+                }
             }
        });
     }
@@ -312,10 +320,14 @@ public DiagnosticDetectorResponse call(DiagnosticDetectorResponseInner inner) {
     public Observable<DiagnosticAnalysis> getSiteAnalysisAsync(String resourceGroupName, String siteName, String diagnosticCategory, String analysisName) {
         DiagnosticsInner client = this.inner();
         return client.getSiteAnalysisAsync(resourceGroupName, siteName, diagnosticCategory, analysisName)
-        .map(new Func1<DiagnosticAnalysisInner, DiagnosticAnalysis>() {
-            @Override
-            public DiagnosticAnalysis call(DiagnosticAnalysisInner inner) {
-                return wrapDiagnosticAnalysisModel(inner);
+        .flatMap(new Func1<DiagnosticAnalysisInner, Observable<DiagnosticAnalysis>>() {
+            @Override
+            public Observable<DiagnosticAnalysis> call(DiagnosticAnalysisInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((DiagnosticAnalysis)wrapDiagnosticAnalysisModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ProvidersImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ProvidersImpl.java
index 942e7c4c6072..fc02280d9181 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ProvidersImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ProvidersImpl.java
@@ -18,14 +18,14 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.CsmOperationDescription;
 
 class ProvidersImpl extends WrapperImpl<ProvidersInner> implements Providers {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    ProvidersImpl(AppServiceManager manager) {
+    ProvidersImpl(WebManager manager) {
         super(manager.inner().providers());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationImpl.java
index cde7878c8dc8..6948fc99fbf8 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationImpl.java
@@ -20,15 +20,15 @@
 import java.util.List;
 
 class RecommendationImpl extends WrapperImpl<RecommendationInner> implements Recommendation {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    RecommendationImpl(RecommendationInner inner,  AppServiceManager manager) {
+    RecommendationImpl(RecommendationInner inner,  WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationRuleImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationRuleImpl.java
index 85f3887c87d4..9b92b783d063 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationRuleImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationRuleImpl.java
@@ -16,14 +16,14 @@
 import java.util.List;
 
 class RecommendationRuleImpl extends WrapperImpl<RecommendationRuleInner> implements RecommendationRule {
-    private final AppServiceManager manager;
-    RecommendationRuleImpl(RecommendationRuleInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    RecommendationRuleImpl(RecommendationRuleInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationsImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationsImpl.java
index f3dee043ff31..4c47ce84183b 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationsImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/RecommendationsImpl.java
@@ -22,9 +22,9 @@
 
 class RecommendationsImpl extends WrapperImpl<RecommendationsInner> implements Recommendations {
     private PagedListConverter<RecommendationInner, Recommendation> converter;
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    RecommendationsImpl(AppServiceManager manager) {
+    RecommendationsImpl(WebManager manager) {
         super(manager.inner().recommendations());
         this.manager = manager;
         this.converter = new PagedListConverter<RecommendationInner, Recommendation>() {
@@ -35,7 +35,7 @@ public Observable<Recommendation> typeConvertAsync(RecommendationInner inner) {
         };
     }
 
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ResourceHealthMetadataImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ResourceHealthMetadataImpl.java
index c04b517e705e..a48148374856 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ResourceHealthMetadataImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ResourceHealthMetadataImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class ResourceHealthMetadataImpl extends WrapperImpl<ResourceHealthMetadataInner> implements ResourceHealthMetadata {
-    private final AppServiceManager manager;
-    ResourceHealthMetadataImpl(ResourceHealthMetadataInner inner, AppServiceManager manager) {
+    private final WebManager manager;
+    ResourceHealthMetadataImpl(ResourceHealthMetadataInner inner, WebManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ResourceHealthMetadatasImpl.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ResourceHealthMetadatasImpl.java
index 5c6f8969153e..40135f07c039 100644
--- a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ResourceHealthMetadatasImpl.java
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/ResourceHealthMetadatasImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.appservice.v2016_03_01.ResourceHealthMetadata;
 
 class ResourceHealthMetadatasImpl extends WrapperImpl<ResourceHealthMetadatasInner> implements ResourceHealthMetadatas {
-    private final AppServiceManager manager;
+    private final WebManager manager;
 
-    ResourceHealthMetadatasImpl(AppServiceManager manager) {
+    ResourceHealthMetadatasImpl(WebManager manager) {
         super(manager.inner().resourceHealthMetadatas());
         this.manager = manager;
     }
 
-    public AppServiceManager manager() {
+    public WebManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/WebManager.java b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/WebManager.java
new file mode 100644
index 000000000000..af4232f07b0b
--- /dev/null
+++ b/sdk/appservice/mgmt-v2016_03_01/src/main/java/com/microsoft/azure/management/appservice/v2016_03_01/implementation/WebManager.java
@@ -0,0 +1,171 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.appservice.v2016_03_01.implementation;
+
+import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.AzureResponseBuilder;
+import com.microsoft.azure.credentials.AzureTokenCredentials;
+import com.microsoft.azure.management.apigeneration.Beta;
+import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
+import com.microsoft.azure.arm.resources.AzureConfigurable;
+import com.microsoft.azure.serializer.AzureJacksonAdapter;
+import com.microsoft.rest.RestClient;
+import com.microsoft.azure.management.appservice.v2016_03_01.Certificates;
+import com.microsoft.azure.management.appservice.v2016_03_01.DeletedWebApps;
+import com.microsoft.azure.management.appservice.v2016_03_01.Diagnostics;
+import com.microsoft.azure.management.appservice.v2016_03_01.Providers;
+import com.microsoft.azure.management.appservice.v2016_03_01.Recommendations;
+import com.microsoft.azure.management.appservice.v2016_03_01.ResourceHealthMetadatas;
+import com.microsoft.azure.management.appservice.v2016_03_01.BillingMeters;
+import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
+import com.microsoft.azure.arm.resources.implementation.ManagerCore;
+
+/**
+ * Entry point to Azure Web resource management.
+ */
+public final class WebManager extends ManagerCore<WebManager, WebSiteManagementClientImpl> {
+    private Certificates certificates;
+    private DeletedWebApps deletedWebApps;
+    private Diagnostics diagnostics;
+    private Providers providers;
+    private Recommendations recommendations;
+    private ResourceHealthMetadatas resourceHealthMetadatas;
+    private BillingMeters billingMeters;
+    /**
+    * Get a Configurable instance that can be used to create WebManager with optional configuration.
+    *
+    * @return the instance allowing configurations
+    */
+    public static Configurable configure() {
+        return new WebManager.ConfigurableImpl();
+    }
+    /**
+    * Creates an instance of WebManager that exposes Web resource management API entry points.
+    *
+    * @param credentials the credentials to use
+    * @param subscriptionId the subscription UUID
+    * @return the WebManager
+    */
+    public static WebManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+        return new WebManager(new RestClient.Builder()
+            .withBaseUrl(credentials.environment(), AzureEnvironment.Endpoint.RESOURCE_MANAGER)
+            .withCredentials(credentials)
+            .withSerializerAdapter(new AzureJacksonAdapter())
+            .withResponseBuilderFactory(new AzureResponseBuilder.Factory())
+            .build(), subscriptionId);
+    }
+    /**
+    * Creates an instance of WebManager that exposes Web resource management API entry points.
+    *
+    * @param restClient the RestClient to be used for API calls.
+    * @param subscriptionId the subscription UUID
+    * @return the WebManager
+    */
+    public static WebManager authenticate(RestClient restClient, String subscriptionId) {
+        return new WebManager(restClient, subscriptionId);
+    }
+    /**
+    * The interface allowing configurations to be set.
+    */
+    public interface Configurable extends AzureConfigurable<Configurable> {
+        /**
+        * Creates an instance of WebManager that exposes Web management API entry points.
+        *
+        * @param credentials the credentials to use
+        * @param subscriptionId the subscription UUID
+        * @return the interface exposing Web management API entry points that work across subscriptions
+        */
+        WebManager authenticate(AzureTokenCredentials credentials, String subscriptionId);
+    }
+
+    /**
+     * @return Entry point to manage Certificates.
+     */
+    public Certificates certificates() {
+        if (this.certificates == null) {
+            this.certificates = new CertificatesImpl(this);
+        }
+        return this.certificates;
+    }
+
+    /**
+     * @return Entry point to manage DeletedWebApps.
+     */
+    public DeletedWebApps deletedWebApps() {
+        if (this.deletedWebApps == null) {
+            this.deletedWebApps = new DeletedWebAppsImpl(this);
+        }
+        return this.deletedWebApps;
+    }
+
+    /**
+     * @return Entry point to manage Diagnostics.
+     */
+    public Diagnostics diagnostics() {
+        if (this.diagnostics == null) {
+            this.diagnostics = new DiagnosticsImpl(this);
+        }
+        return this.diagnostics;
+    }
+
+    /**
+     * @return Entry point to manage Providers.
+     */
+    public Providers providers() {
+        if (this.providers == null) {
+            this.providers = new ProvidersImpl(this);
+        }
+        return this.providers;
+    }
+
+    /**
+     * @return Entry point to manage Recommendations.
+     */
+    public Recommendations recommendations() {
+        if (this.recommendations == null) {
+            this.recommendations = new RecommendationsImpl(this);
+        }
+        return this.recommendations;
+    }
+
+    /**
+     * @return Entry point to manage ResourceHealthMetadatas.
+     */
+    public ResourceHealthMetadatas resourceHealthMetadatas() {
+        if (this.resourceHealthMetadatas == null) {
+            this.resourceHealthMetadatas = new ResourceHealthMetadatasImpl(this);
+        }
+        return this.resourceHealthMetadatas;
+    }
+
+    /**
+     * @return Entry point to manage BillingMeters.
+     */
+    public BillingMeters billingMeters() {
+        if (this.billingMeters == null) {
+            this.billingMeters = new BillingMetersImpl(this);
+        }
+        return this.billingMeters;
+    }
+
+    /**
+    * The implementation for Configurable interface.
+    */
+    private static final class ConfigurableImpl extends AzureConfigurableCoreImpl<Configurable> implements Configurable {
+        public WebManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+           return WebManager.authenticate(buildRestClient(credentials), subscriptionId);
+        }
+     }
+    private WebManager(RestClient restClient, String subscriptionId) {
+        super(
+            restClient,
+            subscriptionId,
+            new WebSiteManagementClientImpl(restClient).withSubscriptionId(subscriptionId));
+    }
+}