diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs
index 03374d8e..b45833f3 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs
@@ -118,6 +118,9 @@ order by rg.groupOrder
         public const string EXCHANGE2007_ALLOWLITIGATIONHOLD = "Exchange2007.AllowLitigationHold";
         public const string EXCHANGE2007_RECOVERABLEITEMSSPACE = "Exchange2007.RecoverableItemsSpace";
         public const string EXCHANGE2007_DISCLAIMERSALLOWED = "Exchange2007.DisclaimersAllowed";
+        public const string EXCHANGE2013_ALLOWARCHIVING = "Exchange2013.AllowArchiving"; // Archiving
+        public const string EXCHANGE2013_ARCHIVINGSTORAGE = "Exchange2013.ArchivingStorage";
+        public const string EXCHANGE2013_ARCHIVINGMAILBOXES = "Exchange2013.ArchivingMailboxes";
         public const string MSSQL2000_DATABASES = "MsSQL2000.Databases";  // Databases
 		public const string MSSQL2000_USERS = "MsSQL2000.Users";  // Users
 		public const string MSSQL2000_MAXDATABASESIZE = "MsSQL2000.MaxDatabaseSize";  // Max Database Size
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/ExchangeServerProxy.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/ExchangeServerProxy.cs
index 8fda3459..61f01a5c 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/ExchangeServerProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/ExchangeServerProxy.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012, Outercurve Foundation.
+// Copyright (c) 2012-2014, Outercurve Foundation.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without modification,
@@ -36,11 +36,15 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
+using WebsitePanel.Providers;
+using WebsitePanel.Providers.Common;
+using WebsitePanel.Providers.HostedSolution;
+using WebsitePanel.Providers.ResultObjects;
+
 // 
 // This source code was auto-generated by wsdl, Version=2.0.50727.42.
 // 
-namespace WebsitePanel.EnterpriseServer
-{
+namespace WebsitePanel.EnterpriseServer {
     using System.Xml.Serialization;
     using System.Web.Services;
     using System.ComponentModel;
@@ -48,790 +52,879 @@ namespace WebsitePanel.EnterpriseServer
     using System;
     using System.Diagnostics;
     using System.Data;
-
-    using WebsitePanel.Providers;
-    using WebsitePanel.Providers.Common;
-    using WebsitePanel.Providers.HostedSolution;
-    using WebsitePanel.Providers.ResultObjects;
-
+    
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Web.Services.WebServiceBindingAttribute(Name = "esExchangeServerSoap", Namespace = "http://smbsaas/websitepanel/enterpriseserver")]
+    [System.Web.Services.WebServiceBindingAttribute(Name="esExchangeServerSoap", Namespace="http://smbsaas/websitepanel/enterpriseserver")]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(BaseStatistics))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ServiceProviderItem))]
-    public partial class esExchangeServer : Microsoft.Web.Services3.WebServicesClientProtocol
-    {
-
-        private System.Threading.SendOrPostCallback GetExchangeMailboxPlansOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetExchangeMailboxPlanOperationCompleted;
-
-        private System.Threading.SendOrPostCallback AddExchangeMailboxPlanOperationCompleted;
-
-        private System.Threading.SendOrPostCallback UpdateExchangeMailboxPlanOperationCompleted;
-
-        private System.Threading.SendOrPostCallback DeleteExchangeMailboxPlanOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetOrganizationDefaultExchangeMailboxPlanOperationCompleted;
-
-        private System.Threading.SendOrPostCallback CreatePublicFolderOperationCompleted;
-
-        private System.Threading.SendOrPostCallback DeletePublicFoldersOperationCompleted;
-
-        private System.Threading.SendOrPostCallback DeletePublicFolderOperationCompleted;
-
-        private System.Threading.SendOrPostCallback EnableMailPublicFolderOperationCompleted;
-
-        private System.Threading.SendOrPostCallback DisableMailPublicFolderOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetPublicFolderGeneralSettingsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetPublicFolderGeneralSettingsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetPublicFolderMailFlowSettingsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetPublicFolderMailFlowSettingsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetPublicFolderEmailAddressesOperationCompleted;
-
-        private System.Threading.SendOrPostCallback AddPublicFolderEmailAddressOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetPublicFolderPrimaryEmailAddressOperationCompleted;
-
-        private System.Threading.SendOrPostCallback DeletePublicFolderEmailAddressesOperationCompleted;
-
-        private System.Threading.SendOrPostCallback AddExchangeDisclaimerOperationCompleted;
-
-        private System.Threading.SendOrPostCallback UpdateExchangeDisclaimerOperationCompleted;
-
-        private System.Threading.SendOrPostCallback DeleteExchangeDisclaimerOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetExchangeDisclaimerOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetExchangeDisclaimersOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetExchangeAccountDisclaimerIdOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetExchangeAccountDisclaimerIdOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetRawExchangeOrganizationsPagedOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetExchangeOrganizationsPagedOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetExchangeOrganizationsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetOrganizationOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetOrganizationStatisticsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetOrganizationStatisticsByOrganizationOperationCompleted;
-
-        private System.Threading.SendOrPostCallback DeleteOrganizationOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetOrganizationStorageLimitsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetOrganizationStorageLimitsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetMailboxesStatisticsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetMailboxStatisticsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback CalculateOrganizationDiskspaceOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetActiveSyncPolicyOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetActiveSyncPolicyOperationCompleted;
-
-        private System.Threading.SendOrPostCallback AddAuthoritativeDomainOperationCompleted;
-
-        private System.Threading.SendOrPostCallback DeleteAuthoritativeDomainOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetAccountsPagedOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetAccountsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetExchangeAccountByMailboxPlanIdOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SearchAccountsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetAccountOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SearchAccountOperationCompleted;
-
-        private System.Threading.SendOrPostCallback CheckAccountCredentialsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback CreateMailboxOperationCompleted;
-
-        private System.Threading.SendOrPostCallback DeleteMailboxOperationCompleted;
-
-        private System.Threading.SendOrPostCallback DisableMailboxOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetMailboxAdvancedSettingsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetMailboxGeneralSettingsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetMailboxGeneralSettingsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetMailboxEmailAddressesOperationCompleted;
-
-        private System.Threading.SendOrPostCallback AddMailboxEmailAddressOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetMailboxPrimaryEmailAddressOperationCompleted;
-
-        private System.Threading.SendOrPostCallback DeleteMailboxEmailAddressesOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetMailboxMailFlowSettingsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetMailboxMailFlowSettingsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetExchangeMailboxPlanOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetMailboxSetupInstructionsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SendMailboxSetupInstructionsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetMailboxManagerSettingsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetMailboxPermissionsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetMailboxPermissionsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback CreateContactOperationCompleted;
-
-        private System.Threading.SendOrPostCallback DeleteContactOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetContactGeneralSettingsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetContactGeneralSettingsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetContactMailFlowSettingsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetContactMailFlowSettingsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback CreateDistributionListOperationCompleted;
-
-        private System.Threading.SendOrPostCallback DeleteDistributionListOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetDistributionListGeneralSettingsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetDistributionListGeneralSettingsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetDistributionListMailFlowSettingsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetDistributionListMailFlowSettingsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetDistributionListEmailAddressesOperationCompleted;
-
-        private System.Threading.SendOrPostCallback AddDistributionListEmailAddressOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetDistributionListPrimaryEmailAddressOperationCompleted;
-
-        private System.Threading.SendOrPostCallback DeleteDistributionListEmailAddressesOperationCompleted;
-
-        private System.Threading.SendOrPostCallback SetDistributionListPermissionsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetDistributionListPermissionsOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetMobileDevicesOperationCompleted;
-
-        private System.Threading.SendOrPostCallback GetMobileDeviceOperationCompleted;
-
+    public partial class esExchangeServer : Microsoft.Web.Services3.WebServicesClientProtocol {
+        
         private System.Threading.SendOrPostCallback WipeDataFromDeviceOperationCompleted;
-
+        
         private System.Threading.SendOrPostCallback CancelRemoteWipeRequestOperationCompleted;
-
+        
         private System.Threading.SendOrPostCallback RemoveDeviceOperationCompleted;
-
+        
+        private System.Threading.SendOrPostCallback GetExchangeMailboxPlansOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetExchangeMailboxPlanOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback AddExchangeMailboxPlanOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback UpdateExchangeMailboxPlanOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeleteExchangeMailboxPlanOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetOrganizationDefaultExchangeMailboxPlanOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback CreatePublicFolderOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeletePublicFoldersOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeletePublicFolderOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback EnableMailPublicFolderOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DisableMailPublicFolderOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetPublicFolderGeneralSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetPublicFolderGeneralSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetPublicFolderMailFlowSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetPublicFolderMailFlowSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetPublicFolderEmailAddressesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback AddPublicFolderEmailAddressOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetPublicFolderPrimaryEmailAddressOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeletePublicFolderEmailAddressesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback AddExchangeDisclaimerOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback UpdateExchangeDisclaimerOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeleteExchangeDisclaimerOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetExchangeDisclaimerOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetExchangeDisclaimersOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetExchangeAccountDisclaimerIdOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetExchangeAccountDisclaimerIdOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetRawExchangeOrganizationsPagedOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetExchangeOrganizationsPagedOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetExchangeOrganizationsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetOrganizationOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetOrganizationStatisticsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetOrganizationStatisticsByOrganizationOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeleteOrganizationOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetOrganizationStorageLimitsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetOrganizationStorageLimitsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetMailboxesStatisticsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetMailboxStatisticsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback CalculateOrganizationDiskspaceOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetActiveSyncPolicyOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetActiveSyncPolicyOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback AddAuthoritativeDomainOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeleteAuthoritativeDomainOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetAccountsPagedOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetAccountsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetExchangeAccountByMailboxPlanIdOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SearchAccountsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetAccountOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SearchAccountOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback CheckAccountCredentialsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback CreateMailboxOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeleteMailboxOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DisableMailboxOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetMailboxAdvancedSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetMailboxGeneralSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetMailboxGeneralSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetMailboxEmailAddressesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback AddMailboxEmailAddressOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetMailboxPrimaryEmailAddressOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeleteMailboxEmailAddressesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetMailboxMailFlowSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetMailboxMailFlowSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetExchangeMailboxPlanOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetMailboxSetupInstructionsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SendMailboxSetupInstructionsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetMailboxManagerSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetMailboxPermissionsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetMailboxPermissionsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback CreateContactOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeleteContactOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetContactGeneralSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetContactGeneralSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetContactMailFlowSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetContactMailFlowSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback CreateDistributionListOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeleteDistributionListOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetDistributionListGeneralSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetDistributionListGeneralSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetDistributionListMailFlowSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetDistributionListMailFlowSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetDistributionListEmailAddressesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback AddDistributionListEmailAddressOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetDistributionListPrimaryEmailAddressOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeleteDistributionListEmailAddressesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetDistributionListPermissionsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetDistributionListPermissionsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetDistributionListsByMemberOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback AddDistributionListMemberOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeleteDistributionListMemberOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetMobileDevicesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetMobileDeviceOperationCompleted;
+        
         /// <remarks/>
-        public esExchangeServer()
-        {
+        public esExchangeServer() {
             this.Url = "http://localhost:9002/esExchangeServer.asmx";
         }
-
-        /// <remarks/>
-        public event GetExchangeMailboxPlansCompletedEventHandler GetExchangeMailboxPlansCompleted;
-
-        /// <remarks/>
-        public event GetExchangeMailboxPlanCompletedEventHandler GetExchangeMailboxPlanCompleted;
-
-        /// <remarks/>
-        public event AddExchangeMailboxPlanCompletedEventHandler AddExchangeMailboxPlanCompleted;
-
-        /// <remarks/>
-        public event UpdateExchangeMailboxPlanCompletedEventHandler UpdateExchangeMailboxPlanCompleted;
-
-        /// <remarks/>
-        public event DeleteExchangeMailboxPlanCompletedEventHandler DeleteExchangeMailboxPlanCompleted;
-
-        /// <remarks/>
-        public event SetOrganizationDefaultExchangeMailboxPlanCompletedEventHandler SetOrganizationDefaultExchangeMailboxPlanCompleted;
-
-        /// <remarks/>
-        public event CreatePublicFolderCompletedEventHandler CreatePublicFolderCompleted;
-
-        /// <remarks/>
-        public event DeletePublicFoldersCompletedEventHandler DeletePublicFoldersCompleted;
-
-        /// <remarks/>
-        public event DeletePublicFolderCompletedEventHandler DeletePublicFolderCompleted;
-
-        /// <remarks/>
-        public event EnableMailPublicFolderCompletedEventHandler EnableMailPublicFolderCompleted;
-
-        /// <remarks/>
-        public event DisableMailPublicFolderCompletedEventHandler DisableMailPublicFolderCompleted;
-
-        /// <remarks/>
-        public event GetPublicFolderGeneralSettingsCompletedEventHandler GetPublicFolderGeneralSettingsCompleted;
-
-        /// <remarks/>
-        public event SetPublicFolderGeneralSettingsCompletedEventHandler SetPublicFolderGeneralSettingsCompleted;
-
-        /// <remarks/>
-        public event GetPublicFolderMailFlowSettingsCompletedEventHandler GetPublicFolderMailFlowSettingsCompleted;
-
-        /// <remarks/>
-        public event SetPublicFolderMailFlowSettingsCompletedEventHandler SetPublicFolderMailFlowSettingsCompleted;
-
-        /// <remarks/>
-        public event GetPublicFolderEmailAddressesCompletedEventHandler GetPublicFolderEmailAddressesCompleted;
-
-        /// <remarks/>
-        public event AddPublicFolderEmailAddressCompletedEventHandler AddPublicFolderEmailAddressCompleted;
-
-        /// <remarks/>
-        public event SetPublicFolderPrimaryEmailAddressCompletedEventHandler SetPublicFolderPrimaryEmailAddressCompleted;
-
-        /// <remarks/>
-        public event DeletePublicFolderEmailAddressesCompletedEventHandler DeletePublicFolderEmailAddressesCompleted;
-
-        /// <remarks/>
-        public event AddExchangeDisclaimerCompletedEventHandler AddExchangeDisclaimerCompleted;
-
-        /// <remarks/>
-        public event UpdateExchangeDisclaimerCompletedEventHandler UpdateExchangeDisclaimerCompleted;
-
-        /// <remarks/>
-        public event DeleteExchangeDisclaimerCompletedEventHandler DeleteExchangeDisclaimerCompleted;
-
-        /// <remarks/>
-        public event GetExchangeDisclaimerCompletedEventHandler GetExchangeDisclaimerCompleted;
-
-        /// <remarks/>
-        public event GetExchangeDisclaimersCompletedEventHandler GetExchangeDisclaimersCompleted;
-
-        /// <remarks/>
-        public event SetExchangeAccountDisclaimerIdCompletedEventHandler SetExchangeAccountDisclaimerIdCompleted;
-
-        /// <remarks/>
-        public event GetExchangeAccountDisclaimerIdCompletedEventHandler GetExchangeAccountDisclaimerIdCompleted;
-
-        /// <remarks/>
-        public event GetRawExchangeOrganizationsPagedCompletedEventHandler GetRawExchangeOrganizationsPagedCompleted;
-
-        /// <remarks/>
-        public event GetExchangeOrganizationsPagedCompletedEventHandler GetExchangeOrganizationsPagedCompleted;
-
-        /// <remarks/>
-        public event GetExchangeOrganizationsCompletedEventHandler GetExchangeOrganizationsCompleted;
-
-        /// <remarks/>
-        public event GetOrganizationCompletedEventHandler GetOrganizationCompleted;
-
-        /// <remarks/>
-        public event GetOrganizationStatisticsCompletedEventHandler GetOrganizationStatisticsCompleted;
-
-        /// <remarks/>
-        public event GetOrganizationStatisticsByOrganizationCompletedEventHandler GetOrganizationStatisticsByOrganizationCompleted;
-
-        /// <remarks/>
-        public event DeleteOrganizationCompletedEventHandler DeleteOrganizationCompleted;
-
-        /// <remarks/>
-        public event GetOrganizationStorageLimitsCompletedEventHandler GetOrganizationStorageLimitsCompleted;
-
-        /// <remarks/>
-        public event SetOrganizationStorageLimitsCompletedEventHandler SetOrganizationStorageLimitsCompleted;
-
-        /// <remarks/>
-        public event GetMailboxesStatisticsCompletedEventHandler GetMailboxesStatisticsCompleted;
-
-        /// <remarks/>
-        public event GetMailboxStatisticsCompletedEventHandler GetMailboxStatisticsCompleted;
-
-        /// <remarks/>
-        public event CalculateOrganizationDiskspaceCompletedEventHandler CalculateOrganizationDiskspaceCompleted;
-
-        /// <remarks/>
-        public event GetActiveSyncPolicyCompletedEventHandler GetActiveSyncPolicyCompleted;
-
-        /// <remarks/>
-        public event SetActiveSyncPolicyCompletedEventHandler SetActiveSyncPolicyCompleted;
-
-        /// <remarks/>
-        public event AddAuthoritativeDomainCompletedEventHandler AddAuthoritativeDomainCompleted;
-
-        /// <remarks/>
-        public event DeleteAuthoritativeDomainCompletedEventHandler DeleteAuthoritativeDomainCompleted;
-
-        /// <remarks/>
-        public event GetAccountsPagedCompletedEventHandler GetAccountsPagedCompleted;
-
-        /// <remarks/>
-        public event GetAccountsCompletedEventHandler GetAccountsCompleted;
-
-        /// <remarks/>
-        public event GetExchangeAccountByMailboxPlanIdCompletedEventHandler GetExchangeAccountByMailboxPlanIdCompleted;
-
-        /// <remarks/>
-        public event SearchAccountsCompletedEventHandler SearchAccountsCompleted;
-
-        /// <remarks/>
-        public event GetAccountCompletedEventHandler GetAccountCompleted;
-
-        /// <remarks/>
-        public event SearchAccountCompletedEventHandler SearchAccountCompleted;
-
-        /// <remarks/>
-        public event CheckAccountCredentialsCompletedEventHandler CheckAccountCredentialsCompleted;
-
-        /// <remarks/>
-        public event CreateMailboxCompletedEventHandler CreateMailboxCompleted;
-
-        /// <remarks/>
-        public event DeleteMailboxCompletedEventHandler DeleteMailboxCompleted;
-
-        /// <remarks/>
-        public event DisableMailboxCompletedEventHandler DisableMailboxCompleted;
-
-        /// <remarks/>
-        public event GetMailboxAdvancedSettingsCompletedEventHandler GetMailboxAdvancedSettingsCompleted;
-
-        /// <remarks/>
-        public event GetMailboxGeneralSettingsCompletedEventHandler GetMailboxGeneralSettingsCompleted;
-
-        /// <remarks/>
-        public event SetMailboxGeneralSettingsCompletedEventHandler SetMailboxGeneralSettingsCompleted;
-
-        /// <remarks/>
-        public event GetMailboxEmailAddressesCompletedEventHandler GetMailboxEmailAddressesCompleted;
-
-        /// <remarks/>
-        public event AddMailboxEmailAddressCompletedEventHandler AddMailboxEmailAddressCompleted;
-
-        /// <remarks/>
-        public event SetMailboxPrimaryEmailAddressCompletedEventHandler SetMailboxPrimaryEmailAddressCompleted;
-
-        /// <remarks/>
-        public event DeleteMailboxEmailAddressesCompletedEventHandler DeleteMailboxEmailAddressesCompleted;
-
-        /// <remarks/>
-        public event GetMailboxMailFlowSettingsCompletedEventHandler GetMailboxMailFlowSettingsCompleted;
-
-        /// <remarks/>
-        public event SetMailboxMailFlowSettingsCompletedEventHandler SetMailboxMailFlowSettingsCompleted;
-
-        /// <remarks/>
-        public event SetExchangeMailboxPlanCompletedEventHandler SetExchangeMailboxPlanCompleted;
-
-        /// <remarks/>
-        public event GetMailboxSetupInstructionsCompletedEventHandler GetMailboxSetupInstructionsCompleted;
-
-        /// <remarks/>
-        public event SendMailboxSetupInstructionsCompletedEventHandler SendMailboxSetupInstructionsCompleted;
-
-        /// <remarks/>
-        public event SetMailboxManagerSettingsCompletedEventHandler SetMailboxManagerSettingsCompleted;
-
-        /// <remarks/>
-        public event GetMailboxPermissionsCompletedEventHandler GetMailboxPermissionsCompleted;
-
-        /// <remarks/>
-        public event SetMailboxPermissionsCompletedEventHandler SetMailboxPermissionsCompleted;
-
-        /// <remarks/>
-        public event CreateContactCompletedEventHandler CreateContactCompleted;
-
-        /// <remarks/>
-        public event DeleteContactCompletedEventHandler DeleteContactCompleted;
-
-        /// <remarks/>
-        public event GetContactGeneralSettingsCompletedEventHandler GetContactGeneralSettingsCompleted;
-
-        /// <remarks/>
-        public event SetContactGeneralSettingsCompletedEventHandler SetContactGeneralSettingsCompleted;
-
-        /// <remarks/>
-        public event GetContactMailFlowSettingsCompletedEventHandler GetContactMailFlowSettingsCompleted;
-
-        /// <remarks/>
-        public event SetContactMailFlowSettingsCompletedEventHandler SetContactMailFlowSettingsCompleted;
-
-        /// <remarks/>
-        public event CreateDistributionListCompletedEventHandler CreateDistributionListCompleted;
-
-        /// <remarks/>
-        public event DeleteDistributionListCompletedEventHandler DeleteDistributionListCompleted;
-
-        /// <remarks/>
-        public event GetDistributionListGeneralSettingsCompletedEventHandler GetDistributionListGeneralSettingsCompleted;
-
-        /// <remarks/>
-        public event SetDistributionListGeneralSettingsCompletedEventHandler SetDistributionListGeneralSettingsCompleted;
-
-        /// <remarks/>
-        public event GetDistributionListMailFlowSettingsCompletedEventHandler GetDistributionListMailFlowSettingsCompleted;
-
-        /// <remarks/>
-        public event SetDistributionListMailFlowSettingsCompletedEventHandler SetDistributionListMailFlowSettingsCompleted;
-
-        /// <remarks/>
-        public event GetDistributionListEmailAddressesCompletedEventHandler GetDistributionListEmailAddressesCompleted;
-
-        /// <remarks/>
-        public event AddDistributionListEmailAddressCompletedEventHandler AddDistributionListEmailAddressCompleted;
-
-        /// <remarks/>
-        public event SetDistributionListPrimaryEmailAddressCompletedEventHandler SetDistributionListPrimaryEmailAddressCompleted;
-
-        /// <remarks/>
-        public event DeleteDistributionListEmailAddressesCompletedEventHandler DeleteDistributionListEmailAddressesCompleted;
-
-        /// <remarks/>
-        public event SetDistributionListPermissionsCompletedEventHandler SetDistributionListPermissionsCompleted;
-
-        /// <remarks/>
-        public event GetDistributionListPermissionsCompletedEventHandler GetDistributionListPermissionsCompleted;
-
-        /// <remarks/>
-        public event GetMobileDevicesCompletedEventHandler GetMobileDevicesCompleted;
-
-        /// <remarks/>
-        public event GetMobileDeviceCompletedEventHandler GetMobileDeviceCompleted;
-
+        
         /// <remarks/>
         public event WipeDataFromDeviceCompletedEventHandler WipeDataFromDeviceCompleted;
-
+        
         /// <remarks/>
         public event CancelRemoteWipeRequestCompletedEventHandler CancelRemoteWipeRequestCompleted;
-
+        
         /// <remarks/>
         public event RemoveDeviceCompletedEventHandler RemoveDeviceCompleted;
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExchangeMailboxPlans", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeMailboxPlan[] GetExchangeMailboxPlans(int itemId)
-        {
+        public event GetExchangeMailboxPlansCompletedEventHandler GetExchangeMailboxPlansCompleted;
+        
+        /// <remarks/>
+        public event GetExchangeMailboxPlanCompletedEventHandler GetExchangeMailboxPlanCompleted;
+        
+        /// <remarks/>
+        public event AddExchangeMailboxPlanCompletedEventHandler AddExchangeMailboxPlanCompleted;
+        
+        /// <remarks/>
+        public event UpdateExchangeMailboxPlanCompletedEventHandler UpdateExchangeMailboxPlanCompleted;
+        
+        /// <remarks/>
+        public event DeleteExchangeMailboxPlanCompletedEventHandler DeleteExchangeMailboxPlanCompleted;
+        
+        /// <remarks/>
+        public event SetOrganizationDefaultExchangeMailboxPlanCompletedEventHandler SetOrganizationDefaultExchangeMailboxPlanCompleted;
+        
+        /// <remarks/>
+        public event CreatePublicFolderCompletedEventHandler CreatePublicFolderCompleted;
+        
+        /// <remarks/>
+        public event DeletePublicFoldersCompletedEventHandler DeletePublicFoldersCompleted;
+        
+        /// <remarks/>
+        public event DeletePublicFolderCompletedEventHandler DeletePublicFolderCompleted;
+        
+        /// <remarks/>
+        public event EnableMailPublicFolderCompletedEventHandler EnableMailPublicFolderCompleted;
+        
+        /// <remarks/>
+        public event DisableMailPublicFolderCompletedEventHandler DisableMailPublicFolderCompleted;
+        
+        /// <remarks/>
+        public event GetPublicFolderGeneralSettingsCompletedEventHandler GetPublicFolderGeneralSettingsCompleted;
+        
+        /// <remarks/>
+        public event SetPublicFolderGeneralSettingsCompletedEventHandler SetPublicFolderGeneralSettingsCompleted;
+        
+        /// <remarks/>
+        public event GetPublicFolderMailFlowSettingsCompletedEventHandler GetPublicFolderMailFlowSettingsCompleted;
+        
+        /// <remarks/>
+        public event SetPublicFolderMailFlowSettingsCompletedEventHandler SetPublicFolderMailFlowSettingsCompleted;
+        
+        /// <remarks/>
+        public event GetPublicFolderEmailAddressesCompletedEventHandler GetPublicFolderEmailAddressesCompleted;
+        
+        /// <remarks/>
+        public event AddPublicFolderEmailAddressCompletedEventHandler AddPublicFolderEmailAddressCompleted;
+        
+        /// <remarks/>
+        public event SetPublicFolderPrimaryEmailAddressCompletedEventHandler SetPublicFolderPrimaryEmailAddressCompleted;
+        
+        /// <remarks/>
+        public event DeletePublicFolderEmailAddressesCompletedEventHandler DeletePublicFolderEmailAddressesCompleted;
+        
+        /// <remarks/>
+        public event AddExchangeDisclaimerCompletedEventHandler AddExchangeDisclaimerCompleted;
+        
+        /// <remarks/>
+        public event UpdateExchangeDisclaimerCompletedEventHandler UpdateExchangeDisclaimerCompleted;
+        
+        /// <remarks/>
+        public event DeleteExchangeDisclaimerCompletedEventHandler DeleteExchangeDisclaimerCompleted;
+        
+        /// <remarks/>
+        public event GetExchangeDisclaimerCompletedEventHandler GetExchangeDisclaimerCompleted;
+        
+        /// <remarks/>
+        public event GetExchangeDisclaimersCompletedEventHandler GetExchangeDisclaimersCompleted;
+        
+        /// <remarks/>
+        public event SetExchangeAccountDisclaimerIdCompletedEventHandler SetExchangeAccountDisclaimerIdCompleted;
+        
+        /// <remarks/>
+        public event GetExchangeAccountDisclaimerIdCompletedEventHandler GetExchangeAccountDisclaimerIdCompleted;
+        
+        /// <remarks/>
+        public event GetRawExchangeOrganizationsPagedCompletedEventHandler GetRawExchangeOrganizationsPagedCompleted;
+        
+        /// <remarks/>
+        public event GetExchangeOrganizationsPagedCompletedEventHandler GetExchangeOrganizationsPagedCompleted;
+        
+        /// <remarks/>
+        public event GetExchangeOrganizationsCompletedEventHandler GetExchangeOrganizationsCompleted;
+        
+        /// <remarks/>
+        public event GetOrganizationCompletedEventHandler GetOrganizationCompleted;
+        
+        /// <remarks/>
+        public event GetOrganizationStatisticsCompletedEventHandler GetOrganizationStatisticsCompleted;
+        
+        /// <remarks/>
+        public event GetOrganizationStatisticsByOrganizationCompletedEventHandler GetOrganizationStatisticsByOrganizationCompleted;
+        
+        /// <remarks/>
+        public event DeleteOrganizationCompletedEventHandler DeleteOrganizationCompleted;
+        
+        /// <remarks/>
+        public event GetOrganizationStorageLimitsCompletedEventHandler GetOrganizationStorageLimitsCompleted;
+        
+        /// <remarks/>
+        public event SetOrganizationStorageLimitsCompletedEventHandler SetOrganizationStorageLimitsCompleted;
+        
+        /// <remarks/>
+        public event GetMailboxesStatisticsCompletedEventHandler GetMailboxesStatisticsCompleted;
+        
+        /// <remarks/>
+        public event GetMailboxStatisticsCompletedEventHandler GetMailboxStatisticsCompleted;
+        
+        /// <remarks/>
+        public event CalculateOrganizationDiskspaceCompletedEventHandler CalculateOrganizationDiskspaceCompleted;
+        
+        /// <remarks/>
+        public event GetActiveSyncPolicyCompletedEventHandler GetActiveSyncPolicyCompleted;
+        
+        /// <remarks/>
+        public event SetActiveSyncPolicyCompletedEventHandler SetActiveSyncPolicyCompleted;
+        
+        /// <remarks/>
+        public event AddAuthoritativeDomainCompletedEventHandler AddAuthoritativeDomainCompleted;
+        
+        /// <remarks/>
+        public event DeleteAuthoritativeDomainCompletedEventHandler DeleteAuthoritativeDomainCompleted;
+        
+        /// <remarks/>
+        public event GetAccountsPagedCompletedEventHandler GetAccountsPagedCompleted;
+        
+        /// <remarks/>
+        public event GetAccountsCompletedEventHandler GetAccountsCompleted;
+        
+        /// <remarks/>
+        public event GetExchangeAccountByMailboxPlanIdCompletedEventHandler GetExchangeAccountByMailboxPlanIdCompleted;
+        
+        /// <remarks/>
+        public event SearchAccountsCompletedEventHandler SearchAccountsCompleted;
+        
+        /// <remarks/>
+        public event GetAccountCompletedEventHandler GetAccountCompleted;
+        
+        /// <remarks/>
+        public event SearchAccountCompletedEventHandler SearchAccountCompleted;
+        
+        /// <remarks/>
+        public event CheckAccountCredentialsCompletedEventHandler CheckAccountCredentialsCompleted;
+        
+        /// <remarks/>
+        public event CreateMailboxCompletedEventHandler CreateMailboxCompleted;
+        
+        /// <remarks/>
+        public event DeleteMailboxCompletedEventHandler DeleteMailboxCompleted;
+        
+        /// <remarks/>
+        public event DisableMailboxCompletedEventHandler DisableMailboxCompleted;
+        
+        /// <remarks/>
+        public event GetMailboxAdvancedSettingsCompletedEventHandler GetMailboxAdvancedSettingsCompleted;
+        
+        /// <remarks/>
+        public event GetMailboxGeneralSettingsCompletedEventHandler GetMailboxGeneralSettingsCompleted;
+        
+        /// <remarks/>
+        public event SetMailboxGeneralSettingsCompletedEventHandler SetMailboxGeneralSettingsCompleted;
+        
+        /// <remarks/>
+        public event GetMailboxEmailAddressesCompletedEventHandler GetMailboxEmailAddressesCompleted;
+        
+        /// <remarks/>
+        public event AddMailboxEmailAddressCompletedEventHandler AddMailboxEmailAddressCompleted;
+        
+        /// <remarks/>
+        public event SetMailboxPrimaryEmailAddressCompletedEventHandler SetMailboxPrimaryEmailAddressCompleted;
+        
+        /// <remarks/>
+        public event DeleteMailboxEmailAddressesCompletedEventHandler DeleteMailboxEmailAddressesCompleted;
+        
+        /// <remarks/>
+        public event GetMailboxMailFlowSettingsCompletedEventHandler GetMailboxMailFlowSettingsCompleted;
+        
+        /// <remarks/>
+        public event SetMailboxMailFlowSettingsCompletedEventHandler SetMailboxMailFlowSettingsCompleted;
+        
+        /// <remarks/>
+        public event SetExchangeMailboxPlanCompletedEventHandler SetExchangeMailboxPlanCompleted;
+        
+        /// <remarks/>
+        public event GetMailboxSetupInstructionsCompletedEventHandler GetMailboxSetupInstructionsCompleted;
+        
+        /// <remarks/>
+        public event SendMailboxSetupInstructionsCompletedEventHandler SendMailboxSetupInstructionsCompleted;
+        
+        /// <remarks/>
+        public event SetMailboxManagerSettingsCompletedEventHandler SetMailboxManagerSettingsCompleted;
+        
+        /// <remarks/>
+        public event GetMailboxPermissionsCompletedEventHandler GetMailboxPermissionsCompleted;
+        
+        /// <remarks/>
+        public event SetMailboxPermissionsCompletedEventHandler SetMailboxPermissionsCompleted;
+        
+        /// <remarks/>
+        public event CreateContactCompletedEventHandler CreateContactCompleted;
+        
+        /// <remarks/>
+        public event DeleteContactCompletedEventHandler DeleteContactCompleted;
+        
+        /// <remarks/>
+        public event GetContactGeneralSettingsCompletedEventHandler GetContactGeneralSettingsCompleted;
+        
+        /// <remarks/>
+        public event SetContactGeneralSettingsCompletedEventHandler SetContactGeneralSettingsCompleted;
+        
+        /// <remarks/>
+        public event GetContactMailFlowSettingsCompletedEventHandler GetContactMailFlowSettingsCompleted;
+        
+        /// <remarks/>
+        public event SetContactMailFlowSettingsCompletedEventHandler SetContactMailFlowSettingsCompleted;
+        
+        /// <remarks/>
+        public event CreateDistributionListCompletedEventHandler CreateDistributionListCompleted;
+        
+        /// <remarks/>
+        public event DeleteDistributionListCompletedEventHandler DeleteDistributionListCompleted;
+        
+        /// <remarks/>
+        public event GetDistributionListGeneralSettingsCompletedEventHandler GetDistributionListGeneralSettingsCompleted;
+        
+        /// <remarks/>
+        public event SetDistributionListGeneralSettingsCompletedEventHandler SetDistributionListGeneralSettingsCompleted;
+        
+        /// <remarks/>
+        public event GetDistributionListMailFlowSettingsCompletedEventHandler GetDistributionListMailFlowSettingsCompleted;
+        
+        /// <remarks/>
+        public event SetDistributionListMailFlowSettingsCompletedEventHandler SetDistributionListMailFlowSettingsCompleted;
+        
+        /// <remarks/>
+        public event GetDistributionListEmailAddressesCompletedEventHandler GetDistributionListEmailAddressesCompleted;
+        
+        /// <remarks/>
+        public event AddDistributionListEmailAddressCompletedEventHandler AddDistributionListEmailAddressCompleted;
+        
+        /// <remarks/>
+        public event SetDistributionListPrimaryEmailAddressCompletedEventHandler SetDistributionListPrimaryEmailAddressCompleted;
+        
+        /// <remarks/>
+        public event DeleteDistributionListEmailAddressesCompletedEventHandler DeleteDistributionListEmailAddressesCompleted;
+        
+        /// <remarks/>
+        public event SetDistributionListPermissionsCompletedEventHandler SetDistributionListPermissionsCompleted;
+        
+        /// <remarks/>
+        public event GetDistributionListPermissionsCompletedEventHandler GetDistributionListPermissionsCompleted;
+        
+        /// <remarks/>
+        public event GetDistributionListsByMemberCompletedEventHandler GetDistributionListsByMemberCompleted;
+        
+        /// <remarks/>
+        public event AddDistributionListMemberCompletedEventHandler AddDistributionListMemberCompleted;
+        
+        /// <remarks/>
+        public event DeleteDistributionListMemberCompletedEventHandler DeleteDistributionListMemberCompleted;
+        
+        /// <remarks/>
+        public event GetMobileDevicesCompletedEventHandler GetMobileDevicesCompleted;
+        
+        /// <remarks/>
+        public event GetMobileDeviceCompletedEventHandler GetMobileDeviceCompleted;
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/WipeDataFromDevice", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void WipeDataFromDevice(int itemId, string deviceId) {
+            this.Invoke("WipeDataFromDevice", new object[] {
+                        itemId,
+                        deviceId});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginWipeDataFromDevice(int itemId, string deviceId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("WipeDataFromDevice", new object[] {
+                        itemId,
+                        deviceId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndWipeDataFromDevice(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void WipeDataFromDeviceAsync(int itemId, string deviceId) {
+            this.WipeDataFromDeviceAsync(itemId, deviceId, null);
+        }
+        
+        /// <remarks/>
+        public void WipeDataFromDeviceAsync(int itemId, string deviceId, object userState) {
+            if ((this.WipeDataFromDeviceOperationCompleted == null)) {
+                this.WipeDataFromDeviceOperationCompleted = new System.Threading.SendOrPostCallback(this.OnWipeDataFromDeviceOperationCompleted);
+            }
+            this.InvokeAsync("WipeDataFromDevice", new object[] {
+                        itemId,
+                        deviceId}, this.WipeDataFromDeviceOperationCompleted, userState);
+        }
+        
+        private void OnWipeDataFromDeviceOperationCompleted(object arg) {
+            if ((this.WipeDataFromDeviceCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.WipeDataFromDeviceCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CancelRemoteWipeRequest", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void CancelRemoteWipeRequest(int itemId, string deviceId) {
+            this.Invoke("CancelRemoteWipeRequest", new object[] {
+                        itemId,
+                        deviceId});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginCancelRemoteWipeRequest(int itemId, string deviceId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("CancelRemoteWipeRequest", new object[] {
+                        itemId,
+                        deviceId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndCancelRemoteWipeRequest(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void CancelRemoteWipeRequestAsync(int itemId, string deviceId) {
+            this.CancelRemoteWipeRequestAsync(itemId, deviceId, null);
+        }
+        
+        /// <remarks/>
+        public void CancelRemoteWipeRequestAsync(int itemId, string deviceId, object userState) {
+            if ((this.CancelRemoteWipeRequestOperationCompleted == null)) {
+                this.CancelRemoteWipeRequestOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCancelRemoteWipeRequestOperationCompleted);
+            }
+            this.InvokeAsync("CancelRemoteWipeRequest", new object[] {
+                        itemId,
+                        deviceId}, this.CancelRemoteWipeRequestOperationCompleted, userState);
+        }
+        
+        private void OnCancelRemoteWipeRequestOperationCompleted(object arg) {
+            if ((this.CancelRemoteWipeRequestCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.CancelRemoteWipeRequestCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/RemoveDevice", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void RemoveDevice(int itemId, string deviceId) {
+            this.Invoke("RemoveDevice", new object[] {
+                        itemId,
+                        deviceId});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginRemoveDevice(int itemId, string deviceId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("RemoveDevice", new object[] {
+                        itemId,
+                        deviceId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndRemoveDevice(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void RemoveDeviceAsync(int itemId, string deviceId) {
+            this.RemoveDeviceAsync(itemId, deviceId, null);
+        }
+        
+        /// <remarks/>
+        public void RemoveDeviceAsync(int itemId, string deviceId, object userState) {
+            if ((this.RemoveDeviceOperationCompleted == null)) {
+                this.RemoveDeviceOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRemoveDeviceOperationCompleted);
+            }
+            this.InvokeAsync("RemoveDevice", new object[] {
+                        itemId,
+                        deviceId}, this.RemoveDeviceOperationCompleted, userState);
+        }
+        
+        private void OnRemoveDeviceOperationCompleted(object arg) {
+            if ((this.RemoveDeviceCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.RemoveDeviceCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExchangeMailboxPlans", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeMailboxPlan[] GetExchangeMailboxPlans(int itemId, bool archiving) {
             object[] results = this.Invoke("GetExchangeMailboxPlans", new object[] {
-                        itemId});
+                        itemId,
+                        archiving});
             return ((ExchangeMailboxPlan[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetExchangeMailboxPlans(int itemId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetExchangeMailboxPlans(int itemId, bool archiving, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetExchangeMailboxPlans", new object[] {
-                        itemId}, callback, asyncState);
+                        itemId,
+                        archiving}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeMailboxPlan[] EndGetExchangeMailboxPlans(System.IAsyncResult asyncResult)
-        {
+        public ExchangeMailboxPlan[] EndGetExchangeMailboxPlans(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeMailboxPlan[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetExchangeMailboxPlansAsync(int itemId)
-        {
-            this.GetExchangeMailboxPlansAsync(itemId, null);
+        public void GetExchangeMailboxPlansAsync(int itemId, bool archiving) {
+            this.GetExchangeMailboxPlansAsync(itemId, archiving, null);
         }
-
+        
         /// <remarks/>
-        public void GetExchangeMailboxPlansAsync(int itemId, object userState)
-        {
-            if ((this.GetExchangeMailboxPlansOperationCompleted == null))
-            {
+        public void GetExchangeMailboxPlansAsync(int itemId, bool archiving, object userState) {
+            if ((this.GetExchangeMailboxPlansOperationCompleted == null)) {
                 this.GetExchangeMailboxPlansOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetExchangeMailboxPlansOperationCompleted);
             }
             this.InvokeAsync("GetExchangeMailboxPlans", new object[] {
-                        itemId}, this.GetExchangeMailboxPlansOperationCompleted, userState);
+                        itemId,
+                        archiving}, this.GetExchangeMailboxPlansOperationCompleted, userState);
         }
-
-        private void OnGetExchangeMailboxPlansOperationCompleted(object arg)
-        {
-            if ((this.GetExchangeMailboxPlansCompleted != null))
-            {
+        
+        private void OnGetExchangeMailboxPlansOperationCompleted(object arg) {
+            if ((this.GetExchangeMailboxPlansCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetExchangeMailboxPlansCompleted(this, new GetExchangeMailboxPlansCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExchangeMailboxPlan", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeMailboxPlan GetExchangeMailboxPlan(int itemId, int mailboxPlanId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExchangeMailboxPlan", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeMailboxPlan GetExchangeMailboxPlan(int itemId, int mailboxPlanId) {
             object[] results = this.Invoke("GetExchangeMailboxPlan", new object[] {
                         itemId,
                         mailboxPlanId});
             return ((ExchangeMailboxPlan)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetExchangeMailboxPlan(int itemId, int mailboxPlanId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetExchangeMailboxPlan(int itemId, int mailboxPlanId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetExchangeMailboxPlan", new object[] {
                         itemId,
                         mailboxPlanId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeMailboxPlan EndGetExchangeMailboxPlan(System.IAsyncResult asyncResult)
-        {
+        public ExchangeMailboxPlan EndGetExchangeMailboxPlan(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeMailboxPlan)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetExchangeMailboxPlanAsync(int itemId, int mailboxPlanId)
-        {
+        public void GetExchangeMailboxPlanAsync(int itemId, int mailboxPlanId) {
             this.GetExchangeMailboxPlanAsync(itemId, mailboxPlanId, null);
         }
-
+        
         /// <remarks/>
-        public void GetExchangeMailboxPlanAsync(int itemId, int mailboxPlanId, object userState)
-        {
-            if ((this.GetExchangeMailboxPlanOperationCompleted == null))
-            {
+        public void GetExchangeMailboxPlanAsync(int itemId, int mailboxPlanId, object userState) {
+            if ((this.GetExchangeMailboxPlanOperationCompleted == null)) {
                 this.GetExchangeMailboxPlanOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetExchangeMailboxPlanOperationCompleted);
             }
             this.InvokeAsync("GetExchangeMailboxPlan", new object[] {
                         itemId,
                         mailboxPlanId}, this.GetExchangeMailboxPlanOperationCompleted, userState);
         }
-
-        private void OnGetExchangeMailboxPlanOperationCompleted(object arg)
-        {
-            if ((this.GetExchangeMailboxPlanCompleted != null))
-            {
+        
+        private void OnGetExchangeMailboxPlanOperationCompleted(object arg) {
+            if ((this.GetExchangeMailboxPlanCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetExchangeMailboxPlanCompleted(this, new GetExchangeMailboxPlanCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddExchangeMailboxPlan", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int AddExchangeMailboxPlan(int itemId, ExchangeMailboxPlan mailboxPlan)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddExchangeMailboxPlan", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int AddExchangeMailboxPlan(int itemId, ExchangeMailboxPlan mailboxPlan) {
             object[] results = this.Invoke("AddExchangeMailboxPlan", new object[] {
                         itemId,
                         mailboxPlan});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginAddExchangeMailboxPlan(int itemId, ExchangeMailboxPlan mailboxPlan, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginAddExchangeMailboxPlan(int itemId, ExchangeMailboxPlan mailboxPlan, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("AddExchangeMailboxPlan", new object[] {
                         itemId,
                         mailboxPlan}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndAddExchangeMailboxPlan(System.IAsyncResult asyncResult)
-        {
+        public int EndAddExchangeMailboxPlan(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void AddExchangeMailboxPlanAsync(int itemId, ExchangeMailboxPlan mailboxPlan)
-        {
+        public void AddExchangeMailboxPlanAsync(int itemId, ExchangeMailboxPlan mailboxPlan) {
             this.AddExchangeMailboxPlanAsync(itemId, mailboxPlan, null);
         }
-
+        
         /// <remarks/>
-        public void AddExchangeMailboxPlanAsync(int itemId, ExchangeMailboxPlan mailboxPlan, object userState)
-        {
-            if ((this.AddExchangeMailboxPlanOperationCompleted == null))
-            {
+        public void AddExchangeMailboxPlanAsync(int itemId, ExchangeMailboxPlan mailboxPlan, object userState) {
+            if ((this.AddExchangeMailboxPlanOperationCompleted == null)) {
                 this.AddExchangeMailboxPlanOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddExchangeMailboxPlanOperationCompleted);
             }
             this.InvokeAsync("AddExchangeMailboxPlan", new object[] {
                         itemId,
                         mailboxPlan}, this.AddExchangeMailboxPlanOperationCompleted, userState);
         }
-
-        private void OnAddExchangeMailboxPlanOperationCompleted(object arg)
-        {
-            if ((this.AddExchangeMailboxPlanCompleted != null))
-            {
+        
+        private void OnAddExchangeMailboxPlanOperationCompleted(object arg) {
+            if ((this.AddExchangeMailboxPlanCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.AddExchangeMailboxPlanCompleted(this, new AddExchangeMailboxPlanCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/UpdateExchangeMailboxPlan", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int UpdateExchangeMailboxPlan(int itemId, ExchangeMailboxPlan mailboxPlan)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/UpdateExchangeMailboxPlan", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int UpdateExchangeMailboxPlan(int itemId, ExchangeMailboxPlan mailboxPlan) {
             object[] results = this.Invoke("UpdateExchangeMailboxPlan", new object[] {
                         itemId,
                         mailboxPlan});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginUpdateExchangeMailboxPlan(int itemId, ExchangeMailboxPlan mailboxPlan, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginUpdateExchangeMailboxPlan(int itemId, ExchangeMailboxPlan mailboxPlan, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("UpdateExchangeMailboxPlan", new object[] {
                         itemId,
                         mailboxPlan}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndUpdateExchangeMailboxPlan(System.IAsyncResult asyncResult)
-        {
+        public int EndUpdateExchangeMailboxPlan(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void UpdateExchangeMailboxPlanAsync(int itemId, ExchangeMailboxPlan mailboxPlan)
-        {
+        public void UpdateExchangeMailboxPlanAsync(int itemId, ExchangeMailboxPlan mailboxPlan) {
             this.UpdateExchangeMailboxPlanAsync(itemId, mailboxPlan, null);
         }
-
+        
         /// <remarks/>
-        public void UpdateExchangeMailboxPlanAsync(int itemId, ExchangeMailboxPlan mailboxPlan, object userState)
-        {
-            if ((this.UpdateExchangeMailboxPlanOperationCompleted == null))
-            {
+        public void UpdateExchangeMailboxPlanAsync(int itemId, ExchangeMailboxPlan mailboxPlan, object userState) {
+            if ((this.UpdateExchangeMailboxPlanOperationCompleted == null)) {
                 this.UpdateExchangeMailboxPlanOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateExchangeMailboxPlanOperationCompleted);
             }
             this.InvokeAsync("UpdateExchangeMailboxPlan", new object[] {
                         itemId,
                         mailboxPlan}, this.UpdateExchangeMailboxPlanOperationCompleted, userState);
         }
-
-        private void OnUpdateExchangeMailboxPlanOperationCompleted(object arg)
-        {
-            if ((this.UpdateExchangeMailboxPlanCompleted != null))
-            {
+        
+        private void OnUpdateExchangeMailboxPlanOperationCompleted(object arg) {
+            if ((this.UpdateExchangeMailboxPlanCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.UpdateExchangeMailboxPlanCompleted(this, new UpdateExchangeMailboxPlanCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteExchangeMailboxPlan", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int DeleteExchangeMailboxPlan(int itemId, int mailboxPlanId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteExchangeMailboxPlan", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DeleteExchangeMailboxPlan(int itemId, int mailboxPlanId) {
             object[] results = this.Invoke("DeleteExchangeMailboxPlan", new object[] {
                         itemId,
                         mailboxPlanId});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginDeleteExchangeMailboxPlan(int itemId, int mailboxPlanId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginDeleteExchangeMailboxPlan(int itemId, int mailboxPlanId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("DeleteExchangeMailboxPlan", new object[] {
                         itemId,
                         mailboxPlanId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndDeleteExchangeMailboxPlan(System.IAsyncResult asyncResult)
-        {
+        public int EndDeleteExchangeMailboxPlan(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void DeleteExchangeMailboxPlanAsync(int itemId, int mailboxPlanId)
-        {
+        public void DeleteExchangeMailboxPlanAsync(int itemId, int mailboxPlanId) {
             this.DeleteExchangeMailboxPlanAsync(itemId, mailboxPlanId, null);
         }
-
+        
         /// <remarks/>
-        public void DeleteExchangeMailboxPlanAsync(int itemId, int mailboxPlanId, object userState)
-        {
-            if ((this.DeleteExchangeMailboxPlanOperationCompleted == null))
-            {
+        public void DeleteExchangeMailboxPlanAsync(int itemId, int mailboxPlanId, object userState) {
+            if ((this.DeleteExchangeMailboxPlanOperationCompleted == null)) {
                 this.DeleteExchangeMailboxPlanOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteExchangeMailboxPlanOperationCompleted);
             }
             this.InvokeAsync("DeleteExchangeMailboxPlan", new object[] {
                         itemId,
                         mailboxPlanId}, this.DeleteExchangeMailboxPlanOperationCompleted, userState);
         }
-
-        private void OnDeleteExchangeMailboxPlanOperationCompleted(object arg)
-        {
-            if ((this.DeleteExchangeMailboxPlanCompleted != null))
-            {
+        
+        private void OnDeleteExchangeMailboxPlanOperationCompleted(object arg) {
+            if ((this.DeleteExchangeMailboxPlanCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.DeleteExchangeMailboxPlanCompleted(this, new DeleteExchangeMailboxPlanCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetOrganizationDefaultExchangeMailbo" +
-            "xPlan", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public void SetOrganizationDefaultExchangeMailboxPlan(int itemId, int mailboxPlanId)
-        {
+            "xPlan", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void SetOrganizationDefaultExchangeMailboxPlan(int itemId, int mailboxPlanId) {
             this.Invoke("SetOrganizationDefaultExchangeMailboxPlan", new object[] {
                         itemId,
                         mailboxPlanId});
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSetOrganizationDefaultExchangeMailboxPlan(int itemId, int mailboxPlanId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSetOrganizationDefaultExchangeMailboxPlan(int itemId, int mailboxPlanId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SetOrganizationDefaultExchangeMailboxPlan", new object[] {
                         itemId,
                         mailboxPlanId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public void EndSetOrganizationDefaultExchangeMailboxPlan(System.IAsyncResult asyncResult)
-        {
+        public void EndSetOrganizationDefaultExchangeMailboxPlan(System.IAsyncResult asyncResult) {
             this.EndInvoke(asyncResult);
         }
-
+        
         /// <remarks/>
-        public void SetOrganizationDefaultExchangeMailboxPlanAsync(int itemId, int mailboxPlanId)
-        {
+        public void SetOrganizationDefaultExchangeMailboxPlanAsync(int itemId, int mailboxPlanId) {
             this.SetOrganizationDefaultExchangeMailboxPlanAsync(itemId, mailboxPlanId, null);
         }
-
+        
         /// <remarks/>
-        public void SetOrganizationDefaultExchangeMailboxPlanAsync(int itemId, int mailboxPlanId, object userState)
-        {
-            if ((this.SetOrganizationDefaultExchangeMailboxPlanOperationCompleted == null))
-            {
+        public void SetOrganizationDefaultExchangeMailboxPlanAsync(int itemId, int mailboxPlanId, object userState) {
+            if ((this.SetOrganizationDefaultExchangeMailboxPlanOperationCompleted == null)) {
                 this.SetOrganizationDefaultExchangeMailboxPlanOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetOrganizationDefaultExchangeMailboxPlanOperationCompleted);
             }
             this.InvokeAsync("SetOrganizationDefaultExchangeMailboxPlan", new object[] {
                         itemId,
                         mailboxPlanId}, this.SetOrganizationDefaultExchangeMailboxPlanOperationCompleted, userState);
         }
-
-        private void OnSetOrganizationDefaultExchangeMailboxPlanOperationCompleted(object arg)
-        {
-            if ((this.SetOrganizationDefaultExchangeMailboxPlanCompleted != null))
-            {
+        
+        private void OnSetOrganizationDefaultExchangeMailboxPlanOperationCompleted(object arg) {
+            if ((this.SetOrganizationDefaultExchangeMailboxPlanCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetOrganizationDefaultExchangeMailboxPlanCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CreatePublicFolder", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int CreatePublicFolder(int itemId, string parentFolder, string folderName, bool mailEnabled, string accountName, string domain)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CreatePublicFolder", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int CreatePublicFolder(int itemId, string parentFolder, string folderName, bool mailEnabled, string accountName, string domain) {
             object[] results = this.Invoke("CreatePublicFolder", new object[] {
                         itemId,
                         parentFolder,
@@ -841,10 +934,9 @@ namespace WebsitePanel.EnterpriseServer
                         domain});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginCreatePublicFolder(int itemId, string parentFolder, string folderName, bool mailEnabled, string accountName, string domain, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginCreatePublicFolder(int itemId, string parentFolder, string folderName, bool mailEnabled, string accountName, string domain, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("CreatePublicFolder", new object[] {
                         itemId,
                         parentFolder,
@@ -853,25 +945,21 @@ namespace WebsitePanel.EnterpriseServer
                         accountName,
                         domain}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndCreatePublicFolder(System.IAsyncResult asyncResult)
-        {
+        public int EndCreatePublicFolder(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void CreatePublicFolderAsync(int itemId, string parentFolder, string folderName, bool mailEnabled, string accountName, string domain)
-        {
+        public void CreatePublicFolderAsync(int itemId, string parentFolder, string folderName, bool mailEnabled, string accountName, string domain) {
             this.CreatePublicFolderAsync(itemId, parentFolder, folderName, mailEnabled, accountName, domain, null);
         }
-
+        
         /// <remarks/>
-        public void CreatePublicFolderAsync(int itemId, string parentFolder, string folderName, bool mailEnabled, string accountName, string domain, object userState)
-        {
-            if ((this.CreatePublicFolderOperationCompleted == null))
-            {
+        public void CreatePublicFolderAsync(int itemId, string parentFolder, string folderName, bool mailEnabled, string accountName, string domain, object userState) {
+            if ((this.CreatePublicFolderOperationCompleted == null)) {
                 this.CreatePublicFolderOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCreatePublicFolderOperationCompleted);
             }
             this.InvokeAsync("CreatePublicFolder", new object[] {
@@ -882,124 +970,105 @@ namespace WebsitePanel.EnterpriseServer
                         accountName,
                         domain}, this.CreatePublicFolderOperationCompleted, userState);
         }
-
-        private void OnCreatePublicFolderOperationCompleted(object arg)
-        {
-            if ((this.CreatePublicFolderCompleted != null))
-            {
+        
+        private void OnCreatePublicFolderOperationCompleted(object arg) {
+            if ((this.CreatePublicFolderCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.CreatePublicFolderCompleted(this, new CreatePublicFolderCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeletePublicFolders", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int DeletePublicFolders(int itemId, int[] accountIds)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeletePublicFolders", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DeletePublicFolders(int itemId, int[] accountIds) {
             object[] results = this.Invoke("DeletePublicFolders", new object[] {
                         itemId,
                         accountIds});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginDeletePublicFolders(int itemId, int[] accountIds, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginDeletePublicFolders(int itemId, int[] accountIds, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("DeletePublicFolders", new object[] {
                         itemId,
                         accountIds}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndDeletePublicFolders(System.IAsyncResult asyncResult)
-        {
+        public int EndDeletePublicFolders(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void DeletePublicFoldersAsync(int itemId, int[] accountIds)
-        {
+        public void DeletePublicFoldersAsync(int itemId, int[] accountIds) {
             this.DeletePublicFoldersAsync(itemId, accountIds, null);
         }
-
+        
         /// <remarks/>
-        public void DeletePublicFoldersAsync(int itemId, int[] accountIds, object userState)
-        {
-            if ((this.DeletePublicFoldersOperationCompleted == null))
-            {
+        public void DeletePublicFoldersAsync(int itemId, int[] accountIds, object userState) {
+            if ((this.DeletePublicFoldersOperationCompleted == null)) {
                 this.DeletePublicFoldersOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeletePublicFoldersOperationCompleted);
             }
             this.InvokeAsync("DeletePublicFolders", new object[] {
                         itemId,
                         accountIds}, this.DeletePublicFoldersOperationCompleted, userState);
         }
-
-        private void OnDeletePublicFoldersOperationCompleted(object arg)
-        {
-            if ((this.DeletePublicFoldersCompleted != null))
-            {
+        
+        private void OnDeletePublicFoldersOperationCompleted(object arg) {
+            if ((this.DeletePublicFoldersCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.DeletePublicFoldersCompleted(this, new DeletePublicFoldersCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeletePublicFolder", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int DeletePublicFolder(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeletePublicFolder", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DeletePublicFolder(int itemId, int accountId) {
             object[] results = this.Invoke("DeletePublicFolder", new object[] {
                         itemId,
                         accountId});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginDeletePublicFolder(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginDeletePublicFolder(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("DeletePublicFolder", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndDeletePublicFolder(System.IAsyncResult asyncResult)
-        {
+        public int EndDeletePublicFolder(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void DeletePublicFolderAsync(int itemId, int accountId)
-        {
+        public void DeletePublicFolderAsync(int itemId, int accountId) {
             this.DeletePublicFolderAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void DeletePublicFolderAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.DeletePublicFolderOperationCompleted == null))
-            {
+        public void DeletePublicFolderAsync(int itemId, int accountId, object userState) {
+            if ((this.DeletePublicFolderOperationCompleted == null)) {
                 this.DeletePublicFolderOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeletePublicFolderOperationCompleted);
             }
             this.InvokeAsync("DeletePublicFolder", new object[] {
                         itemId,
                         accountId}, this.DeletePublicFolderOperationCompleted, userState);
         }
-
-        private void OnDeletePublicFolderOperationCompleted(object arg)
-        {
-            if ((this.DeletePublicFolderCompleted != null))
-            {
+        
+        private void OnDeletePublicFolderOperationCompleted(object arg) {
+            if ((this.DeletePublicFolderCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.DeletePublicFolderCompleted(this, new DeletePublicFolderCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/EnableMailPublicFolder", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int EnableMailPublicFolder(int itemId, int accountId, string name, string domain)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/EnableMailPublicFolder", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int EnableMailPublicFolder(int itemId, int accountId, string name, string domain) {
             object[] results = this.Invoke("EnableMailPublicFolder", new object[] {
                         itemId,
                         accountId,
@@ -1007,35 +1076,30 @@ namespace WebsitePanel.EnterpriseServer
                         domain});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginEnableMailPublicFolder(int itemId, int accountId, string name, string domain, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginEnableMailPublicFolder(int itemId, int accountId, string name, string domain, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("EnableMailPublicFolder", new object[] {
                         itemId,
                         accountId,
                         name,
                         domain}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndEnableMailPublicFolder(System.IAsyncResult asyncResult)
-        {
+        public int EndEnableMailPublicFolder(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void EnableMailPublicFolderAsync(int itemId, int accountId, string name, string domain)
-        {
+        public void EnableMailPublicFolderAsync(int itemId, int accountId, string name, string domain) {
             this.EnableMailPublicFolderAsync(itemId, accountId, name, domain, null);
         }
-
+        
         /// <remarks/>
-        public void EnableMailPublicFolderAsync(int itemId, int accountId, string name, string domain, object userState)
-        {
-            if ((this.EnableMailPublicFolderOperationCompleted == null))
-            {
+        public void EnableMailPublicFolderAsync(int itemId, int accountId, string name, string domain, object userState) {
+            if ((this.EnableMailPublicFolderOperationCompleted == null)) {
                 this.EnableMailPublicFolderOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnableMailPublicFolderOperationCompleted);
             }
             this.InvokeAsync("EnableMailPublicFolder", new object[] {
@@ -1044,124 +1108,105 @@ namespace WebsitePanel.EnterpriseServer
                         name,
                         domain}, this.EnableMailPublicFolderOperationCompleted, userState);
         }
-
-        private void OnEnableMailPublicFolderOperationCompleted(object arg)
-        {
-            if ((this.EnableMailPublicFolderCompleted != null))
-            {
+        
+        private void OnEnableMailPublicFolderOperationCompleted(object arg) {
+            if ((this.EnableMailPublicFolderCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.EnableMailPublicFolderCompleted(this, new EnableMailPublicFolderCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DisableMailPublicFolder", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int DisableMailPublicFolder(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DisableMailPublicFolder", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DisableMailPublicFolder(int itemId, int accountId) {
             object[] results = this.Invoke("DisableMailPublicFolder", new object[] {
                         itemId,
                         accountId});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginDisableMailPublicFolder(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginDisableMailPublicFolder(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("DisableMailPublicFolder", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndDisableMailPublicFolder(System.IAsyncResult asyncResult)
-        {
+        public int EndDisableMailPublicFolder(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void DisableMailPublicFolderAsync(int itemId, int accountId)
-        {
+        public void DisableMailPublicFolderAsync(int itemId, int accountId) {
             this.DisableMailPublicFolderAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void DisableMailPublicFolderAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.DisableMailPublicFolderOperationCompleted == null))
-            {
+        public void DisableMailPublicFolderAsync(int itemId, int accountId, object userState) {
+            if ((this.DisableMailPublicFolderOperationCompleted == null)) {
                 this.DisableMailPublicFolderOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDisableMailPublicFolderOperationCompleted);
             }
             this.InvokeAsync("DisableMailPublicFolder", new object[] {
                         itemId,
                         accountId}, this.DisableMailPublicFolderOperationCompleted, userState);
         }
-
-        private void OnDisableMailPublicFolderOperationCompleted(object arg)
-        {
-            if ((this.DisableMailPublicFolderCompleted != null))
-            {
+        
+        private void OnDisableMailPublicFolderOperationCompleted(object arg) {
+            if ((this.DisableMailPublicFolderCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.DisableMailPublicFolderCompleted(this, new DisableMailPublicFolderCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetPublicFolderGeneralSettings", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangePublicFolder GetPublicFolderGeneralSettings(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetPublicFolderGeneralSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangePublicFolder GetPublicFolderGeneralSettings(int itemId, int accountId) {
             object[] results = this.Invoke("GetPublicFolderGeneralSettings", new object[] {
                         itemId,
                         accountId});
             return ((ExchangePublicFolder)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetPublicFolderGeneralSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetPublicFolderGeneralSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetPublicFolderGeneralSettings", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangePublicFolder EndGetPublicFolderGeneralSettings(System.IAsyncResult asyncResult)
-        {
+        public ExchangePublicFolder EndGetPublicFolderGeneralSettings(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangePublicFolder)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetPublicFolderGeneralSettingsAsync(int itemId, int accountId)
-        {
+        public void GetPublicFolderGeneralSettingsAsync(int itemId, int accountId) {
             this.GetPublicFolderGeneralSettingsAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void GetPublicFolderGeneralSettingsAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.GetPublicFolderGeneralSettingsOperationCompleted == null))
-            {
+        public void GetPublicFolderGeneralSettingsAsync(int itemId, int accountId, object userState) {
+            if ((this.GetPublicFolderGeneralSettingsOperationCompleted == null)) {
                 this.GetPublicFolderGeneralSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetPublicFolderGeneralSettingsOperationCompleted);
             }
             this.InvokeAsync("GetPublicFolderGeneralSettings", new object[] {
                         itemId,
                         accountId}, this.GetPublicFolderGeneralSettingsOperationCompleted, userState);
         }
-
-        private void OnGetPublicFolderGeneralSettingsOperationCompleted(object arg)
-        {
-            if ((this.GetPublicFolderGeneralSettingsCompleted != null))
-            {
+        
+        private void OnGetPublicFolderGeneralSettingsOperationCompleted(object arg) {
+            if ((this.GetPublicFolderGeneralSettingsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetPublicFolderGeneralSettingsCompleted(this, new GetPublicFolderGeneralSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetPublicFolderGeneralSettings", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SetPublicFolderGeneralSettings(int itemId, int accountId, string newName, bool hideAddressBook, ExchangeAccount[] accounts)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetPublicFolderGeneralSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetPublicFolderGeneralSettings(int itemId, int accountId, string newName, bool hideAddressBook, ExchangeAccount[] accounts) {
             object[] results = this.Invoke("SetPublicFolderGeneralSettings", new object[] {
                         itemId,
                         accountId,
@@ -1170,10 +1215,9 @@ namespace WebsitePanel.EnterpriseServer
                         accounts});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSetPublicFolderGeneralSettings(int itemId, int accountId, string newName, bool hideAddressBook, ExchangeAccount[] accounts, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSetPublicFolderGeneralSettings(int itemId, int accountId, string newName, bool hideAddressBook, ExchangeAccount[] accounts, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SetPublicFolderGeneralSettings", new object[] {
                         itemId,
                         accountId,
@@ -1181,25 +1225,21 @@ namespace WebsitePanel.EnterpriseServer
                         hideAddressBook,
                         accounts}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndSetPublicFolderGeneralSettings(System.IAsyncResult asyncResult)
-        {
+        public int EndSetPublicFolderGeneralSettings(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SetPublicFolderGeneralSettingsAsync(int itemId, int accountId, string newName, bool hideAddressBook, ExchangeAccount[] accounts)
-        {
+        public void SetPublicFolderGeneralSettingsAsync(int itemId, int accountId, string newName, bool hideAddressBook, ExchangeAccount[] accounts) {
             this.SetPublicFolderGeneralSettingsAsync(itemId, accountId, newName, hideAddressBook, accounts, null);
         }
-
+        
         /// <remarks/>
-        public void SetPublicFolderGeneralSettingsAsync(int itemId, int accountId, string newName, bool hideAddressBook, ExchangeAccount[] accounts, object userState)
-        {
-            if ((this.SetPublicFolderGeneralSettingsOperationCompleted == null))
-            {
+        public void SetPublicFolderGeneralSettingsAsync(int itemId, int accountId, string newName, bool hideAddressBook, ExchangeAccount[] accounts, object userState) {
+            if ((this.SetPublicFolderGeneralSettingsOperationCompleted == null)) {
                 this.SetPublicFolderGeneralSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetPublicFolderGeneralSettingsOperationCompleted);
             }
             this.InvokeAsync("SetPublicFolderGeneralSettings", new object[] {
@@ -1209,72 +1249,61 @@ namespace WebsitePanel.EnterpriseServer
                         hideAddressBook,
                         accounts}, this.SetPublicFolderGeneralSettingsOperationCompleted, userState);
         }
-
-        private void OnSetPublicFolderGeneralSettingsOperationCompleted(object arg)
-        {
-            if ((this.SetPublicFolderGeneralSettingsCompleted != null))
-            {
+        
+        private void OnSetPublicFolderGeneralSettingsOperationCompleted(object arg) {
+            if ((this.SetPublicFolderGeneralSettingsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetPublicFolderGeneralSettingsCompleted(this, new SetPublicFolderGeneralSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetPublicFolderMailFlowSettings", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangePublicFolder GetPublicFolderMailFlowSettings(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetPublicFolderMailFlowSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangePublicFolder GetPublicFolderMailFlowSettings(int itemId, int accountId) {
             object[] results = this.Invoke("GetPublicFolderMailFlowSettings", new object[] {
                         itemId,
                         accountId});
             return ((ExchangePublicFolder)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetPublicFolderMailFlowSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetPublicFolderMailFlowSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetPublicFolderMailFlowSettings", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangePublicFolder EndGetPublicFolderMailFlowSettings(System.IAsyncResult asyncResult)
-        {
+        public ExchangePublicFolder EndGetPublicFolderMailFlowSettings(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangePublicFolder)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetPublicFolderMailFlowSettingsAsync(int itemId, int accountId)
-        {
+        public void GetPublicFolderMailFlowSettingsAsync(int itemId, int accountId) {
             this.GetPublicFolderMailFlowSettingsAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void GetPublicFolderMailFlowSettingsAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.GetPublicFolderMailFlowSettingsOperationCompleted == null))
-            {
+        public void GetPublicFolderMailFlowSettingsAsync(int itemId, int accountId, object userState) {
+            if ((this.GetPublicFolderMailFlowSettingsOperationCompleted == null)) {
                 this.GetPublicFolderMailFlowSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetPublicFolderMailFlowSettingsOperationCompleted);
             }
             this.InvokeAsync("GetPublicFolderMailFlowSettings", new object[] {
                         itemId,
                         accountId}, this.GetPublicFolderMailFlowSettingsOperationCompleted, userState);
         }
-
-        private void OnGetPublicFolderMailFlowSettingsOperationCompleted(object arg)
-        {
-            if ((this.GetPublicFolderMailFlowSettingsCompleted != null))
-            {
+        
+        private void OnGetPublicFolderMailFlowSettingsOperationCompleted(object arg) {
+            if ((this.GetPublicFolderMailFlowSettingsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetPublicFolderMailFlowSettingsCompleted(this, new GetPublicFolderMailFlowSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetPublicFolderMailFlowSettings", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SetPublicFolderMailFlowSettings(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetPublicFolderMailFlowSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetPublicFolderMailFlowSettings(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication) {
             object[] results = this.Invoke("SetPublicFolderMailFlowSettings", new object[] {
                         itemId,
                         accountId,
@@ -1283,10 +1312,9 @@ namespace WebsitePanel.EnterpriseServer
                         requireSenderAuthentication});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSetPublicFolderMailFlowSettings(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSetPublicFolderMailFlowSettings(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SetPublicFolderMailFlowSettings", new object[] {
                         itemId,
                         accountId,
@@ -1294,25 +1322,21 @@ namespace WebsitePanel.EnterpriseServer
                         rejectAccounts,
                         requireSenderAuthentication}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndSetPublicFolderMailFlowSettings(System.IAsyncResult asyncResult)
-        {
+        public int EndSetPublicFolderMailFlowSettings(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SetPublicFolderMailFlowSettingsAsync(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication)
-        {
+        public void SetPublicFolderMailFlowSettingsAsync(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication) {
             this.SetPublicFolderMailFlowSettingsAsync(itemId, accountId, acceptAccounts, rejectAccounts, requireSenderAuthentication, null);
         }
-
+        
         /// <remarks/>
-        public void SetPublicFolderMailFlowSettingsAsync(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication, object userState)
-        {
-            if ((this.SetPublicFolderMailFlowSettingsOperationCompleted == null))
-            {
+        public void SetPublicFolderMailFlowSettingsAsync(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication, object userState) {
+            if ((this.SetPublicFolderMailFlowSettingsOperationCompleted == null)) {
                 this.SetPublicFolderMailFlowSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetPublicFolderMailFlowSettingsOperationCompleted);
             }
             this.InvokeAsync("SetPublicFolderMailFlowSettings", new object[] {
@@ -1322,106 +1346,90 @@ namespace WebsitePanel.EnterpriseServer
                         rejectAccounts,
                         requireSenderAuthentication}, this.SetPublicFolderMailFlowSettingsOperationCompleted, userState);
         }
-
-        private void OnSetPublicFolderMailFlowSettingsOperationCompleted(object arg)
-        {
-            if ((this.SetPublicFolderMailFlowSettingsCompleted != null))
-            {
+        
+        private void OnSetPublicFolderMailFlowSettingsOperationCompleted(object arg) {
+            if ((this.SetPublicFolderMailFlowSettingsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetPublicFolderMailFlowSettingsCompleted(this, new SetPublicFolderMailFlowSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetPublicFolderEmailAddresses", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeEmailAddress[] GetPublicFolderEmailAddresses(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetPublicFolderEmailAddresses", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeEmailAddress[] GetPublicFolderEmailAddresses(int itemId, int accountId) {
             object[] results = this.Invoke("GetPublicFolderEmailAddresses", new object[] {
                         itemId,
                         accountId});
             return ((ExchangeEmailAddress[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetPublicFolderEmailAddresses(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetPublicFolderEmailAddresses(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetPublicFolderEmailAddresses", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeEmailAddress[] EndGetPublicFolderEmailAddresses(System.IAsyncResult asyncResult)
-        {
+        public ExchangeEmailAddress[] EndGetPublicFolderEmailAddresses(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeEmailAddress[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetPublicFolderEmailAddressesAsync(int itemId, int accountId)
-        {
+        public void GetPublicFolderEmailAddressesAsync(int itemId, int accountId) {
             this.GetPublicFolderEmailAddressesAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void GetPublicFolderEmailAddressesAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.GetPublicFolderEmailAddressesOperationCompleted == null))
-            {
+        public void GetPublicFolderEmailAddressesAsync(int itemId, int accountId, object userState) {
+            if ((this.GetPublicFolderEmailAddressesOperationCompleted == null)) {
                 this.GetPublicFolderEmailAddressesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetPublicFolderEmailAddressesOperationCompleted);
             }
             this.InvokeAsync("GetPublicFolderEmailAddresses", new object[] {
                         itemId,
                         accountId}, this.GetPublicFolderEmailAddressesOperationCompleted, userState);
         }
-
-        private void OnGetPublicFolderEmailAddressesOperationCompleted(object arg)
-        {
-            if ((this.GetPublicFolderEmailAddressesCompleted != null))
-            {
+        
+        private void OnGetPublicFolderEmailAddressesOperationCompleted(object arg) {
+            if ((this.GetPublicFolderEmailAddressesCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetPublicFolderEmailAddressesCompleted(this, new GetPublicFolderEmailAddressesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddPublicFolderEmailAddress", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int AddPublicFolderEmailAddress(int itemId, int accountId, string emailAddress)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddPublicFolderEmailAddress", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int AddPublicFolderEmailAddress(int itemId, int accountId, string emailAddress) {
             object[] results = this.Invoke("AddPublicFolderEmailAddress", new object[] {
                         itemId,
                         accountId,
                         emailAddress});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginAddPublicFolderEmailAddress(int itemId, int accountId, string emailAddress, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginAddPublicFolderEmailAddress(int itemId, int accountId, string emailAddress, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("AddPublicFolderEmailAddress", new object[] {
                         itemId,
                         accountId,
                         emailAddress}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndAddPublicFolderEmailAddress(System.IAsyncResult asyncResult)
-        {
+        public int EndAddPublicFolderEmailAddress(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void AddPublicFolderEmailAddressAsync(int itemId, int accountId, string emailAddress)
-        {
+        public void AddPublicFolderEmailAddressAsync(int itemId, int accountId, string emailAddress) {
             this.AddPublicFolderEmailAddressAsync(itemId, accountId, emailAddress, null);
         }
-
+        
         /// <remarks/>
-        public void AddPublicFolderEmailAddressAsync(int itemId, int accountId, string emailAddress, object userState)
-        {
-            if ((this.AddPublicFolderEmailAddressOperationCompleted == null))
-            {
+        public void AddPublicFolderEmailAddressAsync(int itemId, int accountId, string emailAddress, object userState) {
+            if ((this.AddPublicFolderEmailAddressOperationCompleted == null)) {
                 this.AddPublicFolderEmailAddressOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddPublicFolderEmailAddressOperationCompleted);
             }
             this.InvokeAsync("AddPublicFolderEmailAddress", new object[] {
@@ -1429,54 +1437,46 @@ namespace WebsitePanel.EnterpriseServer
                         accountId,
                         emailAddress}, this.AddPublicFolderEmailAddressOperationCompleted, userState);
         }
-
-        private void OnAddPublicFolderEmailAddressOperationCompleted(object arg)
-        {
-            if ((this.AddPublicFolderEmailAddressCompleted != null))
-            {
+        
+        private void OnAddPublicFolderEmailAddressOperationCompleted(object arg) {
+            if ((this.AddPublicFolderEmailAddressCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.AddPublicFolderEmailAddressCompleted(this, new AddPublicFolderEmailAddressCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetPublicFolderPrimaryEmailAddress", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SetPublicFolderPrimaryEmailAddress(int itemId, int accountId, string emailAddress)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetPublicFolderPrimaryEmailAddress", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetPublicFolderPrimaryEmailAddress(int itemId, int accountId, string emailAddress) {
             object[] results = this.Invoke("SetPublicFolderPrimaryEmailAddress", new object[] {
                         itemId,
                         accountId,
                         emailAddress});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSetPublicFolderPrimaryEmailAddress(int itemId, int accountId, string emailAddress, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSetPublicFolderPrimaryEmailAddress(int itemId, int accountId, string emailAddress, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SetPublicFolderPrimaryEmailAddress", new object[] {
                         itemId,
                         accountId,
                         emailAddress}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndSetPublicFolderPrimaryEmailAddress(System.IAsyncResult asyncResult)
-        {
+        public int EndSetPublicFolderPrimaryEmailAddress(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SetPublicFolderPrimaryEmailAddressAsync(int itemId, int accountId, string emailAddress)
-        {
+        public void SetPublicFolderPrimaryEmailAddressAsync(int itemId, int accountId, string emailAddress) {
             this.SetPublicFolderPrimaryEmailAddressAsync(itemId, accountId, emailAddress, null);
         }
-
+        
         /// <remarks/>
-        public void SetPublicFolderPrimaryEmailAddressAsync(int itemId, int accountId, string emailAddress, object userState)
-        {
-            if ((this.SetPublicFolderPrimaryEmailAddressOperationCompleted == null))
-            {
+        public void SetPublicFolderPrimaryEmailAddressAsync(int itemId, int accountId, string emailAddress, object userState) {
+            if ((this.SetPublicFolderPrimaryEmailAddressOperationCompleted == null)) {
                 this.SetPublicFolderPrimaryEmailAddressOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetPublicFolderPrimaryEmailAddressOperationCompleted);
             }
             this.InvokeAsync("SetPublicFolderPrimaryEmailAddress", new object[] {
@@ -1484,54 +1484,46 @@ namespace WebsitePanel.EnterpriseServer
                         accountId,
                         emailAddress}, this.SetPublicFolderPrimaryEmailAddressOperationCompleted, userState);
         }
-
-        private void OnSetPublicFolderPrimaryEmailAddressOperationCompleted(object arg)
-        {
-            if ((this.SetPublicFolderPrimaryEmailAddressCompleted != null))
-            {
+        
+        private void OnSetPublicFolderPrimaryEmailAddressOperationCompleted(object arg) {
+            if ((this.SetPublicFolderPrimaryEmailAddressCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetPublicFolderPrimaryEmailAddressCompleted(this, new SetPublicFolderPrimaryEmailAddressCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeletePublicFolderEmailAddresses", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int DeletePublicFolderEmailAddresses(int itemId, int accountId, string[] emailAddresses)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeletePublicFolderEmailAddresses", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DeletePublicFolderEmailAddresses(int itemId, int accountId, string[] emailAddresses) {
             object[] results = this.Invoke("DeletePublicFolderEmailAddresses", new object[] {
                         itemId,
                         accountId,
                         emailAddresses});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginDeletePublicFolderEmailAddresses(int itemId, int accountId, string[] emailAddresses, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginDeletePublicFolderEmailAddresses(int itemId, int accountId, string[] emailAddresses, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("DeletePublicFolderEmailAddresses", new object[] {
                         itemId,
                         accountId,
                         emailAddresses}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndDeletePublicFolderEmailAddresses(System.IAsyncResult asyncResult)
-        {
+        public int EndDeletePublicFolderEmailAddresses(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void DeletePublicFolderEmailAddressesAsync(int itemId, int accountId, string[] emailAddresses)
-        {
+        public void DeletePublicFolderEmailAddressesAsync(int itemId, int accountId, string[] emailAddresses) {
             this.DeletePublicFolderEmailAddressesAsync(itemId, accountId, emailAddresses, null);
         }
-
+        
         /// <remarks/>
-        public void DeletePublicFolderEmailAddressesAsync(int itemId, int accountId, string[] emailAddresses, object userState)
-        {
-            if ((this.DeletePublicFolderEmailAddressesOperationCompleted == null))
-            {
+        public void DeletePublicFolderEmailAddressesAsync(int itemId, int accountId, string[] emailAddresses, object userState) {
+            if ((this.DeletePublicFolderEmailAddressesOperationCompleted == null)) {
                 this.DeletePublicFolderEmailAddressesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeletePublicFolderEmailAddressesOperationCompleted);
             }
             this.InvokeAsync("DeletePublicFolderEmailAddresses", new object[] {
@@ -1539,311 +1531,263 @@ namespace WebsitePanel.EnterpriseServer
                         accountId,
                         emailAddresses}, this.DeletePublicFolderEmailAddressesOperationCompleted, userState);
         }
-
-        private void OnDeletePublicFolderEmailAddressesOperationCompleted(object arg)
-        {
-            if ((this.DeletePublicFolderEmailAddressesCompleted != null))
-            {
+        
+        private void OnDeletePublicFolderEmailAddressesOperationCompleted(object arg) {
+            if ((this.DeletePublicFolderEmailAddressesCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.DeletePublicFolderEmailAddressesCompleted(this, new DeletePublicFolderEmailAddressesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddExchangeDisclaimer", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int AddExchangeDisclaimer(int itemId, ExchangeDisclaimer disclaimer)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddExchangeDisclaimer", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int AddExchangeDisclaimer(int itemId, ExchangeDisclaimer disclaimer) {
             object[] results = this.Invoke("AddExchangeDisclaimer", new object[] {
                         itemId,
                         disclaimer});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginAddExchangeDisclaimer(int itemId, ExchangeDisclaimer disclaimer, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginAddExchangeDisclaimer(int itemId, ExchangeDisclaimer disclaimer, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("AddExchangeDisclaimer", new object[] {
                         itemId,
                         disclaimer}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndAddExchangeDisclaimer(System.IAsyncResult asyncResult)
-        {
+        public int EndAddExchangeDisclaimer(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void AddExchangeDisclaimerAsync(int itemId, ExchangeDisclaimer disclaimer)
-        {
+        public void AddExchangeDisclaimerAsync(int itemId, ExchangeDisclaimer disclaimer) {
             this.AddExchangeDisclaimerAsync(itemId, disclaimer, null);
         }
-
+        
         /// <remarks/>
-        public void AddExchangeDisclaimerAsync(int itemId, ExchangeDisclaimer disclaimer, object userState)
-        {
-            if ((this.AddExchangeDisclaimerOperationCompleted == null))
-            {
+        public void AddExchangeDisclaimerAsync(int itemId, ExchangeDisclaimer disclaimer, object userState) {
+            if ((this.AddExchangeDisclaimerOperationCompleted == null)) {
                 this.AddExchangeDisclaimerOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddExchangeDisclaimerOperationCompleted);
             }
             this.InvokeAsync("AddExchangeDisclaimer", new object[] {
                         itemId,
                         disclaimer}, this.AddExchangeDisclaimerOperationCompleted, userState);
         }
-
-        private void OnAddExchangeDisclaimerOperationCompleted(object arg)
-        {
-            if ((this.AddExchangeDisclaimerCompleted != null))
-            {
+        
+        private void OnAddExchangeDisclaimerOperationCompleted(object arg) {
+            if ((this.AddExchangeDisclaimerCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.AddExchangeDisclaimerCompleted(this, new AddExchangeDisclaimerCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/UpdateExchangeDisclaimer", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int UpdateExchangeDisclaimer(int itemId, ExchangeDisclaimer disclaimer)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/UpdateExchangeDisclaimer", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int UpdateExchangeDisclaimer(int itemId, ExchangeDisclaimer disclaimer) {
             object[] results = this.Invoke("UpdateExchangeDisclaimer", new object[] {
                         itemId,
                         disclaimer});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginUpdateExchangeDisclaimer(int itemId, ExchangeDisclaimer disclaimer, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginUpdateExchangeDisclaimer(int itemId, ExchangeDisclaimer disclaimer, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("UpdateExchangeDisclaimer", new object[] {
                         itemId,
                         disclaimer}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndUpdateExchangeDisclaimer(System.IAsyncResult asyncResult)
-        {
+        public int EndUpdateExchangeDisclaimer(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void UpdateExchangeDisclaimerAsync(int itemId, ExchangeDisclaimer disclaimer)
-        {
+        public void UpdateExchangeDisclaimerAsync(int itemId, ExchangeDisclaimer disclaimer) {
             this.UpdateExchangeDisclaimerAsync(itemId, disclaimer, null);
         }
-
+        
         /// <remarks/>
-        public void UpdateExchangeDisclaimerAsync(int itemId, ExchangeDisclaimer disclaimer, object userState)
-        {
-            if ((this.UpdateExchangeDisclaimerOperationCompleted == null))
-            {
+        public void UpdateExchangeDisclaimerAsync(int itemId, ExchangeDisclaimer disclaimer, object userState) {
+            if ((this.UpdateExchangeDisclaimerOperationCompleted == null)) {
                 this.UpdateExchangeDisclaimerOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateExchangeDisclaimerOperationCompleted);
             }
             this.InvokeAsync("UpdateExchangeDisclaimer", new object[] {
                         itemId,
                         disclaimer}, this.UpdateExchangeDisclaimerOperationCompleted, userState);
         }
-
-        private void OnUpdateExchangeDisclaimerOperationCompleted(object arg)
-        {
-            if ((this.UpdateExchangeDisclaimerCompleted != null))
-            {
+        
+        private void OnUpdateExchangeDisclaimerOperationCompleted(object arg) {
+            if ((this.UpdateExchangeDisclaimerCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.UpdateExchangeDisclaimerCompleted(this, new UpdateExchangeDisclaimerCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteExchangeDisclaimer", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int DeleteExchangeDisclaimer(int itemId, int exchangeDisclaimerId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteExchangeDisclaimer", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DeleteExchangeDisclaimer(int itemId, int exchangeDisclaimerId) {
             object[] results = this.Invoke("DeleteExchangeDisclaimer", new object[] {
                         itemId,
                         exchangeDisclaimerId});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginDeleteExchangeDisclaimer(int itemId, int exchangeDisclaimerId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginDeleteExchangeDisclaimer(int itemId, int exchangeDisclaimerId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("DeleteExchangeDisclaimer", new object[] {
                         itemId,
                         exchangeDisclaimerId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndDeleteExchangeDisclaimer(System.IAsyncResult asyncResult)
-        {
+        public int EndDeleteExchangeDisclaimer(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void DeleteExchangeDisclaimerAsync(int itemId, int exchangeDisclaimerId)
-        {
+        public void DeleteExchangeDisclaimerAsync(int itemId, int exchangeDisclaimerId) {
             this.DeleteExchangeDisclaimerAsync(itemId, exchangeDisclaimerId, null);
         }
-
+        
         /// <remarks/>
-        public void DeleteExchangeDisclaimerAsync(int itemId, int exchangeDisclaimerId, object userState)
-        {
-            if ((this.DeleteExchangeDisclaimerOperationCompleted == null))
-            {
+        public void DeleteExchangeDisclaimerAsync(int itemId, int exchangeDisclaimerId, object userState) {
+            if ((this.DeleteExchangeDisclaimerOperationCompleted == null)) {
                 this.DeleteExchangeDisclaimerOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteExchangeDisclaimerOperationCompleted);
             }
             this.InvokeAsync("DeleteExchangeDisclaimer", new object[] {
                         itemId,
                         exchangeDisclaimerId}, this.DeleteExchangeDisclaimerOperationCompleted, userState);
         }
-
-        private void OnDeleteExchangeDisclaimerOperationCompleted(object arg)
-        {
-            if ((this.DeleteExchangeDisclaimerCompleted != null))
-            {
+        
+        private void OnDeleteExchangeDisclaimerOperationCompleted(object arg) {
+            if ((this.DeleteExchangeDisclaimerCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.DeleteExchangeDisclaimerCompleted(this, new DeleteExchangeDisclaimerCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExchangeDisclaimer", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeDisclaimer GetExchangeDisclaimer(int itemId, int exchangeDisclaimerId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExchangeDisclaimer", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeDisclaimer GetExchangeDisclaimer(int itemId, int exchangeDisclaimerId) {
             object[] results = this.Invoke("GetExchangeDisclaimer", new object[] {
                         itemId,
                         exchangeDisclaimerId});
             return ((ExchangeDisclaimer)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetExchangeDisclaimer(int itemId, int exchangeDisclaimerId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetExchangeDisclaimer(int itemId, int exchangeDisclaimerId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetExchangeDisclaimer", new object[] {
                         itemId,
                         exchangeDisclaimerId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeDisclaimer EndGetExchangeDisclaimer(System.IAsyncResult asyncResult)
-        {
+        public ExchangeDisclaimer EndGetExchangeDisclaimer(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeDisclaimer)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetExchangeDisclaimerAsync(int itemId, int exchangeDisclaimerId)
-        {
+        public void GetExchangeDisclaimerAsync(int itemId, int exchangeDisclaimerId) {
             this.GetExchangeDisclaimerAsync(itemId, exchangeDisclaimerId, null);
         }
-
+        
         /// <remarks/>
-        public void GetExchangeDisclaimerAsync(int itemId, int exchangeDisclaimerId, object userState)
-        {
-            if ((this.GetExchangeDisclaimerOperationCompleted == null))
-            {
+        public void GetExchangeDisclaimerAsync(int itemId, int exchangeDisclaimerId, object userState) {
+            if ((this.GetExchangeDisclaimerOperationCompleted == null)) {
                 this.GetExchangeDisclaimerOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetExchangeDisclaimerOperationCompleted);
             }
             this.InvokeAsync("GetExchangeDisclaimer", new object[] {
                         itemId,
                         exchangeDisclaimerId}, this.GetExchangeDisclaimerOperationCompleted, userState);
         }
-
-        private void OnGetExchangeDisclaimerOperationCompleted(object arg)
-        {
-            if ((this.GetExchangeDisclaimerCompleted != null))
-            {
+        
+        private void OnGetExchangeDisclaimerOperationCompleted(object arg) {
+            if ((this.GetExchangeDisclaimerCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetExchangeDisclaimerCompleted(this, new GetExchangeDisclaimerCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExchangeDisclaimers", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeDisclaimer[] GetExchangeDisclaimers(int itemId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExchangeDisclaimers", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeDisclaimer[] GetExchangeDisclaimers(int itemId) {
             object[] results = this.Invoke("GetExchangeDisclaimers", new object[] {
                         itemId});
             return ((ExchangeDisclaimer[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetExchangeDisclaimers(int itemId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetExchangeDisclaimers(int itemId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetExchangeDisclaimers", new object[] {
                         itemId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeDisclaimer[] EndGetExchangeDisclaimers(System.IAsyncResult asyncResult)
-        {
+        public ExchangeDisclaimer[] EndGetExchangeDisclaimers(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeDisclaimer[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetExchangeDisclaimersAsync(int itemId)
-        {
+        public void GetExchangeDisclaimersAsync(int itemId) {
             this.GetExchangeDisclaimersAsync(itemId, null);
         }
-
+        
         /// <remarks/>
-        public void GetExchangeDisclaimersAsync(int itemId, object userState)
-        {
-            if ((this.GetExchangeDisclaimersOperationCompleted == null))
-            {
+        public void GetExchangeDisclaimersAsync(int itemId, object userState) {
+            if ((this.GetExchangeDisclaimersOperationCompleted == null)) {
                 this.GetExchangeDisclaimersOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetExchangeDisclaimersOperationCompleted);
             }
             this.InvokeAsync("GetExchangeDisclaimers", new object[] {
                         itemId}, this.GetExchangeDisclaimersOperationCompleted, userState);
         }
-
-        private void OnGetExchangeDisclaimersOperationCompleted(object arg)
-        {
-            if ((this.GetExchangeDisclaimersCompleted != null))
-            {
+        
+        private void OnGetExchangeDisclaimersOperationCompleted(object arg) {
+            if ((this.GetExchangeDisclaimersCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetExchangeDisclaimersCompleted(this, new GetExchangeDisclaimersCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetExchangeAccountDisclaimerId", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SetExchangeAccountDisclaimerId(int itemId, int AccountID, int ExchangeDisclaimerId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetExchangeAccountDisclaimerId", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetExchangeAccountDisclaimerId(int itemId, int AccountID, int ExchangeDisclaimerId) {
             object[] results = this.Invoke("SetExchangeAccountDisclaimerId", new object[] {
                         itemId,
                         AccountID,
                         ExchangeDisclaimerId});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSetExchangeAccountDisclaimerId(int itemId, int AccountID, int ExchangeDisclaimerId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSetExchangeAccountDisclaimerId(int itemId, int AccountID, int ExchangeDisclaimerId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SetExchangeAccountDisclaimerId", new object[] {
                         itemId,
                         AccountID,
                         ExchangeDisclaimerId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndSetExchangeAccountDisclaimerId(System.IAsyncResult asyncResult)
-        {
+        public int EndSetExchangeAccountDisclaimerId(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SetExchangeAccountDisclaimerIdAsync(int itemId, int AccountID, int ExchangeDisclaimerId)
-        {
+        public void SetExchangeAccountDisclaimerIdAsync(int itemId, int AccountID, int ExchangeDisclaimerId) {
             this.SetExchangeAccountDisclaimerIdAsync(itemId, AccountID, ExchangeDisclaimerId, null);
         }
-
+        
         /// <remarks/>
-        public void SetExchangeAccountDisclaimerIdAsync(int itemId, int AccountID, int ExchangeDisclaimerId, object userState)
-        {
-            if ((this.SetExchangeAccountDisclaimerIdOperationCompleted == null))
-            {
+        public void SetExchangeAccountDisclaimerIdAsync(int itemId, int AccountID, int ExchangeDisclaimerId, object userState) {
+            if ((this.SetExchangeAccountDisclaimerIdOperationCompleted == null)) {
                 this.SetExchangeAccountDisclaimerIdOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetExchangeAccountDisclaimerIdOperationCompleted);
             }
             this.InvokeAsync("SetExchangeAccountDisclaimerId", new object[] {
@@ -1851,72 +1795,61 @@ namespace WebsitePanel.EnterpriseServer
                         AccountID,
                         ExchangeDisclaimerId}, this.SetExchangeAccountDisclaimerIdOperationCompleted, userState);
         }
-
-        private void OnSetExchangeAccountDisclaimerIdOperationCompleted(object arg)
-        {
-            if ((this.SetExchangeAccountDisclaimerIdCompleted != null))
-            {
+        
+        private void OnSetExchangeAccountDisclaimerIdOperationCompleted(object arg) {
+            if ((this.SetExchangeAccountDisclaimerIdCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetExchangeAccountDisclaimerIdCompleted(this, new SetExchangeAccountDisclaimerIdCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExchangeAccountDisclaimerId", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int GetExchangeAccountDisclaimerId(int itemId, int AccountID)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExchangeAccountDisclaimerId", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int GetExchangeAccountDisclaimerId(int itemId, int AccountID) {
             object[] results = this.Invoke("GetExchangeAccountDisclaimerId", new object[] {
                         itemId,
                         AccountID});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetExchangeAccountDisclaimerId(int itemId, int AccountID, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetExchangeAccountDisclaimerId(int itemId, int AccountID, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetExchangeAccountDisclaimerId", new object[] {
                         itemId,
                         AccountID}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndGetExchangeAccountDisclaimerId(System.IAsyncResult asyncResult)
-        {
+        public int EndGetExchangeAccountDisclaimerId(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetExchangeAccountDisclaimerIdAsync(int itemId, int AccountID)
-        {
+        public void GetExchangeAccountDisclaimerIdAsync(int itemId, int AccountID) {
             this.GetExchangeAccountDisclaimerIdAsync(itemId, AccountID, null);
         }
-
+        
         /// <remarks/>
-        public void GetExchangeAccountDisclaimerIdAsync(int itemId, int AccountID, object userState)
-        {
-            if ((this.GetExchangeAccountDisclaimerIdOperationCompleted == null))
-            {
+        public void GetExchangeAccountDisclaimerIdAsync(int itemId, int AccountID, object userState) {
+            if ((this.GetExchangeAccountDisclaimerIdOperationCompleted == null)) {
                 this.GetExchangeAccountDisclaimerIdOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetExchangeAccountDisclaimerIdOperationCompleted);
             }
             this.InvokeAsync("GetExchangeAccountDisclaimerId", new object[] {
                         itemId,
                         AccountID}, this.GetExchangeAccountDisclaimerIdOperationCompleted, userState);
         }
-
-        private void OnGetExchangeAccountDisclaimerIdOperationCompleted(object arg)
-        {
-            if ((this.GetExchangeAccountDisclaimerIdCompleted != null))
-            {
+        
+        private void OnGetExchangeAccountDisclaimerIdOperationCompleted(object arg) {
+            if ((this.GetExchangeAccountDisclaimerIdCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetExchangeAccountDisclaimerIdCompleted(this, new GetExchangeAccountDisclaimerIdCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetRawExchangeOrganizationsPaged", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public System.Data.DataSet GetRawExchangeOrganizationsPaged(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetRawExchangeOrganizationsPaged", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public System.Data.DataSet GetRawExchangeOrganizationsPaged(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
             object[] results = this.Invoke("GetRawExchangeOrganizationsPaged", new object[] {
                         packageId,
                         recursive,
@@ -1927,10 +1860,9 @@ namespace WebsitePanel.EnterpriseServer
                         maximumRows});
             return ((System.Data.DataSet)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetRawExchangeOrganizationsPaged(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetRawExchangeOrganizationsPaged(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetRawExchangeOrganizationsPaged", new object[] {
                         packageId,
                         recursive,
@@ -1940,25 +1872,21 @@ namespace WebsitePanel.EnterpriseServer
                         startRow,
                         maximumRows}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public System.Data.DataSet EndGetRawExchangeOrganizationsPaged(System.IAsyncResult asyncResult)
-        {
+        public System.Data.DataSet EndGetRawExchangeOrganizationsPaged(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((System.Data.DataSet)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetRawExchangeOrganizationsPagedAsync(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
-        {
+        public void GetRawExchangeOrganizationsPagedAsync(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
             this.GetRawExchangeOrganizationsPagedAsync(packageId, recursive, filterColumn, filterValue, sortColumn, startRow, maximumRows, null);
         }
-
+        
         /// <remarks/>
-        public void GetRawExchangeOrganizationsPagedAsync(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState)
-        {
-            if ((this.GetRawExchangeOrganizationsPagedOperationCompleted == null))
-            {
+        public void GetRawExchangeOrganizationsPagedAsync(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState) {
+            if ((this.GetRawExchangeOrganizationsPagedOperationCompleted == null)) {
                 this.GetRawExchangeOrganizationsPagedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetRawExchangeOrganizationsPagedOperationCompleted);
             }
             this.InvokeAsync("GetRawExchangeOrganizationsPaged", new object[] {
@@ -1970,20 +1898,17 @@ namespace WebsitePanel.EnterpriseServer
                         startRow,
                         maximumRows}, this.GetRawExchangeOrganizationsPagedOperationCompleted, userState);
         }
-
-        private void OnGetRawExchangeOrganizationsPagedOperationCompleted(object arg)
-        {
-            if ((this.GetRawExchangeOrganizationsPagedCompleted != null))
-            {
+        
+        private void OnGetRawExchangeOrganizationsPagedOperationCompleted(object arg) {
+            if ((this.GetRawExchangeOrganizationsPagedCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetRawExchangeOrganizationsPagedCompleted(this, new GetRawExchangeOrganizationsPagedCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExchangeOrganizationsPaged", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public OrganizationsPaged GetExchangeOrganizationsPaged(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExchangeOrganizationsPaged", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public OrganizationsPaged GetExchangeOrganizationsPaged(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
             object[] results = this.Invoke("GetExchangeOrganizationsPaged", new object[] {
                         packageId,
                         recursive,
@@ -1994,10 +1919,9 @@ namespace WebsitePanel.EnterpriseServer
                         maximumRows});
             return ((OrganizationsPaged)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetExchangeOrganizationsPaged(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetExchangeOrganizationsPaged(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetExchangeOrganizationsPaged", new object[] {
                         packageId,
                         recursive,
@@ -2007,25 +1931,21 @@ namespace WebsitePanel.EnterpriseServer
                         startRow,
                         maximumRows}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public OrganizationsPaged EndGetExchangeOrganizationsPaged(System.IAsyncResult asyncResult)
-        {
+        public OrganizationsPaged EndGetExchangeOrganizationsPaged(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((OrganizationsPaged)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetExchangeOrganizationsPagedAsync(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
-        {
+        public void GetExchangeOrganizationsPagedAsync(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
             this.GetExchangeOrganizationsPagedAsync(packageId, recursive, filterColumn, filterValue, sortColumn, startRow, maximumRows, null);
         }
-
+        
         /// <remarks/>
-        public void GetExchangeOrganizationsPagedAsync(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState)
-        {
-            if ((this.GetExchangeOrganizationsPagedOperationCompleted == null))
-            {
+        public void GetExchangeOrganizationsPagedAsync(int packageId, bool recursive, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState) {
+            if ((this.GetExchangeOrganizationsPagedOperationCompleted == null)) {
                 this.GetExchangeOrganizationsPagedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetExchangeOrganizationsPagedOperationCompleted);
             }
             this.InvokeAsync("GetExchangeOrganizationsPaged", new object[] {
@@ -2037,318 +1957,267 @@ namespace WebsitePanel.EnterpriseServer
                         startRow,
                         maximumRows}, this.GetExchangeOrganizationsPagedOperationCompleted, userState);
         }
-
-        private void OnGetExchangeOrganizationsPagedOperationCompleted(object arg)
-        {
-            if ((this.GetExchangeOrganizationsPagedCompleted != null))
-            {
+        
+        private void OnGetExchangeOrganizationsPagedOperationCompleted(object arg) {
+            if ((this.GetExchangeOrganizationsPagedCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetExchangeOrganizationsPagedCompleted(this, new GetExchangeOrganizationsPagedCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExchangeOrganizations", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public Organization[] GetExchangeOrganizations(int packageId, bool recursive)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExchangeOrganizations", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public Organization[] GetExchangeOrganizations(int packageId, bool recursive) {
             object[] results = this.Invoke("GetExchangeOrganizations", new object[] {
                         packageId,
                         recursive});
             return ((Organization[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetExchangeOrganizations(int packageId, bool recursive, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetExchangeOrganizations(int packageId, bool recursive, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetExchangeOrganizations", new object[] {
                         packageId,
                         recursive}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public Organization[] EndGetExchangeOrganizations(System.IAsyncResult asyncResult)
-        {
+        public Organization[] EndGetExchangeOrganizations(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((Organization[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetExchangeOrganizationsAsync(int packageId, bool recursive)
-        {
+        public void GetExchangeOrganizationsAsync(int packageId, bool recursive) {
             this.GetExchangeOrganizationsAsync(packageId, recursive, null);
         }
-
+        
         /// <remarks/>
-        public void GetExchangeOrganizationsAsync(int packageId, bool recursive, object userState)
-        {
-            if ((this.GetExchangeOrganizationsOperationCompleted == null))
-            {
+        public void GetExchangeOrganizationsAsync(int packageId, bool recursive, object userState) {
+            if ((this.GetExchangeOrganizationsOperationCompleted == null)) {
                 this.GetExchangeOrganizationsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetExchangeOrganizationsOperationCompleted);
             }
             this.InvokeAsync("GetExchangeOrganizations", new object[] {
                         packageId,
                         recursive}, this.GetExchangeOrganizationsOperationCompleted, userState);
         }
-
-        private void OnGetExchangeOrganizationsOperationCompleted(object arg)
-        {
-            if ((this.GetExchangeOrganizationsCompleted != null))
-            {
+        
+        private void OnGetExchangeOrganizationsOperationCompleted(object arg) {
+            if ((this.GetExchangeOrganizationsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetExchangeOrganizationsCompleted(this, new GetExchangeOrganizationsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetOrganization", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public Organization GetOrganization(int itemId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetOrganization", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public Organization GetOrganization(int itemId) {
             object[] results = this.Invoke("GetOrganization", new object[] {
                         itemId});
             return ((Organization)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetOrganization(int itemId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetOrganization(int itemId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetOrganization", new object[] {
                         itemId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public Organization EndGetOrganization(System.IAsyncResult asyncResult)
-        {
+        public Organization EndGetOrganization(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((Organization)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetOrganizationAsync(int itemId)
-        {
+        public void GetOrganizationAsync(int itemId) {
             this.GetOrganizationAsync(itemId, null);
         }
-
+        
         /// <remarks/>
-        public void GetOrganizationAsync(int itemId, object userState)
-        {
-            if ((this.GetOrganizationOperationCompleted == null))
-            {
+        public void GetOrganizationAsync(int itemId, object userState) {
+            if ((this.GetOrganizationOperationCompleted == null)) {
                 this.GetOrganizationOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetOrganizationOperationCompleted);
             }
             this.InvokeAsync("GetOrganization", new object[] {
                         itemId}, this.GetOrganizationOperationCompleted, userState);
         }
-
-        private void OnGetOrganizationOperationCompleted(object arg)
-        {
-            if ((this.GetOrganizationCompleted != null))
-            {
+        
+        private void OnGetOrganizationOperationCompleted(object arg) {
+            if ((this.GetOrganizationCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetOrganizationCompleted(this, new GetOrganizationCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetOrganizationStatistics", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public OrganizationStatistics GetOrganizationStatistics(int itemId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetOrganizationStatistics", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public OrganizationStatistics GetOrganizationStatistics(int itemId) {
             object[] results = this.Invoke("GetOrganizationStatistics", new object[] {
                         itemId});
             return ((OrganizationStatistics)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetOrganizationStatistics(int itemId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetOrganizationStatistics(int itemId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetOrganizationStatistics", new object[] {
                         itemId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public OrganizationStatistics EndGetOrganizationStatistics(System.IAsyncResult asyncResult)
-        {
+        public OrganizationStatistics EndGetOrganizationStatistics(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((OrganizationStatistics)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetOrganizationStatisticsAsync(int itemId)
-        {
+        public void GetOrganizationStatisticsAsync(int itemId) {
             this.GetOrganizationStatisticsAsync(itemId, null);
         }
-
+        
         /// <remarks/>
-        public void GetOrganizationStatisticsAsync(int itemId, object userState)
-        {
-            if ((this.GetOrganizationStatisticsOperationCompleted == null))
-            {
+        public void GetOrganizationStatisticsAsync(int itemId, object userState) {
+            if ((this.GetOrganizationStatisticsOperationCompleted == null)) {
                 this.GetOrganizationStatisticsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetOrganizationStatisticsOperationCompleted);
             }
             this.InvokeAsync("GetOrganizationStatistics", new object[] {
                         itemId}, this.GetOrganizationStatisticsOperationCompleted, userState);
         }
-
-        private void OnGetOrganizationStatisticsOperationCompleted(object arg)
-        {
-            if ((this.GetOrganizationStatisticsCompleted != null))
-            {
+        
+        private void OnGetOrganizationStatisticsOperationCompleted(object arg) {
+            if ((this.GetOrganizationStatisticsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetOrganizationStatisticsCompleted(this, new GetOrganizationStatisticsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetOrganizationStatisticsByOrganizat" +
-            "ion", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public OrganizationStatistics GetOrganizationStatisticsByOrganization(int itemId)
-        {
+            "ion", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public OrganizationStatistics GetOrganizationStatisticsByOrganization(int itemId) {
             object[] results = this.Invoke("GetOrganizationStatisticsByOrganization", new object[] {
                         itemId});
             return ((OrganizationStatistics)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetOrganizationStatisticsByOrganization(int itemId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetOrganizationStatisticsByOrganization(int itemId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetOrganizationStatisticsByOrganization", new object[] {
                         itemId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public OrganizationStatistics EndGetOrganizationStatisticsByOrganization(System.IAsyncResult asyncResult)
-        {
+        public OrganizationStatistics EndGetOrganizationStatisticsByOrganization(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((OrganizationStatistics)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetOrganizationStatisticsByOrganizationAsync(int itemId)
-        {
+        public void GetOrganizationStatisticsByOrganizationAsync(int itemId) {
             this.GetOrganizationStatisticsByOrganizationAsync(itemId, null);
         }
-
+        
         /// <remarks/>
-        public void GetOrganizationStatisticsByOrganizationAsync(int itemId, object userState)
-        {
-            if ((this.GetOrganizationStatisticsByOrganizationOperationCompleted == null))
-            {
+        public void GetOrganizationStatisticsByOrganizationAsync(int itemId, object userState) {
+            if ((this.GetOrganizationStatisticsByOrganizationOperationCompleted == null)) {
                 this.GetOrganizationStatisticsByOrganizationOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetOrganizationStatisticsByOrganizationOperationCompleted);
             }
             this.InvokeAsync("GetOrganizationStatisticsByOrganization", new object[] {
                         itemId}, this.GetOrganizationStatisticsByOrganizationOperationCompleted, userState);
         }
-
-        private void OnGetOrganizationStatisticsByOrganizationOperationCompleted(object arg)
-        {
-            if ((this.GetOrganizationStatisticsByOrganizationCompleted != null))
-            {
+        
+        private void OnGetOrganizationStatisticsByOrganizationOperationCompleted(object arg) {
+            if ((this.GetOrganizationStatisticsByOrganizationCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetOrganizationStatisticsByOrganizationCompleted(this, new GetOrganizationStatisticsByOrganizationCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteOrganization", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int DeleteOrganization(int itemId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteOrganization", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DeleteOrganization(int itemId) {
             object[] results = this.Invoke("DeleteOrganization", new object[] {
                         itemId});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginDeleteOrganization(int itemId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginDeleteOrganization(int itemId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("DeleteOrganization", new object[] {
                         itemId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndDeleteOrganization(System.IAsyncResult asyncResult)
-        {
+        public int EndDeleteOrganization(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void DeleteOrganizationAsync(int itemId)
-        {
+        public void DeleteOrganizationAsync(int itemId) {
             this.DeleteOrganizationAsync(itemId, null);
         }
-
+        
         /// <remarks/>
-        public void DeleteOrganizationAsync(int itemId, object userState)
-        {
-            if ((this.DeleteOrganizationOperationCompleted == null))
-            {
+        public void DeleteOrganizationAsync(int itemId, object userState) {
+            if ((this.DeleteOrganizationOperationCompleted == null)) {
                 this.DeleteOrganizationOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteOrganizationOperationCompleted);
             }
             this.InvokeAsync("DeleteOrganization", new object[] {
                         itemId}, this.DeleteOrganizationOperationCompleted, userState);
         }
-
-        private void OnDeleteOrganizationOperationCompleted(object arg)
-        {
-            if ((this.DeleteOrganizationCompleted != null))
-            {
+        
+        private void OnDeleteOrganizationOperationCompleted(object arg) {
+            if ((this.DeleteOrganizationCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.DeleteOrganizationCompleted(this, new DeleteOrganizationCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetOrganizationStorageLimits", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public Organization GetOrganizationStorageLimits(int itemId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetOrganizationStorageLimits", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public Organization GetOrganizationStorageLimits(int itemId) {
             object[] results = this.Invoke("GetOrganizationStorageLimits", new object[] {
                         itemId});
             return ((Organization)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetOrganizationStorageLimits(int itemId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetOrganizationStorageLimits(int itemId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetOrganizationStorageLimits", new object[] {
                         itemId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public Organization EndGetOrganizationStorageLimits(System.IAsyncResult asyncResult)
-        {
+        public Organization EndGetOrganizationStorageLimits(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((Organization)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetOrganizationStorageLimitsAsync(int itemId)
-        {
+        public void GetOrganizationStorageLimitsAsync(int itemId) {
             this.GetOrganizationStorageLimitsAsync(itemId, null);
         }
-
+        
         /// <remarks/>
-        public void GetOrganizationStorageLimitsAsync(int itemId, object userState)
-        {
-            if ((this.GetOrganizationStorageLimitsOperationCompleted == null))
-            {
+        public void GetOrganizationStorageLimitsAsync(int itemId, object userState) {
+            if ((this.GetOrganizationStorageLimitsOperationCompleted == null)) {
                 this.GetOrganizationStorageLimitsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetOrganizationStorageLimitsOperationCompleted);
             }
             this.InvokeAsync("GetOrganizationStorageLimits", new object[] {
                         itemId}, this.GetOrganizationStorageLimitsOperationCompleted, userState);
         }
-
-        private void OnGetOrganizationStorageLimitsOperationCompleted(object arg)
-        {
-            if ((this.GetOrganizationStorageLimitsCompleted != null))
-            {
+        
+        private void OnGetOrganizationStorageLimitsOperationCompleted(object arg) {
+            if ((this.GetOrganizationStorageLimitsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetOrganizationStorageLimitsCompleted(this, new GetOrganizationStorageLimitsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetOrganizationStorageLimits", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SetOrganizationStorageLimits(int itemId, int issueWarningKB, int prohibitSendKB, int prohibitSendReceiveKB, int keepDeletedItemsDays, bool applyToMailboxes)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetOrganizationStorageLimits", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetOrganizationStorageLimits(int itemId, int issueWarningKB, int prohibitSendKB, int prohibitSendReceiveKB, int keepDeletedItemsDays, bool applyToMailboxes) {
             object[] results = this.Invoke("SetOrganizationStorageLimits", new object[] {
                         itemId,
                         issueWarningKB,
@@ -2358,10 +2227,9 @@ namespace WebsitePanel.EnterpriseServer
                         applyToMailboxes});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSetOrganizationStorageLimits(int itemId, int issueWarningKB, int prohibitSendKB, int prohibitSendReceiveKB, int keepDeletedItemsDays, bool applyToMailboxes, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSetOrganizationStorageLimits(int itemId, int issueWarningKB, int prohibitSendKB, int prohibitSendReceiveKB, int keepDeletedItemsDays, bool applyToMailboxes, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SetOrganizationStorageLimits", new object[] {
                         itemId,
                         issueWarningKB,
@@ -2370,25 +2238,21 @@ namespace WebsitePanel.EnterpriseServer
                         keepDeletedItemsDays,
                         applyToMailboxes}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndSetOrganizationStorageLimits(System.IAsyncResult asyncResult)
-        {
+        public int EndSetOrganizationStorageLimits(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SetOrganizationStorageLimitsAsync(int itemId, int issueWarningKB, int prohibitSendKB, int prohibitSendReceiveKB, int keepDeletedItemsDays, bool applyToMailboxes)
-        {
+        public void SetOrganizationStorageLimitsAsync(int itemId, int issueWarningKB, int prohibitSendKB, int prohibitSendReceiveKB, int keepDeletedItemsDays, bool applyToMailboxes) {
             this.SetOrganizationStorageLimitsAsync(itemId, issueWarningKB, prohibitSendKB, prohibitSendReceiveKB, keepDeletedItemsDays, applyToMailboxes, null);
         }
-
+        
         /// <remarks/>
-        public void SetOrganizationStorageLimitsAsync(int itemId, int issueWarningKB, int prohibitSendKB, int prohibitSendReceiveKB, int keepDeletedItemsDays, bool applyToMailboxes, object userState)
-        {
-            if ((this.SetOrganizationStorageLimitsOperationCompleted == null))
-            {
+        public void SetOrganizationStorageLimitsAsync(int itemId, int issueWarningKB, int prohibitSendKB, int prohibitSendReceiveKB, int keepDeletedItemsDays, bool applyToMailboxes, object userState) {
+            if ((this.SetOrganizationStorageLimitsOperationCompleted == null)) {
                 this.SetOrganizationStorageLimitsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetOrganizationStorageLimitsOperationCompleted);
             }
             this.InvokeAsync("SetOrganizationStorageLimits", new object[] {
@@ -2399,236 +2263,201 @@ namespace WebsitePanel.EnterpriseServer
                         keepDeletedItemsDays,
                         applyToMailboxes}, this.SetOrganizationStorageLimitsOperationCompleted, userState);
         }
-
-        private void OnSetOrganizationStorageLimitsOperationCompleted(object arg)
-        {
-            if ((this.SetOrganizationStorageLimitsCompleted != null))
-            {
+        
+        private void OnSetOrganizationStorageLimitsOperationCompleted(object arg) {
+            if ((this.SetOrganizationStorageLimitsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetOrganizationStorageLimitsCompleted(this, new SetOrganizationStorageLimitsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxesStatistics", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeItemStatistics[] GetMailboxesStatistics(int itemId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxesStatistics", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeItemStatistics[] GetMailboxesStatistics(int itemId) {
             object[] results = this.Invoke("GetMailboxesStatistics", new object[] {
                         itemId});
             return ((ExchangeItemStatistics[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetMailboxesStatistics(int itemId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetMailboxesStatistics(int itemId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetMailboxesStatistics", new object[] {
                         itemId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeItemStatistics[] EndGetMailboxesStatistics(System.IAsyncResult asyncResult)
-        {
+        public ExchangeItemStatistics[] EndGetMailboxesStatistics(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeItemStatistics[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetMailboxesStatisticsAsync(int itemId)
-        {
+        public void GetMailboxesStatisticsAsync(int itemId) {
             this.GetMailboxesStatisticsAsync(itemId, null);
         }
-
+        
         /// <remarks/>
-        public void GetMailboxesStatisticsAsync(int itemId, object userState)
-        {
-            if ((this.GetMailboxesStatisticsOperationCompleted == null))
-            {
+        public void GetMailboxesStatisticsAsync(int itemId, object userState) {
+            if ((this.GetMailboxesStatisticsOperationCompleted == null)) {
                 this.GetMailboxesStatisticsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetMailboxesStatisticsOperationCompleted);
             }
             this.InvokeAsync("GetMailboxesStatistics", new object[] {
                         itemId}, this.GetMailboxesStatisticsOperationCompleted, userState);
         }
-
-        private void OnGetMailboxesStatisticsOperationCompleted(object arg)
-        {
-            if ((this.GetMailboxesStatisticsCompleted != null))
-            {
+        
+        private void OnGetMailboxesStatisticsOperationCompleted(object arg) {
+            if ((this.GetMailboxesStatisticsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetMailboxesStatisticsCompleted(this, new GetMailboxesStatisticsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxStatistics", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeMailboxStatistics GetMailboxStatistics(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxStatistics", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeMailboxStatistics GetMailboxStatistics(int itemId, int accountId) {
             object[] results = this.Invoke("GetMailboxStatistics", new object[] {
                         itemId,
                         accountId});
             return ((ExchangeMailboxStatistics)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetMailboxStatistics(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetMailboxStatistics(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetMailboxStatistics", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeMailboxStatistics EndGetMailboxStatistics(System.IAsyncResult asyncResult)
-        {
+        public ExchangeMailboxStatistics EndGetMailboxStatistics(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeMailboxStatistics)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetMailboxStatisticsAsync(int itemId, int accountId)
-        {
+        public void GetMailboxStatisticsAsync(int itemId, int accountId) {
             this.GetMailboxStatisticsAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void GetMailboxStatisticsAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.GetMailboxStatisticsOperationCompleted == null))
-            {
+        public void GetMailboxStatisticsAsync(int itemId, int accountId, object userState) {
+            if ((this.GetMailboxStatisticsOperationCompleted == null)) {
                 this.GetMailboxStatisticsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetMailboxStatisticsOperationCompleted);
             }
             this.InvokeAsync("GetMailboxStatistics", new object[] {
                         itemId,
                         accountId}, this.GetMailboxStatisticsOperationCompleted, userState);
         }
-
-        private void OnGetMailboxStatisticsOperationCompleted(object arg)
-        {
-            if ((this.GetMailboxStatisticsCompleted != null))
-            {
+        
+        private void OnGetMailboxStatisticsOperationCompleted(object arg) {
+            if ((this.GetMailboxStatisticsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetMailboxStatisticsCompleted(this, new GetMailboxStatisticsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CalculateOrganizationDiskspace", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int CalculateOrganizationDiskspace(int itemId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CalculateOrganizationDiskspace", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int CalculateOrganizationDiskspace(int itemId) {
             object[] results = this.Invoke("CalculateOrganizationDiskspace", new object[] {
                         itemId});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginCalculateOrganizationDiskspace(int itemId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginCalculateOrganizationDiskspace(int itemId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("CalculateOrganizationDiskspace", new object[] {
                         itemId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndCalculateOrganizationDiskspace(System.IAsyncResult asyncResult)
-        {
+        public int EndCalculateOrganizationDiskspace(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void CalculateOrganizationDiskspaceAsync(int itemId)
-        {
+        public void CalculateOrganizationDiskspaceAsync(int itemId) {
             this.CalculateOrganizationDiskspaceAsync(itemId, null);
         }
-
+        
         /// <remarks/>
-        public void CalculateOrganizationDiskspaceAsync(int itemId, object userState)
-        {
-            if ((this.CalculateOrganizationDiskspaceOperationCompleted == null))
-            {
+        public void CalculateOrganizationDiskspaceAsync(int itemId, object userState) {
+            if ((this.CalculateOrganizationDiskspaceOperationCompleted == null)) {
                 this.CalculateOrganizationDiskspaceOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCalculateOrganizationDiskspaceOperationCompleted);
             }
             this.InvokeAsync("CalculateOrganizationDiskspace", new object[] {
                         itemId}, this.CalculateOrganizationDiskspaceOperationCompleted, userState);
         }
-
-        private void OnCalculateOrganizationDiskspaceOperationCompleted(object arg)
-        {
-            if ((this.CalculateOrganizationDiskspaceCompleted != null))
-            {
+        
+        private void OnCalculateOrganizationDiskspaceOperationCompleted(object arg) {
+            if ((this.CalculateOrganizationDiskspaceCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.CalculateOrganizationDiskspaceCompleted(this, new CalculateOrganizationDiskspaceCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetActiveSyncPolicy", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeActiveSyncPolicy GetActiveSyncPolicy(int itemId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetActiveSyncPolicy", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeActiveSyncPolicy GetActiveSyncPolicy(int itemId) {
             object[] results = this.Invoke("GetActiveSyncPolicy", new object[] {
                         itemId});
             return ((ExchangeActiveSyncPolicy)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetActiveSyncPolicy(int itemId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetActiveSyncPolicy(int itemId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetActiveSyncPolicy", new object[] {
                         itemId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeActiveSyncPolicy EndGetActiveSyncPolicy(System.IAsyncResult asyncResult)
-        {
+        public ExchangeActiveSyncPolicy EndGetActiveSyncPolicy(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeActiveSyncPolicy)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetActiveSyncPolicyAsync(int itemId)
-        {
+        public void GetActiveSyncPolicyAsync(int itemId) {
             this.GetActiveSyncPolicyAsync(itemId, null);
         }
-
+        
         /// <remarks/>
-        public void GetActiveSyncPolicyAsync(int itemId, object userState)
-        {
-            if ((this.GetActiveSyncPolicyOperationCompleted == null))
-            {
+        public void GetActiveSyncPolicyAsync(int itemId, object userState) {
+            if ((this.GetActiveSyncPolicyOperationCompleted == null)) {
                 this.GetActiveSyncPolicyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetActiveSyncPolicyOperationCompleted);
             }
             this.InvokeAsync("GetActiveSyncPolicy", new object[] {
                         itemId}, this.GetActiveSyncPolicyOperationCompleted, userState);
         }
-
-        private void OnGetActiveSyncPolicyOperationCompleted(object arg)
-        {
-            if ((this.GetActiveSyncPolicyCompleted != null))
-            {
+        
+        private void OnGetActiveSyncPolicyOperationCompleted(object arg) {
+            if ((this.GetActiveSyncPolicyCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetActiveSyncPolicyCompleted(this, new GetActiveSyncPolicyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetActiveSyncPolicy", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetActiveSyncPolicy", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
         public int SetActiveSyncPolicy(
-                    int itemId,
-                    bool allowNonProvisionableDevices,
-                    bool attachmentsEnabled,
-                    int maxAttachmentSizeKB,
-                    bool uncAccessEnabled,
-                    bool wssAccessEnabled,
-                    bool devicePasswordEnabled,
-                    bool alphanumericPasswordRequired,
-                    bool passwordRecoveryEnabled,
-                    bool deviceEncryptionEnabled,
-                    bool allowSimplePassword,
-                    int maxPasswordFailedAttempts,
-                    int minPasswordLength,
-                    int inactivityLockMin,
-                    int passwordExpirationDays,
-                    int passwordHistory,
-                    int refreshInteval)
-        {
+                    int itemId, 
+                    bool allowNonProvisionableDevices, 
+                    bool attachmentsEnabled, 
+                    int maxAttachmentSizeKB, 
+                    bool uncAccessEnabled, 
+                    bool wssAccessEnabled, 
+                    bool devicePasswordEnabled, 
+                    bool alphanumericPasswordRequired, 
+                    bool passwordRecoveryEnabled, 
+                    bool deviceEncryptionEnabled, 
+                    bool allowSimplePassword, 
+                    int maxPasswordFailedAttempts, 
+                    int minPasswordLength, 
+                    int inactivityLockMin, 
+                    int passwordExpirationDays, 
+                    int passwordHistory, 
+                    int refreshInteval) {
             object[] results = this.Invoke("SetActiveSyncPolicy", new object[] {
                         itemId,
                         allowNonProvisionableDevices,
@@ -2649,29 +2478,28 @@ namespace WebsitePanel.EnterpriseServer
                         refreshInteval});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
         public System.IAsyncResult BeginSetActiveSyncPolicy(
-                    int itemId,
-                    bool allowNonProvisionableDevices,
-                    bool attachmentsEnabled,
-                    int maxAttachmentSizeKB,
-                    bool uncAccessEnabled,
-                    bool wssAccessEnabled,
-                    bool devicePasswordEnabled,
-                    bool alphanumericPasswordRequired,
-                    bool passwordRecoveryEnabled,
-                    bool deviceEncryptionEnabled,
-                    bool allowSimplePassword,
-                    int maxPasswordFailedAttempts,
-                    int minPasswordLength,
-                    int inactivityLockMin,
-                    int passwordExpirationDays,
-                    int passwordHistory,
-                    int refreshInteval,
-                    System.AsyncCallback callback,
-                    object asyncState)
-        {
+                    int itemId, 
+                    bool allowNonProvisionableDevices, 
+                    bool attachmentsEnabled, 
+                    int maxAttachmentSizeKB, 
+                    bool uncAccessEnabled, 
+                    bool wssAccessEnabled, 
+                    bool devicePasswordEnabled, 
+                    bool alphanumericPasswordRequired, 
+                    bool passwordRecoveryEnabled, 
+                    bool deviceEncryptionEnabled, 
+                    bool allowSimplePassword, 
+                    int maxPasswordFailedAttempts, 
+                    int minPasswordLength, 
+                    int inactivityLockMin, 
+                    int passwordExpirationDays, 
+                    int passwordHistory, 
+                    int refreshInteval, 
+                    System.AsyncCallback callback, 
+                    object asyncState) {
             return this.BeginInvoke("SetActiveSyncPolicy", new object[] {
                         itemId,
                         allowNonProvisionableDevices,
@@ -2691,60 +2519,56 @@ namespace WebsitePanel.EnterpriseServer
                         passwordHistory,
                         refreshInteval}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndSetActiveSyncPolicy(System.IAsyncResult asyncResult)
-        {
+        public int EndSetActiveSyncPolicy(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
         public void SetActiveSyncPolicyAsync(
-                    int itemId,
-                    bool allowNonProvisionableDevices,
-                    bool attachmentsEnabled,
-                    int maxAttachmentSizeKB,
-                    bool uncAccessEnabled,
-                    bool wssAccessEnabled,
-                    bool devicePasswordEnabled,
-                    bool alphanumericPasswordRequired,
-                    bool passwordRecoveryEnabled,
-                    bool deviceEncryptionEnabled,
-                    bool allowSimplePassword,
-                    int maxPasswordFailedAttempts,
-                    int minPasswordLength,
-                    int inactivityLockMin,
-                    int passwordExpirationDays,
-                    int passwordHistory,
-                    int refreshInteval)
-        {
+                    int itemId, 
+                    bool allowNonProvisionableDevices, 
+                    bool attachmentsEnabled, 
+                    int maxAttachmentSizeKB, 
+                    bool uncAccessEnabled, 
+                    bool wssAccessEnabled, 
+                    bool devicePasswordEnabled, 
+                    bool alphanumericPasswordRequired, 
+                    bool passwordRecoveryEnabled, 
+                    bool deviceEncryptionEnabled, 
+                    bool allowSimplePassword, 
+                    int maxPasswordFailedAttempts, 
+                    int minPasswordLength, 
+                    int inactivityLockMin, 
+                    int passwordExpirationDays, 
+                    int passwordHistory, 
+                    int refreshInteval) {
             this.SetActiveSyncPolicyAsync(itemId, allowNonProvisionableDevices, attachmentsEnabled, maxAttachmentSizeKB, uncAccessEnabled, wssAccessEnabled, devicePasswordEnabled, alphanumericPasswordRequired, passwordRecoveryEnabled, deviceEncryptionEnabled, allowSimplePassword, maxPasswordFailedAttempts, minPasswordLength, inactivityLockMin, passwordExpirationDays, passwordHistory, refreshInteval, null);
         }
-
+        
         /// <remarks/>
         public void SetActiveSyncPolicyAsync(
-                    int itemId,
-                    bool allowNonProvisionableDevices,
-                    bool attachmentsEnabled,
-                    int maxAttachmentSizeKB,
-                    bool uncAccessEnabled,
-                    bool wssAccessEnabled,
-                    bool devicePasswordEnabled,
-                    bool alphanumericPasswordRequired,
-                    bool passwordRecoveryEnabled,
-                    bool deviceEncryptionEnabled,
-                    bool allowSimplePassword,
-                    int maxPasswordFailedAttempts,
-                    int minPasswordLength,
-                    int inactivityLockMin,
-                    int passwordExpirationDays,
-                    int passwordHistory,
-                    int refreshInteval,
-                    object userState)
-        {
-            if ((this.SetActiveSyncPolicyOperationCompleted == null))
-            {
+                    int itemId, 
+                    bool allowNonProvisionableDevices, 
+                    bool attachmentsEnabled, 
+                    int maxAttachmentSizeKB, 
+                    bool uncAccessEnabled, 
+                    bool wssAccessEnabled, 
+                    bool devicePasswordEnabled, 
+                    bool alphanumericPasswordRequired, 
+                    bool passwordRecoveryEnabled, 
+                    bool deviceEncryptionEnabled, 
+                    bool allowSimplePassword, 
+                    int maxPasswordFailedAttempts, 
+                    int minPasswordLength, 
+                    int inactivityLockMin, 
+                    int passwordExpirationDays, 
+                    int passwordHistory, 
+                    int refreshInteval, 
+                    object userState) {
+            if ((this.SetActiveSyncPolicyOperationCompleted == null)) {
                 this.SetActiveSyncPolicyOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetActiveSyncPolicyOperationCompleted);
             }
             this.InvokeAsync("SetActiveSyncPolicy", new object[] {
@@ -2766,124 +2590,105 @@ namespace WebsitePanel.EnterpriseServer
                         passwordHistory,
                         refreshInteval}, this.SetActiveSyncPolicyOperationCompleted, userState);
         }
-
-        private void OnSetActiveSyncPolicyOperationCompleted(object arg)
-        {
-            if ((this.SetActiveSyncPolicyCompleted != null))
-            {
+        
+        private void OnSetActiveSyncPolicyOperationCompleted(object arg) {
+            if ((this.SetActiveSyncPolicyCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetActiveSyncPolicyCompleted(this, new SetActiveSyncPolicyCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddAuthoritativeDomain", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int AddAuthoritativeDomain(int itemId, int domainId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddAuthoritativeDomain", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int AddAuthoritativeDomain(int itemId, int domainId) {
             object[] results = this.Invoke("AddAuthoritativeDomain", new object[] {
                         itemId,
                         domainId});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginAddAuthoritativeDomain(int itemId, int domainId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginAddAuthoritativeDomain(int itemId, int domainId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("AddAuthoritativeDomain", new object[] {
                         itemId,
                         domainId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndAddAuthoritativeDomain(System.IAsyncResult asyncResult)
-        {
+        public int EndAddAuthoritativeDomain(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void AddAuthoritativeDomainAsync(int itemId, int domainId)
-        {
+        public void AddAuthoritativeDomainAsync(int itemId, int domainId) {
             this.AddAuthoritativeDomainAsync(itemId, domainId, null);
         }
-
+        
         /// <remarks/>
-        public void AddAuthoritativeDomainAsync(int itemId, int domainId, object userState)
-        {
-            if ((this.AddAuthoritativeDomainOperationCompleted == null))
-            {
+        public void AddAuthoritativeDomainAsync(int itemId, int domainId, object userState) {
+            if ((this.AddAuthoritativeDomainOperationCompleted == null)) {
                 this.AddAuthoritativeDomainOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddAuthoritativeDomainOperationCompleted);
             }
             this.InvokeAsync("AddAuthoritativeDomain", new object[] {
                         itemId,
                         domainId}, this.AddAuthoritativeDomainOperationCompleted, userState);
         }
-
-        private void OnAddAuthoritativeDomainOperationCompleted(object arg)
-        {
-            if ((this.AddAuthoritativeDomainCompleted != null))
-            {
+        
+        private void OnAddAuthoritativeDomainOperationCompleted(object arg) {
+            if ((this.AddAuthoritativeDomainCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.AddAuthoritativeDomainCompleted(this, new AddAuthoritativeDomainCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteAuthoritativeDomain", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int DeleteAuthoritativeDomain(int itemId, int domainId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteAuthoritativeDomain", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DeleteAuthoritativeDomain(int itemId, int domainId) {
             object[] results = this.Invoke("DeleteAuthoritativeDomain", new object[] {
                         itemId,
                         domainId});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginDeleteAuthoritativeDomain(int itemId, int domainId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginDeleteAuthoritativeDomain(int itemId, int domainId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("DeleteAuthoritativeDomain", new object[] {
                         itemId,
                         domainId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndDeleteAuthoritativeDomain(System.IAsyncResult asyncResult)
-        {
+        public int EndDeleteAuthoritativeDomain(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void DeleteAuthoritativeDomainAsync(int itemId, int domainId)
-        {
+        public void DeleteAuthoritativeDomainAsync(int itemId, int domainId) {
             this.DeleteAuthoritativeDomainAsync(itemId, domainId, null);
         }
-
+        
         /// <remarks/>
-        public void DeleteAuthoritativeDomainAsync(int itemId, int domainId, object userState)
-        {
-            if ((this.DeleteAuthoritativeDomainOperationCompleted == null))
-            {
+        public void DeleteAuthoritativeDomainAsync(int itemId, int domainId, object userState) {
+            if ((this.DeleteAuthoritativeDomainOperationCompleted == null)) {
                 this.DeleteAuthoritativeDomainOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteAuthoritativeDomainOperationCompleted);
             }
             this.InvokeAsync("DeleteAuthoritativeDomain", new object[] {
                         itemId,
                         domainId}, this.DeleteAuthoritativeDomainOperationCompleted, userState);
         }
-
-        private void OnDeleteAuthoritativeDomainOperationCompleted(object arg)
-        {
-            if ((this.DeleteAuthoritativeDomainCompleted != null))
-            {
+        
+        private void OnDeleteAuthoritativeDomainOperationCompleted(object arg) {
+            if ((this.DeleteAuthoritativeDomainCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.DeleteAuthoritativeDomainCompleted(this, new DeleteAuthoritativeDomainCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetAccountsPaged", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeAccountsPaged GetAccountsPaged(int itemId, string accountTypes, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetAccountsPaged", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeAccountsPaged GetAccountsPaged(int itemId, string accountTypes, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, bool archiving) {
             object[] results = this.Invoke("GetAccountsPaged", new object[] {
                         itemId,
                         accountTypes,
@@ -2891,13 +2696,13 @@ namespace WebsitePanel.EnterpriseServer
                         filterValue,
                         sortColumn,
                         startRow,
-                        maximumRows});
+                        maximumRows,
+                        archiving});
             return ((ExchangeAccountsPaged)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetAccountsPaged(int itemId, string accountTypes, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetAccountsPaged(int itemId, string accountTypes, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, bool archiving, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetAccountsPaged", new object[] {
                         itemId,
                         accountTypes,
@@ -2905,27 +2710,24 @@ namespace WebsitePanel.EnterpriseServer
                         filterValue,
                         sortColumn,
                         startRow,
-                        maximumRows}, callback, asyncState);
+                        maximumRows,
+                        archiving}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeAccountsPaged EndGetAccountsPaged(System.IAsyncResult asyncResult)
-        {
+        public ExchangeAccountsPaged EndGetAccountsPaged(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeAccountsPaged)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetAccountsPagedAsync(int itemId, string accountTypes, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
-        {
-            this.GetAccountsPagedAsync(itemId, accountTypes, filterColumn, filterValue, sortColumn, startRow, maximumRows, null);
+        public void GetAccountsPagedAsync(int itemId, string accountTypes, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, bool archiving) {
+            this.GetAccountsPagedAsync(itemId, accountTypes, filterColumn, filterValue, sortColumn, startRow, maximumRows, archiving, null);
         }
-
+        
         /// <remarks/>
-        public void GetAccountsPagedAsync(int itemId, string accountTypes, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState)
-        {
-            if ((this.GetAccountsPagedOperationCompleted == null))
-            {
+        public void GetAccountsPagedAsync(int itemId, string accountTypes, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, bool archiving, object userState) {
+            if ((this.GetAccountsPagedOperationCompleted == null)) {
                 this.GetAccountsPagedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetAccountsPagedOperationCompleted);
             }
             this.InvokeAsync("GetAccountsPaged", new object[] {
@@ -2935,126 +2737,108 @@ namespace WebsitePanel.EnterpriseServer
                         filterValue,
                         sortColumn,
                         startRow,
-                        maximumRows}, this.GetAccountsPagedOperationCompleted, userState);
+                        maximumRows,
+                        archiving}, this.GetAccountsPagedOperationCompleted, userState);
         }
-
-        private void OnGetAccountsPagedOperationCompleted(object arg)
-        {
-            if ((this.GetAccountsPagedCompleted != null))
-            {
+        
+        private void OnGetAccountsPagedOperationCompleted(object arg) {
+            if ((this.GetAccountsPagedCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetAccountsPagedCompleted(this, new GetAccountsPagedCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetAccounts", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeAccount[] GetAccounts(int itemId, ExchangeAccountType accountType)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetAccounts", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeAccount[] GetAccounts(int itemId, ExchangeAccountType accountType) {
             object[] results = this.Invoke("GetAccounts", new object[] {
                         itemId,
                         accountType});
             return ((ExchangeAccount[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetAccounts(int itemId, ExchangeAccountType accountType, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetAccounts(int itemId, ExchangeAccountType accountType, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetAccounts", new object[] {
                         itemId,
                         accountType}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeAccount[] EndGetAccounts(System.IAsyncResult asyncResult)
-        {
+        public ExchangeAccount[] EndGetAccounts(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeAccount[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetAccountsAsync(int itemId, ExchangeAccountType accountType)
-        {
+        public void GetAccountsAsync(int itemId, ExchangeAccountType accountType) {
             this.GetAccountsAsync(itemId, accountType, null);
         }
-
+        
         /// <remarks/>
-        public void GetAccountsAsync(int itemId, ExchangeAccountType accountType, object userState)
-        {
-            if ((this.GetAccountsOperationCompleted == null))
-            {
+        public void GetAccountsAsync(int itemId, ExchangeAccountType accountType, object userState) {
+            if ((this.GetAccountsOperationCompleted == null)) {
                 this.GetAccountsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetAccountsOperationCompleted);
             }
             this.InvokeAsync("GetAccounts", new object[] {
                         itemId,
                         accountType}, this.GetAccountsOperationCompleted, userState);
         }
-
-        private void OnGetAccountsOperationCompleted(object arg)
-        {
-            if ((this.GetAccountsCompleted != null))
-            {
+        
+        private void OnGetAccountsOperationCompleted(object arg) {
+            if ((this.GetAccountsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetAccountsCompleted(this, new GetAccountsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExchangeAccountByMailboxPlanId", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeAccount[] GetExchangeAccountByMailboxPlanId(int itemId, int mailboxPlanId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExchangeAccountByMailboxPlanId", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeAccount[] GetExchangeAccountByMailboxPlanId(int itemId, int mailboxPlanId) {
             object[] results = this.Invoke("GetExchangeAccountByMailboxPlanId", new object[] {
                         itemId,
                         mailboxPlanId});
             return ((ExchangeAccount[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetExchangeAccountByMailboxPlanId(int itemId, int mailboxPlanId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetExchangeAccountByMailboxPlanId(int itemId, int mailboxPlanId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetExchangeAccountByMailboxPlanId", new object[] {
                         itemId,
                         mailboxPlanId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeAccount[] EndGetExchangeAccountByMailboxPlanId(System.IAsyncResult asyncResult)
-        {
+        public ExchangeAccount[] EndGetExchangeAccountByMailboxPlanId(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeAccount[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetExchangeAccountByMailboxPlanIdAsync(int itemId, int mailboxPlanId)
-        {
+        public void GetExchangeAccountByMailboxPlanIdAsync(int itemId, int mailboxPlanId) {
             this.GetExchangeAccountByMailboxPlanIdAsync(itemId, mailboxPlanId, null);
         }
-
+        
         /// <remarks/>
-        public void GetExchangeAccountByMailboxPlanIdAsync(int itemId, int mailboxPlanId, object userState)
-        {
-            if ((this.GetExchangeAccountByMailboxPlanIdOperationCompleted == null))
-            {
+        public void GetExchangeAccountByMailboxPlanIdAsync(int itemId, int mailboxPlanId, object userState) {
+            if ((this.GetExchangeAccountByMailboxPlanIdOperationCompleted == null)) {
                 this.GetExchangeAccountByMailboxPlanIdOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetExchangeAccountByMailboxPlanIdOperationCompleted);
             }
             this.InvokeAsync("GetExchangeAccountByMailboxPlanId", new object[] {
                         itemId,
                         mailboxPlanId}, this.GetExchangeAccountByMailboxPlanIdOperationCompleted, userState);
         }
-
-        private void OnGetExchangeAccountByMailboxPlanIdOperationCompleted(object arg)
-        {
-            if ((this.GetExchangeAccountByMailboxPlanIdCompleted != null))
-            {
+        
+        private void OnGetExchangeAccountByMailboxPlanIdOperationCompleted(object arg) {
+            if ((this.GetExchangeAccountByMailboxPlanIdCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetExchangeAccountByMailboxPlanIdCompleted(this, new GetExchangeAccountByMailboxPlanIdCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SearchAccounts", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeAccount[] SearchAccounts(int itemId, bool includeMailboxes, bool includeContacts, bool includeDistributionLists, bool includeRooms, bool includeEquipment, bool includeSecurityGroups, string filterColumn, string filterValue, string sortColumn)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SearchAccounts", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeAccount[] SearchAccounts(int itemId, bool includeMailboxes, bool includeContacts, bool includeDistributionLists, bool includeRooms, bool includeEquipment, bool includeSecurityGroups, string filterColumn, string filterValue, string sortColumn) {
             object[] results = this.Invoke("SearchAccounts", new object[] {
                         itemId,
                         includeMailboxes,
@@ -3068,10 +2852,9 @@ namespace WebsitePanel.EnterpriseServer
                         sortColumn});
             return ((ExchangeAccount[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSearchAccounts(int itemId, bool includeMailboxes, bool includeContacts, bool includeDistributionLists, bool includeRooms, bool includeEquipment, bool includeSecurityGroups, string filterColumn, string filterValue, string sortColumn, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSearchAccounts(int itemId, bool includeMailboxes, bool includeContacts, bool includeDistributionLists, bool includeRooms, bool includeEquipment, bool includeSecurityGroups, string filterColumn, string filterValue, string sortColumn, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SearchAccounts", new object[] {
                         itemId,
                         includeMailboxes,
@@ -3084,25 +2867,21 @@ namespace WebsitePanel.EnterpriseServer
                         filterValue,
                         sortColumn}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeAccount[] EndSearchAccounts(System.IAsyncResult asyncResult)
-        {
+        public ExchangeAccount[] EndSearchAccounts(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeAccount[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SearchAccountsAsync(int itemId, bool includeMailboxes, bool includeContacts, bool includeDistributionLists, bool includeRooms, bool includeEquipment, bool includeSecurityGroups, string filterColumn, string filterValue, string sortColumn)
-        {
+        public void SearchAccountsAsync(int itemId, bool includeMailboxes, bool includeContacts, bool includeDistributionLists, bool includeRooms, bool includeEquipment, bool includeSecurityGroups, string filterColumn, string filterValue, string sortColumn) {
             this.SearchAccountsAsync(itemId, includeMailboxes, includeContacts, includeDistributionLists, includeRooms, includeEquipment, includeSecurityGroups, filterColumn, filterValue, sortColumn, null);
         }
-
+        
         /// <remarks/>
-        public void SearchAccountsAsync(int itemId, bool includeMailboxes, bool includeContacts, bool includeDistributionLists, bool includeRooms, bool includeEquipment, bool includeSecurityGroups, string filterColumn, string filterValue, string sortColumn, object userState)
-        {
-            if ((this.SearchAccountsOperationCompleted == null))
-            {
+        public void SearchAccountsAsync(int itemId, bool includeMailboxes, bool includeContacts, bool includeDistributionLists, bool includeRooms, bool includeEquipment, bool includeSecurityGroups, string filterColumn, string filterValue, string sortColumn, object userState) {
+            if ((this.SearchAccountsOperationCompleted == null)) {
                 this.SearchAccountsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchAccountsOperationCompleted);
             }
             this.InvokeAsync("SearchAccounts", new object[] {
@@ -3117,158 +2896,134 @@ namespace WebsitePanel.EnterpriseServer
                         filterValue,
                         sortColumn}, this.SearchAccountsOperationCompleted, userState);
         }
-
-        private void OnSearchAccountsOperationCompleted(object arg)
-        {
-            if ((this.SearchAccountsCompleted != null))
-            {
+        
+        private void OnSearchAccountsOperationCompleted(object arg) {
+            if ((this.SearchAccountsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SearchAccountsCompleted(this, new SearchAccountsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetAccount", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeAccount GetAccount(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetAccount", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeAccount GetAccount(int itemId, int accountId) {
             object[] results = this.Invoke("GetAccount", new object[] {
                         itemId,
                         accountId});
             return ((ExchangeAccount)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetAccount(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetAccount(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetAccount", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeAccount EndGetAccount(System.IAsyncResult asyncResult)
-        {
+        public ExchangeAccount EndGetAccount(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeAccount)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetAccountAsync(int itemId, int accountId)
-        {
+        public void GetAccountAsync(int itemId, int accountId) {
             this.GetAccountAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void GetAccountAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.GetAccountOperationCompleted == null))
-            {
+        public void GetAccountAsync(int itemId, int accountId, object userState) {
+            if ((this.GetAccountOperationCompleted == null)) {
                 this.GetAccountOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetAccountOperationCompleted);
             }
             this.InvokeAsync("GetAccount", new object[] {
                         itemId,
                         accountId}, this.GetAccountOperationCompleted, userState);
         }
-
-        private void OnGetAccountOperationCompleted(object arg)
-        {
-            if ((this.GetAccountCompleted != null))
-            {
+        
+        private void OnGetAccountOperationCompleted(object arg) {
+            if ((this.GetAccountCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetAccountCompleted(this, new GetAccountCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SearchAccount", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeAccount SearchAccount(ExchangeAccountType accountType, string primaryEmailAddress)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SearchAccount", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeAccount SearchAccount(ExchangeAccountType accountType, string primaryEmailAddress) {
             object[] results = this.Invoke("SearchAccount", new object[] {
                         accountType,
                         primaryEmailAddress});
             return ((ExchangeAccount)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSearchAccount(ExchangeAccountType accountType, string primaryEmailAddress, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSearchAccount(ExchangeAccountType accountType, string primaryEmailAddress, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SearchAccount", new object[] {
                         accountType,
                         primaryEmailAddress}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeAccount EndSearchAccount(System.IAsyncResult asyncResult)
-        {
+        public ExchangeAccount EndSearchAccount(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeAccount)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SearchAccountAsync(ExchangeAccountType accountType, string primaryEmailAddress)
-        {
+        public void SearchAccountAsync(ExchangeAccountType accountType, string primaryEmailAddress) {
             this.SearchAccountAsync(accountType, primaryEmailAddress, null);
         }
-
+        
         /// <remarks/>
-        public void SearchAccountAsync(ExchangeAccountType accountType, string primaryEmailAddress, object userState)
-        {
-            if ((this.SearchAccountOperationCompleted == null))
-            {
+        public void SearchAccountAsync(ExchangeAccountType accountType, string primaryEmailAddress, object userState) {
+            if ((this.SearchAccountOperationCompleted == null)) {
                 this.SearchAccountOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSearchAccountOperationCompleted);
             }
             this.InvokeAsync("SearchAccount", new object[] {
                         accountType,
                         primaryEmailAddress}, this.SearchAccountOperationCompleted, userState);
         }
-
-        private void OnSearchAccountOperationCompleted(object arg)
-        {
-            if ((this.SearchAccountCompleted != null))
-            {
+        
+        private void OnSearchAccountOperationCompleted(object arg) {
+            if ((this.SearchAccountCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SearchAccountCompleted(this, new SearchAccountCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CheckAccountCredentials", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public bool CheckAccountCredentials(int itemId, string email, string password)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CheckAccountCredentials", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public bool CheckAccountCredentials(int itemId, string email, string password) {
             object[] results = this.Invoke("CheckAccountCredentials", new object[] {
                         itemId,
                         email,
                         password});
             return ((bool)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginCheckAccountCredentials(int itemId, string email, string password, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginCheckAccountCredentials(int itemId, string email, string password, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("CheckAccountCredentials", new object[] {
                         itemId,
                         email,
                         password}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public bool EndCheckAccountCredentials(System.IAsyncResult asyncResult)
-        {
+        public bool EndCheckAccountCredentials(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((bool)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void CheckAccountCredentialsAsync(int itemId, string email, string password)
-        {
+        public void CheckAccountCredentialsAsync(int itemId, string email, string password) {
             this.CheckAccountCredentialsAsync(itemId, email, password, null);
         }
-
+        
         /// <remarks/>
-        public void CheckAccountCredentialsAsync(int itemId, string email, string password, object userState)
-        {
-            if ((this.CheckAccountCredentialsOperationCompleted == null))
-            {
+        public void CheckAccountCredentialsAsync(int itemId, string email, string password, object userState) {
+            if ((this.CheckAccountCredentialsOperationCompleted == null)) {
                 this.CheckAccountCredentialsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCheckAccountCredentialsOperationCompleted);
             }
             this.InvokeAsync("CheckAccountCredentials", new object[] {
@@ -3276,20 +3031,17 @@ namespace WebsitePanel.EnterpriseServer
                         email,
                         password}, this.CheckAccountCredentialsOperationCompleted, userState);
         }
-
-        private void OnCheckAccountCredentialsOperationCompleted(object arg)
-        {
-            if ((this.CheckAccountCredentialsCompleted != null))
-            {
+        
+        private void OnCheckAccountCredentialsOperationCompleted(object arg) {
+            if ((this.CheckAccountCredentialsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.CheckAccountCredentialsCompleted(this, new CheckAccountCredentialsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CreateMailbox", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int CreateMailbox(int itemId, int accountId, ExchangeAccountType accountType, string accountName, string displayName, string name, string domain, string password, bool sendSetupInstructions, string setupInstructionMailAddress, int mailboxPlanId, string subscriberNumber)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CreateMailbox", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int CreateMailbox(int itemId, int accountId, ExchangeAccountType accountType, string accountName, string displayName, string name, string domain, string password, bool sendSetupInstructions, string setupInstructionMailAddress, int mailboxPlanId, int archivedPlanId, string subscriberNumber) {
             object[] results = this.Invoke("CreateMailbox", new object[] {
                         itemId,
                         accountId,
@@ -3302,13 +3054,13 @@ namespace WebsitePanel.EnterpriseServer
                         sendSetupInstructions,
                         setupInstructionMailAddress,
                         mailboxPlanId,
+                        archivedPlanId,
                         subscriberNumber});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginCreateMailbox(int itemId, int accountId, ExchangeAccountType accountType, string accountName, string displayName, string name, string domain, string password, bool sendSetupInstructions, string setupInstructionMailAddress, int mailboxPlanId, string subscriberNumber, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginCreateMailbox(int itemId, int accountId, ExchangeAccountType accountType, string accountName, string displayName, string name, string domain, string password, bool sendSetupInstructions, string setupInstructionMailAddress, int mailboxPlanId, int archivedPlanId, string subscriberNumber, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("CreateMailbox", new object[] {
                         itemId,
                         accountId,
@@ -3321,27 +3073,24 @@ namespace WebsitePanel.EnterpriseServer
                         sendSetupInstructions,
                         setupInstructionMailAddress,
                         mailboxPlanId,
+                        archivedPlanId,
                         subscriberNumber}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndCreateMailbox(System.IAsyncResult asyncResult)
-        {
+        public int EndCreateMailbox(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void CreateMailboxAsync(int itemId, int accountId, ExchangeAccountType accountType, string accountName, string displayName, string name, string domain, string password, bool sendSetupInstructions, string setupInstructionMailAddress, int mailboxPlanId, string subscriberNumber)
-        {
-            this.CreateMailboxAsync(itemId, accountId, accountType, accountName, displayName, name, domain, password, sendSetupInstructions, setupInstructionMailAddress, mailboxPlanId, subscriberNumber, null);
+        public void CreateMailboxAsync(int itemId, int accountId, ExchangeAccountType accountType, string accountName, string displayName, string name, string domain, string password, bool sendSetupInstructions, string setupInstructionMailAddress, int mailboxPlanId, int archivedPlanId, string subscriberNumber) {
+            this.CreateMailboxAsync(itemId, accountId, accountType, accountName, displayName, name, domain, password, sendSetupInstructions, setupInstructionMailAddress, mailboxPlanId, archivedPlanId, subscriberNumber, null);
         }
-
+        
         /// <remarks/>
-        public void CreateMailboxAsync(int itemId, int accountId, ExchangeAccountType accountType, string accountName, string displayName, string name, string domain, string password, bool sendSetupInstructions, string setupInstructionMailAddress, int mailboxPlanId, string subscriberNumber, object userState)
-        {
-            if ((this.CreateMailboxOperationCompleted == null))
-            {
+        public void CreateMailboxAsync(int itemId, int accountId, ExchangeAccountType accountType, string accountName, string displayName, string name, string domain, string password, bool sendSetupInstructions, string setupInstructionMailAddress, int mailboxPlanId, int archivedPlanId, string subscriberNumber, object userState) {
+            if ((this.CreateMailboxOperationCompleted == null)) {
                 this.CreateMailboxOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCreateMailboxOperationCompleted);
             }
             this.InvokeAsync("CreateMailbox", new object[] {
@@ -3356,230 +3105,196 @@ namespace WebsitePanel.EnterpriseServer
                         sendSetupInstructions,
                         setupInstructionMailAddress,
                         mailboxPlanId,
+                        archivedPlanId,
                         subscriberNumber}, this.CreateMailboxOperationCompleted, userState);
         }
-
-        private void OnCreateMailboxOperationCompleted(object arg)
-        {
-            if ((this.CreateMailboxCompleted != null))
-            {
+        
+        private void OnCreateMailboxOperationCompleted(object arg) {
+            if ((this.CreateMailboxCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.CreateMailboxCompleted(this, new CreateMailboxCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteMailbox", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int DeleteMailbox(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteMailbox", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DeleteMailbox(int itemId, int accountId) {
             object[] results = this.Invoke("DeleteMailbox", new object[] {
                         itemId,
                         accountId});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginDeleteMailbox(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginDeleteMailbox(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("DeleteMailbox", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndDeleteMailbox(System.IAsyncResult asyncResult)
-        {
+        public int EndDeleteMailbox(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void DeleteMailboxAsync(int itemId, int accountId)
-        {
+        public void DeleteMailboxAsync(int itemId, int accountId) {
             this.DeleteMailboxAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void DeleteMailboxAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.DeleteMailboxOperationCompleted == null))
-            {
+        public void DeleteMailboxAsync(int itemId, int accountId, object userState) {
+            if ((this.DeleteMailboxOperationCompleted == null)) {
                 this.DeleteMailboxOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteMailboxOperationCompleted);
             }
             this.InvokeAsync("DeleteMailbox", new object[] {
                         itemId,
                         accountId}, this.DeleteMailboxOperationCompleted, userState);
         }
-
-        private void OnDeleteMailboxOperationCompleted(object arg)
-        {
-            if ((this.DeleteMailboxCompleted != null))
-            {
+        
+        private void OnDeleteMailboxOperationCompleted(object arg) {
+            if ((this.DeleteMailboxCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.DeleteMailboxCompleted(this, new DeleteMailboxCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DisableMailbox", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int DisableMailbox(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DisableMailbox", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DisableMailbox(int itemId, int accountId) {
             object[] results = this.Invoke("DisableMailbox", new object[] {
                         itemId,
                         accountId});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginDisableMailbox(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginDisableMailbox(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("DisableMailbox", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndDisableMailbox(System.IAsyncResult asyncResult)
-        {
+        public int EndDisableMailbox(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void DisableMailboxAsync(int itemId, int accountId)
-        {
+        public void DisableMailboxAsync(int itemId, int accountId) {
             this.DisableMailboxAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void DisableMailboxAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.DisableMailboxOperationCompleted == null))
-            {
+        public void DisableMailboxAsync(int itemId, int accountId, object userState) {
+            if ((this.DisableMailboxOperationCompleted == null)) {
                 this.DisableMailboxOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDisableMailboxOperationCompleted);
             }
             this.InvokeAsync("DisableMailbox", new object[] {
                         itemId,
                         accountId}, this.DisableMailboxOperationCompleted, userState);
         }
-
-        private void OnDisableMailboxOperationCompleted(object arg)
-        {
-            if ((this.DisableMailboxCompleted != null))
-            {
+        
+        private void OnDisableMailboxOperationCompleted(object arg) {
+            if ((this.DisableMailboxCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.DisableMailboxCompleted(this, new DisableMailboxCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxAdvancedSettings", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeMailbox GetMailboxAdvancedSettings(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxAdvancedSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeMailbox GetMailboxAdvancedSettings(int itemId, int accountId) {
             object[] results = this.Invoke("GetMailboxAdvancedSettings", new object[] {
                         itemId,
                         accountId});
             return ((ExchangeMailbox)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetMailboxAdvancedSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetMailboxAdvancedSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetMailboxAdvancedSettings", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeMailbox EndGetMailboxAdvancedSettings(System.IAsyncResult asyncResult)
-        {
+        public ExchangeMailbox EndGetMailboxAdvancedSettings(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeMailbox)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetMailboxAdvancedSettingsAsync(int itemId, int accountId)
-        {
+        public void GetMailboxAdvancedSettingsAsync(int itemId, int accountId) {
             this.GetMailboxAdvancedSettingsAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void GetMailboxAdvancedSettingsAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.GetMailboxAdvancedSettingsOperationCompleted == null))
-            {
+        public void GetMailboxAdvancedSettingsAsync(int itemId, int accountId, object userState) {
+            if ((this.GetMailboxAdvancedSettingsOperationCompleted == null)) {
                 this.GetMailboxAdvancedSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetMailboxAdvancedSettingsOperationCompleted);
             }
             this.InvokeAsync("GetMailboxAdvancedSettings", new object[] {
                         itemId,
                         accountId}, this.GetMailboxAdvancedSettingsOperationCompleted, userState);
         }
-
-        private void OnGetMailboxAdvancedSettingsOperationCompleted(object arg)
-        {
-            if ((this.GetMailboxAdvancedSettingsCompleted != null))
-            {
+        
+        private void OnGetMailboxAdvancedSettingsOperationCompleted(object arg) {
+            if ((this.GetMailboxAdvancedSettingsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetMailboxAdvancedSettingsCompleted(this, new GetMailboxAdvancedSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxGeneralSettings", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeMailbox GetMailboxGeneralSettings(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxGeneralSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeMailbox GetMailboxGeneralSettings(int itemId, int accountId) {
             object[] results = this.Invoke("GetMailboxGeneralSettings", new object[] {
                         itemId,
                         accountId});
             return ((ExchangeMailbox)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetMailboxGeneralSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetMailboxGeneralSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetMailboxGeneralSettings", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeMailbox EndGetMailboxGeneralSettings(System.IAsyncResult asyncResult)
-        {
+        public ExchangeMailbox EndGetMailboxGeneralSettings(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeMailbox)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetMailboxGeneralSettingsAsync(int itemId, int accountId)
-        {
+        public void GetMailboxGeneralSettingsAsync(int itemId, int accountId) {
             this.GetMailboxGeneralSettingsAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void GetMailboxGeneralSettingsAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.GetMailboxGeneralSettingsOperationCompleted == null))
-            {
+        public void GetMailboxGeneralSettingsAsync(int itemId, int accountId, object userState) {
+            if ((this.GetMailboxGeneralSettingsOperationCompleted == null)) {
                 this.GetMailboxGeneralSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetMailboxGeneralSettingsOperationCompleted);
             }
             this.InvokeAsync("GetMailboxGeneralSettings", new object[] {
                         itemId,
                         accountId}, this.GetMailboxGeneralSettingsOperationCompleted, userState);
         }
-
-        private void OnGetMailboxGeneralSettingsOperationCompleted(object arg)
-        {
-            if ((this.GetMailboxGeneralSettingsCompleted != null))
-            {
+        
+        private void OnGetMailboxGeneralSettingsOperationCompleted(object arg) {
+            if ((this.GetMailboxGeneralSettingsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetMailboxGeneralSettingsCompleted(this, new GetMailboxGeneralSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetMailboxGeneralSettings", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SetMailboxGeneralSettings(int itemId, int accountId, bool hideAddressBook, bool disabled)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetMailboxGeneralSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetMailboxGeneralSettings(int itemId, int accountId, bool hideAddressBook, bool disabled) {
             object[] results = this.Invoke("SetMailboxGeneralSettings", new object[] {
                         itemId,
                         accountId,
@@ -3587,35 +3302,30 @@ namespace WebsitePanel.EnterpriseServer
                         disabled});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSetMailboxGeneralSettings(int itemId, int accountId, bool hideAddressBook, bool disabled, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSetMailboxGeneralSettings(int itemId, int accountId, bool hideAddressBook, bool disabled, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SetMailboxGeneralSettings", new object[] {
                         itemId,
                         accountId,
                         hideAddressBook,
                         disabled}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndSetMailboxGeneralSettings(System.IAsyncResult asyncResult)
-        {
+        public int EndSetMailboxGeneralSettings(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SetMailboxGeneralSettingsAsync(int itemId, int accountId, bool hideAddressBook, bool disabled)
-        {
+        public void SetMailboxGeneralSettingsAsync(int itemId, int accountId, bool hideAddressBook, bool disabled) {
             this.SetMailboxGeneralSettingsAsync(itemId, accountId, hideAddressBook, disabled, null);
         }
-
+        
         /// <remarks/>
-        public void SetMailboxGeneralSettingsAsync(int itemId, int accountId, bool hideAddressBook, bool disabled, object userState)
-        {
-            if ((this.SetMailboxGeneralSettingsOperationCompleted == null))
-            {
+        public void SetMailboxGeneralSettingsAsync(int itemId, int accountId, bool hideAddressBook, bool disabled, object userState) {
+            if ((this.SetMailboxGeneralSettingsOperationCompleted == null)) {
                 this.SetMailboxGeneralSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetMailboxGeneralSettingsOperationCompleted);
             }
             this.InvokeAsync("SetMailboxGeneralSettings", new object[] {
@@ -3624,106 +3334,90 @@ namespace WebsitePanel.EnterpriseServer
                         hideAddressBook,
                         disabled}, this.SetMailboxGeneralSettingsOperationCompleted, userState);
         }
-
-        private void OnSetMailboxGeneralSettingsOperationCompleted(object arg)
-        {
-            if ((this.SetMailboxGeneralSettingsCompleted != null))
-            {
+        
+        private void OnSetMailboxGeneralSettingsOperationCompleted(object arg) {
+            if ((this.SetMailboxGeneralSettingsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetMailboxGeneralSettingsCompleted(this, new SetMailboxGeneralSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxEmailAddresses", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeEmailAddress[] GetMailboxEmailAddresses(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxEmailAddresses", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeEmailAddress[] GetMailboxEmailAddresses(int itemId, int accountId) {
             object[] results = this.Invoke("GetMailboxEmailAddresses", new object[] {
                         itemId,
                         accountId});
             return ((ExchangeEmailAddress[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetMailboxEmailAddresses(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetMailboxEmailAddresses(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetMailboxEmailAddresses", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeEmailAddress[] EndGetMailboxEmailAddresses(System.IAsyncResult asyncResult)
-        {
+        public ExchangeEmailAddress[] EndGetMailboxEmailAddresses(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeEmailAddress[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetMailboxEmailAddressesAsync(int itemId, int accountId)
-        {
+        public void GetMailboxEmailAddressesAsync(int itemId, int accountId) {
             this.GetMailboxEmailAddressesAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void GetMailboxEmailAddressesAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.GetMailboxEmailAddressesOperationCompleted == null))
-            {
+        public void GetMailboxEmailAddressesAsync(int itemId, int accountId, object userState) {
+            if ((this.GetMailboxEmailAddressesOperationCompleted == null)) {
                 this.GetMailboxEmailAddressesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetMailboxEmailAddressesOperationCompleted);
             }
             this.InvokeAsync("GetMailboxEmailAddresses", new object[] {
                         itemId,
                         accountId}, this.GetMailboxEmailAddressesOperationCompleted, userState);
         }
-
-        private void OnGetMailboxEmailAddressesOperationCompleted(object arg)
-        {
-            if ((this.GetMailboxEmailAddressesCompleted != null))
-            {
+        
+        private void OnGetMailboxEmailAddressesOperationCompleted(object arg) {
+            if ((this.GetMailboxEmailAddressesCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetMailboxEmailAddressesCompleted(this, new GetMailboxEmailAddressesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddMailboxEmailAddress", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int AddMailboxEmailAddress(int itemId, int accountId, string emailAddress)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddMailboxEmailAddress", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int AddMailboxEmailAddress(int itemId, int accountId, string emailAddress) {
             object[] results = this.Invoke("AddMailboxEmailAddress", new object[] {
                         itemId,
                         accountId,
                         emailAddress});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginAddMailboxEmailAddress(int itemId, int accountId, string emailAddress, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginAddMailboxEmailAddress(int itemId, int accountId, string emailAddress, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("AddMailboxEmailAddress", new object[] {
                         itemId,
                         accountId,
                         emailAddress}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndAddMailboxEmailAddress(System.IAsyncResult asyncResult)
-        {
+        public int EndAddMailboxEmailAddress(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void AddMailboxEmailAddressAsync(int itemId, int accountId, string emailAddress)
-        {
+        public void AddMailboxEmailAddressAsync(int itemId, int accountId, string emailAddress) {
             this.AddMailboxEmailAddressAsync(itemId, accountId, emailAddress, null);
         }
-
+        
         /// <remarks/>
-        public void AddMailboxEmailAddressAsync(int itemId, int accountId, string emailAddress, object userState)
-        {
-            if ((this.AddMailboxEmailAddressOperationCompleted == null))
-            {
+        public void AddMailboxEmailAddressAsync(int itemId, int accountId, string emailAddress, object userState) {
+            if ((this.AddMailboxEmailAddressOperationCompleted == null)) {
                 this.AddMailboxEmailAddressOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddMailboxEmailAddressOperationCompleted);
             }
             this.InvokeAsync("AddMailboxEmailAddress", new object[] {
@@ -3731,54 +3425,46 @@ namespace WebsitePanel.EnterpriseServer
                         accountId,
                         emailAddress}, this.AddMailboxEmailAddressOperationCompleted, userState);
         }
-
-        private void OnAddMailboxEmailAddressOperationCompleted(object arg)
-        {
-            if ((this.AddMailboxEmailAddressCompleted != null))
-            {
+        
+        private void OnAddMailboxEmailAddressOperationCompleted(object arg) {
+            if ((this.AddMailboxEmailAddressCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.AddMailboxEmailAddressCompleted(this, new AddMailboxEmailAddressCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetMailboxPrimaryEmailAddress", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SetMailboxPrimaryEmailAddress(int itemId, int accountId, string emailAddress)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetMailboxPrimaryEmailAddress", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetMailboxPrimaryEmailAddress(int itemId, int accountId, string emailAddress) {
             object[] results = this.Invoke("SetMailboxPrimaryEmailAddress", new object[] {
                         itemId,
                         accountId,
                         emailAddress});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSetMailboxPrimaryEmailAddress(int itemId, int accountId, string emailAddress, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSetMailboxPrimaryEmailAddress(int itemId, int accountId, string emailAddress, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SetMailboxPrimaryEmailAddress", new object[] {
                         itemId,
                         accountId,
                         emailAddress}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndSetMailboxPrimaryEmailAddress(System.IAsyncResult asyncResult)
-        {
+        public int EndSetMailboxPrimaryEmailAddress(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SetMailboxPrimaryEmailAddressAsync(int itemId, int accountId, string emailAddress)
-        {
+        public void SetMailboxPrimaryEmailAddressAsync(int itemId, int accountId, string emailAddress) {
             this.SetMailboxPrimaryEmailAddressAsync(itemId, accountId, emailAddress, null);
         }
-
+        
         /// <remarks/>
-        public void SetMailboxPrimaryEmailAddressAsync(int itemId, int accountId, string emailAddress, object userState)
-        {
-            if ((this.SetMailboxPrimaryEmailAddressOperationCompleted == null))
-            {
+        public void SetMailboxPrimaryEmailAddressAsync(int itemId, int accountId, string emailAddress, object userState) {
+            if ((this.SetMailboxPrimaryEmailAddressOperationCompleted == null)) {
                 this.SetMailboxPrimaryEmailAddressOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetMailboxPrimaryEmailAddressOperationCompleted);
             }
             this.InvokeAsync("SetMailboxPrimaryEmailAddress", new object[] {
@@ -3786,54 +3472,46 @@ namespace WebsitePanel.EnterpriseServer
                         accountId,
                         emailAddress}, this.SetMailboxPrimaryEmailAddressOperationCompleted, userState);
         }
-
-        private void OnSetMailboxPrimaryEmailAddressOperationCompleted(object arg)
-        {
-            if ((this.SetMailboxPrimaryEmailAddressCompleted != null))
-            {
+        
+        private void OnSetMailboxPrimaryEmailAddressOperationCompleted(object arg) {
+            if ((this.SetMailboxPrimaryEmailAddressCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetMailboxPrimaryEmailAddressCompleted(this, new SetMailboxPrimaryEmailAddressCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteMailboxEmailAddresses", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int DeleteMailboxEmailAddresses(int itemId, int accountId, string[] emailAddresses)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteMailboxEmailAddresses", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DeleteMailboxEmailAddresses(int itemId, int accountId, string[] emailAddresses) {
             object[] results = this.Invoke("DeleteMailboxEmailAddresses", new object[] {
                         itemId,
                         accountId,
                         emailAddresses});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginDeleteMailboxEmailAddresses(int itemId, int accountId, string[] emailAddresses, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginDeleteMailboxEmailAddresses(int itemId, int accountId, string[] emailAddresses, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("DeleteMailboxEmailAddresses", new object[] {
                         itemId,
                         accountId,
                         emailAddresses}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndDeleteMailboxEmailAddresses(System.IAsyncResult asyncResult)
-        {
+        public int EndDeleteMailboxEmailAddresses(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void DeleteMailboxEmailAddressesAsync(int itemId, int accountId, string[] emailAddresses)
-        {
+        public void DeleteMailboxEmailAddressesAsync(int itemId, int accountId, string[] emailAddresses) {
             this.DeleteMailboxEmailAddressesAsync(itemId, accountId, emailAddresses, null);
         }
-
+        
         /// <remarks/>
-        public void DeleteMailboxEmailAddressesAsync(int itemId, int accountId, string[] emailAddresses, object userState)
-        {
-            if ((this.DeleteMailboxEmailAddressesOperationCompleted == null))
-            {
+        public void DeleteMailboxEmailAddressesAsync(int itemId, int accountId, string[] emailAddresses, object userState) {
+            if ((this.DeleteMailboxEmailAddressesOperationCompleted == null)) {
                 this.DeleteMailboxEmailAddressesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteMailboxEmailAddressesOperationCompleted);
             }
             this.InvokeAsync("DeleteMailboxEmailAddresses", new object[] {
@@ -3841,72 +3519,61 @@ namespace WebsitePanel.EnterpriseServer
                         accountId,
                         emailAddresses}, this.DeleteMailboxEmailAddressesOperationCompleted, userState);
         }
-
-        private void OnDeleteMailboxEmailAddressesOperationCompleted(object arg)
-        {
-            if ((this.DeleteMailboxEmailAddressesCompleted != null))
-            {
+        
+        private void OnDeleteMailboxEmailAddressesOperationCompleted(object arg) {
+            if ((this.DeleteMailboxEmailAddressesCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.DeleteMailboxEmailAddressesCompleted(this, new DeleteMailboxEmailAddressesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxMailFlowSettings", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeMailbox GetMailboxMailFlowSettings(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxMailFlowSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeMailbox GetMailboxMailFlowSettings(int itemId, int accountId) {
             object[] results = this.Invoke("GetMailboxMailFlowSettings", new object[] {
                         itemId,
                         accountId});
             return ((ExchangeMailbox)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetMailboxMailFlowSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetMailboxMailFlowSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetMailboxMailFlowSettings", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeMailbox EndGetMailboxMailFlowSettings(System.IAsyncResult asyncResult)
-        {
+        public ExchangeMailbox EndGetMailboxMailFlowSettings(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeMailbox)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetMailboxMailFlowSettingsAsync(int itemId, int accountId)
-        {
+        public void GetMailboxMailFlowSettingsAsync(int itemId, int accountId) {
             this.GetMailboxMailFlowSettingsAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void GetMailboxMailFlowSettingsAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.GetMailboxMailFlowSettingsOperationCompleted == null))
-            {
+        public void GetMailboxMailFlowSettingsAsync(int itemId, int accountId, object userState) {
+            if ((this.GetMailboxMailFlowSettingsOperationCompleted == null)) {
                 this.GetMailboxMailFlowSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetMailboxMailFlowSettingsOperationCompleted);
             }
             this.InvokeAsync("GetMailboxMailFlowSettings", new object[] {
                         itemId,
                         accountId}, this.GetMailboxMailFlowSettingsOperationCompleted, userState);
         }
-
-        private void OnGetMailboxMailFlowSettingsOperationCompleted(object arg)
-        {
-            if ((this.GetMailboxMailFlowSettingsCompleted != null))
-            {
+        
+        private void OnGetMailboxMailFlowSettingsOperationCompleted(object arg) {
+            if ((this.GetMailboxMailFlowSettingsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetMailboxMailFlowSettingsCompleted(this, new GetMailboxMailFlowSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetMailboxMailFlowSettings", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SetMailboxMailFlowSettings(int itemId, int accountId, bool enableForwarding, string forwardingAccountName, bool forwardToBoth, string[] sendOnBehalfAccounts, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetMailboxMailFlowSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetMailboxMailFlowSettings(int itemId, int accountId, bool enableForwarding, string forwardingAccountName, bool forwardToBoth, string[] sendOnBehalfAccounts, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication) {
             object[] results = this.Invoke("SetMailboxMailFlowSettings", new object[] {
                         itemId,
                         accountId,
@@ -3919,10 +3586,9 @@ namespace WebsitePanel.EnterpriseServer
                         requireSenderAuthentication});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSetMailboxMailFlowSettings(int itemId, int accountId, bool enableForwarding, string forwardingAccountName, bool forwardToBoth, string[] sendOnBehalfAccounts, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSetMailboxMailFlowSettings(int itemId, int accountId, bool enableForwarding, string forwardingAccountName, bool forwardToBoth, string[] sendOnBehalfAccounts, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SetMailboxMailFlowSettings", new object[] {
                         itemId,
                         accountId,
@@ -3934,25 +3600,21 @@ namespace WebsitePanel.EnterpriseServer
                         rejectAccounts,
                         requireSenderAuthentication}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndSetMailboxMailFlowSettings(System.IAsyncResult asyncResult)
-        {
+        public int EndSetMailboxMailFlowSettings(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SetMailboxMailFlowSettingsAsync(int itemId, int accountId, bool enableForwarding, string forwardingAccountName, bool forwardToBoth, string[] sendOnBehalfAccounts, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication)
-        {
+        public void SetMailboxMailFlowSettingsAsync(int itemId, int accountId, bool enableForwarding, string forwardingAccountName, bool forwardToBoth, string[] sendOnBehalfAccounts, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication) {
             this.SetMailboxMailFlowSettingsAsync(itemId, accountId, enableForwarding, forwardingAccountName, forwardToBoth, sendOnBehalfAccounts, acceptAccounts, rejectAccounts, requireSenderAuthentication, null);
         }
-
+        
         /// <remarks/>
-        public void SetMailboxMailFlowSettingsAsync(int itemId, int accountId, bool enableForwarding, string forwardingAccountName, bool forwardToBoth, string[] sendOnBehalfAccounts, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication, object userState)
-        {
-            if ((this.SetMailboxMailFlowSettingsOperationCompleted == null))
-            {
+        public void SetMailboxMailFlowSettingsAsync(int itemId, int accountId, bool enableForwarding, string forwardingAccountName, bool forwardToBoth, string[] sendOnBehalfAccounts, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication, object userState) {
+            if ((this.SetMailboxMailFlowSettingsOperationCompleted == null)) {
                 this.SetMailboxMailFlowSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetMailboxMailFlowSettingsOperationCompleted);
             }
             this.InvokeAsync("SetMailboxMailFlowSettings", new object[] {
@@ -3966,75 +3628,67 @@ namespace WebsitePanel.EnterpriseServer
                         rejectAccounts,
                         requireSenderAuthentication}, this.SetMailboxMailFlowSettingsOperationCompleted, userState);
         }
-
-        private void OnSetMailboxMailFlowSettingsOperationCompleted(object arg)
-        {
-            if ((this.SetMailboxMailFlowSettingsCompleted != null))
-            {
+        
+        private void OnSetMailboxMailFlowSettingsOperationCompleted(object arg) {
+            if ((this.SetMailboxMailFlowSettingsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetMailboxMailFlowSettingsCompleted(this, new SetMailboxMailFlowSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetExchangeMailboxPlan", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SetExchangeMailboxPlan(int itemId, int accountId, int mailboxPlanId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetExchangeMailboxPlan", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetExchangeMailboxPlan(int itemId, int accountId, int mailboxPlanId, int archivePlanId) {
             object[] results = this.Invoke("SetExchangeMailboxPlan", new object[] {
                         itemId,
                         accountId,
-                        mailboxPlanId});
+                        mailboxPlanId,
+                        archivePlanId});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSetExchangeMailboxPlan(int itemId, int accountId, int mailboxPlanId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSetExchangeMailboxPlan(int itemId, int accountId, int mailboxPlanId, int archivePlanId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SetExchangeMailboxPlan", new object[] {
                         itemId,
                         accountId,
-                        mailboxPlanId}, callback, asyncState);
+                        mailboxPlanId,
+                        archivePlanId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndSetExchangeMailboxPlan(System.IAsyncResult asyncResult)
-        {
+        public int EndSetExchangeMailboxPlan(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SetExchangeMailboxPlanAsync(int itemId, int accountId, int mailboxPlanId)
-        {
-            this.SetExchangeMailboxPlanAsync(itemId, accountId, mailboxPlanId, null);
+        public void SetExchangeMailboxPlanAsync(int itemId, int accountId, int mailboxPlanId, int archivePlanId) {
+            this.SetExchangeMailboxPlanAsync(itemId, accountId, mailboxPlanId, archivePlanId, null);
         }
-
+        
         /// <remarks/>
-        public void SetExchangeMailboxPlanAsync(int itemId, int accountId, int mailboxPlanId, object userState)
-        {
-            if ((this.SetExchangeMailboxPlanOperationCompleted == null))
-            {
+        public void SetExchangeMailboxPlanAsync(int itemId, int accountId, int mailboxPlanId, int archivePlanId, object userState) {
+            if ((this.SetExchangeMailboxPlanOperationCompleted == null)) {
                 this.SetExchangeMailboxPlanOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetExchangeMailboxPlanOperationCompleted);
             }
             this.InvokeAsync("SetExchangeMailboxPlan", new object[] {
                         itemId,
                         accountId,
-                        mailboxPlanId}, this.SetExchangeMailboxPlanOperationCompleted, userState);
+                        mailboxPlanId,
+                        archivePlanId}, this.SetExchangeMailboxPlanOperationCompleted, userState);
         }
-
-        private void OnSetExchangeMailboxPlanOperationCompleted(object arg)
-        {
-            if ((this.SetExchangeMailboxPlanCompleted != null))
-            {
+        
+        private void OnSetExchangeMailboxPlanOperationCompleted(object arg) {
+            if ((this.SetExchangeMailboxPlanCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetExchangeMailboxPlanCompleted(this, new SetExchangeMailboxPlanCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxSetupInstructions", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public string GetMailboxSetupInstructions(int itemId, int accountId, bool pmm, bool emailMode, bool signup)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxSetupInstructions", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public string GetMailboxSetupInstructions(int itemId, int accountId, bool pmm, bool emailMode, bool signup) {
             object[] results = this.Invoke("GetMailboxSetupInstructions", new object[] {
                         itemId,
                         accountId,
@@ -4043,10 +3697,9 @@ namespace WebsitePanel.EnterpriseServer
                         signup});
             return ((string)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetMailboxSetupInstructions(int itemId, int accountId, bool pmm, bool emailMode, bool signup, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetMailboxSetupInstructions(int itemId, int accountId, bool pmm, bool emailMode, bool signup, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetMailboxSetupInstructions", new object[] {
                         itemId,
                         accountId,
@@ -4054,25 +3707,21 @@ namespace WebsitePanel.EnterpriseServer
                         emailMode,
                         signup}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public string EndGetMailboxSetupInstructions(System.IAsyncResult asyncResult)
-        {
+        public string EndGetMailboxSetupInstructions(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((string)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetMailboxSetupInstructionsAsync(int itemId, int accountId, bool pmm, bool emailMode, bool signup)
-        {
+        public void GetMailboxSetupInstructionsAsync(int itemId, int accountId, bool pmm, bool emailMode, bool signup) {
             this.GetMailboxSetupInstructionsAsync(itemId, accountId, pmm, emailMode, signup, null);
         }
-
+        
         /// <remarks/>
-        public void GetMailboxSetupInstructionsAsync(int itemId, int accountId, bool pmm, bool emailMode, bool signup, object userState)
-        {
-            if ((this.GetMailboxSetupInstructionsOperationCompleted == null))
-            {
+        public void GetMailboxSetupInstructionsAsync(int itemId, int accountId, bool pmm, bool emailMode, bool signup, object userState) {
+            if ((this.GetMailboxSetupInstructionsOperationCompleted == null)) {
                 this.GetMailboxSetupInstructionsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetMailboxSetupInstructionsOperationCompleted);
             }
             this.InvokeAsync("GetMailboxSetupInstructions", new object[] {
@@ -4082,20 +3731,17 @@ namespace WebsitePanel.EnterpriseServer
                         emailMode,
                         signup}, this.GetMailboxSetupInstructionsOperationCompleted, userState);
         }
-
-        private void OnGetMailboxSetupInstructionsOperationCompleted(object arg)
-        {
-            if ((this.GetMailboxSetupInstructionsCompleted != null))
-            {
+        
+        private void OnGetMailboxSetupInstructionsOperationCompleted(object arg) {
+            if ((this.GetMailboxSetupInstructionsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetMailboxSetupInstructionsCompleted(this, new GetMailboxSetupInstructionsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SendMailboxSetupInstructions", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SendMailboxSetupInstructions(int itemId, int accountId, bool signup, string to, string cc)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SendMailboxSetupInstructions", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SendMailboxSetupInstructions(int itemId, int accountId, bool signup, string to, string cc) {
             object[] results = this.Invoke("SendMailboxSetupInstructions", new object[] {
                         itemId,
                         accountId,
@@ -4104,10 +3750,9 @@ namespace WebsitePanel.EnterpriseServer
                         cc});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSendMailboxSetupInstructions(int itemId, int accountId, bool signup, string to, string cc, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSendMailboxSetupInstructions(int itemId, int accountId, bool signup, string to, string cc, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SendMailboxSetupInstructions", new object[] {
                         itemId,
                         accountId,
@@ -4115,25 +3760,21 @@ namespace WebsitePanel.EnterpriseServer
                         to,
                         cc}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndSendMailboxSetupInstructions(System.IAsyncResult asyncResult)
-        {
+        public int EndSendMailboxSetupInstructions(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SendMailboxSetupInstructionsAsync(int itemId, int accountId, bool signup, string to, string cc)
-        {
+        public void SendMailboxSetupInstructionsAsync(int itemId, int accountId, bool signup, string to, string cc) {
             this.SendMailboxSetupInstructionsAsync(itemId, accountId, signup, to, cc, null);
         }
-
+        
         /// <remarks/>
-        public void SendMailboxSetupInstructionsAsync(int itemId, int accountId, bool signup, string to, string cc, object userState)
-        {
-            if ((this.SendMailboxSetupInstructionsOperationCompleted == null))
-            {
+        public void SendMailboxSetupInstructionsAsync(int itemId, int accountId, bool signup, string to, string cc, object userState) {
+            if ((this.SendMailboxSetupInstructionsOperationCompleted == null)) {
                 this.SendMailboxSetupInstructionsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSendMailboxSetupInstructionsOperationCompleted);
             }
             this.InvokeAsync("SendMailboxSetupInstructions", new object[] {
@@ -4143,20 +3784,17 @@ namespace WebsitePanel.EnterpriseServer
                         to,
                         cc}, this.SendMailboxSetupInstructionsOperationCompleted, userState);
         }
-
-        private void OnSendMailboxSetupInstructionsOperationCompleted(object arg)
-        {
-            if ((this.SendMailboxSetupInstructionsCompleted != null))
-            {
+        
+        private void OnSendMailboxSetupInstructionsOperationCompleted(object arg) {
+            if ((this.SendMailboxSetupInstructionsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SendMailboxSetupInstructionsCompleted(this, new SendMailboxSetupInstructionsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetMailboxManagerSettings", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SetMailboxManagerSettings(int itemId, int accountId, bool pmmAllowed, MailboxManagerActions action)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetMailboxManagerSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetMailboxManagerSettings(int itemId, int accountId, bool pmmAllowed, MailboxManagerActions action) {
             object[] results = this.Invoke("SetMailboxManagerSettings", new object[] {
                         itemId,
                         accountId,
@@ -4164,35 +3802,30 @@ namespace WebsitePanel.EnterpriseServer
                         action});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSetMailboxManagerSettings(int itemId, int accountId, bool pmmAllowed, MailboxManagerActions action, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSetMailboxManagerSettings(int itemId, int accountId, bool pmmAllowed, MailboxManagerActions action, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SetMailboxManagerSettings", new object[] {
                         itemId,
                         accountId,
                         pmmAllowed,
                         action}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndSetMailboxManagerSettings(System.IAsyncResult asyncResult)
-        {
+        public int EndSetMailboxManagerSettings(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SetMailboxManagerSettingsAsync(int itemId, int accountId, bool pmmAllowed, MailboxManagerActions action)
-        {
+        public void SetMailboxManagerSettingsAsync(int itemId, int accountId, bool pmmAllowed, MailboxManagerActions action) {
             this.SetMailboxManagerSettingsAsync(itemId, accountId, pmmAllowed, action, null);
         }
-
+        
         /// <remarks/>
-        public void SetMailboxManagerSettingsAsync(int itemId, int accountId, bool pmmAllowed, MailboxManagerActions action, object userState)
-        {
-            if ((this.SetMailboxManagerSettingsOperationCompleted == null))
-            {
+        public void SetMailboxManagerSettingsAsync(int itemId, int accountId, bool pmmAllowed, MailboxManagerActions action, object userState) {
+            if ((this.SetMailboxManagerSettingsOperationCompleted == null)) {
                 this.SetMailboxManagerSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetMailboxManagerSettingsOperationCompleted);
             }
             this.InvokeAsync("SetMailboxManagerSettings", new object[] {
@@ -4201,72 +3834,61 @@ namespace WebsitePanel.EnterpriseServer
                         pmmAllowed,
                         action}, this.SetMailboxManagerSettingsOperationCompleted, userState);
         }
-
-        private void OnSetMailboxManagerSettingsOperationCompleted(object arg)
-        {
-            if ((this.SetMailboxManagerSettingsCompleted != null))
-            {
+        
+        private void OnSetMailboxManagerSettingsOperationCompleted(object arg) {
+            if ((this.SetMailboxManagerSettingsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetMailboxManagerSettingsCompleted(this, new SetMailboxManagerSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxPermissions", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeMailbox GetMailboxPermissions(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMailboxPermissions", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeMailbox GetMailboxPermissions(int itemId, int accountId) {
             object[] results = this.Invoke("GetMailboxPermissions", new object[] {
                         itemId,
                         accountId});
             return ((ExchangeMailbox)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetMailboxPermissions(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetMailboxPermissions(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetMailboxPermissions", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeMailbox EndGetMailboxPermissions(System.IAsyncResult asyncResult)
-        {
+        public ExchangeMailbox EndGetMailboxPermissions(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeMailbox)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetMailboxPermissionsAsync(int itemId, int accountId)
-        {
+        public void GetMailboxPermissionsAsync(int itemId, int accountId) {
             this.GetMailboxPermissionsAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void GetMailboxPermissionsAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.GetMailboxPermissionsOperationCompleted == null))
-            {
+        public void GetMailboxPermissionsAsync(int itemId, int accountId, object userState) {
+            if ((this.GetMailboxPermissionsOperationCompleted == null)) {
                 this.GetMailboxPermissionsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetMailboxPermissionsOperationCompleted);
             }
             this.InvokeAsync("GetMailboxPermissions", new object[] {
                         itemId,
                         accountId}, this.GetMailboxPermissionsOperationCompleted, userState);
         }
-
-        private void OnGetMailboxPermissionsOperationCompleted(object arg)
-        {
-            if ((this.GetMailboxPermissionsCompleted != null))
-            {
+        
+        private void OnGetMailboxPermissionsOperationCompleted(object arg) {
+            if ((this.GetMailboxPermissionsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetMailboxPermissionsCompleted(this, new GetMailboxPermissionsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetMailboxPermissions", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SetMailboxPermissions(int itemId, int accountId, string[] sendAsaccounts, string[] fullAccessAcounts)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetMailboxPermissions", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetMailboxPermissions(int itemId, int accountId, string[] sendAsaccounts, string[] fullAccessAcounts) {
             object[] results = this.Invoke("SetMailboxPermissions", new object[] {
                         itemId,
                         accountId,
@@ -4274,35 +3896,30 @@ namespace WebsitePanel.EnterpriseServer
                         fullAccessAcounts});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSetMailboxPermissions(int itemId, int accountId, string[] sendAsaccounts, string[] fullAccessAcounts, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSetMailboxPermissions(int itemId, int accountId, string[] sendAsaccounts, string[] fullAccessAcounts, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SetMailboxPermissions", new object[] {
                         itemId,
                         accountId,
                         sendAsaccounts,
                         fullAccessAcounts}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndSetMailboxPermissions(System.IAsyncResult asyncResult)
-        {
+        public int EndSetMailboxPermissions(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SetMailboxPermissionsAsync(int itemId, int accountId, string[] sendAsaccounts, string[] fullAccessAcounts)
-        {
+        public void SetMailboxPermissionsAsync(int itemId, int accountId, string[] sendAsaccounts, string[] fullAccessAcounts) {
             this.SetMailboxPermissionsAsync(itemId, accountId, sendAsaccounts, fullAccessAcounts, null);
         }
-
+        
         /// <remarks/>
-        public void SetMailboxPermissionsAsync(int itemId, int accountId, string[] sendAsaccounts, string[] fullAccessAcounts, object userState)
-        {
-            if ((this.SetMailboxPermissionsOperationCompleted == null))
-            {
+        public void SetMailboxPermissionsAsync(int itemId, int accountId, string[] sendAsaccounts, string[] fullAccessAcounts, object userState) {
+            if ((this.SetMailboxPermissionsOperationCompleted == null)) {
                 this.SetMailboxPermissionsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetMailboxPermissionsOperationCompleted);
             }
             this.InvokeAsync("SetMailboxPermissions", new object[] {
@@ -4311,54 +3928,46 @@ namespace WebsitePanel.EnterpriseServer
                         sendAsaccounts,
                         fullAccessAcounts}, this.SetMailboxPermissionsOperationCompleted, userState);
         }
-
-        private void OnSetMailboxPermissionsOperationCompleted(object arg)
-        {
-            if ((this.SetMailboxPermissionsCompleted != null))
-            {
+        
+        private void OnSetMailboxPermissionsOperationCompleted(object arg) {
+            if ((this.SetMailboxPermissionsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetMailboxPermissionsCompleted(this, new SetMailboxPermissionsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CreateContact", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int CreateContact(int itemId, string displayName, string email)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CreateContact", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int CreateContact(int itemId, string displayName, string email) {
             object[] results = this.Invoke("CreateContact", new object[] {
                         itemId,
                         displayName,
                         email});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginCreateContact(int itemId, string displayName, string email, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginCreateContact(int itemId, string displayName, string email, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("CreateContact", new object[] {
                         itemId,
                         displayName,
                         email}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndCreateContact(System.IAsyncResult asyncResult)
-        {
+        public int EndCreateContact(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void CreateContactAsync(int itemId, string displayName, string email)
-        {
+        public void CreateContactAsync(int itemId, string displayName, string email) {
             this.CreateContactAsync(itemId, displayName, email, null);
         }
-
+        
         /// <remarks/>
-        public void CreateContactAsync(int itemId, string displayName, string email, object userState)
-        {
-            if ((this.CreateContactOperationCompleted == null))
-            {
+        public void CreateContactAsync(int itemId, string displayName, string email, object userState) {
+            if ((this.CreateContactOperationCompleted == null)) {
                 this.CreateContactOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCreateContactOperationCompleted);
             }
             this.InvokeAsync("CreateContact", new object[] {
@@ -4366,150 +3975,131 @@ namespace WebsitePanel.EnterpriseServer
                         displayName,
                         email}, this.CreateContactOperationCompleted, userState);
         }
-
-        private void OnCreateContactOperationCompleted(object arg)
-        {
-            if ((this.CreateContactCompleted != null))
-            {
+        
+        private void OnCreateContactOperationCompleted(object arg) {
+            if ((this.CreateContactCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.CreateContactCompleted(this, new CreateContactCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteContact", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int DeleteContact(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteContact", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DeleteContact(int itemId, int accountId) {
             object[] results = this.Invoke("DeleteContact", new object[] {
                         itemId,
                         accountId});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginDeleteContact(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginDeleteContact(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("DeleteContact", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndDeleteContact(System.IAsyncResult asyncResult)
-        {
+        public int EndDeleteContact(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void DeleteContactAsync(int itemId, int accountId)
-        {
+        public void DeleteContactAsync(int itemId, int accountId) {
             this.DeleteContactAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void DeleteContactAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.DeleteContactOperationCompleted == null))
-            {
+        public void DeleteContactAsync(int itemId, int accountId, object userState) {
+            if ((this.DeleteContactOperationCompleted == null)) {
                 this.DeleteContactOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteContactOperationCompleted);
             }
             this.InvokeAsync("DeleteContact", new object[] {
                         itemId,
                         accountId}, this.DeleteContactOperationCompleted, userState);
         }
-
-        private void OnDeleteContactOperationCompleted(object arg)
-        {
-            if ((this.DeleteContactCompleted != null))
-            {
+        
+        private void OnDeleteContactOperationCompleted(object arg) {
+            if ((this.DeleteContactCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.DeleteContactCompleted(this, new DeleteContactCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetContactGeneralSettings", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeContact GetContactGeneralSettings(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetContactGeneralSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeContact GetContactGeneralSettings(int itemId, int accountId) {
             object[] results = this.Invoke("GetContactGeneralSettings", new object[] {
                         itemId,
                         accountId});
             return ((ExchangeContact)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetContactGeneralSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetContactGeneralSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetContactGeneralSettings", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeContact EndGetContactGeneralSettings(System.IAsyncResult asyncResult)
-        {
+        public ExchangeContact EndGetContactGeneralSettings(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeContact)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetContactGeneralSettingsAsync(int itemId, int accountId)
-        {
+        public void GetContactGeneralSettingsAsync(int itemId, int accountId) {
             this.GetContactGeneralSettingsAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void GetContactGeneralSettingsAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.GetContactGeneralSettingsOperationCompleted == null))
-            {
+        public void GetContactGeneralSettingsAsync(int itemId, int accountId, object userState) {
+            if ((this.GetContactGeneralSettingsOperationCompleted == null)) {
                 this.GetContactGeneralSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetContactGeneralSettingsOperationCompleted);
             }
             this.InvokeAsync("GetContactGeneralSettings", new object[] {
                         itemId,
                         accountId}, this.GetContactGeneralSettingsOperationCompleted, userState);
         }
-
-        private void OnGetContactGeneralSettingsOperationCompleted(object arg)
-        {
-            if ((this.GetContactGeneralSettingsCompleted != null))
-            {
+        
+        private void OnGetContactGeneralSettingsOperationCompleted(object arg) {
+            if ((this.GetContactGeneralSettingsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetContactGeneralSettingsCompleted(this, new GetContactGeneralSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetContactGeneralSettings", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetContactGeneralSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
         public int SetContactGeneralSettings(
-                    int itemId,
-                    int accountId,
-                    string displayName,
-                    string emailAddress,
-                    bool hideAddressBook,
-                    string firstName,
-                    string initials,
-                    string lastName,
-                    string address,
-                    string city,
-                    string state,
-                    string zip,
-                    string country,
-                    string jobTitle,
-                    string company,
-                    string department,
-                    string office,
-                    string managerAccountName,
-                    string businessPhone,
-                    string fax,
-                    string homePhone,
-                    string mobilePhone,
-                    string pager,
-                    string webPage,
-                    string notes,
-                    int useMapiRichTextFormat)
-        {
+                    int itemId, 
+                    int accountId, 
+                    string displayName, 
+                    string emailAddress, 
+                    bool hideAddressBook, 
+                    string firstName, 
+                    string initials, 
+                    string lastName, 
+                    string address, 
+                    string city, 
+                    string state, 
+                    string zip, 
+                    string country, 
+                    string jobTitle, 
+                    string company, 
+                    string department, 
+                    string office, 
+                    string managerAccountName, 
+                    string businessPhone, 
+                    string fax, 
+                    string homePhone, 
+                    string mobilePhone, 
+                    string pager, 
+                    string webPage, 
+                    string notes, 
+                    int useMapiRichTextFormat) {
             object[] results = this.Invoke("SetContactGeneralSettings", new object[] {
                         itemId,
                         accountId,
@@ -4539,38 +4129,37 @@ namespace WebsitePanel.EnterpriseServer
                         useMapiRichTextFormat});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
         public System.IAsyncResult BeginSetContactGeneralSettings(
-                    int itemId,
-                    int accountId,
-                    string displayName,
-                    string emailAddress,
-                    bool hideAddressBook,
-                    string firstName,
-                    string initials,
-                    string lastName,
-                    string address,
-                    string city,
-                    string state,
-                    string zip,
-                    string country,
-                    string jobTitle,
-                    string company,
-                    string department,
-                    string office,
-                    string managerAccountName,
-                    string businessPhone,
-                    string fax,
-                    string homePhone,
-                    string mobilePhone,
-                    string pager,
-                    string webPage,
-                    string notes,
-                    int useMapiRichTextFormat,
-                    System.AsyncCallback callback,
-                    object asyncState)
-        {
+                    int itemId, 
+                    int accountId, 
+                    string displayName, 
+                    string emailAddress, 
+                    bool hideAddressBook, 
+                    string firstName, 
+                    string initials, 
+                    string lastName, 
+                    string address, 
+                    string city, 
+                    string state, 
+                    string zip, 
+                    string country, 
+                    string jobTitle, 
+                    string company, 
+                    string department, 
+                    string office, 
+                    string managerAccountName, 
+                    string businessPhone, 
+                    string fax, 
+                    string homePhone, 
+                    string mobilePhone, 
+                    string pager, 
+                    string webPage, 
+                    string notes, 
+                    int useMapiRichTextFormat, 
+                    System.AsyncCallback callback, 
+                    object asyncState) {
             return this.BeginInvoke("SetContactGeneralSettings", new object[] {
                         itemId,
                         accountId,
@@ -4599,78 +4188,74 @@ namespace WebsitePanel.EnterpriseServer
                         notes,
                         useMapiRichTextFormat}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndSetContactGeneralSettings(System.IAsyncResult asyncResult)
-        {
+        public int EndSetContactGeneralSettings(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
         public void SetContactGeneralSettingsAsync(
-                    int itemId,
-                    int accountId,
-                    string displayName,
-                    string emailAddress,
-                    bool hideAddressBook,
-                    string firstName,
-                    string initials,
-                    string lastName,
-                    string address,
-                    string city,
-                    string state,
-                    string zip,
-                    string country,
-                    string jobTitle,
-                    string company,
-                    string department,
-                    string office,
-                    string managerAccountName,
-                    string businessPhone,
-                    string fax,
-                    string homePhone,
-                    string mobilePhone,
-                    string pager,
-                    string webPage,
-                    string notes,
-                    int useMapiRichTextFormat)
-        {
+                    int itemId, 
+                    int accountId, 
+                    string displayName, 
+                    string emailAddress, 
+                    bool hideAddressBook, 
+                    string firstName, 
+                    string initials, 
+                    string lastName, 
+                    string address, 
+                    string city, 
+                    string state, 
+                    string zip, 
+                    string country, 
+                    string jobTitle, 
+                    string company, 
+                    string department, 
+                    string office, 
+                    string managerAccountName, 
+                    string businessPhone, 
+                    string fax, 
+                    string homePhone, 
+                    string mobilePhone, 
+                    string pager, 
+                    string webPage, 
+                    string notes, 
+                    int useMapiRichTextFormat) {
             this.SetContactGeneralSettingsAsync(itemId, accountId, displayName, emailAddress, hideAddressBook, firstName, initials, lastName, address, city, state, zip, country, jobTitle, company, department, office, managerAccountName, businessPhone, fax, homePhone, mobilePhone, pager, webPage, notes, useMapiRichTextFormat, null);
         }
-
+        
         /// <remarks/>
         public void SetContactGeneralSettingsAsync(
-                    int itemId,
-                    int accountId,
-                    string displayName,
-                    string emailAddress,
-                    bool hideAddressBook,
-                    string firstName,
-                    string initials,
-                    string lastName,
-                    string address,
-                    string city,
-                    string state,
-                    string zip,
-                    string country,
-                    string jobTitle,
-                    string company,
-                    string department,
-                    string office,
-                    string managerAccountName,
-                    string businessPhone,
-                    string fax,
-                    string homePhone,
-                    string mobilePhone,
-                    string pager,
-                    string webPage,
-                    string notes,
-                    int useMapiRichTextFormat,
-                    object userState)
-        {
-            if ((this.SetContactGeneralSettingsOperationCompleted == null))
-            {
+                    int itemId, 
+                    int accountId, 
+                    string displayName, 
+                    string emailAddress, 
+                    bool hideAddressBook, 
+                    string firstName, 
+                    string initials, 
+                    string lastName, 
+                    string address, 
+                    string city, 
+                    string state, 
+                    string zip, 
+                    string country, 
+                    string jobTitle, 
+                    string company, 
+                    string department, 
+                    string office, 
+                    string managerAccountName, 
+                    string businessPhone, 
+                    string fax, 
+                    string homePhone, 
+                    string mobilePhone, 
+                    string pager, 
+                    string webPage, 
+                    string notes, 
+                    int useMapiRichTextFormat, 
+                    object userState) {
+            if ((this.SetContactGeneralSettingsOperationCompleted == null)) {
                 this.SetContactGeneralSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetContactGeneralSettingsOperationCompleted);
             }
             this.InvokeAsync("SetContactGeneralSettings", new object[] {
@@ -4701,72 +4286,61 @@ namespace WebsitePanel.EnterpriseServer
                         notes,
                         useMapiRichTextFormat}, this.SetContactGeneralSettingsOperationCompleted, userState);
         }
-
-        private void OnSetContactGeneralSettingsOperationCompleted(object arg)
-        {
-            if ((this.SetContactGeneralSettingsCompleted != null))
-            {
+        
+        private void OnSetContactGeneralSettingsOperationCompleted(object arg) {
+            if ((this.SetContactGeneralSettingsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetContactGeneralSettingsCompleted(this, new SetContactGeneralSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetContactMailFlowSettings", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeContact GetContactMailFlowSettings(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetContactMailFlowSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeContact GetContactMailFlowSettings(int itemId, int accountId) {
             object[] results = this.Invoke("GetContactMailFlowSettings", new object[] {
                         itemId,
                         accountId});
             return ((ExchangeContact)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetContactMailFlowSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetContactMailFlowSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetContactMailFlowSettings", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeContact EndGetContactMailFlowSettings(System.IAsyncResult asyncResult)
-        {
+        public ExchangeContact EndGetContactMailFlowSettings(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeContact)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetContactMailFlowSettingsAsync(int itemId, int accountId)
-        {
+        public void GetContactMailFlowSettingsAsync(int itemId, int accountId) {
             this.GetContactMailFlowSettingsAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void GetContactMailFlowSettingsAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.GetContactMailFlowSettingsOperationCompleted == null))
-            {
+        public void GetContactMailFlowSettingsAsync(int itemId, int accountId, object userState) {
+            if ((this.GetContactMailFlowSettingsOperationCompleted == null)) {
                 this.GetContactMailFlowSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetContactMailFlowSettingsOperationCompleted);
             }
             this.InvokeAsync("GetContactMailFlowSettings", new object[] {
                         itemId,
                         accountId}, this.GetContactMailFlowSettingsOperationCompleted, userState);
         }
-
-        private void OnGetContactMailFlowSettingsOperationCompleted(object arg)
-        {
-            if ((this.GetContactMailFlowSettingsCompleted != null))
-            {
+        
+        private void OnGetContactMailFlowSettingsOperationCompleted(object arg) {
+            if ((this.GetContactMailFlowSettingsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetContactMailFlowSettingsCompleted(this, new GetContactMailFlowSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetContactMailFlowSettings", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SetContactMailFlowSettings(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetContactMailFlowSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetContactMailFlowSettings(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication) {
             object[] results = this.Invoke("SetContactMailFlowSettings", new object[] {
                         itemId,
                         accountId,
@@ -4775,10 +4349,9 @@ namespace WebsitePanel.EnterpriseServer
                         requireSenderAuthentication});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSetContactMailFlowSettings(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSetContactMailFlowSettings(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SetContactMailFlowSettings", new object[] {
                         itemId,
                         accountId,
@@ -4786,25 +4359,21 @@ namespace WebsitePanel.EnterpriseServer
                         rejectAccounts,
                         requireSenderAuthentication}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndSetContactMailFlowSettings(System.IAsyncResult asyncResult)
-        {
+        public int EndSetContactMailFlowSettings(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SetContactMailFlowSettingsAsync(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication)
-        {
+        public void SetContactMailFlowSettingsAsync(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication) {
             this.SetContactMailFlowSettingsAsync(itemId, accountId, acceptAccounts, rejectAccounts, requireSenderAuthentication, null);
         }
-
+        
         /// <remarks/>
-        public void SetContactMailFlowSettingsAsync(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication, object userState)
-        {
-            if ((this.SetContactMailFlowSettingsOperationCompleted == null))
-            {
+        public void SetContactMailFlowSettingsAsync(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication, object userState) {
+            if ((this.SetContactMailFlowSettingsOperationCompleted == null)) {
                 this.SetContactMailFlowSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetContactMailFlowSettingsOperationCompleted);
             }
             this.InvokeAsync("SetContactMailFlowSettings", new object[] {
@@ -4814,20 +4383,17 @@ namespace WebsitePanel.EnterpriseServer
                         rejectAccounts,
                         requireSenderAuthentication}, this.SetContactMailFlowSettingsOperationCompleted, userState);
         }
-
-        private void OnSetContactMailFlowSettingsOperationCompleted(object arg)
-        {
-            if ((this.SetContactMailFlowSettingsCompleted != null))
-            {
+        
+        private void OnSetContactMailFlowSettingsOperationCompleted(object arg) {
+            if ((this.SetContactMailFlowSettingsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetContactMailFlowSettingsCompleted(this, new SetContactMailFlowSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CreateDistributionList", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int CreateDistributionList(int itemId, string displayName, string name, string domain, int managerId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CreateDistributionList", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int CreateDistributionList(int itemId, string displayName, string name, string domain, int managerId) {
             object[] results = this.Invoke("CreateDistributionList", new object[] {
                         itemId,
                         displayName,
@@ -4836,10 +4402,9 @@ namespace WebsitePanel.EnterpriseServer
                         managerId});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginCreateDistributionList(int itemId, string displayName, string name, string domain, int managerId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginCreateDistributionList(int itemId, string displayName, string name, string domain, int managerId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("CreateDistributionList", new object[] {
                         itemId,
                         displayName,
@@ -4847,25 +4412,21 @@ namespace WebsitePanel.EnterpriseServer
                         domain,
                         managerId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndCreateDistributionList(System.IAsyncResult asyncResult)
-        {
+        public int EndCreateDistributionList(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void CreateDistributionListAsync(int itemId, string displayName, string name, string domain, int managerId)
-        {
+        public void CreateDistributionListAsync(int itemId, string displayName, string name, string domain, int managerId) {
             this.CreateDistributionListAsync(itemId, displayName, name, domain, managerId, null);
         }
-
+        
         /// <remarks/>
-        public void CreateDistributionListAsync(int itemId, string displayName, string name, string domain, int managerId, object userState)
-        {
-            if ((this.CreateDistributionListOperationCompleted == null))
-            {
+        public void CreateDistributionListAsync(int itemId, string displayName, string name, string domain, int managerId, object userState) {
+            if ((this.CreateDistributionListOperationCompleted == null)) {
                 this.CreateDistributionListOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCreateDistributionListOperationCompleted);
             }
             this.InvokeAsync("CreateDistributionList", new object[] {
@@ -4875,124 +4436,105 @@ namespace WebsitePanel.EnterpriseServer
                         domain,
                         managerId}, this.CreateDistributionListOperationCompleted, userState);
         }
-
-        private void OnCreateDistributionListOperationCompleted(object arg)
-        {
-            if ((this.CreateDistributionListCompleted != null))
-            {
+        
+        private void OnCreateDistributionListOperationCompleted(object arg) {
+            if ((this.CreateDistributionListCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.CreateDistributionListCompleted(this, new CreateDistributionListCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteDistributionList", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int DeleteDistributionList(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteDistributionList", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DeleteDistributionList(int itemId, int accountId) {
             object[] results = this.Invoke("DeleteDistributionList", new object[] {
                         itemId,
                         accountId});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginDeleteDistributionList(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginDeleteDistributionList(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("DeleteDistributionList", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndDeleteDistributionList(System.IAsyncResult asyncResult)
-        {
+        public int EndDeleteDistributionList(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void DeleteDistributionListAsync(int itemId, int accountId)
-        {
+        public void DeleteDistributionListAsync(int itemId, int accountId) {
             this.DeleteDistributionListAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void DeleteDistributionListAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.DeleteDistributionListOperationCompleted == null))
-            {
+        public void DeleteDistributionListAsync(int itemId, int accountId, object userState) {
+            if ((this.DeleteDistributionListOperationCompleted == null)) {
                 this.DeleteDistributionListOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteDistributionListOperationCompleted);
             }
             this.InvokeAsync("DeleteDistributionList", new object[] {
                         itemId,
                         accountId}, this.DeleteDistributionListOperationCompleted, userState);
         }
-
-        private void OnDeleteDistributionListOperationCompleted(object arg)
-        {
-            if ((this.DeleteDistributionListCompleted != null))
-            {
+        
+        private void OnDeleteDistributionListOperationCompleted(object arg) {
+            if ((this.DeleteDistributionListCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.DeleteDistributionListCompleted(this, new DeleteDistributionListCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetDistributionListGeneralSettings", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeDistributionList GetDistributionListGeneralSettings(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetDistributionListGeneralSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeDistributionList GetDistributionListGeneralSettings(int itemId, int accountId) {
             object[] results = this.Invoke("GetDistributionListGeneralSettings", new object[] {
                         itemId,
                         accountId});
             return ((ExchangeDistributionList)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetDistributionListGeneralSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetDistributionListGeneralSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetDistributionListGeneralSettings", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeDistributionList EndGetDistributionListGeneralSettings(System.IAsyncResult asyncResult)
-        {
+        public ExchangeDistributionList EndGetDistributionListGeneralSettings(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeDistributionList)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetDistributionListGeneralSettingsAsync(int itemId, int accountId)
-        {
+        public void GetDistributionListGeneralSettingsAsync(int itemId, int accountId) {
             this.GetDistributionListGeneralSettingsAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void GetDistributionListGeneralSettingsAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.GetDistributionListGeneralSettingsOperationCompleted == null))
-            {
+        public void GetDistributionListGeneralSettingsAsync(int itemId, int accountId, object userState) {
+            if ((this.GetDistributionListGeneralSettingsOperationCompleted == null)) {
                 this.GetDistributionListGeneralSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetDistributionListGeneralSettingsOperationCompleted);
             }
             this.InvokeAsync("GetDistributionListGeneralSettings", new object[] {
                         itemId,
                         accountId}, this.GetDistributionListGeneralSettingsOperationCompleted, userState);
         }
-
-        private void OnGetDistributionListGeneralSettingsOperationCompleted(object arg)
-        {
-            if ((this.GetDistributionListGeneralSettingsCompleted != null))
-            {
+        
+        private void OnGetDistributionListGeneralSettingsOperationCompleted(object arg) {
+            if ((this.GetDistributionListGeneralSettingsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetDistributionListGeneralSettingsCompleted(this, new GetDistributionListGeneralSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetDistributionListGeneralSettings", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SetDistributionListGeneralSettings(int itemId, int accountId, string displayName, bool hideAddressBook, string managerAccount, string[] memberAccounts, string notes)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetDistributionListGeneralSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetDistributionListGeneralSettings(int itemId, int accountId, string displayName, bool hideAddressBook, string managerAccount, string[] memberAccounts, string notes) {
             object[] results = this.Invoke("SetDistributionListGeneralSettings", new object[] {
                         itemId,
                         accountId,
@@ -5003,10 +4545,9 @@ namespace WebsitePanel.EnterpriseServer
                         notes});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSetDistributionListGeneralSettings(int itemId, int accountId, string displayName, bool hideAddressBook, string managerAccount, string[] memberAccounts, string notes, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSetDistributionListGeneralSettings(int itemId, int accountId, string displayName, bool hideAddressBook, string managerAccount, string[] memberAccounts, string notes, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SetDistributionListGeneralSettings", new object[] {
                         itemId,
                         accountId,
@@ -5016,25 +4557,21 @@ namespace WebsitePanel.EnterpriseServer
                         memberAccounts,
                         notes}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndSetDistributionListGeneralSettings(System.IAsyncResult asyncResult)
-        {
+        public int EndSetDistributionListGeneralSettings(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SetDistributionListGeneralSettingsAsync(int itemId, int accountId, string displayName, bool hideAddressBook, string managerAccount, string[] memberAccounts, string notes)
-        {
+        public void SetDistributionListGeneralSettingsAsync(int itemId, int accountId, string displayName, bool hideAddressBook, string managerAccount, string[] memberAccounts, string notes) {
             this.SetDistributionListGeneralSettingsAsync(itemId, accountId, displayName, hideAddressBook, managerAccount, memberAccounts, notes, null);
         }
-
+        
         /// <remarks/>
-        public void SetDistributionListGeneralSettingsAsync(int itemId, int accountId, string displayName, bool hideAddressBook, string managerAccount, string[] memberAccounts, string notes, object userState)
-        {
-            if ((this.SetDistributionListGeneralSettingsOperationCompleted == null))
-            {
+        public void SetDistributionListGeneralSettingsAsync(int itemId, int accountId, string displayName, bool hideAddressBook, string managerAccount, string[] memberAccounts, string notes, object userState) {
+            if ((this.SetDistributionListGeneralSettingsOperationCompleted == null)) {
                 this.SetDistributionListGeneralSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetDistributionListGeneralSettingsOperationCompleted);
             }
             this.InvokeAsync("SetDistributionListGeneralSettings", new object[] {
@@ -5046,72 +4583,61 @@ namespace WebsitePanel.EnterpriseServer
                         memberAccounts,
                         notes}, this.SetDistributionListGeneralSettingsOperationCompleted, userState);
         }
-
-        private void OnSetDistributionListGeneralSettingsOperationCompleted(object arg)
-        {
-            if ((this.SetDistributionListGeneralSettingsCompleted != null))
-            {
+        
+        private void OnSetDistributionListGeneralSettingsOperationCompleted(object arg) {
+            if ((this.SetDistributionListGeneralSettingsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetDistributionListGeneralSettingsCompleted(this, new SetDistributionListGeneralSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetDistributionListMailFlowSettings", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeDistributionList GetDistributionListMailFlowSettings(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetDistributionListMailFlowSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeDistributionList GetDistributionListMailFlowSettings(int itemId, int accountId) {
             object[] results = this.Invoke("GetDistributionListMailFlowSettings", new object[] {
                         itemId,
                         accountId});
             return ((ExchangeDistributionList)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetDistributionListMailFlowSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetDistributionListMailFlowSettings(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetDistributionListMailFlowSettings", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeDistributionList EndGetDistributionListMailFlowSettings(System.IAsyncResult asyncResult)
-        {
+        public ExchangeDistributionList EndGetDistributionListMailFlowSettings(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeDistributionList)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetDistributionListMailFlowSettingsAsync(int itemId, int accountId)
-        {
+        public void GetDistributionListMailFlowSettingsAsync(int itemId, int accountId) {
             this.GetDistributionListMailFlowSettingsAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void GetDistributionListMailFlowSettingsAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.GetDistributionListMailFlowSettingsOperationCompleted == null))
-            {
+        public void GetDistributionListMailFlowSettingsAsync(int itemId, int accountId, object userState) {
+            if ((this.GetDistributionListMailFlowSettingsOperationCompleted == null)) {
                 this.GetDistributionListMailFlowSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetDistributionListMailFlowSettingsOperationCompleted);
             }
             this.InvokeAsync("GetDistributionListMailFlowSettings", new object[] {
                         itemId,
                         accountId}, this.GetDistributionListMailFlowSettingsOperationCompleted, userState);
         }
-
-        private void OnGetDistributionListMailFlowSettingsOperationCompleted(object arg)
-        {
-            if ((this.GetDistributionListMailFlowSettingsCompleted != null))
-            {
+        
+        private void OnGetDistributionListMailFlowSettingsOperationCompleted(object arg) {
+            if ((this.GetDistributionListMailFlowSettingsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetDistributionListMailFlowSettingsCompleted(this, new GetDistributionListMailFlowSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetDistributionListMailFlowSettings", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SetDistributionListMailFlowSettings(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetDistributionListMailFlowSettings", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetDistributionListMailFlowSettings(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication) {
             object[] results = this.Invoke("SetDistributionListMailFlowSettings", new object[] {
                         itemId,
                         accountId,
@@ -5120,10 +4646,9 @@ namespace WebsitePanel.EnterpriseServer
                         requireSenderAuthentication});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSetDistributionListMailFlowSettings(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSetDistributionListMailFlowSettings(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SetDistributionListMailFlowSettings", new object[] {
                         itemId,
                         accountId,
@@ -5131,25 +4656,21 @@ namespace WebsitePanel.EnterpriseServer
                         rejectAccounts,
                         requireSenderAuthentication}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndSetDistributionListMailFlowSettings(System.IAsyncResult asyncResult)
-        {
+        public int EndSetDistributionListMailFlowSettings(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SetDistributionListMailFlowSettingsAsync(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication)
-        {
+        public void SetDistributionListMailFlowSettingsAsync(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication) {
             this.SetDistributionListMailFlowSettingsAsync(itemId, accountId, acceptAccounts, rejectAccounts, requireSenderAuthentication, null);
         }
-
+        
         /// <remarks/>
-        public void SetDistributionListMailFlowSettingsAsync(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication, object userState)
-        {
-            if ((this.SetDistributionListMailFlowSettingsOperationCompleted == null))
-            {
+        public void SetDistributionListMailFlowSettingsAsync(int itemId, int accountId, string[] acceptAccounts, string[] rejectAccounts, bool requireSenderAuthentication, object userState) {
+            if ((this.SetDistributionListMailFlowSettingsOperationCompleted == null)) {
                 this.SetDistributionListMailFlowSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetDistributionListMailFlowSettingsOperationCompleted);
             }
             this.InvokeAsync("SetDistributionListMailFlowSettings", new object[] {
@@ -5159,106 +4680,90 @@ namespace WebsitePanel.EnterpriseServer
                         rejectAccounts,
                         requireSenderAuthentication}, this.SetDistributionListMailFlowSettingsOperationCompleted, userState);
         }
-
-        private void OnSetDistributionListMailFlowSettingsOperationCompleted(object arg)
-        {
-            if ((this.SetDistributionListMailFlowSettingsCompleted != null))
-            {
+        
+        private void OnSetDistributionListMailFlowSettingsOperationCompleted(object arg) {
+            if ((this.SetDistributionListMailFlowSettingsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetDistributionListMailFlowSettingsCompleted(this, new SetDistributionListMailFlowSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetDistributionListEmailAddresses", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeEmailAddress[] GetDistributionListEmailAddresses(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetDistributionListEmailAddresses", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeEmailAddress[] GetDistributionListEmailAddresses(int itemId, int accountId) {
             object[] results = this.Invoke("GetDistributionListEmailAddresses", new object[] {
                         itemId,
                         accountId});
             return ((ExchangeEmailAddress[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetDistributionListEmailAddresses(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetDistributionListEmailAddresses(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetDistributionListEmailAddresses", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeEmailAddress[] EndGetDistributionListEmailAddresses(System.IAsyncResult asyncResult)
-        {
+        public ExchangeEmailAddress[] EndGetDistributionListEmailAddresses(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeEmailAddress[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetDistributionListEmailAddressesAsync(int itemId, int accountId)
-        {
+        public void GetDistributionListEmailAddressesAsync(int itemId, int accountId) {
             this.GetDistributionListEmailAddressesAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void GetDistributionListEmailAddressesAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.GetDistributionListEmailAddressesOperationCompleted == null))
-            {
+        public void GetDistributionListEmailAddressesAsync(int itemId, int accountId, object userState) {
+            if ((this.GetDistributionListEmailAddressesOperationCompleted == null)) {
                 this.GetDistributionListEmailAddressesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetDistributionListEmailAddressesOperationCompleted);
             }
             this.InvokeAsync("GetDistributionListEmailAddresses", new object[] {
                         itemId,
                         accountId}, this.GetDistributionListEmailAddressesOperationCompleted, userState);
         }
-
-        private void OnGetDistributionListEmailAddressesOperationCompleted(object arg)
-        {
-            if ((this.GetDistributionListEmailAddressesCompleted != null))
-            {
+        
+        private void OnGetDistributionListEmailAddressesOperationCompleted(object arg) {
+            if ((this.GetDistributionListEmailAddressesCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetDistributionListEmailAddressesCompleted(this, new GetDistributionListEmailAddressesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddDistributionListEmailAddress", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int AddDistributionListEmailAddress(int itemId, int accountId, string emailAddress)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddDistributionListEmailAddress", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int AddDistributionListEmailAddress(int itemId, int accountId, string emailAddress) {
             object[] results = this.Invoke("AddDistributionListEmailAddress", new object[] {
                         itemId,
                         accountId,
                         emailAddress});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginAddDistributionListEmailAddress(int itemId, int accountId, string emailAddress, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginAddDistributionListEmailAddress(int itemId, int accountId, string emailAddress, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("AddDistributionListEmailAddress", new object[] {
                         itemId,
                         accountId,
                         emailAddress}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndAddDistributionListEmailAddress(System.IAsyncResult asyncResult)
-        {
+        public int EndAddDistributionListEmailAddress(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void AddDistributionListEmailAddressAsync(int itemId, int accountId, string emailAddress)
-        {
+        public void AddDistributionListEmailAddressAsync(int itemId, int accountId, string emailAddress) {
             this.AddDistributionListEmailAddressAsync(itemId, accountId, emailAddress, null);
         }
-
+        
         /// <remarks/>
-        public void AddDistributionListEmailAddressAsync(int itemId, int accountId, string emailAddress, object userState)
-        {
-            if ((this.AddDistributionListEmailAddressOperationCompleted == null))
-            {
+        public void AddDistributionListEmailAddressAsync(int itemId, int accountId, string emailAddress, object userState) {
+            if ((this.AddDistributionListEmailAddressOperationCompleted == null)) {
                 this.AddDistributionListEmailAddressOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddDistributionListEmailAddressOperationCompleted);
             }
             this.InvokeAsync("AddDistributionListEmailAddress", new object[] {
@@ -5266,55 +4771,47 @@ namespace WebsitePanel.EnterpriseServer
                         accountId,
                         emailAddress}, this.AddDistributionListEmailAddressOperationCompleted, userState);
         }
-
-        private void OnAddDistributionListEmailAddressOperationCompleted(object arg)
-        {
-            if ((this.AddDistributionListEmailAddressCompleted != null))
-            {
+        
+        private void OnAddDistributionListEmailAddressOperationCompleted(object arg) {
+            if ((this.AddDistributionListEmailAddressCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.AddDistributionListEmailAddressCompleted(this, new AddDistributionListEmailAddressCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetDistributionListPrimaryEmailAddre" +
-            "ss", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int SetDistributionListPrimaryEmailAddress(int itemId, int accountId, string emailAddress)
-        {
+            "ss", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int SetDistributionListPrimaryEmailAddress(int itemId, int accountId, string emailAddress) {
             object[] results = this.Invoke("SetDistributionListPrimaryEmailAddress", new object[] {
                         itemId,
                         accountId,
                         emailAddress});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSetDistributionListPrimaryEmailAddress(int itemId, int accountId, string emailAddress, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSetDistributionListPrimaryEmailAddress(int itemId, int accountId, string emailAddress, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SetDistributionListPrimaryEmailAddress", new object[] {
                         itemId,
                         accountId,
                         emailAddress}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndSetDistributionListPrimaryEmailAddress(System.IAsyncResult asyncResult)
-        {
+        public int EndSetDistributionListPrimaryEmailAddress(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SetDistributionListPrimaryEmailAddressAsync(int itemId, int accountId, string emailAddress)
-        {
+        public void SetDistributionListPrimaryEmailAddressAsync(int itemId, int accountId, string emailAddress) {
             this.SetDistributionListPrimaryEmailAddressAsync(itemId, accountId, emailAddress, null);
         }
-
+        
         /// <remarks/>
-        public void SetDistributionListPrimaryEmailAddressAsync(int itemId, int accountId, string emailAddress, object userState)
-        {
-            if ((this.SetDistributionListPrimaryEmailAddressOperationCompleted == null))
-            {
+        public void SetDistributionListPrimaryEmailAddressAsync(int itemId, int accountId, string emailAddress, object userState) {
+            if ((this.SetDistributionListPrimaryEmailAddressOperationCompleted == null)) {
                 this.SetDistributionListPrimaryEmailAddressOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetDistributionListPrimaryEmailAddressOperationCompleted);
             }
             this.InvokeAsync("SetDistributionListPrimaryEmailAddress", new object[] {
@@ -5322,55 +4819,47 @@ namespace WebsitePanel.EnterpriseServer
                         accountId,
                         emailAddress}, this.SetDistributionListPrimaryEmailAddressOperationCompleted, userState);
         }
-
-        private void OnSetDistributionListPrimaryEmailAddressOperationCompleted(object arg)
-        {
-            if ((this.SetDistributionListPrimaryEmailAddressCompleted != null))
-            {
+        
+        private void OnSetDistributionListPrimaryEmailAddressOperationCompleted(object arg) {
+            if ((this.SetDistributionListPrimaryEmailAddressCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetDistributionListPrimaryEmailAddressCompleted(this, new SetDistributionListPrimaryEmailAddressCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteDistributionListEmailAddresses" +
-            "", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int DeleteDistributionListEmailAddresses(int itemId, int accountId, string[] emailAddresses)
-        {
+            "", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DeleteDistributionListEmailAddresses(int itemId, int accountId, string[] emailAddresses) {
             object[] results = this.Invoke("DeleteDistributionListEmailAddresses", new object[] {
                         itemId,
                         accountId,
                         emailAddresses});
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginDeleteDistributionListEmailAddresses(int itemId, int accountId, string[] emailAddresses, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginDeleteDistributionListEmailAddresses(int itemId, int accountId, string[] emailAddresses, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("DeleteDistributionListEmailAddresses", new object[] {
                         itemId,
                         accountId,
                         emailAddresses}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public int EndDeleteDistributionListEmailAddresses(System.IAsyncResult asyncResult)
-        {
+        public int EndDeleteDistributionListEmailAddresses(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((int)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void DeleteDistributionListEmailAddressesAsync(int itemId, int accountId, string[] emailAddresses)
-        {
+        public void DeleteDistributionListEmailAddressesAsync(int itemId, int accountId, string[] emailAddresses) {
             this.DeleteDistributionListEmailAddressesAsync(itemId, accountId, emailAddresses, null);
         }
-
+        
         /// <remarks/>
-        public void DeleteDistributionListEmailAddressesAsync(int itemId, int accountId, string[] emailAddresses, object userState)
-        {
-            if ((this.DeleteDistributionListEmailAddressesOperationCompleted == null))
-            {
+        public void DeleteDistributionListEmailAddressesAsync(int itemId, int accountId, string[] emailAddresses, object userState) {
+            if ((this.DeleteDistributionListEmailAddressesOperationCompleted == null)) {
                 this.DeleteDistributionListEmailAddressesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteDistributionListEmailAddressesOperationCompleted);
             }
             this.InvokeAsync("DeleteDistributionListEmailAddresses", new object[] {
@@ -5378,20 +4867,17 @@ namespace WebsitePanel.EnterpriseServer
                         accountId,
                         emailAddresses}, this.DeleteDistributionListEmailAddressesOperationCompleted, userState);
         }
-
-        private void OnDeleteDistributionListEmailAddressesOperationCompleted(object arg)
-        {
-            if ((this.DeleteDistributionListEmailAddressesCompleted != null))
-            {
+        
+        private void OnDeleteDistributionListEmailAddressesOperationCompleted(object arg) {
+            if ((this.DeleteDistributionListEmailAddressesCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.DeleteDistributionListEmailAddressesCompleted(this, new DeleteDistributionListEmailAddressesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetDistributionListPermissions", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ResultObject SetDistributionListPermissions(int itemId, int accountId, string[] sendAsAccounts, string[] sendOnBehalfAccounts)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetDistributionListPermissions", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ResultObject SetDistributionListPermissions(int itemId, int accountId, string[] sendAsAccounts, string[] sendOnBehalfAccounts) {
             object[] results = this.Invoke("SetDistributionListPermissions", new object[] {
                         itemId,
                         accountId,
@@ -5399,35 +4885,30 @@ namespace WebsitePanel.EnterpriseServer
                         sendOnBehalfAccounts});
             return ((ResultObject)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginSetDistributionListPermissions(int itemId, int accountId, string[] sendAsAccounts, string[] sendOnBehalfAccounts, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginSetDistributionListPermissions(int itemId, int accountId, string[] sendAsAccounts, string[] sendOnBehalfAccounts, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("SetDistributionListPermissions", new object[] {
                         itemId,
                         accountId,
                         sendAsAccounts,
                         sendOnBehalfAccounts}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ResultObject EndSetDistributionListPermissions(System.IAsyncResult asyncResult)
-        {
+        public ResultObject EndSetDistributionListPermissions(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ResultObject)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void SetDistributionListPermissionsAsync(int itemId, int accountId, string[] sendAsAccounts, string[] sendOnBehalfAccounts)
-        {
+        public void SetDistributionListPermissionsAsync(int itemId, int accountId, string[] sendAsAccounts, string[] sendOnBehalfAccounts) {
             this.SetDistributionListPermissionsAsync(itemId, accountId, sendAsAccounts, sendOnBehalfAccounts, null);
         }
-
+        
         /// <remarks/>
-        public void SetDistributionListPermissionsAsync(int itemId, int accountId, string[] sendAsAccounts, string[] sendOnBehalfAccounts, object userState)
-        {
-            if ((this.SetDistributionListPermissionsOperationCompleted == null))
-            {
+        public void SetDistributionListPermissionsAsync(int itemId, int accountId, string[] sendAsAccounts, string[] sendOnBehalfAccounts, object userState) {
+            if ((this.SetDistributionListPermissionsOperationCompleted == null)) {
                 this.SetDistributionListPermissionsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetDistributionListPermissionsOperationCompleted);
             }
             this.InvokeAsync("SetDistributionListPermissions", new object[] {
@@ -5436,2953 +4917,2617 @@ namespace WebsitePanel.EnterpriseServer
                         sendAsAccounts,
                         sendOnBehalfAccounts}, this.SetDistributionListPermissionsOperationCompleted, userState);
         }
-
-        private void OnSetDistributionListPermissionsOperationCompleted(object arg)
-        {
-            if ((this.SetDistributionListPermissionsCompleted != null))
-            {
+        
+        private void OnSetDistributionListPermissionsOperationCompleted(object arg) {
+            if ((this.SetDistributionListPermissionsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.SetDistributionListPermissionsCompleted(this, new SetDistributionListPermissionsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetDistributionListPermissions", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeDistributionListResult GetDistributionListPermissions(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetDistributionListPermissions", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeDistributionListResult GetDistributionListPermissions(int itemId, int accountId) {
             object[] results = this.Invoke("GetDistributionListPermissions", new object[] {
                         itemId,
                         accountId});
             return ((ExchangeDistributionListResult)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetDistributionListPermissions(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetDistributionListPermissions(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetDistributionListPermissions", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeDistributionListResult EndGetDistributionListPermissions(System.IAsyncResult asyncResult)
-        {
+        public ExchangeDistributionListResult EndGetDistributionListPermissions(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeDistributionListResult)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetDistributionListPermissionsAsync(int itemId, int accountId)
-        {
+        public void GetDistributionListPermissionsAsync(int itemId, int accountId) {
             this.GetDistributionListPermissionsAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void GetDistributionListPermissionsAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.GetDistributionListPermissionsOperationCompleted == null))
-            {
+        public void GetDistributionListPermissionsAsync(int itemId, int accountId, object userState) {
+            if ((this.GetDistributionListPermissionsOperationCompleted == null)) {
                 this.GetDistributionListPermissionsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetDistributionListPermissionsOperationCompleted);
             }
             this.InvokeAsync("GetDistributionListPermissions", new object[] {
                         itemId,
                         accountId}, this.GetDistributionListPermissionsOperationCompleted, userState);
         }
-
-        private void OnGetDistributionListPermissionsOperationCompleted(object arg)
-        {
-            if ((this.GetDistributionListPermissionsCompleted != null))
-            {
+        
+        private void OnGetDistributionListPermissionsOperationCompleted(object arg) {
+            if ((this.GetDistributionListPermissionsCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetDistributionListPermissionsCompleted(this, new GetDistributionListPermissionsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetDistributionListsByMember", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeAccount[] GetDistributionListsByMember(int itemId, int accountId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetDistributionListsByMember", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeAccount[] GetDistributionListsByMember(int itemId, int accountId) {
             object[] results = this.Invoke("GetDistributionListsByMember", new object[] {
                         itemId,
                         accountId});
             return ((ExchangeAccount[])(results[0]));
         }
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddDistributionListMember", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int AddDistributionListMember(int itemId, string distributionListName, int memberId)
-        {
+        public System.IAsyncResult BeginGetDistributionListsByMember(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetDistributionListsByMember", new object[] {
+                        itemId,
+                        accountId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ExchangeAccount[] EndGetDistributionListsByMember(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ExchangeAccount[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetDistributionListsByMemberAsync(int itemId, int accountId) {
+            this.GetDistributionListsByMemberAsync(itemId, accountId, null);
+        }
+        
+        /// <remarks/>
+        public void GetDistributionListsByMemberAsync(int itemId, int accountId, object userState) {
+            if ((this.GetDistributionListsByMemberOperationCompleted == null)) {
+                this.GetDistributionListsByMemberOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetDistributionListsByMemberOperationCompleted);
+            }
+            this.InvokeAsync("GetDistributionListsByMember", new object[] {
+                        itemId,
+                        accountId}, this.GetDistributionListsByMemberOperationCompleted, userState);
+        }
+        
+        private void OnGetDistributionListsByMemberOperationCompleted(object arg) {
+            if ((this.GetDistributionListsByMemberCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetDistributionListsByMemberCompleted(this, new GetDistributionListsByMemberCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddDistributionListMember", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int AddDistributionListMember(int itemId, string distributionListName, int memberId) {
             object[] results = this.Invoke("AddDistributionListMember", new object[] {
                         itemId,
                         distributionListName,
                         memberId});
             return ((int)(results[0]));
         }
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteDistributionListMember", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public int DeleteDistributionListMember(int itemId, string distributionListName, int memberId)
-        {
+        public System.IAsyncResult BeginAddDistributionListMember(int itemId, string distributionListName, int memberId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("AddDistributionListMember", new object[] {
+                        itemId,
+                        distributionListName,
+                        memberId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public int EndAddDistributionListMember(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void AddDistributionListMemberAsync(int itemId, string distributionListName, int memberId) {
+            this.AddDistributionListMemberAsync(itemId, distributionListName, memberId, null);
+        }
+        
+        /// <remarks/>
+        public void AddDistributionListMemberAsync(int itemId, string distributionListName, int memberId, object userState) {
+            if ((this.AddDistributionListMemberOperationCompleted == null)) {
+                this.AddDistributionListMemberOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddDistributionListMemberOperationCompleted);
+            }
+            this.InvokeAsync("AddDistributionListMember", new object[] {
+                        itemId,
+                        distributionListName,
+                        memberId}, this.AddDistributionListMemberOperationCompleted, userState);
+        }
+        
+        private void OnAddDistributionListMemberOperationCompleted(object arg) {
+            if ((this.AddDistributionListMemberCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.AddDistributionListMemberCompleted(this, new AddDistributionListMemberCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteDistributionListMember", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int DeleteDistributionListMember(int itemId, string distributionListName, int memberId) {
             object[] results = this.Invoke("DeleteDistributionListMember", new object[] {
                         itemId,
                         distributionListName,
                         memberId});
             return ((int)(results[0]));
         }
-
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMobileDevices", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeMobileDevice[] GetMobileDevices(int itemId, int accountId)
-        {
+        public System.IAsyncResult BeginDeleteDistributionListMember(int itemId, string distributionListName, int memberId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("DeleteDistributionListMember", new object[] {
+                        itemId,
+                        distributionListName,
+                        memberId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public int EndDeleteDistributionListMember(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void DeleteDistributionListMemberAsync(int itemId, string distributionListName, int memberId) {
+            this.DeleteDistributionListMemberAsync(itemId, distributionListName, memberId, null);
+        }
+        
+        /// <remarks/>
+        public void DeleteDistributionListMemberAsync(int itemId, string distributionListName, int memberId, object userState) {
+            if ((this.DeleteDistributionListMemberOperationCompleted == null)) {
+                this.DeleteDistributionListMemberOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteDistributionListMemberOperationCompleted);
+            }
+            this.InvokeAsync("DeleteDistributionListMember", new object[] {
+                        itemId,
+                        distributionListName,
+                        memberId}, this.DeleteDistributionListMemberOperationCompleted, userState);
+        }
+        
+        private void OnDeleteDistributionListMemberOperationCompleted(object arg) {
+            if ((this.DeleteDistributionListMemberCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.DeleteDistributionListMemberCompleted(this, new DeleteDistributionListMemberCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMobileDevices", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeMobileDevice[] GetMobileDevices(int itemId, int accountId) {
             object[] results = this.Invoke("GetMobileDevices", new object[] {
                         itemId,
                         accountId});
             return ((ExchangeMobileDevice[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetMobileDevices(int itemId, int accountId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetMobileDevices(int itemId, int accountId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetMobileDevices", new object[] {
                         itemId,
                         accountId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeMobileDevice[] EndGetMobileDevices(System.IAsyncResult asyncResult)
-        {
+        public ExchangeMobileDevice[] EndGetMobileDevices(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeMobileDevice[])(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetMobileDevicesAsync(int itemId, int accountId)
-        {
+        public void GetMobileDevicesAsync(int itemId, int accountId) {
             this.GetMobileDevicesAsync(itemId, accountId, null);
         }
-
+        
         /// <remarks/>
-        public void GetMobileDevicesAsync(int itemId, int accountId, object userState)
-        {
-            if ((this.GetMobileDevicesOperationCompleted == null))
-            {
+        public void GetMobileDevicesAsync(int itemId, int accountId, object userState) {
+            if ((this.GetMobileDevicesOperationCompleted == null)) {
                 this.GetMobileDevicesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetMobileDevicesOperationCompleted);
             }
             this.InvokeAsync("GetMobileDevices", new object[] {
                         itemId,
                         accountId}, this.GetMobileDevicesOperationCompleted, userState);
         }
-
-        private void OnGetMobileDevicesOperationCompleted(object arg)
-        {
-            if ((this.GetMobileDevicesCompleted != null))
-            {
+        
+        private void OnGetMobileDevicesOperationCompleted(object arg) {
+            if ((this.GetMobileDevicesCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetMobileDevicesCompleted(this, new GetMobileDevicesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMobileDevice", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public ExchangeMobileDevice GetMobileDevice(int itemId, string deviceId)
-        {
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMobileDevice", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public ExchangeMobileDevice GetMobileDevice(int itemId, string deviceId) {
             object[] results = this.Invoke("GetMobileDevice", new object[] {
                         itemId,
                         deviceId});
             return ((ExchangeMobileDevice)(results[0]));
         }
-
+        
         /// <remarks/>
-        public System.IAsyncResult BeginGetMobileDevice(int itemId, string deviceId, System.AsyncCallback callback, object asyncState)
-        {
+        public System.IAsyncResult BeginGetMobileDevice(int itemId, string deviceId, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetMobileDevice", new object[] {
                         itemId,
                         deviceId}, callback, asyncState);
         }
-
+        
         /// <remarks/>
-        public ExchangeMobileDevice EndGetMobileDevice(System.IAsyncResult asyncResult)
-        {
+        public ExchangeMobileDevice EndGetMobileDevice(System.IAsyncResult asyncResult) {
             object[] results = this.EndInvoke(asyncResult);
             return ((ExchangeMobileDevice)(results[0]));
         }
-
+        
         /// <remarks/>
-        public void GetMobileDeviceAsync(int itemId, string deviceId)
-        {
+        public void GetMobileDeviceAsync(int itemId, string deviceId) {
             this.GetMobileDeviceAsync(itemId, deviceId, null);
         }
-
+        
         /// <remarks/>
-        public void GetMobileDeviceAsync(int itemId, string deviceId, object userState)
-        {
-            if ((this.GetMobileDeviceOperationCompleted == null))
-            {
+        public void GetMobileDeviceAsync(int itemId, string deviceId, object userState) {
+            if ((this.GetMobileDeviceOperationCompleted == null)) {
                 this.GetMobileDeviceOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetMobileDeviceOperationCompleted);
             }
             this.InvokeAsync("GetMobileDevice", new object[] {
                         itemId,
                         deviceId}, this.GetMobileDeviceOperationCompleted, userState);
         }
-
-        private void OnGetMobileDeviceOperationCompleted(object arg)
-        {
-            if ((this.GetMobileDeviceCompleted != null))
-            {
+        
+        private void OnGetMobileDeviceOperationCompleted(object arg) {
+            if ((this.GetMobileDeviceCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.GetMobileDeviceCompleted(this, new GetMobileDeviceCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
-
+        
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/WipeDataFromDevice", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public void WipeDataFromDevice(int itemId, string deviceId)
-        {
-            this.Invoke("WipeDataFromDevice", new object[] {
-                        itemId,
-                        deviceId});
-        }
-
-        /// <remarks/>
-        public System.IAsyncResult BeginWipeDataFromDevice(int itemId, string deviceId, System.AsyncCallback callback, object asyncState)
-        {
-            return this.BeginInvoke("WipeDataFromDevice", new object[] {
-                        itemId,
-                        deviceId}, callback, asyncState);
-        }
-
-        /// <remarks/>
-        public void EndWipeDataFromDevice(System.IAsyncResult asyncResult)
-        {
-            this.EndInvoke(asyncResult);
-        }
-
-        /// <remarks/>
-        public void WipeDataFromDeviceAsync(int itemId, string deviceId)
-        {
-            this.WipeDataFromDeviceAsync(itemId, deviceId, null);
-        }
-
-        /// <remarks/>
-        public void WipeDataFromDeviceAsync(int itemId, string deviceId, object userState)
-        {
-            if ((this.WipeDataFromDeviceOperationCompleted == null))
-            {
-                this.WipeDataFromDeviceOperationCompleted = new System.Threading.SendOrPostCallback(this.OnWipeDataFromDeviceOperationCompleted);
-            }
-            this.InvokeAsync("WipeDataFromDevice", new object[] {
-                        itemId,
-                        deviceId}, this.WipeDataFromDeviceOperationCompleted, userState);
-        }
-
-        private void OnWipeDataFromDeviceOperationCompleted(object arg)
-        {
-            if ((this.WipeDataFromDeviceCompleted != null))
-            {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.WipeDataFromDeviceCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CancelRemoteWipeRequest", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public void CancelRemoteWipeRequest(int itemId, string deviceId)
-        {
-            this.Invoke("CancelRemoteWipeRequest", new object[] {
-                        itemId,
-                        deviceId});
-        }
-
-        /// <remarks/>
-        public System.IAsyncResult BeginCancelRemoteWipeRequest(int itemId, string deviceId, System.AsyncCallback callback, object asyncState)
-        {
-            return this.BeginInvoke("CancelRemoteWipeRequest", new object[] {
-                        itemId,
-                        deviceId}, callback, asyncState);
-        }
-
-        /// <remarks/>
-        public void EndCancelRemoteWipeRequest(System.IAsyncResult asyncResult)
-        {
-            this.EndInvoke(asyncResult);
-        }
-
-        /// <remarks/>
-        public void CancelRemoteWipeRequestAsync(int itemId, string deviceId)
-        {
-            this.CancelRemoteWipeRequestAsync(itemId, deviceId, null);
-        }
-
-        /// <remarks/>
-        public void CancelRemoteWipeRequestAsync(int itemId, string deviceId, object userState)
-        {
-            if ((this.CancelRemoteWipeRequestOperationCompleted == null))
-            {
-                this.CancelRemoteWipeRequestOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCancelRemoteWipeRequestOperationCompleted);
-            }
-            this.InvokeAsync("CancelRemoteWipeRequest", new object[] {
-                        itemId,
-                        deviceId}, this.CancelRemoteWipeRequestOperationCompleted, userState);
-        }
-
-        private void OnCancelRemoteWipeRequestOperationCompleted(object arg)
-        {
-            if ((this.CancelRemoteWipeRequestCompleted != null))
-            {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.CancelRemoteWipeRequestCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/RemoveDevice", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public void RemoveDevice(int itemId, string deviceId)
-        {
-            this.Invoke("RemoveDevice", new object[] {
-                        itemId,
-                        deviceId});
-        }
-
-        /// <remarks/>
-        public System.IAsyncResult BeginRemoveDevice(int itemId, string deviceId, System.AsyncCallback callback, object asyncState)
-        {
-            return this.BeginInvoke("RemoveDevice", new object[] {
-                        itemId,
-                        deviceId}, callback, asyncState);
-        }
-
-        /// <remarks/>
-        public void EndRemoveDevice(System.IAsyncResult asyncResult)
-        {
-            this.EndInvoke(asyncResult);
-        }
-
-        /// <remarks/>
-        public void RemoveDeviceAsync(int itemId, string deviceId)
-        {
-            this.RemoveDeviceAsync(itemId, deviceId, null);
-        }
-
-        /// <remarks/>
-        public void RemoveDeviceAsync(int itemId, string deviceId, object userState)
-        {
-            if ((this.RemoveDeviceOperationCompleted == null))
-            {
-                this.RemoveDeviceOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRemoveDeviceOperationCompleted);
-            }
-            this.InvokeAsync("RemoveDevice", new object[] {
-                        itemId,
-                        deviceId}, this.RemoveDeviceOperationCompleted, userState);
-        }
-
-        private void OnRemoveDeviceOperationCompleted(object arg)
-        {
-            if ((this.RemoveDeviceCompleted != null))
-            {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.RemoveDeviceCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-
-        /// <remarks/>
-        public new void CancelAsync(object userState)
-        {
+        public new void CancelAsync(object userState) {
             base.CancelAsync(userState);
         }
     }
-
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void WipeDataFromDeviceCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void CancelRemoteWipeRequestCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void RemoveDeviceCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetExchangeMailboxPlansCompletedEventHandler(object sender, GetExchangeMailboxPlansCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetExchangeMailboxPlansCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetExchangeMailboxPlansCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetExchangeMailboxPlansCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetExchangeMailboxPlansCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeMailboxPlan[] Result
-        {
-            get
-            {
+        public ExchangeMailboxPlan[] Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeMailboxPlan[])(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetExchangeMailboxPlanCompletedEventHandler(object sender, GetExchangeMailboxPlanCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetExchangeMailboxPlanCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetExchangeMailboxPlanCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetExchangeMailboxPlanCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetExchangeMailboxPlanCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeMailboxPlan Result
-        {
-            get
-            {
+        public ExchangeMailboxPlan Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeMailboxPlan)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void AddExchangeMailboxPlanCompletedEventHandler(object sender, AddExchangeMailboxPlanCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class AddExchangeMailboxPlanCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class AddExchangeMailboxPlanCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal AddExchangeMailboxPlanCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal AddExchangeMailboxPlanCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void UpdateExchangeMailboxPlanCompletedEventHandler(object sender, UpdateExchangeMailboxPlanCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class UpdateExchangeMailboxPlanCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class UpdateExchangeMailboxPlanCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal UpdateExchangeMailboxPlanCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal UpdateExchangeMailboxPlanCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeleteExchangeMailboxPlanCompletedEventHandler(object sender, DeleteExchangeMailboxPlanCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeleteExchangeMailboxPlanCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class DeleteExchangeMailboxPlanCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal DeleteExchangeMailboxPlanCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal DeleteExchangeMailboxPlanCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetOrganizationDefaultExchangeMailboxPlanCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void CreatePublicFolderCompletedEventHandler(object sender, CreatePublicFolderCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class CreatePublicFolderCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class CreatePublicFolderCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal CreatePublicFolderCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal CreatePublicFolderCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeletePublicFoldersCompletedEventHandler(object sender, DeletePublicFoldersCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeletePublicFoldersCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class DeletePublicFoldersCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal DeletePublicFoldersCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal DeletePublicFoldersCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeletePublicFolderCompletedEventHandler(object sender, DeletePublicFolderCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeletePublicFolderCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class DeletePublicFolderCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal DeletePublicFolderCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal DeletePublicFolderCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void EnableMailPublicFolderCompletedEventHandler(object sender, EnableMailPublicFolderCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class EnableMailPublicFolderCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class EnableMailPublicFolderCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal EnableMailPublicFolderCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal EnableMailPublicFolderCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DisableMailPublicFolderCompletedEventHandler(object sender, DisableMailPublicFolderCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DisableMailPublicFolderCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class DisableMailPublicFolderCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal DisableMailPublicFolderCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal DisableMailPublicFolderCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPublicFolderGeneralSettingsCompletedEventHandler(object sender, GetPublicFolderGeneralSettingsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetPublicFolderGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetPublicFolderGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetPublicFolderGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetPublicFolderGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangePublicFolder Result
-        {
-            get
-            {
+        public ExchangePublicFolder Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangePublicFolder)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetPublicFolderGeneralSettingsCompletedEventHandler(object sender, SetPublicFolderGeneralSettingsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetPublicFolderGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SetPublicFolderGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SetPublicFolderGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SetPublicFolderGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPublicFolderMailFlowSettingsCompletedEventHandler(object sender, GetPublicFolderMailFlowSettingsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetPublicFolderMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetPublicFolderMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetPublicFolderMailFlowSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetPublicFolderMailFlowSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangePublicFolder Result
-        {
-            get
-            {
+        public ExchangePublicFolder Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangePublicFolder)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetPublicFolderMailFlowSettingsCompletedEventHandler(object sender, SetPublicFolderMailFlowSettingsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetPublicFolderMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SetPublicFolderMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SetPublicFolderMailFlowSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SetPublicFolderMailFlowSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetPublicFolderEmailAddressesCompletedEventHandler(object sender, GetPublicFolderEmailAddressesCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetPublicFolderEmailAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetPublicFolderEmailAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetPublicFolderEmailAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetPublicFolderEmailAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeEmailAddress[] Result
-        {
-            get
-            {
+        public ExchangeEmailAddress[] Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeEmailAddress[])(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void AddPublicFolderEmailAddressCompletedEventHandler(object sender, AddPublicFolderEmailAddressCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class AddPublicFolderEmailAddressCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class AddPublicFolderEmailAddressCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal AddPublicFolderEmailAddressCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal AddPublicFolderEmailAddressCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetPublicFolderPrimaryEmailAddressCompletedEventHandler(object sender, SetPublicFolderPrimaryEmailAddressCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetPublicFolderPrimaryEmailAddressCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SetPublicFolderPrimaryEmailAddressCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SetPublicFolderPrimaryEmailAddressCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SetPublicFolderPrimaryEmailAddressCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeletePublicFolderEmailAddressesCompletedEventHandler(object sender, DeletePublicFolderEmailAddressesCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeletePublicFolderEmailAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class DeletePublicFolderEmailAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal DeletePublicFolderEmailAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal DeletePublicFolderEmailAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void AddExchangeDisclaimerCompletedEventHandler(object sender, AddExchangeDisclaimerCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class AddExchangeDisclaimerCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class AddExchangeDisclaimerCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal AddExchangeDisclaimerCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal AddExchangeDisclaimerCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void UpdateExchangeDisclaimerCompletedEventHandler(object sender, UpdateExchangeDisclaimerCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class UpdateExchangeDisclaimerCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class UpdateExchangeDisclaimerCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal UpdateExchangeDisclaimerCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal UpdateExchangeDisclaimerCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeleteExchangeDisclaimerCompletedEventHandler(object sender, DeleteExchangeDisclaimerCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeleteExchangeDisclaimerCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class DeleteExchangeDisclaimerCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal DeleteExchangeDisclaimerCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal DeleteExchangeDisclaimerCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetExchangeDisclaimerCompletedEventHandler(object sender, GetExchangeDisclaimerCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetExchangeDisclaimerCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetExchangeDisclaimerCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetExchangeDisclaimerCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetExchangeDisclaimerCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeDisclaimer Result
-        {
-            get
-            {
+        public ExchangeDisclaimer Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeDisclaimer)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetExchangeDisclaimersCompletedEventHandler(object sender, GetExchangeDisclaimersCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetExchangeDisclaimersCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetExchangeDisclaimersCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetExchangeDisclaimersCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetExchangeDisclaimersCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeDisclaimer[] Result
-        {
-            get
-            {
+        public ExchangeDisclaimer[] Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeDisclaimer[])(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetExchangeAccountDisclaimerIdCompletedEventHandler(object sender, SetExchangeAccountDisclaimerIdCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetExchangeAccountDisclaimerIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SetExchangeAccountDisclaimerIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SetExchangeAccountDisclaimerIdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SetExchangeAccountDisclaimerIdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetExchangeAccountDisclaimerIdCompletedEventHandler(object sender, GetExchangeAccountDisclaimerIdCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetExchangeAccountDisclaimerIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetExchangeAccountDisclaimerIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetExchangeAccountDisclaimerIdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetExchangeAccountDisclaimerIdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetRawExchangeOrganizationsPagedCompletedEventHandler(object sender, GetRawExchangeOrganizationsPagedCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetRawExchangeOrganizationsPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetRawExchangeOrganizationsPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetRawExchangeOrganizationsPagedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetRawExchangeOrganizationsPagedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public System.Data.DataSet Result
-        {
-            get
-            {
+        public System.Data.DataSet Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((System.Data.DataSet)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetExchangeOrganizationsPagedCompletedEventHandler(object sender, GetExchangeOrganizationsPagedCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetExchangeOrganizationsPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetExchangeOrganizationsPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetExchangeOrganizationsPagedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetExchangeOrganizationsPagedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public OrganizationsPaged Result
-        {
-            get
-            {
+        public OrganizationsPaged Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((OrganizationsPaged)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetExchangeOrganizationsCompletedEventHandler(object sender, GetExchangeOrganizationsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetExchangeOrganizationsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetExchangeOrganizationsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetExchangeOrganizationsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetExchangeOrganizationsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public Organization[] Result
-        {
-            get
-            {
+        public Organization[] Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((Organization[])(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetOrganizationCompletedEventHandler(object sender, GetOrganizationCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetOrganizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetOrganizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetOrganizationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetOrganizationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public Organization Result
-        {
-            get
-            {
+        public Organization Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((Organization)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetOrganizationStatisticsCompletedEventHandler(object sender, GetOrganizationStatisticsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetOrganizationStatisticsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetOrganizationStatisticsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetOrganizationStatisticsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetOrganizationStatisticsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public OrganizationStatistics Result
-        {
-            get
-            {
+        public OrganizationStatistics Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((OrganizationStatistics)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetOrganizationStatisticsByOrganizationCompletedEventHandler(object sender, GetOrganizationStatisticsByOrganizationCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetOrganizationStatisticsByOrganizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetOrganizationStatisticsByOrganizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetOrganizationStatisticsByOrganizationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetOrganizationStatisticsByOrganizationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public OrganizationStatistics Result
-        {
-            get
-            {
+        public OrganizationStatistics Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((OrganizationStatistics)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeleteOrganizationCompletedEventHandler(object sender, DeleteOrganizationCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeleteOrganizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class DeleteOrganizationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal DeleteOrganizationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal DeleteOrganizationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetOrganizationStorageLimitsCompletedEventHandler(object sender, GetOrganizationStorageLimitsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetOrganizationStorageLimitsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetOrganizationStorageLimitsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetOrganizationStorageLimitsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetOrganizationStorageLimitsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public Organization Result
-        {
-            get
-            {
+        public Organization Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((Organization)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetOrganizationStorageLimitsCompletedEventHandler(object sender, SetOrganizationStorageLimitsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetOrganizationStorageLimitsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SetOrganizationStorageLimitsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SetOrganizationStorageLimitsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SetOrganizationStorageLimitsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMailboxesStatisticsCompletedEventHandler(object sender, GetMailboxesStatisticsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetMailboxesStatisticsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetMailboxesStatisticsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetMailboxesStatisticsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetMailboxesStatisticsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeItemStatistics[] Result
-        {
-            get
-            {
+        public ExchangeItemStatistics[] Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeItemStatistics[])(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMailboxStatisticsCompletedEventHandler(object sender, GetMailboxStatisticsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetMailboxStatisticsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetMailboxStatisticsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetMailboxStatisticsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetMailboxStatisticsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeMailboxStatistics Result
-        {
-            get
-            {
+        public ExchangeMailboxStatistics Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeMailboxStatistics)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void CalculateOrganizationDiskspaceCompletedEventHandler(object sender, CalculateOrganizationDiskspaceCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class CalculateOrganizationDiskspaceCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class CalculateOrganizationDiskspaceCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal CalculateOrganizationDiskspaceCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal CalculateOrganizationDiskspaceCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetActiveSyncPolicyCompletedEventHandler(object sender, GetActiveSyncPolicyCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetActiveSyncPolicyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetActiveSyncPolicyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetActiveSyncPolicyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetActiveSyncPolicyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeActiveSyncPolicy Result
-        {
-            get
-            {
+        public ExchangeActiveSyncPolicy Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeActiveSyncPolicy)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetActiveSyncPolicyCompletedEventHandler(object sender, SetActiveSyncPolicyCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetActiveSyncPolicyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SetActiveSyncPolicyCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SetActiveSyncPolicyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SetActiveSyncPolicyCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void AddAuthoritativeDomainCompletedEventHandler(object sender, AddAuthoritativeDomainCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class AddAuthoritativeDomainCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class AddAuthoritativeDomainCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal AddAuthoritativeDomainCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal AddAuthoritativeDomainCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeleteAuthoritativeDomainCompletedEventHandler(object sender, DeleteAuthoritativeDomainCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeleteAuthoritativeDomainCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class DeleteAuthoritativeDomainCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal DeleteAuthoritativeDomainCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal DeleteAuthoritativeDomainCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetAccountsPagedCompletedEventHandler(object sender, GetAccountsPagedCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetAccountsPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetAccountsPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetAccountsPagedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetAccountsPagedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeAccountsPaged Result
-        {
-            get
-            {
+        public ExchangeAccountsPaged Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeAccountsPaged)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetAccountsCompletedEventHandler(object sender, GetAccountsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetAccountsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetAccountsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetAccountsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetAccountsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeAccount[] Result
-        {
-            get
-            {
+        public ExchangeAccount[] Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeAccount[])(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetExchangeAccountByMailboxPlanIdCompletedEventHandler(object sender, GetExchangeAccountByMailboxPlanIdCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetExchangeAccountByMailboxPlanIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetExchangeAccountByMailboxPlanIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetExchangeAccountByMailboxPlanIdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetExchangeAccountByMailboxPlanIdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeAccount[] Result
-        {
-            get
-            {
+        public ExchangeAccount[] Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeAccount[])(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SearchAccountsCompletedEventHandler(object sender, SearchAccountsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SearchAccountsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SearchAccountsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SearchAccountsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SearchAccountsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeAccount[] Result
-        {
-            get
-            {
+        public ExchangeAccount[] Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeAccount[])(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetAccountCompletedEventHandler(object sender, GetAccountCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetAccountCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetAccountCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetAccountCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetAccountCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeAccount Result
-        {
-            get
-            {
+        public ExchangeAccount Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeAccount)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SearchAccountCompletedEventHandler(object sender, SearchAccountCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SearchAccountCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SearchAccountCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SearchAccountCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SearchAccountCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeAccount Result
-        {
-            get
-            {
+        public ExchangeAccount Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeAccount)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void CheckAccountCredentialsCompletedEventHandler(object sender, CheckAccountCredentialsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class CheckAccountCredentialsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class CheckAccountCredentialsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal CheckAccountCredentialsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal CheckAccountCredentialsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public bool Result
-        {
-            get
-            {
+        public bool Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((bool)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void CreateMailboxCompletedEventHandler(object sender, CreateMailboxCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class CreateMailboxCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class CreateMailboxCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal CreateMailboxCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal CreateMailboxCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeleteMailboxCompletedEventHandler(object sender, DeleteMailboxCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeleteMailboxCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class DeleteMailboxCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal DeleteMailboxCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal DeleteMailboxCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DisableMailboxCompletedEventHandler(object sender, DisableMailboxCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DisableMailboxCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class DisableMailboxCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal DisableMailboxCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal DisableMailboxCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMailboxAdvancedSettingsCompletedEventHandler(object sender, GetMailboxAdvancedSettingsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetMailboxAdvancedSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetMailboxAdvancedSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetMailboxAdvancedSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetMailboxAdvancedSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeMailbox Result
-        {
-            get
-            {
+        public ExchangeMailbox Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeMailbox)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMailboxGeneralSettingsCompletedEventHandler(object sender, GetMailboxGeneralSettingsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetMailboxGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetMailboxGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetMailboxGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetMailboxGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeMailbox Result
-        {
-            get
-            {
+        public ExchangeMailbox Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeMailbox)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetMailboxGeneralSettingsCompletedEventHandler(object sender, SetMailboxGeneralSettingsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetMailboxGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SetMailboxGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SetMailboxGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SetMailboxGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMailboxEmailAddressesCompletedEventHandler(object sender, GetMailboxEmailAddressesCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetMailboxEmailAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetMailboxEmailAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetMailboxEmailAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetMailboxEmailAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeEmailAddress[] Result
-        {
-            get
-            {
+        public ExchangeEmailAddress[] Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeEmailAddress[])(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void AddMailboxEmailAddressCompletedEventHandler(object sender, AddMailboxEmailAddressCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class AddMailboxEmailAddressCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class AddMailboxEmailAddressCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal AddMailboxEmailAddressCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal AddMailboxEmailAddressCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetMailboxPrimaryEmailAddressCompletedEventHandler(object sender, SetMailboxPrimaryEmailAddressCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetMailboxPrimaryEmailAddressCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SetMailboxPrimaryEmailAddressCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SetMailboxPrimaryEmailAddressCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SetMailboxPrimaryEmailAddressCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeleteMailboxEmailAddressesCompletedEventHandler(object sender, DeleteMailboxEmailAddressesCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeleteMailboxEmailAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class DeleteMailboxEmailAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal DeleteMailboxEmailAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal DeleteMailboxEmailAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMailboxMailFlowSettingsCompletedEventHandler(object sender, GetMailboxMailFlowSettingsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetMailboxMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetMailboxMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetMailboxMailFlowSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetMailboxMailFlowSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeMailbox Result
-        {
-            get
-            {
+        public ExchangeMailbox Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeMailbox)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetMailboxMailFlowSettingsCompletedEventHandler(object sender, SetMailboxMailFlowSettingsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetMailboxMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SetMailboxMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SetMailboxMailFlowSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SetMailboxMailFlowSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetExchangeMailboxPlanCompletedEventHandler(object sender, SetExchangeMailboxPlanCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetExchangeMailboxPlanCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SetExchangeMailboxPlanCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SetExchangeMailboxPlanCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SetExchangeMailboxPlanCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMailboxSetupInstructionsCompletedEventHandler(object sender, GetMailboxSetupInstructionsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetMailboxSetupInstructionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetMailboxSetupInstructionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetMailboxSetupInstructionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetMailboxSetupInstructionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public string Result
-        {
-            get
-            {
+        public string Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((string)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SendMailboxSetupInstructionsCompletedEventHandler(object sender, SendMailboxSetupInstructionsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SendMailboxSetupInstructionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SendMailboxSetupInstructionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SendMailboxSetupInstructionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SendMailboxSetupInstructionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetMailboxManagerSettingsCompletedEventHandler(object sender, SetMailboxManagerSettingsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetMailboxManagerSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SetMailboxManagerSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SetMailboxManagerSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SetMailboxManagerSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMailboxPermissionsCompletedEventHandler(object sender, GetMailboxPermissionsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetMailboxPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetMailboxPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetMailboxPermissionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetMailboxPermissionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeMailbox Result
-        {
-            get
-            {
+        public ExchangeMailbox Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeMailbox)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetMailboxPermissionsCompletedEventHandler(object sender, SetMailboxPermissionsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetMailboxPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SetMailboxPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SetMailboxPermissionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SetMailboxPermissionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void CreateContactCompletedEventHandler(object sender, CreateContactCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class CreateContactCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class CreateContactCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal CreateContactCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal CreateContactCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeleteContactCompletedEventHandler(object sender, DeleteContactCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeleteContactCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class DeleteContactCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal DeleteContactCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal DeleteContactCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetContactGeneralSettingsCompletedEventHandler(object sender, GetContactGeneralSettingsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetContactGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetContactGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetContactGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetContactGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeContact Result
-        {
-            get
-            {
+        public ExchangeContact Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeContact)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetContactGeneralSettingsCompletedEventHandler(object sender, SetContactGeneralSettingsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetContactGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SetContactGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SetContactGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SetContactGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetContactMailFlowSettingsCompletedEventHandler(object sender, GetContactMailFlowSettingsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetContactMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetContactMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetContactMailFlowSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetContactMailFlowSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeContact Result
-        {
-            get
-            {
+        public ExchangeContact Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeContact)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetContactMailFlowSettingsCompletedEventHandler(object sender, SetContactMailFlowSettingsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetContactMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SetContactMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SetContactMailFlowSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SetContactMailFlowSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void CreateDistributionListCompletedEventHandler(object sender, CreateDistributionListCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class CreateDistributionListCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class CreateDistributionListCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal CreateDistributionListCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal CreateDistributionListCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeleteDistributionListCompletedEventHandler(object sender, DeleteDistributionListCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeleteDistributionListCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class DeleteDistributionListCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal DeleteDistributionListCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal DeleteDistributionListCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetDistributionListGeneralSettingsCompletedEventHandler(object sender, GetDistributionListGeneralSettingsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetDistributionListGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetDistributionListGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetDistributionListGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetDistributionListGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeDistributionList Result
-        {
-            get
-            {
+        public ExchangeDistributionList Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeDistributionList)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetDistributionListGeneralSettingsCompletedEventHandler(object sender, SetDistributionListGeneralSettingsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetDistributionListGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SetDistributionListGeneralSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SetDistributionListGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SetDistributionListGeneralSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetDistributionListMailFlowSettingsCompletedEventHandler(object sender, GetDistributionListMailFlowSettingsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetDistributionListMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetDistributionListMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetDistributionListMailFlowSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetDistributionListMailFlowSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeDistributionList Result
-        {
-            get
-            {
+        public ExchangeDistributionList Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeDistributionList)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetDistributionListMailFlowSettingsCompletedEventHandler(object sender, SetDistributionListMailFlowSettingsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetDistributionListMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SetDistributionListMailFlowSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SetDistributionListMailFlowSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SetDistributionListMailFlowSettingsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetDistributionListEmailAddressesCompletedEventHandler(object sender, GetDistributionListEmailAddressesCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetDistributionListEmailAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetDistributionListEmailAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetDistributionListEmailAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetDistributionListEmailAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeEmailAddress[] Result
-        {
-            get
-            {
+        public ExchangeEmailAddress[] Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeEmailAddress[])(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void AddDistributionListEmailAddressCompletedEventHandler(object sender, AddDistributionListEmailAddressCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class AddDistributionListEmailAddressCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class AddDistributionListEmailAddressCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal AddDistributionListEmailAddressCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal AddDistributionListEmailAddressCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetDistributionListPrimaryEmailAddressCompletedEventHandler(object sender, SetDistributionListPrimaryEmailAddressCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetDistributionListPrimaryEmailAddressCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SetDistributionListPrimaryEmailAddressCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SetDistributionListPrimaryEmailAddressCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SetDistributionListPrimaryEmailAddressCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void DeleteDistributionListEmailAddressesCompletedEventHandler(object sender, DeleteDistributionListEmailAddressesCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeleteDistributionListEmailAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class DeleteDistributionListEmailAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal DeleteDistributionListEmailAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal DeleteDistributionListEmailAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public int Result
-        {
-            get
-            {
+        public int Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((int)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void SetDistributionListPermissionsCompletedEventHandler(object sender, SetDistributionListPermissionsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetDistributionListPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class SetDistributionListPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal SetDistributionListPermissionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal SetDistributionListPermissionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ResultObject Result
-        {
-            get
-            {
+        public ResultObject Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ResultObject)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetDistributionListPermissionsCompletedEventHandler(object sender, GetDistributionListPermissionsCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetDistributionListPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetDistributionListPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetDistributionListPermissionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetDistributionListPermissionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeDistributionListResult Result
-        {
-            get
-            {
+        public ExchangeDistributionListResult Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeDistributionListResult)(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetMobileDevicesCompletedEventHandler(object sender, GetMobileDevicesCompletedEventArgs e);
-
+    public delegate void GetDistributionListsByMemberCompletedEventHandler(object sender, GetDistributionListsByMemberCompletedEventArgs e);
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetMobileDevicesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetDistributionListsByMemberCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetMobileDevicesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetDistributionListsByMemberCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeMobileDevice[] Result
-        {
-            get
-            {
+        public ExchangeAccount[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ExchangeAccount[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void AddDistributionListMemberCompletedEventHandler(object sender, AddDistributionListMemberCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class AddDistributionListMemberCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal AddDistributionListMemberCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public int Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((int)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void DeleteDistributionListMemberCompletedEventHandler(object sender, DeleteDistributionListMemberCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class DeleteDistributionListMemberCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal DeleteDistributionListMemberCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public int Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((int)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetMobileDevicesCompletedEventHandler(object sender, GetMobileDevicesCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetMobileDevicesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetMobileDevicesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ExchangeMobileDevice[] Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeMobileDevice[])(this.results[0]));
             }
         }
     }
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     public delegate void GetMobileDeviceCompletedEventHandler(object sender, GetMobileDeviceCompletedEventArgs e);
-
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetMobileDeviceCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs
-    {
-
+    public partial class GetMobileDeviceCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
         private object[] results;
-
-        internal GetMobileDeviceCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
-            base(exception, cancelled, userState)
-        {
+        
+        internal GetMobileDeviceCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
             this.results = results;
         }
-
+        
         /// <remarks/>
-        public ExchangeMobileDevice Result
-        {
-            get
-            {
+        public ExchangeMobileDevice Result {
+            get {
                 this.RaiseExceptionIfNecessary();
                 return ((ExchangeMobileDevice)(this.results[0]));
             }
         }
     }
-
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void WipeDataFromDeviceCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
-
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void CancelRemoteWipeRequestCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
-
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void RemoveDeviceCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
index 6dc8c467..1022a16c 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012, Outercurve Foundation.
+// Copyright (c) 2012-2014, Outercurve Foundation.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without modification,
@@ -2570,7 +2570,7 @@ namespace WebsitePanel.EnterpriseServer
 
         public static void UpdateExchangeAccount(int accountId, string accountName, ExchangeAccountType accountType,
             string displayName, string primaryEmailAddress, bool mailEnabledPublicFolder,
-            string mailboxManagerActions, string samAccountName, string accountPassword, int mailboxPlanId, string subscriberNumber)
+            string mailboxManagerActions, string samAccountName, string accountPassword, int mailboxPlanId, int archivePlanId, string subscriberNumber)
         {
             SqlHelper.ExecuteNonQuery(
                 ConnectionString,
@@ -2586,6 +2586,7 @@ namespace WebsitePanel.EnterpriseServer
                 new SqlParameter("@Password", string.IsNullOrEmpty(accountPassword) ? (object)DBNull.Value : (object)accountPassword),
                 new SqlParameter("@SamAccountName", samAccountName),
                 new SqlParameter("@MailboxPlanId", (mailboxPlanId == 0) ? (object)DBNull.Value : (object)mailboxPlanId),
+                new SqlParameter("@ArchivingMailboxPlanId", (archivePlanId < 1) ? (object)DBNull.Value : (object)archivePlanId),
                 new SqlParameter("@SubscriberNumber", (string.IsNullOrEmpty(subscriberNumber) ? (object)DBNull.Value : (object)subscriberNumber))
             );
         }
@@ -2709,7 +2710,7 @@ namespace WebsitePanel.EnterpriseServer
         }
 
         public static DataSet GetExchangeAccountsPaged(int actorId, int itemId, string accountTypes,
-                string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
+                string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, bool archiving)
         {
             // check input parameters
             string[] types = accountTypes.Split(',');
@@ -2738,7 +2739,8 @@ namespace WebsitePanel.EnterpriseServer
                 new SqlParameter("@FilterValue", VerifyColumnValue(filterValue)),
                 new SqlParameter("@SortColumn", VerifyColumnName(sortColumn)),
                 new SqlParameter("@StartRow", startRow),
-                new SqlParameter("@MaximumRows", maximumRows)
+                new SqlParameter("@MaximumRows", maximumRows),
+                new SqlParameter("@Archiving", archiving)
             );
         }
 
@@ -2782,7 +2784,8 @@ namespace WebsitePanel.EnterpriseServer
         public static int AddExchangeMailboxPlan(int itemID, string mailboxPlan, bool enableActiveSync, bool enableIMAP, bool enableMAPI, bool enableOWA, bool enablePOP,
                                                     bool isDefault, int issueWarningPct, int keepDeletedItemsDays, int mailboxSizeMB, int maxReceiveMessageSizeKB, int maxRecipients,
                                                     int maxSendMessageSizeKB, int prohibitSendPct, int prohibitSendReceivePct, bool hideFromAddressBook, int mailboxPlanType,
-                                                    bool enabledLitigationHold, long recoverabelItemsSpace, long recoverabelItemsWarning, string litigationHoldUrl, string litigationHoldMsg)
+                                                    bool enabledLitigationHold, long recoverabelItemsSpace, long recoverabelItemsWarning, string litigationHoldUrl, string litigationHoldMsg,
+            bool archiving)
         {
             SqlParameter outParam = new SqlParameter("@MailboxPlanId", SqlDbType.Int);
             outParam.Direction = ParameterDirection.Output;
@@ -2814,7 +2817,8 @@ namespace WebsitePanel.EnterpriseServer
                 new SqlParameter("@RecoverableItemsWarningPct", recoverabelItemsWarning),
                 new SqlParameter("@RecoverableItemsSpace", recoverabelItemsSpace),
                 new SqlParameter("@LitigationHoldUrl", litigationHoldUrl),
-                new SqlParameter("@LitigationHoldMsg", litigationHoldMsg)
+                new SqlParameter("@LitigationHoldMsg", litigationHoldMsg),
+                new SqlParameter("@Archiving", archiving)
             );
 
             return Convert.ToInt32(outParam.Value);
@@ -2881,13 +2885,14 @@ namespace WebsitePanel.EnterpriseServer
             );
         }
 
-        public static IDataReader GetExchangeMailboxPlans(int itemId)
+        public static IDataReader GetExchangeMailboxPlans(int itemId, bool archiving)
         {
             return SqlHelper.ExecuteReader(
                 ConnectionString,
                 CommandType.StoredProcedure,
                 "GetExchangeMailboxPlans",
-                new SqlParameter("@ItemID", itemId)
+                new SqlParameter("@ItemID", itemId),
+                new SqlParameter("@Archiving", archiving)
             );
         }
 
@@ -2914,14 +2919,15 @@ namespace WebsitePanel.EnterpriseServer
             );
         }
 
-        public static void SetExchangeAccountMailboxPlan(int accountId, int mailboxPlanId)
+        public static void SetExchangeAccountMailboxPlan(int accountId, int mailboxPlanId, int archivePlanId)
         {
             SqlHelper.ExecuteNonQuery(
                 ConnectionString,
                 CommandType.StoredProcedure,
                 "SetExchangeAccountMailboxplan",
                 new SqlParameter("@AccountID", accountId),
-                new SqlParameter("@MailboxPlanId", (mailboxPlanId == 0) ? (object)DBNull.Value : (object)mailboxPlanId)
+                new SqlParameter("@MailboxPlanId", (mailboxPlanId == 0) ? (object)DBNull.Value : (object)mailboxPlanId),
+                new SqlParameter("@ArchivingMailboxPlanId", (archivePlanId < 1) ? (object)DBNull.Value : (object)archivePlanId)
             );
         }
 
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/ExchangeServer/ExchangeServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/ExchangeServer/ExchangeServerController.cs
index 2070d35c..c1193f63 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/ExchangeServer/ExchangeServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/ExchangeServer/ExchangeServerController.cs
@@ -950,7 +950,7 @@ namespace WebsitePanel.EnterpriseServer
 
         public static ExchangeAccountsPaged GetAccountsPaged(int itemId, string accountTypes,
             string filterColumn, string filterValue, string sortColumn,
-            int startRow, int maximumRows)
+            int startRow, int maximumRows, bool archiving)
         {
             #region Demo Mode
             if (IsDemoMode)
@@ -965,7 +965,7 @@ namespace WebsitePanel.EnterpriseServer
             #endregion
 
             DataSet ds = DataProvider.GetExchangeAccountsPaged(SecurityContext.User.UserId, itemId,
-                accountTypes, filterColumn, filterValue, sortColumn, startRow, maximumRows);
+                accountTypes, filterColumn, filterValue, sortColumn, startRow, maximumRows, archiving);
 
             ExchangeAccountsPaged result = new ExchangeAccountsPaged();
             result.RecordsCount = (int)ds.Tables[0].Rows[0][0];
@@ -1223,7 +1223,7 @@ namespace WebsitePanel.EnterpriseServer
         {
             DataProvider.UpdateExchangeAccount(account.AccountId, account.AccountName, account.AccountType, account.DisplayName,
                 account.PrimaryEmailAddress, account.MailEnabledPublicFolder,
-                account.MailboxManagerActions.ToString(), account.SamAccountName, account.AccountPassword, account.MailboxPlanId,
+                account.MailboxManagerActions.ToString(), account.SamAccountName, account.AccountPassword, account.MailboxPlanId, account.ArchivingMailboxPlanId,
                 (string.IsNullOrEmpty(account.SubscriberNumber) ? null : account.SubscriberNumber.Trim()));
         }
 
@@ -1598,7 +1598,7 @@ namespace WebsitePanel.EnterpriseServer
 
         private static void UpdateExchangeAccount(int accountId, string accountName, ExchangeAccountType accountType,
             string displayName, string primaryEmailAddress, bool mailEnabledPublicFolder,
-            string mailboxManagerActions, string samAccountName, string accountPassword, int mailboxPlanId, string subscriberNumber)
+            string mailboxManagerActions, string samAccountName, string accountPassword, int mailboxPlanId, int archivePlanId, string subscriberNumber)
         {
             DataProvider.UpdateExchangeAccount(accountId,
                 accountName,
@@ -1609,13 +1609,13 @@ namespace WebsitePanel.EnterpriseServer
                 mailboxManagerActions,
                 samAccountName,
                 CryptoUtils.Encrypt(accountPassword),
-                mailboxPlanId,
+                mailboxPlanId, archivePlanId, 
                 (string.IsNullOrEmpty(subscriberNumber) ? null : subscriberNumber.Trim()));
         }
 
 
         public static int CreateMailbox(int itemId, int accountId, ExchangeAccountType accountType, string accountName,
-            string displayName, string name, string domain, string password, bool sendSetupInstructions, string setupInstructionMailAddress, int mailboxPlanId, string subscriberNumber)
+            string displayName, string name, string domain, string password, bool sendSetupInstructions, string setupInstructionMailAddress, int mailboxPlanId, int archivedPlanId, string subscriberNumber)
         {
             // check account
             int accountCheck = SecurityContext.CheckAccount(DemandAccount.NotDemo | DemandAccount.IsActive);
@@ -1756,7 +1756,7 @@ namespace WebsitePanel.EnterpriseServer
                     | MailboxManagerActions.EmailAddresses;
 
 
-                UpdateExchangeAccount(accountId, accountName, accountType, displayName, email, false, pmmActions.ToString(), samAccount, password, mailboxPlanId, subscriberNumber);
+                UpdateExchangeAccount(accountId, accountName, accountType, displayName, email, false, pmmActions.ToString(), samAccount, password, mailboxPlanId, archivedPlanId, subscriberNumber);
 
 
 
@@ -2600,7 +2600,7 @@ namespace WebsitePanel.EnterpriseServer
 
 
         #region Mailbox plan
-        public static int SetExchangeMailboxPlan(int itemId, int accountId, int mailboxPlanId)
+        public static int SetExchangeMailboxPlan(int itemId, int accountId, int mailboxPlanId, int archivePlanId)
         {
             // check account
             int accountCheck = SecurityContext.CheckAccount(DemandAccount.NotDemo | DemandAccount.IsActive);
@@ -2679,6 +2679,7 @@ namespace WebsitePanel.EnterpriseServer
                 int exchangeServiceId = GetExchangeServiceID(org.PackageId);
                 ExchangeServer exchange = GetExchangeServer(exchangeServiceId, org.ServiceId);
 
+                //TDMX
                 exchange.SetMailboxAdvancedSettings(
                     org.OrganizationId,
                     account.UserPrincipalName,
@@ -2700,7 +2701,7 @@ namespace WebsitePanel.EnterpriseServer
                     plan.LitigationHoldUrl,
                     plan.LitigationHoldMsg);
 
-                DataProvider.SetExchangeAccountMailboxPlan(accountId, mailboxPlanId);
+                DataProvider.SetExchangeAccountMailboxPlan(accountId, mailboxPlanId, archivePlanId);
 
                 return 0;
             }
@@ -2714,7 +2715,7 @@ namespace WebsitePanel.EnterpriseServer
             }
         }
 
-        public static List<ExchangeMailboxPlan> GetExchangeMailboxPlans(int itemId)
+        public static List<ExchangeMailboxPlan> GetExchangeMailboxPlans(int itemId, bool archiving)
         {
             // place log record
             TaskManager.StartTask("EXCHANGE", "GET_EXCHANGE_MAILBOXPLANS", itemId);
@@ -2726,9 +2727,9 @@ namespace WebsitePanel.EnterpriseServer
                 UserInfo user = ObjectUtils.FillObjectFromDataReader<UserInfo>(DataProvider.GetUserByExchangeOrganizationIdInternally(itemId));
 
                 if (user.Role == UserRole.User)
-                    ExchangeServerController.GetExchangeMailboxPlansByUser(itemId, user, ref mailboxPlans);
+                    ExchangeServerController.GetExchangeMailboxPlansByUser(itemId, user, ref mailboxPlans, archiving);
                 else
-                    ExchangeServerController.GetExchangeMailboxPlansByUser(0, user, ref mailboxPlans);
+                    ExchangeServerController.GetExchangeMailboxPlansByUser(0, user, ref mailboxPlans, archiving);
 
 
                 ExchangeOrganization ExchangeOrg = ObjectUtils.FillObjectFromDataReader<ExchangeOrganization>(DataProvider.GetExchangeOrganization(itemId));
@@ -2753,7 +2754,7 @@ namespace WebsitePanel.EnterpriseServer
             }
         }
 
-        private static void GetExchangeMailboxPlansByUser(int itemId, UserInfo user, ref List<ExchangeMailboxPlan> mailboxPlans)
+        private static void GetExchangeMailboxPlansByUser(int itemId, UserInfo user, ref List<ExchangeMailboxPlan> mailboxPlans, bool archiving)
         {
             if ((user != null))
             {
@@ -2780,7 +2781,7 @@ namespace WebsitePanel.EnterpriseServer
 
                 if (OrgId != -1)
                 {
-                    List<ExchangeMailboxPlan> Plans = ObjectUtils.CreateListFromDataReader<ExchangeMailboxPlan>(DataProvider.GetExchangeMailboxPlans(OrgId));
+                    List<ExchangeMailboxPlan> Plans = ObjectUtils.CreateListFromDataReader<ExchangeMailboxPlan>(DataProvider.GetExchangeMailboxPlans(OrgId, archiving));
 
                     foreach (ExchangeMailboxPlan p in Plans)
                     {
@@ -2790,7 +2791,7 @@ namespace WebsitePanel.EnterpriseServer
 
                 UserInfo owner = UserController.GetUserInternally(user.OwnerId);
 
-                GetExchangeMailboxPlansByUser(0, owner, ref mailboxPlans);
+                GetExchangeMailboxPlansByUser(0, owner, ref mailboxPlans, archiving);
             }
         }
 
@@ -2842,9 +2843,18 @@ namespace WebsitePanel.EnterpriseServer
                         if (mailboxPlan.KeepDeletedItemsDays > cntx.Quotas[Quotas.EXCHANGE2007_KEEPDELETEDITEMSDAYS].QuotaAllocatedValue)
                             mailboxPlan.KeepDeletedItemsDays = cntx.Quotas[Quotas.EXCHANGE2007_KEEPDELETEDITEMSDAYS].QuotaAllocatedValue;
 
-                    if (cntx.Quotas[Quotas.EXCHANGE2007_DISKSPACE].QuotaAllocatedValue != -1)
-                        if (mailboxPlan.MailboxSizeMB > cntx.Quotas[Quotas.EXCHANGE2007_DISKSPACE].QuotaAllocatedValue)
-                            mailboxPlan.MailboxSizeMB = cntx.Quotas[Quotas.EXCHANGE2007_DISKSPACE].QuotaAllocatedValue;
+                    if (mailboxPlan.Archiving)
+                    {
+                        if (cntx.Quotas[Quotas.EXCHANGE2013_ARCHIVINGSTORAGE].QuotaAllocatedValue != -1)
+                            if (mailboxPlan.MailboxSizeMB > cntx.Quotas[Quotas.EXCHANGE2013_ARCHIVINGSTORAGE].QuotaAllocatedValue)
+                                mailboxPlan.MailboxSizeMB = cntx.Quotas[Quotas.EXCHANGE2013_ARCHIVINGSTORAGE].QuotaAllocatedValue;
+                    }
+                    else
+                    {
+                        if (cntx.Quotas[Quotas.EXCHANGE2007_DISKSPACE].QuotaAllocatedValue != -1)
+                            if (mailboxPlan.MailboxSizeMB > cntx.Quotas[Quotas.EXCHANGE2007_DISKSPACE].QuotaAllocatedValue)
+                                mailboxPlan.MailboxSizeMB = cntx.Quotas[Quotas.EXCHANGE2007_DISKSPACE].QuotaAllocatedValue;
+                    }
 
                     if (cntx.Quotas[Quotas.EXCHANGE2007_MAXRECEIVEMESSAGESIZEKB].QuotaAllocatedValue != -1)
                         if (mailboxPlan.MaxReceiveMessageSizeKB > cntx.Quotas[Quotas.EXCHANGE2007_MAXRECEIVEMESSAGESIZEKB].QuotaAllocatedValue)
@@ -2871,7 +2881,7 @@ namespace WebsitePanel.EnterpriseServer
                                                         mailboxPlan.IsDefault, mailboxPlan.IssueWarningPct, mailboxPlan.KeepDeletedItemsDays, mailboxPlan.MailboxSizeMB, mailboxPlan.MaxReceiveMessageSizeKB, mailboxPlan.MaxRecipients,
                                                         mailboxPlan.MaxSendMessageSizeKB, mailboxPlan.ProhibitSendPct, mailboxPlan.ProhibitSendReceivePct, mailboxPlan.HideFromAddressBook, mailboxPlan.MailboxPlanType,
                                                         mailboxPlan.AllowLitigationHold, mailboxPlan.RecoverableItemsSpace, mailboxPlan.RecoverableItemsWarningPct,
-                                                        mailboxPlan.LitigationHoldUrl, mailboxPlan.LitigationHoldMsg);
+                                                        mailboxPlan.LitigationHoldUrl, mailboxPlan.LitigationHoldMsg, mailboxPlan.Archiving);
             }
             catch (Exception ex)
             {
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
index 0b63cf24..fa03a722 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
@@ -1314,7 +1314,7 @@ namespace WebsitePanel.EnterpriseServer
 
             DataSet ds =
                 DataProvider.GetExchangeAccountsPaged(SecurityContext.User.UserId, itemId, accountTypes, filterColumn,
-                                                      filterValue, sortColumn, startRow, maximumRows);
+                                                      filterValue, sortColumn, startRow, maximumRows, false);
 
             OrganizationUsersPaged result = new OrganizationUsersPaged();
             result.RecordsCount = (int)ds.Tables[0].Rows[0][0];
@@ -2078,7 +2078,7 @@ namespace WebsitePanel.EnterpriseServer
         {
             DataProvider.UpdateExchangeAccount(account.AccountId, account.AccountName, account.AccountType, account.DisplayName,
                 account.PrimaryEmailAddress, account.MailEnabledPublicFolder,
-                account.MailboxManagerActions.ToString(), account.SamAccountName, account.AccountPassword, account.MailboxPlanId,
+                account.MailboxManagerActions.ToString(), account.SamAccountName, account.AccountPassword, account.MailboxPlanId, account.ArchivingMailboxPlanId,
                 (string.IsNullOrEmpty(account.SubscriberNumber) ? null : account.SubscriberNumber.Trim()));
         }
 
@@ -2635,7 +2635,7 @@ namespace WebsitePanel.EnterpriseServer
 
             DataSet ds =
                 DataProvider.GetExchangeAccountsPaged(SecurityContext.User.UserId, itemId, accountTypes, filterColumn,
-                                                      filterValue, sortColumn, startRow, maximumRows);
+                                                      filterValue, sortColumn, startRow, maximumRows, false);
 
             ExchangeAccountsPaged result = new ExchangeAccountsPaged();
             result.RecordsCount = (int)ds.Tables[0].Rows[0][0];
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esExchangeServer.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esExchangeServer.asmx.cs
index 0e201812..8d86fd5b 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esExchangeServer.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esExchangeServer.asmx.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012, Outercurve Foundation.
+// Copyright (c) 2012-2014, Outercurve Foundation.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without modification,
@@ -166,11 +166,11 @@ namespace WebsitePanel.EnterpriseServer
         [WebMethod]
         public ExchangeAccountsPaged GetAccountsPaged(int itemId, string accountTypes,
             string filterColumn, string filterValue, string sortColumn,
-            int startRow, int maximumRows)
+            int startRow, int maximumRows, bool archiving)
         {
             return ExchangeServerController.GetAccountsPaged(itemId, accountTypes,
                 filterColumn, filterValue, sortColumn,
-                startRow, maximumRows);
+                startRow, maximumRows, archiving);
         }
 
         [WebMethod]
@@ -222,9 +222,9 @@ namespace WebsitePanel.EnterpriseServer
         #region Mailboxes
         [WebMethod]
         public int CreateMailbox(int itemId, int accountId, ExchangeAccountType accountType, string accountName, string displayName,
-            string name, string domain, string password, bool sendSetupInstructions, string setupInstructionMailAddress, int mailboxPlanId, string subscriberNumber)
+            string name, string domain, string password, bool sendSetupInstructions, string setupInstructionMailAddress, int mailboxPlanId, int archivedPlanId, string subscriberNumber)
         {
-            return ExchangeServerController.CreateMailbox(itemId, accountId, accountType, accountName, displayName, name, domain, password, sendSetupInstructions, setupInstructionMailAddress, mailboxPlanId, subscriberNumber);
+            return ExchangeServerController.CreateMailbox(itemId, accountId, accountType, accountName, displayName, name, domain, password, sendSetupInstructions, setupInstructionMailAddress, mailboxPlanId, archivedPlanId, subscriberNumber);
         }
 
         [WebMethod]
@@ -303,9 +303,9 @@ namespace WebsitePanel.EnterpriseServer
 
 
         [WebMethod]
-        public int SetExchangeMailboxPlan(int itemId, int accountId, int mailboxPlanId)
+        public int SetExchangeMailboxPlan(int itemId, int accountId, int mailboxPlanId, int archivePlanId)
         {
-            return ExchangeServerController.SetExchangeMailboxPlan(itemId, accountId, mailboxPlanId);
+            return ExchangeServerController.SetExchangeMailboxPlan(itemId, accountId, mailboxPlanId, archivePlanId);
         }
 
         [WebMethod]
@@ -527,9 +527,9 @@ namespace WebsitePanel.EnterpriseServer
 
         #region MailboxPlans
         [WebMethod]
-        public List<ExchangeMailboxPlan> GetExchangeMailboxPlans(int itemId)
+        public List<ExchangeMailboxPlan> GetExchangeMailboxPlans(int itemId, bool archiving)
         {
-            return ExchangeServerController.GetExchangeMailboxPlans(itemId);
+            return ExchangeServerController.GetExchangeMailboxPlans(itemId, archiving);
         }
 
         [WebMethod]
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeAccount.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeAccount.cs
index 58b9e55b..586dcf3c 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeAccount.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeAccount.cs
@@ -155,5 +155,21 @@ namespace WebsitePanel.Providers.HostedSolution
             get { return this.notes; }
             set { this.notes = value; }
         }
+
+        int archivingMailboxPlanId;
+        public int ArchivingMailboxPlanId
+        {
+            get { return this.archivingMailboxPlanId; }
+            set { this.archivingMailboxPlanId = value; }
+        }
+
+        string archivingMailboxPlan;
+        public string ArchivingMailboxPlan
+        {
+            get { return this.archivingMailboxPlan; }
+            set { this.archivingMailboxPlan = value; }
+        }
+
+    
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeMailboxPlan.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeMailboxPlan.cs
index c2207f0d..cd4a69ec 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeMailboxPlan.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeMailboxPlan.cs
@@ -209,5 +209,12 @@ namespace WebsitePanel.Providers.HostedSolution
             get { return this.litigationHoldMsg; }
             set { this.litigationHoldMsg = value; }
         }
+
+        bool archiving;
+        public bool Archiving
+        {
+            get { return this.archiving; }
+            set { this.archiving = value; }
+        }
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config
index ef870227..1d8d927a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config
@@ -469,7 +469,8 @@
 			<Control key="organization_home" src="WebsitePanel/ExchangeServer/OrganizationHome.ascx" title="OrganizationHome" type="View" />
 			<Control key="organization_user_setup" src="WebsitePanel/ExchangeServer/OrganizationUserSetupInstructions.ascx" title="OrganizationUserSetupInstructions" type="View" />
 			<Control key="mailboxes" src="WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx" title="ExchangeMailboxes" type="View" />
-			<Control key="create_mailbox" src="WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx" title="ExchangeCreateMailbox" type="View" />
+      <Control key="archivingmailboxes" src="WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx" title="ExchangeArchivingMailboxes" type="View" />
+      <Control key="create_mailbox" src="WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx" title="ExchangeCreateMailbox" type="View" />
 			<Control key="mailbox_settings" src="WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx" title="ExchangeMailboxGeneralSettings" type="View" />
       <Control key="mailbox_mobile" src="WebsitePanel/ExchangeServer/ExchangeMailboxMobile.ascx" title="ExchangeMailboxMobile" type="View" />
       <Control key="mailbox_mobile_details" src="WebsitePanel/ExchangeServer/ExchangeMailboxMobileDetails.ascx" title="ExchangeMailboxMobile" type="View" />
@@ -512,6 +513,7 @@
 			<Control key="storage_limits" src="WebsitePanel/ExchangeServer/ExchangeStorageLimits.ascx" title="ExchangeStorageLimits" type="View" />
 			<Control key="activesync_policy" src="WebsitePanel/ExchangeServer/ExchangeActiveSyncSettings.ascx" title="ExchangeActiveSyncSettings" type="View" />
       <Control key="mailboxplans" src="WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx" title="ExchangeMailboxPlans" type="View" />
+      <Control key="archivingmailboxplans" src="WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx" title="ExchangeArchivingMailboxPlans" type="View" />
       <Control key="add_mailboxplan" src="WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx" title="ExchangeAddMailboxPlan" type="View" />
 
       <Control key="CRMOrganizationDetails" src="WebsitePanel/CRM/CRMOrganizationDetails.ascx" title="ExchangeActiveSyncSettings" type="View" />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
index 0f3de7a5..fe8a1b6f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
@@ -5431,4 +5431,10 @@
   <data name="HostedCRM.LicenseProfessional" xml:space="preserve">
     <value>Professional</value>
   </data>
+  <data name="Quota.Exchange2013.AllowArchiving" xml:space="preserve">
+    <value>Allow Archiving</value>
+  </data>
+  <data name="Quota.Exchange2013.ArchivingStorage" xml:space="preserve">
+    <value>Archiving storage, MB</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Framework/PanelRequest.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Framework/PanelRequest.cs
index 6cd86c5e..ea205638 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Framework/PanelRequest.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Framework/PanelRequest.cs
@@ -49,6 +49,19 @@ namespace WebsitePanel.Portal
             return result;
         }
 
+        public static bool GetBool(string key)
+        {
+            return GetBool(key, false);
+        }
+
+        public static bool GetBool(string key, bool defaultValue)
+        {
+            bool result = defaultValue;
+            try { result = bool.Parse(HttpContext.Current.Request[key]); }
+            catch { /* do nothing */ }
+            return result;
+        }
+
         public static int UserID
         {
             get { return GetInt("UserID"); }
@@ -195,5 +208,10 @@ namespace WebsitePanel.Portal
         {
             get { return HttpContext.Current.Request["FolderID"] ?? ""; }
         }
+
+        public static string Ctl
+        {
+            get { return HttpContext.Current.Request["ctl"] ?? ""; }
+        }
     }
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/ExchangeHelper.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/ExchangeHelper.cs
index fe9507c5..08fe23fd 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/ExchangeHelper.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/ExchangeHelper.cs
@@ -65,20 +65,20 @@ namespace WebsitePanel.Portal
 		ExchangeAccountsPaged accounts;
 
 		public int GetExchangeAccountsPagedCount(int itemId, string accountTypes,
-			string filterColumn, string filterValue)
+            string filterColumn, string filterValue, bool archiving)
 		{
 			return accounts.RecordsCount;
 		}
 
 		public ExchangeAccount[] GetExchangeAccountsPaged(int itemId, string accountTypes,
 			string filterColumn, string filterValue,
-			int maximumRows, int startRowIndex, string sortColumn)
+            int maximumRows, int startRowIndex, string sortColumn, bool archiving)
 		{
 			if (!String.IsNullOrEmpty(filterValue))
 				filterValue = filterValue + "%";
 
-			accounts = ES.Services.ExchangeServer.GetAccountsPaged(itemId,
-                accountTypes, filterColumn, filterValue, sortColumn, startRowIndex, maximumRows);
+            accounts = ES.Services.ExchangeServer.GetAccountsPaged(itemId,
+                accountTypes, filterColumn, filterValue, sortColumn, startRowIndex, maximumRows, archiving);
 
 			return accounts.PageItems;
 		}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeAddMailboxPlan.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeAddMailboxPlan.ascx.resx
index d2a05201..d3e7ed41 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeAddMailboxPlan.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeAddMailboxPlan.ascx.resx
@@ -216,4 +216,7 @@
   <data name="lblLitigationHoldUrl.Text" xml:space="preserve">
     <value>Litigation Hold Url:</value>
   </data>
+  <data name="locTitleArchiving.Text" xml:space="preserve">
+    <value>Add Archiving Mailbox plan</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeMailboxPlans.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeMailboxPlans.ascx.resx
index f2b0cc1d..c7831aaf 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeMailboxPlans.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeMailboxPlans.ascx.resx
@@ -162,4 +162,7 @@
   <data name="Text.PageName" xml:space="preserve">
     <value>Mailbox plans</value>
   </data>
+  <data name="locTitleArchiving.Text" xml:space="preserve">
+    <value>Archiving Mailbox plans</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeMailboxes.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeMailboxes.ascx.resx
index ef18271b..6b4a1ba2 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeMailboxes.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/ExchangeMailboxes.ascx.resx
@@ -174,4 +174,7 @@
   <data name="gvUsersLogin.Header" xml:space="preserve">
     <value>Login</value>
   </data>
+  <data name="locTitleArchiving.Text" xml:space="preserve">
+    <value>Archiving Mailboxes</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx
index 47f94741..fec347e3 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx
@@ -22,11 +22,13 @@
 			<div class="Center">
 				<div class="Title">
 					<asp:Image ID="Image1" SkinID="ExchangeDomainNameAdd48" runat="server" />
-					<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Add Mailboxplan"></asp:Localize>
+					<asp:Localize ID="locTitle" runat="server" Text="Add Mailboxplan"></asp:Localize>
 				</div>
 				<div class="FormBody">
 				    <wsp:SimpleMessageBox id="messageBox" runat="server" />
 
+                    <asp:HiddenField runat="server" ID="hfArchivingPlan" />
+
 					<wsp:CollapsiblePanel id="secMailboxPlan" runat="server"
                         TargetControlID="MailboxPlan" meta:resourcekey="secMailboxPlan" Text="Mailboxplan">
                     </wsp:CollapsiblePanel>
@@ -165,7 +167,6 @@
 						</table>
 					</asp:Panel>
 					
-					
 					<wsp:CollapsiblePanel id="secDeleteRetention" runat="server"
                         TargetControlID="DeleteRetention" meta:resourcekey="secDeleteRetention" Text="Delete Item Retention">
                     </wsp:CollapsiblePanel>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx.cs
index b5d72109..f3aa61ee 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx.cs
@@ -35,6 +35,20 @@ namespace WebsitePanel.Portal.ExchangeServer
 {
     public partial class ExchangeAddMailboxPlan : WebsitePanelModuleBase
     {
+        private bool ArchivingPlan
+        {
+            get
+            {
+                bool res = false;
+                bool.TryParse(hfArchivingPlan.Value, out res);
+                return res;
+            }
+            set
+            {
+                hfArchivingPlan.Value = value.ToString();
+            }
+        }
+
         protected void Page_Load(object sender, EventArgs e)
         {
 
@@ -66,27 +80,7 @@ namespace WebsitePanel.Portal.ExchangeServer
                     txtLitigationHoldMsg.Text = plan.LitigationHoldMsg;
                     txtLitigationHoldUrl.Text = plan.LitigationHoldUrl;
 
-
-
-                    /*
-                    txtMailboxPlan.Enabled = false;
-                    mailboxSize.Enabled = false;
-                    maxRecipients.Enabled = false;
-                    maxSendMessageSizeKB.Enabled = false;
-                    maxReceiveMessageSizeKB.Enabled = false;
-                    chkPOP3.Enabled = false;
-                    chkIMAP.Enabled = false;
-                    chkOWA.Enabled = false;
-                    chkMAPI.Enabled = false;
-                    chkActiveSync.Enabled = false;
-                    sizeIssueWarning.Enabled = false;
-                    sizeProhibitSend.Enabled = false;
-                    sizeProhibitSendReceive.Enabled = false;
-                    daysKeepDeletedItems.Enabled = false;
-                    chkHideFromAddressBook.Enabled = false;
-
-                    btnAdd.Enabled = false;
-                     */
+                    ArchivingPlan = plan.Archiving;
 
                     locTitle.Text = plan.MailboxPlan;
                     this.DisableControls = true;
@@ -156,11 +150,19 @@ namespace WebsitePanel.Portal.ExchangeServer
                             sizeProhibitSend.ValueKB = 100;
                             sizeProhibitSendReceive.ValueKB = 100;
                             recoverableItemsWarning.ValueKB = 95;
+
+                            ArchivingPlan = PanelRequest.GetBool("archiving", false);
                         }
                     }
                     else
                         this.DisableControls = true;
                 }
+
+                locTitle.Text = ArchivingPlan ? GetLocalizedString("locTitleArchiving.Text") : GetLocalizedString("locTitle.Text");
+
+                secMailboxFeatures.Visible = !ArchivingPlan;
+                secMailboxGeneral.Visible = !ArchivingPlan;
+
             }
 
         }
@@ -201,8 +203,9 @@ namespace WebsitePanel.Portal.ExchangeServer
                 plan.RecoverableItemsWarningPct = recoverableItemsWarning.ValueKB;
                 if ((plan.RecoverableItemsWarningPct == 0)) plan.RecoverableItemsWarningPct = 100;
                 plan.LitigationHoldMsg = txtLitigationHoldMsg.Text.Trim();
-                plan.LitigationHoldUrl = txtLitigationHoldUrl.Text.Trim(); 
+                plan.LitigationHoldUrl = txtLitigationHoldUrl.Text.Trim();
 
+                plan.Archiving = ArchivingPlan;
 
                 int result = ES.Services.ExchangeServer.AddExchangeMailboxPlan(PanelRequest.ItemID,
                                                                                 plan);
@@ -214,7 +217,7 @@ namespace WebsitePanel.Portal.ExchangeServer
                     return;
                 }
 
-                Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "mailboxplans",
+                Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), ArchivingPlan ? "archivingmailboxplans" : "mailboxplans",
                     "SpaceID=" + PanelSecurity.PackageId));
             }
             catch (Exception ex)
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx.designer.cs
index 2446bd6f..ec1414e5 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeAddMailboxPlan.ascx.designer.cs
@@ -66,6 +66,15 @@ namespace WebsitePanel.Portal.ExchangeServer {
         /// </remarks>
         protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
         
+        /// <summary>
+        /// hfArchivingPlan control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField hfArchivingPlan;
+        
         /// <summary>
         /// secMailboxPlan control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx
index b2deb2cf..76fa28eb 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx
@@ -142,7 +142,15 @@
                                     <asp:Localize ID="locMailboxplanName" runat="server" meta:resourcekey="locMailboxplanName" Text="Mailboxplan Name: *"></asp:Localize>
                                 </td>
                                 <td>                                
-                                    <wsp:MailboxPlanSelector ID="mailboxPlanSelector" runat="server" />
+                                    <wsp:MailboxPlanSelector ID="mailboxPlanSelector" runat="server" Archiving="false" />
+                                </td>
+					        </tr>
+                            <tr>
+                                <td class="FormLabel150">
+                                    <asp:Localize ID="locArchivingMailboxplanName" runat="server" meta:resourcekey="locArchivingMailboxplanName" Text="Archiving Mailboxplan Name: "></asp:Localize>
+                                </td>
+                                <td>                                
+                                    <wsp:MailboxPlanSelector ID="archivingMailboxPlanSelector" runat="server" Archiving="true" AddNone="true" />
                                 </td>
 					        </tr>
 					    </table>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx.cs
index cb2f08c3..972fce20 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx.cs
@@ -84,7 +84,7 @@ namespace WebsitePanel.Portal.ExchangeServer
 
 
 
-                WebsitePanel.Providers.HostedSolution.ExchangeMailboxPlan[] plans = ES.Services.ExchangeServer.GetExchangeMailboxPlans(PanelRequest.ItemID);
+                WebsitePanel.Providers.HostedSolution.ExchangeMailboxPlan[] plans = ES.Services.ExchangeServer.GetExchangeMailboxPlans(PanelRequest.ItemID, false);
 
                 if (plans.Length == 0)
                     btnCreate.Enabled = false;
@@ -138,6 +138,7 @@ namespace WebsitePanel.Portal.ExchangeServer
                                     chkSendInstructions.Checked,
                                     sendInstructionEmail.Text,
                                     Convert.ToInt32(mailboxPlanSelector.MailboxPlanId),
+                                    Convert.ToInt32(archivingMailboxPlanSelector.MailboxPlanId),
                                     subscriberNumber);
 
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx.designer.cs
index f58e8241..948f2580 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx.designer.cs
@@ -1,31 +1,3 @@
-// Copyright (c) 2012, Outercurve Foundation.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// - Redistributions of source code must  retain  the  above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
-//   this list of conditions  and  the  following  disclaimer in  the documentation
-//   and/or other materials provided with the distribution.
-//
-// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
-//   contributors may be used to endorse or  promote  products  derived  from  this
-//   software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
-// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
-// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -355,6 +327,24 @@ namespace WebsitePanel.Portal.ExchangeServer {
         /// </remarks>
         protected global::WebsitePanel.Portal.ExchangeServer.UserControls.MailboxPlanSelector mailboxPlanSelector;
         
+        /// <summary>
+        /// locArchivingMailboxplanName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locArchivingMailboxplanName;
+        
+        /// <summary>
+        /// archivingMailboxPlanSelector control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.MailboxPlanSelector archivingMailboxPlanSelector;
+        
         /// <summary>
         /// chkSendInstructions control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx
index 684c694f..881987b9 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx
@@ -75,6 +75,28 @@
 						</asp:UpdatePanel>
 					</asp:Panel>
 
+                    <wsp:CollapsiblePanel id="secArchiving" runat="server" TargetControlID="Archiving" meta:resourcekey="secArchiving" Text="Archiving"></wsp:CollapsiblePanel>
+                    <asp:Panel ID="Archiving" runat="server" Height="0" style="overflow:hidden;">
+						<asp:UpdatePanel ID="ArchivingUpdatePanel" runat="server" UpdateMode="Conditional" ChildrenAsTriggers="true">
+							<ContentTemplate>
+					            <table>
+                                    <tr>
+                                        <td class="FormLabel150"></td>
+                                        <td>
+                                            <asp:CheckBox ID="chkArchiving" runat="server" meta:resourcekey ="chkArchiving" Text ="Enable Archiving" AutoPostBack="true" OnCheckedChanged="chkArchiving_CheckedChanged"></asp:CheckBox>
+                                        </td>
+                                    </tr>
+					                <tr runat="server" id="mailboxArchivePlan">
+					                    <td class="FormLabel150"><asp:Localize ID="locArchiveMailboxplanName" runat="server" meta:resourcekey="locArchiveMailboxplanName" Text="Archive Mailbox plan: "></asp:Localize></td>
+					                    <td>                                
+                                            <wsp:MailboxPlanSelector ID="mailboxArchivePlanSelector" runat="server" Archiving="true" AddNone="true" />
+                                        </td>
+					                </tr>
+					            </table>
+							</ContentTemplate>
+						</asp:UpdatePanel>
+					</asp:Panel>
+
                     <wsp:CollapsiblePanel id="secLitigationHoldSettings" runat="server" TargetControlID="LitigationHoldSettings" meta:resourcekey="secLitigationHoldSettings" Text="Litigation Hold"></wsp:CollapsiblePanel>
                     <asp:Panel ID="LitigationHoldSettings" runat="server" Height="0" style="overflow:hidden;">
 						<asp:UpdatePanel ID="LitigationHoldUpdatePanel" runat="server" UpdateMode="Conditional" ChildrenAsTriggers="true">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.cs
index c2195493..44a83cf7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.cs
@@ -53,6 +53,8 @@ namespace WebsitePanel.Portal.ExchangeServer
                     ddDisclaimer.Visible = false;
                 }
 
+                secArchiving.Visible = Utils.CheckQouta(Quotas.EXCHANGE2013_ALLOWARCHIVING, cntx);
+
                 BindSettings();
 
                 UserInfo user = UsersHelper.GetUser(PanelSecurity.EffectiveUserId);
@@ -114,6 +116,15 @@ namespace WebsitePanel.Portal.ExchangeServer
                     mailboxPlanSelector.MailboxPlanId = account.MailboxPlanId.ToString();
                 }
 
+                if (account.ArchivingMailboxPlanId<1)
+                {
+                    mailboxArchivePlanSelector.MailboxPlanId = "-1";
+                }
+                else
+                {
+                    mailboxArchivePlanSelector.MailboxPlanId = account.ArchivingMailboxPlanId.ToString();
+                }
+
                 mailboxSize.QuotaUsedValue = Convert.ToInt32(stats.TotalSize / 1024 / 1024);
                 mailboxSize.QuotaValue = (stats.MaxSize == -1) ? -1 : (int)Math.Round((double)(stats.MaxSize / 1024 / 1024));
 
@@ -163,7 +174,8 @@ namespace WebsitePanel.Portal.ExchangeServer
                 }
                 else
                 {
-                    result = ES.Services.ExchangeServer.SetExchangeMailboxPlan(PanelRequest.ItemID, PanelRequest.AccountID, Convert.ToInt32(mailboxPlanSelector.MailboxPlanId));
+                    result = ES.Services.ExchangeServer.SetExchangeMailboxPlan(PanelRequest.ItemID, PanelRequest.AccountID, Convert.ToInt32(mailboxPlanSelector.MailboxPlanId),
+                        Convert.ToInt32(mailboxArchivePlanSelector.MailboxPlanId) );
                     if (result < 0)
                     {
                         messageBox.ShowResultMessage(result);
@@ -241,5 +253,10 @@ namespace WebsitePanel.Portal.ExchangeServer
             return result;
         }
 
+        protected void chkArchiving_CheckedChanged(object sender, EventArgs e)
+        {
+            mailboxArchivePlan.Visible = chkArchiving.Checked;
+        }
+
     }
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.designer.cs
index 32932678..b79f3f0d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.designer.cs
@@ -1,30 +1,3 @@
-// Copyright (c) 2012, Outercurve Foundation.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// - Redistributions of source code must  retain  the  above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
-//   this list of conditions  and  the  following  disclaimer in  the documentation
-//   and/or other materials provided with the distribution.
-//
-// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
-//   contributors may be used to endorse or  promote  products  derived  from  this
-//   software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
-// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
-// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -210,6 +183,69 @@ namespace WebsitePanel.Portal.ExchangeServer {
         /// </remarks>
         protected global::WebsitePanel.Portal.QuotaViewer mailboxSize;
         
+        /// <summary>
+        /// secArchiving control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secArchiving;
+        
+        /// <summary>
+        /// Archiving control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Panel Archiving;
+        
+        /// <summary>
+        /// ArchivingUpdatePanel control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.UpdatePanel ArchivingUpdatePanel;
+        
+        /// <summary>
+        /// chkArchiving control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.CheckBox chkArchiving;
+        
+        /// <summary>
+        /// mailboxArchivePlan control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTableRow mailboxArchivePlan;
+        
+        /// <summary>
+        /// locArchiveMailboxplanName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locArchiveMailboxplanName;
+        
+        /// <summary>
+        /// mailboxArchivePlanSelector control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.ExchangeServer.UserControls.MailboxPlanSelector mailboxArchivePlanSelector;
+        
         /// <summary>
         /// secLitigationHoldSettings control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx
index 8aa91af9..29237ac7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx
@@ -21,7 +21,7 @@
 			<div class="Center">
 				<div class="Title">
 					<asp:Image ID="Image1" SkinID="ExchangeDomainName48" runat="server" />
-					<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Domain Names"></asp:Localize>
+					<asp:Localize ID="locTitle" runat="server"></asp:Localize>
 				</div>
 				<div class="FormBody">
 				    <wsp:SimpleMessageBox id="messageBox" runat="server" />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx.cs
index b384d207..fbd03b7c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx.cs
@@ -35,8 +35,19 @@ namespace WebsitePanel.Portal.ExchangeServer
 {
     public partial class ExchangeMailboxPlans : WebsitePanelModuleBase
     {
+        private bool ArchivingPlans
+        {
+            get
+            {
+                return PanelRequest.Ctl.ToLower().Contains("archiving");
+            }
+        }
+
+
         protected void Page_Load(object sender, EventArgs e)
         {
+            locTitle.Text = ArchivingPlans ? GetLocalizedString("locTitleArchiving.Text") : GetLocalizedString("locTitle.Text");
+
             if (!IsPostBack)
             {
                 // bind mailboxplans
@@ -71,7 +82,7 @@ namespace WebsitePanel.Portal.ExchangeServer
 
         private void BindMailboxPlans()
         {
-            ExchangeMailboxPlan[] list = ES.Services.ExchangeServer.GetExchangeMailboxPlans(PanelRequest.ItemID);
+            ExchangeMailboxPlan[] list = ES.Services.ExchangeServer.GetExchangeMailboxPlans(PanelRequest.ItemID, ArchivingPlans);
 
             gvMailboxPlans.DataSource = list;
             gvMailboxPlans.DataBind();
@@ -94,7 +105,7 @@ namespace WebsitePanel.Portal.ExchangeServer
         {
             btnSetDefaultMailboxPlan.Enabled = true;
             Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "add_mailboxplan",
-                "SpaceID=" + PanelSecurity.PackageId));
+                "SpaceID=" + PanelSecurity.PackageId, "archiving="+ArchivingPlans));
         }
 
         protected void gvMailboxPlan_RowCommand(object sender, GridViewCommandEventArgs e)
@@ -177,7 +188,7 @@ namespace WebsitePanel.Portal.ExchangeServer
                 foreach (ExchangeAccount a in Accounts)
                 {
                     txtStatus.Text = "Completed";
-                    int result = ES.Services.ExchangeServer.SetExchangeMailboxPlan(PanelRequest.ItemID, a.AccountId, Convert.ToInt32(mailboxPlanSelectorTarget.MailboxPlanId));
+                    int result = ES.Services.ExchangeServer.SetExchangeMailboxPlan(PanelRequest.ItemID, a.AccountId, Convert.ToInt32(mailboxPlanSelectorTarget.MailboxPlanId), a.ArchivingMailboxPlanId);
                     if (result < 0)
                     {
                         BindMailboxPlans();
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx.designer.cs
index 069976ff..19250806 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxPlans.ascx.designer.cs
@@ -1,33 +1,4 @@
-// Copyright (c) 2012, Outercurve Foundation.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// - Redistributions of source code must  retain  the  above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
-//   this list of conditions  and  the  following  disclaimer in  the documentation
-//   and/or other materials provided with the distribution.
-//
-// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
-//   contributors may be used to endorse or  promote  products  derived  from  this
-//   software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
-// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
-// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //
@@ -202,14 +173,5 @@ namespace WebsitePanel.Portal.ExchangeServer {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btnSave;
-        
-        /// <summary>
-        /// FormComments control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Localize FormComments;
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx
index 09dc751d..501e099e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx
@@ -19,7 +19,7 @@
 			<div class="Center">
 				<div class="Title">
 					<asp:Image ID="Image1" SkinID="ExchangeMailbox48" runat="server" />
-					<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Mailboxes"></asp:Localize>
+					<asp:Localize ID="locTitle" runat="server" Text="Mailboxes"></asp:Localize>
 				</div>
 				<div class="FormBody">
 				    <wsp:SimpleMessageBox id="messageBox" runat="server" />
@@ -94,12 +94,14 @@
 							SelectMethod="GetExchangeAccountsPaged"
 							SortParameterName="sortColumn"
 							TypeName="WebsitePanel.Portal.ExchangeHelper"
+                            OnSelecting="odsAccountsPaged_Selecting"
 							OnSelected="odsAccountsPaged_Selected">
 						<SelectParameters>
 							<asp:QueryStringParameter Name="itemId" QueryStringField="ItemID" DefaultValue="0" />
 							<asp:Parameter Name="accountTypes" DefaultValue="1,5,6" />
 							<asp:ControlParameter Name="filterColumn" ControlID="ddlSearchColumn" PropertyName="SelectedValue" />
 							<asp:ControlParameter Name="filterValue" ControlID="txtSearchValue" PropertyName="Text" />
+                            <asp:Parameter Name="archiving" Type="Boolean" />
 						</SelectParameters>
 					</asp:ObjectDataSource>
 				    <br />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx.cs
index f225eb71..3f155650 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx.cs
@@ -35,8 +35,20 @@ namespace WebsitePanel.Portal.ExchangeServer
 {
     public partial class ExchangeMailboxes : WebsitePanelModuleBase
     {
+        private bool ArchivingBoxes
+        {
+            get
+            {
+                return PanelRequest.Ctl.ToLower().Contains("archiving");
+            }
+        }
+
         protected void Page_Load(object sender, EventArgs e)
         {
+            locTitle.Text = ArchivingBoxes ? GetLocalizedString("locTitleArchiving.Text") : GetLocalizedString("locTitle.Text");
+
+            btnCreateMailbox.Visible = !ArchivingBoxes;
+
             if (!IsPostBack)
             {
                 BindStats();
@@ -149,5 +161,10 @@ namespace WebsitePanel.Portal.ExchangeServer
                     "ItemID=" + PanelRequest.ItemID,
                     "Context=User");
         }
+
+        protected void odsAccountsPaged_Selecting(object sender, ObjectDataSourceSelectingEventArgs e)
+        {
+            e.InputParameters["archiving"] = ArchivingBoxes;
+        }
     }
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/Menu.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/Menu.ascx.resx
index e8a5d3fb..825046d9 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/Menu.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/App_LocalResources/Menu.ascx.resx
@@ -216,4 +216,10 @@
   <data name="Text.CRMGroup2013" xml:space="preserve">
     <value>CRM 2013</value>
   </data>
+  <data name="Text.ArchivingMailboxes" xml:space="preserve">
+    <value>Archiving Mailboxes</value>
+  </data>
+  <data name="Text.ArchivingMailboxPlans" xml:space="preserve">
+    <value>Archiving Mailbox Plans</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxPlanSelector.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxPlanSelector.ascx.cs
index 17f6f552..7c4ea1d5 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxPlanSelector.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/MailboxPlanSelector.ascx.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012, Outercurve Foundation.
+// Copyright (c) 2012-2014, Outercurve Foundation.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without modification,
@@ -70,6 +70,13 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
             }
         }
 
+        private bool archiving = false;
+        public bool Archiving
+        {
+            get { return archiving; }
+            set { archiving = value; }
+        }
+
 
         protected void Page_Load(object sender, EventArgs e)
         {
@@ -81,7 +88,16 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
 
         private void BindMailboxPlans()
         {
-            WebsitePanel.Providers.HostedSolution.ExchangeMailboxPlan[] plans = ES.Services.ExchangeServer.GetExchangeMailboxPlans(PanelRequest.ItemID);
+            WebsitePanel.Providers.HostedSolution.ExchangeMailboxPlan[] plans = ES.Services.ExchangeServer.GetExchangeMailboxPlans(PanelRequest.ItemID, Archiving);
+
+            if (AddNone)
+            {
+                ListItem li = new ListItem();
+                li.Text =  "None";
+                li.Value = "-1";
+                li.Selected = false;
+                ddlMailboxPlan.Items.Add(li);
+            }
 
             foreach (WebsitePanel.Providers.HostedSolution.ExchangeMailboxPlan plan in plans)
             {
@@ -92,15 +108,6 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
                 ddlMailboxPlan.Items.Add(li);
             }
 
-            if (AddNone)
-            {
-                ListItem li = new ListItem();
-                li.Text = "[None]";
-                li.Value = "-1";
-                li.Selected = false;
-                ddlMailboxPlan.Items.Add(li);
-            }
-
 
             if (!string.IsNullOrEmpty(mailboxPlanToSelect))
             {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/Menu.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/Menu.ascx.cs
index c7b899aa..81b1a6e3 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/Menu.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/Menu.ascx.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012, Outercurve Foundation.
+// Copyright (c) 2012-2014, Outercurve Foundation.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without modification,
@@ -120,6 +120,9 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
             if (Utils.CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, cntx))
                 exchangeGroup.MenuItems.Add(CreateMenuItem("Mailboxes", "mailboxes"));
 
+            if (Utils.CheckQouta(Quotas.EXCHANGE2013_ALLOWARCHIVING, cntx))
+                exchangeGroup.MenuItems.Add(CreateMenuItem("ArchivingMailboxes", "archivingmailboxes"));
+
             if (Utils.CheckQouta(Quotas.EXCHANGE2007_CONTACTS, cntx))
                 exchangeGroup.MenuItems.Add(CreateMenuItem("Contacts", "contacts"));
 
@@ -137,6 +140,10 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
                 if (Utils.CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, cntx))
                     exchangeGroup.MenuItems.Add(CreateMenuItem("MailboxPlans", "mailboxplans"));
 
+            if (!hideItems)
+                if (Utils.CheckQouta(Quotas.EXCHANGE2013_ALLOWARCHIVING, cntx))
+                    exchangeGroup.MenuItems.Add(CreateMenuItem("ArchivingMailboxPlans", "archivingmailboxplans"));
+
             if (!hideItems)
                 if (Utils.CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, cntx))
                     exchangeGroup.MenuItems.Add(CreateMenuItem("ExchangeDomainNames", "domains"));
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Exchange_Settings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Exchange_Settings.ascx
index be0220cb..587cf3e2 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Exchange_Settings.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Exchange_Settings.ascx
@@ -40,6 +40,17 @@
         </td>
     </tr>
 
+    <tr>
+        <td class="SubHead" runat="server" id="archivingGroup" width="200" nowrap>
+            <asp:Localize ID="locArchivingDatabase" runat="server" meta:resourcekey="locArchivingDatabase"
+                Text="Archiving Database Name:"></asp:Localize>
+        </td>
+        <td>
+            <asp:TextBox ID="txtArchivingDatabase" runat="server" Width="200px"></asp:TextBox>
+        </td>
+    </tr>
+
+
     <tr>
         <td class="SubHead">
             <asp:Localize ID="locKeepDeletedItems" runat="server" meta:resourcekey="locKeepDeletedItems"
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Exchange_Settings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Exchange_Settings.ascx.cs
index 51a9393b..03c7832a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Exchange_Settings.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Exchange_Settings.ascx.cs
@@ -93,6 +93,8 @@ namespace WebsitePanel.Portal.ProviderControls
                             locMailboxDAG.Visible = false;
 
                             powershellUrl1.Visible = powershellUrl2.Visible = false;
+
+                            archivingGroup.Visible = false;
                             break;
 
                         case EXCHANGE2010SP2_PROVIDER_ID:
@@ -104,6 +106,8 @@ namespace WebsitePanel.Portal.ProviderControls
 
                             locMailboxDatabase.Visible = false;
                             powershellUrl1.Visible = powershellUrl2.Visible = false;
+
+                            archivingGroup.Visible = false;
                             break;
 
                         case EXCHANGE2013_PROVIDER_ID:
@@ -115,6 +119,8 @@ namespace WebsitePanel.Portal.ProviderControls
 
                             locMailboxDatabase.Visible = false;
                             powershellUrl1.Visible = powershellUrl2.Visible = true;
+
+                            archivingGroup.Visible = true;
                             break;
 
                         default:
@@ -123,6 +129,8 @@ namespace WebsitePanel.Portal.ProviderControls
                             clusteredMailboxServer.Visible = true;
                             txtMailboxClusterName.Text = settings["MailboxCluster"];
                             locMailboxDAG.Visible = false;
+
+                            archivingGroup.Visible = false;
                             break;
                     }
                 }
@@ -153,6 +161,8 @@ namespace WebsitePanel.Portal.ProviderControls
                 txtPublicFolderServer.Text = settings["PublicFolderServer"];
                 txtPowerShellUrl.Text = settings["PowerShellUrl"];
 
+                txtArchivingDatabase.Text = settings["ArchivingDatabase"];
+
                 UpdateHubTransportsGrid();
                 UpdateClientAccessGrid();
             
@@ -179,6 +189,9 @@ namespace WebsitePanel.Portal.ProviderControls
 
             settings["StorageGroup"] = txtStorageGroup.Text;
             settings["PowerShellUrl"] = txtPowerShellUrl.Text;
+
+            settings["ArchivingDatabase"] = txtArchivingDatabase.Text;
+
         }
 
 		public void BindExchangeServices(DropDownList ddl, bool isHubservice)
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Exchange_Settings.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Exchange_Settings.ascx.designer.cs
index bc155a48..a282d46b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Exchange_Settings.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/Exchange_Settings.ascx.designer.cs
@@ -1,31 +1,3 @@
-// Copyright (c) 2012, Outercurve Foundation.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// - Redistributions of source code must  retain  the  above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
-//   this list of conditions  and  the  following  disclaimer in  the documentation
-//   and/or other materials provided with the distribution.
-//
-// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
-//   contributors may be used to endorse or  promote  products  derived  from  this
-//   software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
-// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
-// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -139,6 +111,33 @@ namespace WebsitePanel.Portal.ProviderControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtMailboxDatabase;
         
+        /// <summary>
+        /// archivingGroup control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTableCell archivingGroup;
+        
+        /// <summary>
+        /// locArchivingDatabase control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locArchivingDatabase;
+        
+        /// <summary>
+        /// txtArchivingDatabase control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtArchivingDatabase;
+        
         /// <summary>
         /// locKeepDeletedItems control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx.cs
index bb8d211b..f4e8d101 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsExchangeMailboxPlansPolicy.ascx.cs
@@ -81,7 +81,7 @@ namespace WebsitePanel.Portal
 
             if ((orgs != null) & (orgs.GetLength(0) > 0))
             {
-                ExchangeMailboxPlan[] list = ES.Services.ExchangeServer.GetExchangeMailboxPlans(orgs[0].Id);
+                ExchangeMailboxPlan[] list = ES.Services.ExchangeServer.GetExchangeMailboxPlans(orgs[0].Id, false);
 
                 gvMailboxPlans.DataSource = list;
                 gvMailboxPlans.DataBind();
@@ -470,7 +470,7 @@ namespace WebsitePanel.Portal
                                         foreach (ExchangeAccount a in Accounts)
                                         {
                                             txtStatus.Text = "Completed";
-                                            int result = ES.Services.ExchangeServer.SetExchangeMailboxPlan(org.Id, a.AccountId, destinationMailboxPlanId);
+                                            int result = ES.Services.ExchangeServer.SetExchangeMailboxPlan(org.Id, a.AccountId, destinationMailboxPlanId, a.ArchivingMailboxPlanId);
                                             if (result < 0)
                                             {
                                                 BindMailboxPlans();