diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index 25255a78..c1a8d1fa 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -21,7 +21,10 @@ DELETE FROM HostingPlanQuotas WHERE QuotaID = 342
 GO
 DELETE FROM HostingPlanQuotas WHERE QuotaID = 343
 GO
+IF NOT EXISTS (SELECT * FROM [dbo].[ResourceGroups] WHERE GroupID = 33 AND [GroupName] = 'VPS2012')
+BEGIN
 DELETE FROM HostingPlanResources WHERE GroupID = 33
+END
 GO
 
 
@@ -8204,6 +8207,27 @@ AS
 							INNER JOIN IPAddresses AS IP ON PIP.AddressID = IP.AddressID
 							INNER JOIN PackagesTreeCache AS PT ON PIP.PackageID = PT.PackageID
 							WHERE PT.ParentPackageID = @PackageID AND IP.PoolID = 3)
+		ELSE IF @QuotaID = 558 BEGIN -- RAM of VPS2012
+			DECLARE @Result1 int = (SELECT SUM(CAST(SIP.PropertyValue AS int)) FROM ServiceItemProperties AS SIP
+							INNER JOIN ServiceItems AS SI ON SIP.ItemID = SI.ItemID
+							INNER JOIN PackagesTreeCache AS PT ON SI.PackageID = PT.PackageID
+							WHERE SIP.PropertyName = 'RamSize' AND PT.ParentPackageID = @PackageID)
+			DECLARE @Result2 int = (SELECT SUM(CAST(SIP.PropertyValue AS int)) FROM ServiceItemProperties AS SIP
+							INNER JOIN ServiceItems AS SI ON SIP.ItemID = SI.ItemID
+							INNER JOIN PackagesTreeCache AS PT ON SI.PackageID = PT.PackageID
+							WHERE SIP.PropertyName = 'DynamicMemory.Maximum' AND PT.ParentPackageID = @PackageID)
+			SET @Result = CASE WHEN isnull(@Result1,0) > isnull(@Result2,0) THEN @Result1 ELSE @Result2 END
+		END
+		ELSE IF @QuotaID = 559 -- HDD of VPS2012
+			SET @Result = (SELECT SUM(CAST(SIP.PropertyValue AS int)) FROM ServiceItemProperties AS SIP
+							INNER JOIN ServiceItems AS SI ON SIP.ItemID = SI.ItemID
+							INNER JOIN PackagesTreeCache AS PT ON SI.PackageID = PT.PackageID
+							WHERE SIP.PropertyName = 'HddSize' AND PT.ParentPackageID = @PackageID)
+		ELSE IF @QuotaID = 562 -- External IP addresses of VPS2012
+			SET @Result = (SELECT COUNT(PIP.PackageAddressID) FROM PackageIPAddresses AS PIP
+							INNER JOIN IPAddresses AS IP ON PIP.AddressID = IP.AddressID
+							INNER JOIN PackagesTreeCache AS PT ON PIP.PackageID = PT.PackageID
+							WHERE PT.ParentPackageID = @PackageID AND IP.PoolID = 3)
 		ELSE IF @QuotaID = 100 -- Dedicated Web IP addresses
 			SET @Result = (SELECT COUNT(PIP.PackageAddressID) FROM PackageIPAddresses AS PIP
 							INNER JOIN IPAddresses AS IP ON PIP.AddressID = IP.AddressID
@@ -8846,16 +8870,168 @@ RETURN
 GO
 
 -- Hyper-V 2012 R2 Provider
+IF NOT EXISTS (SELECT * FROM [dbo].[ResourceGroups] WHERE [GroupName] = 'VPS2012')
+BEGIN
+INSERT [dbo].[ResourceGroups] ([GroupID], [GroupName], [GroupOrder], [GroupController], [ShowGroup]) VALUES (33, N'VPS2012', 19, NULL, 1)
+
+INSERT [dbo].[ServiceItemTypes] ([ItemTypeID], [GroupID], [DisplayName], [TypeName], [TypeOrder], [CalculateDiskspace], [CalculateBandwidth], [Suspendable], [Disposable], [Searchable], [Importable], [Backupable]) VALUES (41, 33, N'VirtualMachine', N'WebsitePanel.Providers.Virtualization.VirtualMachine, WebsitePanel.Providers.Base', 1, 0, 0, 1, 1, 1, 0, 0)
+
+INSERT [dbo].[ServiceItemTypes] ([ItemTypeID], [GroupID], [DisplayName], [TypeName], [TypeOrder], [CalculateDiskspace], [CalculateBandwidth], [Suspendable], [Disposable], [Searchable], [Importable], [Backupable]) VALUES (42, 33, N'VirtualSwitch', N'WebsitePanel.Providers.Virtualization.VirtualSwitch, WebsitePanel.Providers.Base', 2, 0, 0, 1, 1, 1, 0, 0)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (553, 33, 1, N'VPS2012.ServersNumber', N'Number of VPS', 2, 0, 41, NULL)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (554, 33, 2, N'VPS2012.ManagingAllowed', N'Allow user to create VPS', 1, 0, NULL, NULL)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (555, 33, 3, N'VPS2012.CpuNumber', N'Number of CPU cores', 3, 0, NULL, NULL)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (556, 33, 7, N'VPS2012.BootCdAllowed', N'Boot from CD allowed', 1, 0, NULL, NULL)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (557, 33, 8, N'VPS2012.BootCdEnabled', N'Boot from CD', 1, 0, NULL, NULL)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (558, 33, 4, N'VPS2012.Ram', N'RAM size, MB', 2, 0, NULL, NULL)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (559, 33, 5, N'VPS2012.Hdd', N'Hard Drive size, GB', 2, 0, NULL, NULL)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (560, 33, 6, N'VPS2012.DvdEnabled', N'DVD drive', 1, 0, NULL, NULL)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (561, 33, 10, N'VPS2012.ExternalNetworkEnabled', N'External Network', 1, 0, NULL, NULL)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (562, 33, 11, N'VPS2012.ExternalIPAddressesNumber', N'Number of External IP addresses', 2, 0, NULL, NULL)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (563, 33, 13, N'VPS2012.PrivateNetworkEnabled', N'Private Network', 1, 0, NULL, NULL)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (564, 33, 14, N'VPS2012.PrivateIPAddressesNumber', N'Number of Private IP addresses per VPS', 3, 0, NULL, NULL)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (565, 33, 9, N'VPS2012.SnapshotsNumber', N'Number of Snaphots', 3, 0, NULL, NULL)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (566, 33, 15, N'VPS2012.StartShutdownAllowed', N'Allow user to Start, Turn off and Shutdown VPS', 1, 0, NULL, NULL)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (567, 33, 16, N'VPS2012.PauseResumeAllowed', N'Allow user to Pause, Resume VPS', 1, 0, NULL, NULL)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (568, 33, 17, N'VPS2012.RebootAllowed', N'Allow user to Reboot VPS', 1, 0, NULL, NULL)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (569, 33, 18, N'VPS2012.ResetAlowed', N'Allow user to Reset VPS', 1, 0, NULL, NULL)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (570, 33, 19, N'VPS2012.ReinstallAllowed', N'Allow user to Re-install VPS', 1, 0, NULL, NULL)
+
+INSERT [dbo].[Quotas] ([QuotaID], [GroupID], [QuotaOrder], [QuotaName], [QuotaDescription], [QuotaTypeID], [ServiceQuota], [ItemTypeID], [HideQuota]) VALUES (571, 33, 12, N'VPS2012.Bandwidth', N'Monthly bandwidth, GB', 2, 0, NULL, NULL)
+
+END
+GO
+
 IF NOT EXISTS (SELECT * FROM [dbo].[Providers] WHERE [ProviderName] = 'HyperV2012R2')
 BEGIN
-INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery]) VALUES (350, 30, N'HyperV2012R2', N'Microsoft Hyper-V 2012 R2', N'WebsitePanel.Providers.Virtualization.HyperV2012R2, WebsitePanel.Providers.Virtualization.HyperV2012R2', N'HyperV2012R2', 1)
+INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery]) VALUES (350, 33, N'HyperV2012R2', N'Microsoft Hyper-V 2012 R2', N'WebsitePanel.Providers.Virtualization.HyperV2012R2, WebsitePanel.Providers.Virtualization.HyperV2012R2', N'HyperV2012R2', 1)
 END
 ELSE
 BEGIN
-UPDATE [dbo].[Providers] SET [EditorControl] = N'HyperV2012R2' WHERE [ProviderName] = 'HyperV2012R2'
+UPDATE [dbo].[Providers] SET [EditorControl] = N'HyperV2012R2', [GroupID] = 33 WHERE [ProviderName] = 'HyperV2012R2'
 END
 GO
 
+IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'GetVirtualMachinesPaged2012')
+DROP PROCEDURE GetVirtualMachinesPaged2012
+GO
+CREATE PROCEDURE [dbo].[GetVirtualMachinesPaged2012]
+(
+	@ActorID int,
+	@PackageID int,
+	@FilterColumn nvarchar(50) = '',
+	@FilterValue nvarchar(50) = '',
+	@SortColumn nvarchar(50),
+	@StartRow int,
+	@MaximumRows int,
+	@Recursive bit
+)
+AS
+-- check rights
+IF dbo.CheckActorPackageRights(@ActorID, @PackageID) = 0
+RAISERROR('You are not allowed to access this package', 16, 1)
+
+-- start
+DECLARE @condition nvarchar(700)
+SET @condition = '
+SI.ItemTypeID = 41 -- VPS2012
+AND ((@Recursive = 0 AND P.PackageID = @PackageID)
+OR (@Recursive = 1 AND dbo.CheckPackageParent(@PackageID, P.PackageID) = 1))
+'
+
+IF @FilterColumn <> '' AND @FilterColumn IS NOT NULL
+AND @FilterValue <> '' AND @FilterValue IS NOT NULL
+SET @condition = @condition + ' AND ' + @FilterColumn + ' LIKE ''' + @FilterValue + ''''
+
+IF @SortColumn IS NULL OR @SortColumn = ''
+SET @SortColumn = 'SI.ItemName ASC'
+
+DECLARE @sql nvarchar(3500)
+
+set @sql = '
+SELECT COUNT(SI.ItemID) FROM Packages AS P
+INNER JOIN ServiceItems AS SI ON P.PackageID = SI.PackageID
+INNER JOIN Users AS U ON P.UserID = U.UserID
+LEFT OUTER JOIN (
+	SELECT PIP.ItemID, IP.ExternalIP FROM PackageIPAddresses AS PIP
+	INNER JOIN IPAddresses AS IP ON PIP.AddressID = IP.AddressID
+	WHERE PIP.IsPrimary = 1 AND IP.PoolID = 3 -- external IP addresses
+) AS EIP ON SI.ItemID = EIP.ItemID
+LEFT OUTER JOIN PrivateIPAddresses AS PIP ON PIP.ItemID = SI.ItemID AND PIP.IsPrimary = 1
+WHERE ' + @condition + '
+
+DECLARE @Items AS TABLE
+(
+	ItemID int
+);
+
+WITH TempItems AS (
+	SELECT ROW_NUMBER() OVER (ORDER BY ' + @SortColumn + ') as Row,
+		SI.ItemID
+	FROM Packages AS P
+	INNER JOIN ServiceItems AS SI ON P.PackageID = SI.PackageID
+	INNER JOIN Users AS U ON P.UserID = U.UserID
+	LEFT OUTER JOIN (
+		SELECT PIP.ItemID, IP.ExternalIP FROM PackageIPAddresses AS PIP
+		INNER JOIN IPAddresses AS IP ON PIP.AddressID = IP.AddressID
+		WHERE PIP.IsPrimary = 1 AND IP.PoolID = 3 -- external IP addresses
+	) AS EIP ON SI.ItemID = EIP.ItemID
+	LEFT OUTER JOIN PrivateIPAddresses AS PIP ON PIP.ItemID = SI.ItemID AND PIP.IsPrimary = 1
+	WHERE ' + @condition + '
+)
+
+INSERT INTO @Items
+SELECT ItemID FROM TempItems
+WHERE TempItems.Row BETWEEN @StartRow + 1 and @StartRow + @MaximumRows
+
+SELECT
+	SI.ItemID,
+	SI.ItemName,
+	SI.PackageID,
+	P.PackageName,
+	P.UserID,
+	U.Username,
+
+	EIP.ExternalIP,
+	PIP.IPAddress
+FROM @Items AS TSI
+INNER JOIN ServiceItems AS SI ON TSI.ItemID = SI.ItemID
+INNER JOIN Packages AS P ON SI.PackageID = P.PackageID
+INNER JOIN Users AS U ON P.UserID = U.UserID
+LEFT OUTER JOIN (
+	SELECT PIP.ItemID, IP.ExternalIP FROM PackageIPAddresses AS PIP
+	INNER JOIN IPAddresses AS IP ON PIP.AddressID = IP.AddressID
+	WHERE PIP.IsPrimary = 1 AND IP.PoolID = 3 -- external IP addresses
+) AS EIP ON SI.ItemID = EIP.ItemID
+LEFT OUTER JOIN PrivateIPAddresses AS PIP ON PIP.ItemID = SI.ItemID AND PIP.IsPrimary = 1
+'
+
+--print @sql
+
+exec sp_executesql @sql, N'@PackageID int, @StartRow int, @MaximumRows int, @Recursive bit',
+@PackageID, @StartRow, @MaximumRows, @Recursive
+
+RETURN 
+GO
+
+
 --ES OWA Editing
 IF NOT EXISTS (SELECT * FROM SYS.TABLES WHERE name = 'EnterpriseFoldersOwaPermissions')
 CREATE TABLE EnterpriseFoldersOwaPermissions
@@ -9446,10 +9622,167 @@ END
 
 GO
 
+UPDATE [dbo].[Quotas] SET GroupID = 45 WHERE QuotaName = 'EnterpriseStorage.DriveMaps'
+GO
 
 
+UPDATE [dbo].[ResourceGroups] SET GroupName = 'Sharepoint Enterprise Server' WHERE GroupName = 'Sharepoint Server'
+GO
+
+UPDATE [dbo].[ResourceGroups] SET GroupController = 'WebsitePanel.EnterpriseServer.HostedSharePointServerEntController' WHERE GroupName = 'Sharepoint Enterprise Server'
+GO
+
+IF NOT EXISTS (SELECT * FROM [dbo].[Providers] WHERE [DisplayName] = 'Hosted SharePoint Enterprise 2013')
+BEGIN
+DECLARE @provider_id AS INT
+DECLARE @group_id AS INT
+SELECT @group_id = GroupId FROM [dbo].[ResourceGroups] WHERE GroupName = 'Sharepoint Enterprise Server'
+SELECT TOP 1 @provider_id = ProviderId + 1 From [dbo].[Providers] ORDER BY ProviderID DESC
+INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery])
+VALUES (@provider_id, @group_id, N'HostedSharePoint2013Ent', N'Hosted SharePoint Enterprise 2013', N'WebsitePanel.Providers.HostedSolution.HostedSharePointServer2013Ent, WebsitePanel.Providers.HostedSolution.SharePoint2013Ent', N'HostedSharePoint30', NULL)
+END
+GO
+
+UPDATE [dbo].[Quotas] SET QuotaName = 'HostedSharePointEnterprise.Sites' WHERE QuotaId = 550
+GO
+
+UPDATE [dbo].[Quotas] SET QuotaName = 'HostedSharePointEnterprise.MaxStorage' WHERE QuotaId = 551
+GO
+
+UPDATE [dbo].[Quotas] SET QuotaName = 'HostedSharePointEnterprise.UseSharedSSL' WHERE QuotaId = 552
+GO
+
+UPDATE [dbo].[ServiceItemTypes] SET DisplayName = 'SharePointEnterpriseSiteCollection' WHERE DisplayName = 'SharePointSiteCollection'
+GO
 
 
+IF EXISTS (SELECT * FROM Providers WHERE ProviderName = 'HostedSharePoint2013' AND GroupID IN (Select GroupID FROM ResourceGroups WHERE GroupName = 'Sharepoint Enterprise Server'))
+BEGIN
+	DECLARE @group_id INT
+	SELECT @group_id = GroupId FROM ResourceGroups WHERE GroupName = 'Sharepoint Enterprise Server'
+	DELETE FROM Providers WHERE ProviderName = 'HostedSharePoint2013' AND GroupID = @group_id
+END
+
+GO
+
+		
+ALTER PROCEDURE [dbo].[AddServiceItem]
+(
+	@ActorID int,
+	@PackageID int,
+	@ServiceID int,
+	@ItemName nvarchar(500),
+	@ItemTypeName nvarchar(200),
+	@ItemID int OUTPUT,
+	@XmlProperties ntext,
+	@CreatedDate datetime
+)
+AS
+BEGIN TRAN
+
+-- check rights
+IF dbo.CheckActorPackageRights(@ActorID, @PackageID) = 0
+RAISERROR('You are not allowed to access this package', 16, 1)
+
+-- get GroupID
+DECLARE @GroupID int
+SELECT
+	@GroupID = PROV.GroupID
+FROM Services AS S
+INNER JOIN Providers AS PROV ON S.ProviderID = PROV.ProviderID
+WHERE S.ServiceID = @ServiceID
+
+DECLARE @ItemTypeID int
+SELECT @ItemTypeID = ItemTypeID FROM ServiceItemTypes
+WHERE TypeName = @ItemTypeName
+AND ((@GroupID IS NULL) OR (@GroupID IS NOT NULL AND GroupID = @GroupID))
+
+-- Fix to allow plans assigned to serveradmin
+IF (@ItemTypeName = 'WebsitePanel.Providers.HostedSolution.Organization, WebsitePanel.Providers.Base')
+BEGIN
+	IF NOT EXISTS (SELECT * FROM ServiceItems WHERE PackageID = 1)
+	BEGIN
+		INSERT INTO ServiceItems (PackageID, ItemTypeID,ServiceID,ItemName,CreatedDate)
+		VALUES(1, @ItemTypeID, @ServiceID, 'System',  @CreatedDate)
+		
+		DECLARE @TempItemID int
+		
+		SET @TempItemID = SCOPE_IDENTITY()
+		INSERT INTO ExchangeOrganizations (ItemID, OrganizationID)
+		VALUES(@TempItemID, 'System')
+	END
+END
+
+
+		
+-- add item
+INSERT INTO ServiceItems
+(
+	PackageID,
+	ServiceID,
+	ItemName,
+	ItemTypeID,
+	CreatedDate
+)
+VALUES
+(
+	@PackageID,
+	@ServiceID,
+	@ItemName,
+	@ItemTypeID,
+	@CreatedDate
+)
+
+SET @ItemID = SCOPE_IDENTITY()
+
+DECLARE @idoc int
+--Create an internal representation of the XML document.
+EXEC sp_xml_preparedocument @idoc OUTPUT, @XmlProperties
+
+-- Execute a SELECT statement that uses the OPENXML rowset provider.
+DELETE FROM ServiceItemProperties
+WHERE ItemID = @ItemID
+
+CREATE TABLE #TempTable(
+	ItemID int,
+	PropertyName nvarchar(50),
+	PropertyValue  nvarchar(3000))
+
+INSERT INTO #TempTable (ItemID, PropertyName, PropertyValue)
+SELECT
+	@ItemID,
+	PropertyName,
+	PropertyValue
+FROM OPENXML(@idoc, '/properties/property',1) WITH 
+(
+	PropertyName nvarchar(50) '@name',
+	PropertyValue nvarchar(3000) '@value'
+) as PV
+
+-- Move data from temp table to real table
+INSERT INTO ServiceItemProperties
+(
+	ItemID,
+	PropertyName,
+	PropertyValue
+)
+SELECT 
+	ItemID, 
+	PropertyName, 
+	PropertyValue
+FROM #TempTable
+
+DROP TABLE #TempTable
+
+-- remove document
+exec sp_xml_removedocument @idoc
+
+COMMIT TRAN
+RETURN 
+GO
+
+UPDATE [dbo].[ServiceItemTypes] SET TypeName ='WebsitePanel.Providers.SharePoint.SharePointEnterpriseSiteCollection, WebsitePanel.Providers.Base' WHERE DisplayName = 'SharePointEnterpriseSiteCollection'
+GO
 
 -- USER PASSWORD EXPIRATION NOTIFICATION tasks
 
@@ -9998,4 +10331,4 @@ GO
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER OFF
-GO
\ No newline at end of file
+GO
diff --git a/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/WebsitePanel.Import.Enterprise.csproj b/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/WebsitePanel.Import.Enterprise.csproj
index 32738387..dc52b6d8 100644
--- a/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/WebsitePanel.Import.Enterprise.csproj
+++ b/WebsitePanel/Sources/Tools/WebsitePanel.Import.Enterprise/WebsitePanel.Import.Enterprise.csproj
@@ -65,21 +65,6 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="WebsitePanel.EnterpriseServer">
-      <HintPath>..\..\WebsitePanel.EnterpriseServer\bin\WebsitePanel.EnterpriseServer.dll</HintPath>
-    </Reference>
-    <Reference Include="WebsitePanel.EnterpriseServer.Base">
-      <HintPath>..\..\..\Bin\WebsitePanel.EnterpriseServer.Base.dll</HintPath>
-    </Reference>
-    <Reference Include="WebsitePanel.EnterpriseServer.Client">
-      <HintPath>..\..\..\Bin\WebsitePanel.EnterpriseServer.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="WebsitePanel.EnterpriseServer.Code">
-      <HintPath>..\..\..\Bin\WebsitePanel.EnterpriseServer.Code.dll</HintPath>
-    </Reference>
-    <Reference Include="WebsitePanel.Providers.Base">
-      <HintPath>..\..\..\Bin\WebsitePanel.Providers.Base.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\VersionInfo.cs">
@@ -216,6 +201,28 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\WebsitePanel.EnterpriseServer.Base\WebsitePanel.EnterpriseServer.Base.csproj">
+      <Project>{c09ce910-f16b-48a1-b2cc-c99b8c1cf775}</Project>
+      <Name>WebsitePanel.EnterpriseServer.Base</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\WebsitePanel.EnterpriseServer.Client\WebsitePanel.EnterpriseServer.Client.csproj">
+      <Project>{4b344644-a570-477e-adcc-f2b267d6c038}</Project>
+      <Name>WebsitePanel.EnterpriseServer.Client</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\WebsitePanel.EnterpriseServer.Code\WebsitePanel.EnterpriseServer.Code.csproj">
+      <Project>{60e39314-659c-4fad-ab91-d0d08e223578}</Project>
+      <Name>WebsitePanel.EnterpriseServer.Code</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\WebsitePanel.EnterpriseServer\WebsitePanel.EnterpriseServer.csproj">
+      <Project>{59c7623a-5181-48a5-880a-c9b82b48f589}</Project>
+      <Name>WebsitePanel.EnterpriseServer</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\WebsitePanel.Providers.Base\WebsitePanel.Providers.Base.csproj">
+      <Project>{684c932a-6c75-46ac-a327-f3689d89eb42}</Project>
+      <Name>WebsitePanel.Providers.Base</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/PackageSettings.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/PackageSettings.cs
index 9481c0c9..96501589 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/PackageSettings.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/PackageSettings.cs
@@ -44,6 +44,7 @@ namespace WebsitePanel.EnterpriseServer
 		public const string EXCHANGE_SERVER = "ExchangeServer";
         public const string HOSTED_SOLLUTION = "HostedSollution";
         public const string VIRTUAL_PRIVATE_SERVERS = "VirtualPrivateServers";
+        public const string VIRTUAL_PRIVATE_SERVERS_2012 = "VirtualPrivateServers2012";
 
         public const string VIRTUAL_PRIVATE_SERVERS_FOR_PRIVATE_CLOUD = "VirtualPrivateServersForPrivateCloud";
         public int PackageId;
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs
index 47155cb1..b9347a17 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Packages/Quotas.cs
@@ -154,6 +154,9 @@ order by rg.groupOrder
 		public const string HOSTED_SHAREPOINT_SITES = "HostedSharePoint.Sites";  // Hosted SharePoint Sites
         public const string HOSTED_SHAREPOINT_STORAGE_SIZE = "HostedSharePoint.MaxStorage"; // Hosted SharePoint storage size;
         public const string HOSTED_SHAREPOINT_USESHAREDSSL = "HostedSharePoint.UseSharedSSL"; // Hosted SharePoint Use Shared SSL Root
+        public const string HOSTED_SHAREPOINT_ENTERPRISE_SITES = "HostedSharePointEnterprise.Sites";  // Hosted SharePoint Sites
+        public const string HOSTED_SHAREPOINT_ENTERPRISE_STORAGE_SIZE = "HostedSharePointEnterprise.MaxStorage"; // Hosted SharePoint storage size;
+        public const string HOSTED_SHAREPOINT_ENTERPRISE_USESHAREDSSL = "HostedSharePointEnterprise.UseSharedSSL"; // Hosted SharePoint Use Shared SSL Root
         public const string DNS_EDITOR = "DNS.Editor";  // DNS Editor
         public const string DNS_ZONES = "DNS.Zones";  // DNS Editor
         public const string DNS_PRIMARY_ZONES = "DNS.PrimaryZones";  // DNS Editor
@@ -201,6 +204,26 @@ order by rg.groupOrder
         public const string VPS_REINSTALL_ALLOWED = "VPS.ReinstallAllowed";		// Allow user to Re-install VPS
         public const string VPS_BANDWIDTH = "VPS.Bandwidth";		// Monthly bandwidth, GB
 
+        public const string VPS2012_SERVERS_NUMBER = "VPS2012.ServersNumber";		// Number of VPS
+        public const string VPS2012_MANAGING_ALLOWED = "VPS2012.ManagingAllowed";		// Allow user to create VPS
+        public const string VPS2012_CPU_NUMBER = "VPS2012.CpuNumber";		// Number of CPU cores
+        public const string VPS2012_BOOT_CD_ALLOWED = "VPS2012.BootCdAllowed";		// Boot from CD allowed
+        public const string VPS2012_BOOT_CD_ENABLED = "VPS2012.BootCdEnabled";		// Boot from CD
+        public const string VPS2012_RAM = "VPS2012.Ram";		// RAM size, MB
+        public const string VPS2012_HDD = "VPS2012.Hdd";		// Hard Drive size, GB
+        public const string VPS2012_DVD_ENABLED = "VPS2012.DvdEnabled";		// DVD drive
+        public const string VPS2012_EXTERNAL_NETWORK_ENABLED = "VPS2012.ExternalNetworkEnabled";		// External Network
+        public const string VPS2012_EXTERNAL_IP_ADDRESSES_NUMBER = "VPS2012.ExternalIPAddressesNumber";		// Number of External IP addresses
+        public const string VPS2012_PRIVATE_NETWORK_ENABLED = "VPS2012.PrivateNetworkEnabled";		// Private Network
+        public const string VPS2012_PRIVATE_IP_ADDRESSES_NUMBER = "VPS2012.PrivateIPAddressesNumber";		// Number of Private IP addresses per VPS
+        public const string VPS2012_SNAPSHOTS_NUMBER = "VPS2012.SnapshotsNumber";		// Number of Snaphots
+        public const string VPS2012_START_SHUTDOWN_ALLOWED = "VPS2012.StartShutdownAllowed";		// Allow user to Start, Turn off and Shutdown VPS
+        public const string VPS2012_PAUSE_RESUME_ALLOWED = "VPS2012.PauseResumeAllowed";		// Allow user to Pause, Resume VPS
+        public const string VPS2012_REBOOT_ALLOWED = "VPS2012.RebootAllowed";		// Allow user to Reboot VPS
+        public const string VPS2012_RESET_ALOWED = "VPS2012.ResetAlowed";		// Allow user to Reset VPS
+        public const string VPS2012_REINSTALL_ALLOWED = "VPS2012.ReinstallAllowed";		// Allow user to Re-install VPS
+        public const string VPS2012_BANDWIDTH = "VPS2012.Bandwidth";		// Monthly bandwidth, GB
+
 		public const string VPSForPC_SERVERS_NUMBER = "VPSForPC.ServersNumber";		// Number of VPS
 		public const string VPSForPC_MANAGING_ALLOWED = "VPSForPC.ManagingAllowed";		// Allow user to create VPS
 		public const string VPSForPC_CPU_NUMBER = "VPSForPC.CpuNumber";		// Number of CPU cores
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Servers/ResourceGroups.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Servers/ResourceGroups.cs
index 0e412bfb..3b4d061e 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Servers/ResourceGroups.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Servers/ResourceGroups.cs
@@ -45,12 +45,14 @@ namespace WebsitePanel.EnterpriseServer
         public const string Statistics = "Statistics";
         public const string SharePoint = "SharePoint";
         public const string SharepointFoundationServer = "Sharepoint Foundation Server";
+        public const string SharepointEnterpriseServer = "Sharepoint Enterprise Server";
         public const string SharepointServer = "Sharepoint Server";
 		public const string Exchange = "Exchange";
         public const string HostedOrganizations = "Hosted Organizations";
         public const string HostedCRM = "Hosted CRM"; // CRM 4/2011
         public const string HostedCRM2013 = "Hosted CRM2013"; // CRM 2013/2015
         public const string VPS = "VPS";
+        public const string VPS2012 = "VPS2012";
         public const string BlackBerry = "BlackBerry";
         public const string OCS = "OCS";
         public const string VPSForPC = "VPSForPC";
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Virtualization/VirtualizationErrorCodes.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Virtualization/VirtualizationErrorCodes.cs
index e97a8914..6ccd5695 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Virtualization/VirtualizationErrorCodes.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/Virtualization/VirtualizationErrorCodes.cs
@@ -39,6 +39,7 @@
         public const string QUOTA_EXCEEDED_CPU = "VPS_QUOTA_EXCEEDED_CPU";
         public const string QUOTA_EXCEEDED_RAM = "VPS_QUOTA_EXCEEDED_RAM";
         public const string QUOTA_WRONG_RAM = "VPS_QUOTA_WRONG_RAM";
+        public const string QUOTA_NOT_IN_DYNAMIC_RAM = "VPS_QUOTA_NOT_IN_DYNAMIC_RAM";
         public const string QUOTA_EXCEEDED_HDD = "VPS_QUOTA_EXCEEDED_HDD";
         public const string QUOTA_WRONG_HDD = "VPS_QUOTA_WRONG_HDD";
         public const string QUOTA_EXCEEDED_SNAPSHOTS = "VPS_QUOTA_EXCEEDED_SNAPSHOTS";
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/WebsitePanel.EnterpriseServer.Base.csproj b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/WebsitePanel.EnterpriseServer.Base.csproj
index 7deb1d4d..3a24cbb4 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/WebsitePanel.EnterpriseServer.Base.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Base/WebsitePanel.EnterpriseServer.Base.csproj
@@ -39,7 +39,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Bin\</OutputPath>
+    <OutputPath>..\WebsitePanel.EnterpriseServer\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -49,7 +49,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Bin\</OutputPath>
+    <OutputPath>..\WebsitePanel.EnterpriseServer\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/EnterpriseStorageProxy.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/EnterpriseStorageProxy.cs
index ef29192f..761f7449 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/EnterpriseStorageProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/EnterpriseStorageProxy.cs
@@ -47,6 +47,8 @@ namespace WebsitePanel.EnterpriseServer {
         
         private System.Threading.SendOrPostCallback GetEnterpriseFoldersOperationCompleted;
         
+        private System.Threading.SendOrPostCallback GetUserRootFoldersOperationCompleted;
+        
         private System.Threading.SendOrPostCallback GetEnterpriseFolderOperationCompleted;
         
         private System.Threading.SendOrPostCallback CreateEnterpriseFolderOperationCompleted;
@@ -128,6 +130,9 @@ namespace WebsitePanel.EnterpriseServer {
         /// <remarks/>
         public event GetEnterpriseFoldersCompletedEventHandler GetEnterpriseFoldersCompleted;
         
+        /// <remarks/>
+        public event GetUserRootFoldersCompletedEventHandler GetUserRootFoldersCompleted;
+        
         /// <remarks/>
         public event GetEnterpriseFolderCompletedEventHandler GetEnterpriseFolderCompleted;
         
@@ -456,6 +461,56 @@ namespace WebsitePanel.EnterpriseServer {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetUserRootFolders", 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 SystemFile[] GetUserRootFolders(int itemId, int accountId, string userName, string displayName) {
+            object[] results = this.Invoke("GetUserRootFolders", new object[] {
+                        itemId,
+                        accountId,
+                        userName,
+                        displayName});
+            return ((SystemFile[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetUserRootFolders(int itemId, int accountId, string userName, string displayName, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetUserRootFolders", new object[] {
+                        itemId,
+                        accountId,
+                        userName,
+                        displayName}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public SystemFile[] EndGetUserRootFolders(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((SystemFile[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetUserRootFoldersAsync(int itemId, int accountId, string userName, string displayName) {
+            this.GetUserRootFoldersAsync(itemId, accountId, userName, displayName, null);
+        }
+        
+        /// <remarks/>
+        public void GetUserRootFoldersAsync(int itemId, int accountId, string userName, string displayName, object userState) {
+            if ((this.GetUserRootFoldersOperationCompleted == null)) {
+                this.GetUserRootFoldersOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetUserRootFoldersOperationCompleted);
+            }
+            this.InvokeAsync("GetUserRootFolders", new object[] {
+                        itemId,
+                        accountId,
+                        userName,
+                        displayName}, this.GetUserRootFoldersOperationCompleted, userState);
+        }
+        
+        private void OnGetUserRootFoldersOperationCompleted(object arg) {
+            if ((this.GetUserRootFoldersCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetUserRootFoldersCompleted(this, new GetUserRootFoldersCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetEnterpriseFolder", 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 SystemFile GetEnterpriseFolder(int itemId, string folderName) {
@@ -1933,6 +1988,32 @@ namespace WebsitePanel.EnterpriseServer {
         }
     }
     
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetUserRootFoldersCompletedEventHandler(object sender, GetUserRootFoldersCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetUserRootFoldersCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetUserRootFoldersCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public SystemFile[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((SystemFile[])(this.results[0]));
+            }
+        }
+    }
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void GetEnterpriseFolderCompletedEventHandler(object sender, GetEnterpriseFolderCompletedEventArgs e);
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/HostedSharePointServersEntProxy.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/HostedSharePointServersEntProxy.cs
new file mode 100644
index 00000000..ff8492db
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/HostedSharePointServersEntProxy.cs
@@ -0,0 +1,1218 @@
+// Copyright (c) 2015, 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.
+//     Runtime Version:2.0.50727.8009
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+// 
+// This source code was auto-generated by wsdl, Version=2.0.50727.3038.
+// 
+namespace WebsitePanel.EnterpriseServer {
+    using System.Xml.Serialization;
+    using System.Web.Services;
+    using System.ComponentModel;
+    using System.Web.Services.Protocols;
+    using System;
+    using System.Diagnostics;
+    using WebsitePanel.Providers.SharePoint;
+    using WebsitePanel.Providers;
+    
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Web.Services.WebServiceBindingAttribute(Name="esHostedSharePointServersEntSoap", Namespace="http://smbsaas/websitepanel/enterpriseserver")]
+    [System.Xml.Serialization.XmlIncludeAttribute(typeof(ServiceProviderItem))]
+    public partial class esHostedSharePointServersEnt : Microsoft.Web.Services3.WebServicesClientProtocol {
+        
+        private System.Threading.SendOrPostCallback Enterprise_GetSiteCollectionsPagedOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_GetSupportedLanguagesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_GetSiteCollectionsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_SetStorageSettingsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_GetSiteCollectionOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_GetSiteCollectionByDomainOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_AddSiteCollectionOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_DeleteSiteCollectionOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_DeleteSiteCollectionsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_BackupSiteCollectionOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_RestoreSiteCollectionOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_GetBackupBinaryChunkOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_AppendBackupBinaryChunkOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_CalculateSharePointSitesDiskSpaceOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_UpdateQuotaOperationCompleted;
+        
+        /// <remarks/>
+        public esHostedSharePointServersEnt() {
+            this.Url = "http://localhost:9002/esHostedSharePointServersEnt.asmx";
+        }
+        
+        /// <remarks/>
+        public event Enterprise_GetSiteCollectionsPagedCompletedEventHandler Enterprise_GetSiteCollectionsPagedCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_GetSupportedLanguagesCompletedEventHandler Enterprise_GetSupportedLanguagesCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_GetSiteCollectionsCompletedEventHandler Enterprise_GetSiteCollectionsCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_SetStorageSettingsCompletedEventHandler Enterprise_SetStorageSettingsCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_GetSiteCollectionCompletedEventHandler Enterprise_GetSiteCollectionCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_GetSiteCollectionByDomainCompletedEventHandler Enterprise_GetSiteCollectionByDomainCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_AddSiteCollectionCompletedEventHandler Enterprise_AddSiteCollectionCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_DeleteSiteCollectionCompletedEventHandler Enterprise_DeleteSiteCollectionCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_DeleteSiteCollectionsCompletedEventHandler Enterprise_DeleteSiteCollectionsCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_BackupSiteCollectionCompletedEventHandler Enterprise_BackupSiteCollectionCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_RestoreSiteCollectionCompletedEventHandler Enterprise_RestoreSiteCollectionCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_GetBackupBinaryChunkCompletedEventHandler Enterprise_GetBackupBinaryChunkCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_AppendBackupBinaryChunkCompletedEventHandler Enterprise_AppendBackupBinaryChunkCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_CalculateSharePointSitesDiskSpaceCompletedEventHandler Enterprise_CalculateSharePointSitesDiskSpaceCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_UpdateQuotaCompletedEventHandler Enterprise_UpdateQuotaCompleted;
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/Enterprise_GetSiteCollectionsPaged", 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 SharePointEnterpriseSiteCollectionListPaged Enterprise_GetSiteCollectionsPaged(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
+            object[] results = this.Invoke("Enterprise_GetSiteCollectionsPaged", new object[] {
+                        packageId,
+                        organizationId,
+                        filterColumn,
+                        filterValue,
+                        sortColumn,
+                        startRow,
+                        maximumRows});
+            return ((SharePointEnterpriseSiteCollectionListPaged)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_GetSiteCollectionsPaged(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_GetSiteCollectionsPaged", new object[] {
+                        packageId,
+                        organizationId,
+                        filterColumn,
+                        filterValue,
+                        sortColumn,
+                        startRow,
+                        maximumRows}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public SharePointEnterpriseSiteCollectionListPaged EndEnterprise_GetSiteCollectionsPaged(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((SharePointEnterpriseSiteCollectionListPaged)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetSiteCollectionsPagedAsync(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
+            this.Enterprise_GetSiteCollectionsPagedAsync(packageId, organizationId, filterColumn, filterValue, sortColumn, startRow, maximumRows, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetSiteCollectionsPagedAsync(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState) {
+            if ((this.Enterprise_GetSiteCollectionsPagedOperationCompleted == null)) {
+                this.Enterprise_GetSiteCollectionsPagedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_GetSiteCollectionsPagedOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_GetSiteCollectionsPaged", new object[] {
+                        packageId,
+                        organizationId,
+                        filterColumn,
+                        filterValue,
+                        sortColumn,
+                        startRow,
+                        maximumRows}, this.Enterprise_GetSiteCollectionsPagedOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_GetSiteCollectionsPagedOperationCompleted(object arg) {
+            if ((this.Enterprise_GetSiteCollectionsPagedCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_GetSiteCollectionsPagedCompleted(this, new Enterprise_GetSiteCollectionsPagedCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/Enterprise_GetSupportedLanguages", 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[] Enterprise_GetSupportedLanguages(int packageId) {
+            object[] results = this.Invoke("Enterprise_GetSupportedLanguages", new object[] {
+                        packageId});
+            return ((int[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_GetSupportedLanguages(int packageId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_GetSupportedLanguages", new object[] {
+                        packageId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public int[] EndEnterprise_GetSupportedLanguages(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetSupportedLanguagesAsync(int packageId) {
+            this.Enterprise_GetSupportedLanguagesAsync(packageId, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetSupportedLanguagesAsync(int packageId, object userState) {
+            if ((this.Enterprise_GetSupportedLanguagesOperationCompleted == null)) {
+                this.Enterprise_GetSupportedLanguagesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_GetSupportedLanguagesOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_GetSupportedLanguages", new object[] {
+                        packageId}, this.Enterprise_GetSupportedLanguagesOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_GetSupportedLanguagesOperationCompleted(object arg) {
+            if ((this.Enterprise_GetSupportedLanguagesCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_GetSupportedLanguagesCompleted(this, new Enterprise_GetSupportedLanguagesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/Enterprise_GetSiteCollections", 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 SharePointEnterpriseSiteCollection[] Enterprise_GetSiteCollections(int packageId, bool recursive) {
+            object[] results = this.Invoke("Enterprise_GetSiteCollections", new object[] {
+                        packageId,
+                        recursive});
+            return ((SharePointEnterpriseSiteCollection[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_GetSiteCollections(int packageId, bool recursive, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_GetSiteCollections", new object[] {
+                        packageId,
+                        recursive}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public SharePointEnterpriseSiteCollection[] EndEnterprise_GetSiteCollections(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((SharePointEnterpriseSiteCollection[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetSiteCollectionsAsync(int packageId, bool recursive) {
+            this.Enterprise_GetSiteCollectionsAsync(packageId, recursive, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetSiteCollectionsAsync(int packageId, bool recursive, object userState) {
+            if ((this.Enterprise_GetSiteCollectionsOperationCompleted == null)) {
+                this.Enterprise_GetSiteCollectionsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_GetSiteCollectionsOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_GetSiteCollections", new object[] {
+                        packageId,
+                        recursive}, this.Enterprise_GetSiteCollectionsOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_GetSiteCollectionsOperationCompleted(object arg) {
+            if ((this.Enterprise_GetSiteCollectionsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_GetSiteCollectionsCompleted(this, new Enterprise_GetSiteCollectionsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/Enterprise_SetStorageSettings", 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 Enterprise_SetStorageSettings(int itemId, int maxStorage, int warningStorage, bool applyToSiteCollections) {
+            object[] results = this.Invoke("Enterprise_SetStorageSettings", new object[] {
+                        itemId,
+                        maxStorage,
+                        warningStorage,
+                        applyToSiteCollections});
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_SetStorageSettings(int itemId, int maxStorage, int warningStorage, bool applyToSiteCollections, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_SetStorageSettings", new object[] {
+                        itemId,
+                        maxStorage,
+                        warningStorage,
+                        applyToSiteCollections}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public int EndEnterprise_SetStorageSettings(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_SetStorageSettingsAsync(int itemId, int maxStorage, int warningStorage, bool applyToSiteCollections) {
+            this.Enterprise_SetStorageSettingsAsync(itemId, maxStorage, warningStorage, applyToSiteCollections, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_SetStorageSettingsAsync(int itemId, int maxStorage, int warningStorage, bool applyToSiteCollections, object userState) {
+            if ((this.Enterprise_SetStorageSettingsOperationCompleted == null)) {
+                this.Enterprise_SetStorageSettingsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_SetStorageSettingsOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_SetStorageSettings", new object[] {
+                        itemId,
+                        maxStorage,
+                        warningStorage,
+                        applyToSiteCollections}, this.Enterprise_SetStorageSettingsOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_SetStorageSettingsOperationCompleted(object arg) {
+            if ((this.Enterprise_SetStorageSettingsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_SetStorageSettingsCompleted(this, new Enterprise_SetStorageSettingsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/Enterprise_GetSiteCollection", 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 SharePointEnterpriseSiteCollection Enterprise_GetSiteCollection(int itemId) {
+            object[] results = this.Invoke("Enterprise_GetSiteCollection", new object[] {
+                        itemId});
+            return ((SharePointEnterpriseSiteCollection)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_GetSiteCollection(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_GetSiteCollection", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public SharePointEnterpriseSiteCollection EndEnterprise_GetSiteCollection(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((SharePointEnterpriseSiteCollection)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetSiteCollectionAsync(int itemId) {
+            this.Enterprise_GetSiteCollectionAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetSiteCollectionAsync(int itemId, object userState) {
+            if ((this.Enterprise_GetSiteCollectionOperationCompleted == null)) {
+                this.Enterprise_GetSiteCollectionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_GetSiteCollectionOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_GetSiteCollection", new object[] {
+                        itemId}, this.Enterprise_GetSiteCollectionOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_GetSiteCollectionOperationCompleted(object arg) {
+            if ((this.Enterprise_GetSiteCollectionCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_GetSiteCollectionCompleted(this, new Enterprise_GetSiteCollectionCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/Enterprise_GetSiteCollectionByDomain" +
+            "", 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 SharePointEnterpriseSiteCollection Enterprise_GetSiteCollectionByDomain(int organizationId, string domain) {
+            object[] results = this.Invoke("Enterprise_GetSiteCollectionByDomain", new object[] {
+                        organizationId,
+                        domain});
+            return ((SharePointEnterpriseSiteCollection)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_GetSiteCollectionByDomain(int organizationId, string domain, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_GetSiteCollectionByDomain", new object[] {
+                        organizationId,
+                        domain}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public SharePointEnterpriseSiteCollection EndEnterprise_GetSiteCollectionByDomain(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((SharePointEnterpriseSiteCollection)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetSiteCollectionByDomainAsync(int organizationId, string domain) {
+            this.Enterprise_GetSiteCollectionByDomainAsync(organizationId, domain, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetSiteCollectionByDomainAsync(int organizationId, string domain, object userState) {
+            if ((this.Enterprise_GetSiteCollectionByDomainOperationCompleted == null)) {
+                this.Enterprise_GetSiteCollectionByDomainOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_GetSiteCollectionByDomainOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_GetSiteCollectionByDomain", new object[] {
+                        organizationId,
+                        domain}, this.Enterprise_GetSiteCollectionByDomainOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_GetSiteCollectionByDomainOperationCompleted(object arg) {
+            if ((this.Enterprise_GetSiteCollectionByDomainCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_GetSiteCollectionByDomainCompleted(this, new Enterprise_GetSiteCollectionByDomainCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/Enterprise_AddSiteCollection", 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 Enterprise_AddSiteCollection(SharePointEnterpriseSiteCollection item) {
+            object[] results = this.Invoke("Enterprise_AddSiteCollection", new object[] {
+                        item});
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_AddSiteCollection(SharePointEnterpriseSiteCollection item, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_AddSiteCollection", new object[] {
+                        item}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public int EndEnterprise_AddSiteCollection(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_AddSiteCollectionAsync(SharePointEnterpriseSiteCollection item) {
+            this.Enterprise_AddSiteCollectionAsync(item, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_AddSiteCollectionAsync(SharePointEnterpriseSiteCollection item, object userState) {
+            if ((this.Enterprise_AddSiteCollectionOperationCompleted == null)) {
+                this.Enterprise_AddSiteCollectionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_AddSiteCollectionOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_AddSiteCollection", new object[] {
+                        item}, this.Enterprise_AddSiteCollectionOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_AddSiteCollectionOperationCompleted(object arg) {
+            if ((this.Enterprise_AddSiteCollectionCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_AddSiteCollectionCompleted(this, new Enterprise_AddSiteCollectionCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/Enterprise_DeleteSiteCollection", 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 Enterprise_DeleteSiteCollection(int itemId) {
+            object[] results = this.Invoke("Enterprise_DeleteSiteCollection", new object[] {
+                        itemId});
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_DeleteSiteCollection(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_DeleteSiteCollection", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public int EndEnterprise_DeleteSiteCollection(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_DeleteSiteCollectionAsync(int itemId) {
+            this.Enterprise_DeleteSiteCollectionAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_DeleteSiteCollectionAsync(int itemId, object userState) {
+            if ((this.Enterprise_DeleteSiteCollectionOperationCompleted == null)) {
+                this.Enterprise_DeleteSiteCollectionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_DeleteSiteCollectionOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_DeleteSiteCollection", new object[] {
+                        itemId}, this.Enterprise_DeleteSiteCollectionOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_DeleteSiteCollectionOperationCompleted(object arg) {
+            if ((this.Enterprise_DeleteSiteCollectionCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_DeleteSiteCollectionCompleted(this, new Enterprise_DeleteSiteCollectionCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/Enterprise_DeleteSiteCollections", 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 Enterprise_DeleteSiteCollections(int organizationId) {
+            object[] results = this.Invoke("Enterprise_DeleteSiteCollections", new object[] {
+                        organizationId});
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_DeleteSiteCollections(int organizationId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_DeleteSiteCollections", new object[] {
+                        organizationId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public int EndEnterprise_DeleteSiteCollections(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_DeleteSiteCollectionsAsync(int organizationId) {
+            this.Enterprise_DeleteSiteCollectionsAsync(organizationId, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_DeleteSiteCollectionsAsync(int organizationId, object userState) {
+            if ((this.Enterprise_DeleteSiteCollectionsOperationCompleted == null)) {
+                this.Enterprise_DeleteSiteCollectionsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_DeleteSiteCollectionsOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_DeleteSiteCollections", new object[] {
+                        organizationId}, this.Enterprise_DeleteSiteCollectionsOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_DeleteSiteCollectionsOperationCompleted(object arg) {
+            if ((this.Enterprise_DeleteSiteCollectionsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_DeleteSiteCollectionsCompleted(this, new Enterprise_DeleteSiteCollectionsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/Enterprise_BackupSiteCollection", 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 Enterprise_BackupSiteCollection(int itemId, string fileName, bool zipBackup, bool download, string folderName) {
+            object[] results = this.Invoke("Enterprise_BackupSiteCollection", new object[] {
+                        itemId,
+                        fileName,
+                        zipBackup,
+                        download,
+                        folderName});
+            return ((string)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_BackupSiteCollection(int itemId, string fileName, bool zipBackup, bool download, string folderName, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_BackupSiteCollection", new object[] {
+                        itemId,
+                        fileName,
+                        zipBackup,
+                        download,
+                        folderName}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public string EndEnterprise_BackupSiteCollection(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((string)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_BackupSiteCollectionAsync(int itemId, string fileName, bool zipBackup, bool download, string folderName) {
+            this.Enterprise_BackupSiteCollectionAsync(itemId, fileName, zipBackup, download, folderName, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_BackupSiteCollectionAsync(int itemId, string fileName, bool zipBackup, bool download, string folderName, object userState) {
+            if ((this.Enterprise_BackupSiteCollectionOperationCompleted == null)) {
+                this.Enterprise_BackupSiteCollectionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_BackupSiteCollectionOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_BackupSiteCollection", new object[] {
+                        itemId,
+                        fileName,
+                        zipBackup,
+                        download,
+                        folderName}, this.Enterprise_BackupSiteCollectionOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_BackupSiteCollectionOperationCompleted(object arg) {
+            if ((this.Enterprise_BackupSiteCollectionCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_BackupSiteCollectionCompleted(this, new Enterprise_BackupSiteCollectionCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/Enterprise_RestoreSiteCollection", 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 Enterprise_RestoreSiteCollection(int itemId, string uploadedFile, string packageFile) {
+            object[] results = this.Invoke("Enterprise_RestoreSiteCollection", new object[] {
+                        itemId,
+                        uploadedFile,
+                        packageFile});
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_RestoreSiteCollection(int itemId, string uploadedFile, string packageFile, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_RestoreSiteCollection", new object[] {
+                        itemId,
+                        uploadedFile,
+                        packageFile}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public int EndEnterprise_RestoreSiteCollection(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_RestoreSiteCollectionAsync(int itemId, string uploadedFile, string packageFile) {
+            this.Enterprise_RestoreSiteCollectionAsync(itemId, uploadedFile, packageFile, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_RestoreSiteCollectionAsync(int itemId, string uploadedFile, string packageFile, object userState) {
+            if ((this.Enterprise_RestoreSiteCollectionOperationCompleted == null)) {
+                this.Enterprise_RestoreSiteCollectionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_RestoreSiteCollectionOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_RestoreSiteCollection", new object[] {
+                        itemId,
+                        uploadedFile,
+                        packageFile}, this.Enterprise_RestoreSiteCollectionOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_RestoreSiteCollectionOperationCompleted(object arg) {
+            if ((this.Enterprise_RestoreSiteCollectionCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_RestoreSiteCollectionCompleted(this, new Enterprise_RestoreSiteCollectionCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/Enterprise_GetBackupBinaryChunk", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        [return: System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")]
+        public byte[] Enterprise_GetBackupBinaryChunk(int itemId, string path, int offset, int length) {
+            object[] results = this.Invoke("Enterprise_GetBackupBinaryChunk", new object[] {
+                        itemId,
+                        path,
+                        offset,
+                        length});
+            return ((byte[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_GetBackupBinaryChunk(int itemId, string path, int offset, int length, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_GetBackupBinaryChunk", new object[] {
+                        itemId,
+                        path,
+                        offset,
+                        length}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public byte[] EndEnterprise_GetBackupBinaryChunk(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((byte[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetBackupBinaryChunkAsync(int itemId, string path, int offset, int length) {
+            this.Enterprise_GetBackupBinaryChunkAsync(itemId, path, offset, length, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetBackupBinaryChunkAsync(int itemId, string path, int offset, int length, object userState) {
+            if ((this.Enterprise_GetBackupBinaryChunkOperationCompleted == null)) {
+                this.Enterprise_GetBackupBinaryChunkOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_GetBackupBinaryChunkOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_GetBackupBinaryChunk", new object[] {
+                        itemId,
+                        path,
+                        offset,
+                        length}, this.Enterprise_GetBackupBinaryChunkOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_GetBackupBinaryChunkOperationCompleted(object arg) {
+            if ((this.Enterprise_GetBackupBinaryChunkCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_GetBackupBinaryChunkCompleted(this, new Enterprise_GetBackupBinaryChunkCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/Enterprise_AppendBackupBinaryChunk", 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 Enterprise_AppendBackupBinaryChunk(int itemId, string fileName, string path, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] chunk) {
+            object[] results = this.Invoke("Enterprise_AppendBackupBinaryChunk", new object[] {
+                        itemId,
+                        fileName,
+                        path,
+                        chunk});
+            return ((string)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_AppendBackupBinaryChunk(int itemId, string fileName, string path, byte[] chunk, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_AppendBackupBinaryChunk", new object[] {
+                        itemId,
+                        fileName,
+                        path,
+                        chunk}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public string EndEnterprise_AppendBackupBinaryChunk(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((string)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_AppendBackupBinaryChunkAsync(int itemId, string fileName, string path, byte[] chunk) {
+            this.Enterprise_AppendBackupBinaryChunkAsync(itemId, fileName, path, chunk, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_AppendBackupBinaryChunkAsync(int itemId, string fileName, string path, byte[] chunk, object userState) {
+            if ((this.Enterprise_AppendBackupBinaryChunkOperationCompleted == null)) {
+                this.Enterprise_AppendBackupBinaryChunkOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_AppendBackupBinaryChunkOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_AppendBackupBinaryChunk", new object[] {
+                        itemId,
+                        fileName,
+                        path,
+                        chunk}, this.Enterprise_AppendBackupBinaryChunkOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_AppendBackupBinaryChunkOperationCompleted(object arg) {
+            if ((this.Enterprise_AppendBackupBinaryChunkCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_AppendBackupBinaryChunkCompleted(this, new Enterprise_AppendBackupBinaryChunkCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/Enterprise_CalculateSharePointSitesD" +
+            "iskSpace", 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 SharePointEnterpriseSiteDiskSpace[] Enterprise_CalculateSharePointSitesDiskSpace(int itemId, out int errorCode) {
+            object[] results = this.Invoke("Enterprise_CalculateSharePointSitesDiskSpace", new object[] {
+                        itemId});
+            errorCode = ((int)(results[1]));
+            return ((SharePointEnterpriseSiteDiskSpace[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_CalculateSharePointSitesDiskSpace(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_CalculateSharePointSitesDiskSpace", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public SharePointEnterpriseSiteDiskSpace[] EndEnterprise_CalculateSharePointSitesDiskSpace(System.IAsyncResult asyncResult, out int errorCode) {
+            object[] results = this.EndInvoke(asyncResult);
+            errorCode = ((int)(results[1]));
+            return ((SharePointEnterpriseSiteDiskSpace[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_CalculateSharePointSitesDiskSpaceAsync(int itemId) {
+            this.Enterprise_CalculateSharePointSitesDiskSpaceAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_CalculateSharePointSitesDiskSpaceAsync(int itemId, object userState) {
+            if ((this.Enterprise_CalculateSharePointSitesDiskSpaceOperationCompleted == null)) {
+                this.Enterprise_CalculateSharePointSitesDiskSpaceOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_CalculateSharePointSitesDiskSpaceOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_CalculateSharePointSitesDiskSpace", new object[] {
+                        itemId}, this.Enterprise_CalculateSharePointSitesDiskSpaceOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_CalculateSharePointSitesDiskSpaceOperationCompleted(object arg) {
+            if ((this.Enterprise_CalculateSharePointSitesDiskSpaceCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_CalculateSharePointSitesDiskSpaceCompleted(this, new Enterprise_CalculateSharePointSitesDiskSpaceCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/Enterprise_UpdateQuota", 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 Enterprise_UpdateQuota(int itemId, int siteCollectionId, int maxSize, int warningSize) {
+            this.Invoke("Enterprise_UpdateQuota", new object[] {
+                        itemId,
+                        siteCollectionId,
+                        maxSize,
+                        warningSize});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_UpdateQuota(int itemId, int siteCollectionId, int maxSize, int warningSize, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_UpdateQuota", new object[] {
+                        itemId,
+                        siteCollectionId,
+                        maxSize,
+                        warningSize}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndEnterprise_UpdateQuota(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_UpdateQuotaAsync(int itemId, int siteCollectionId, int maxSize, int warningSize) {
+            this.Enterprise_UpdateQuotaAsync(itemId, siteCollectionId, maxSize, warningSize, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_UpdateQuotaAsync(int itemId, int siteCollectionId, int maxSize, int warningSize, object userState) {
+            if ((this.Enterprise_UpdateQuotaOperationCompleted == null)) {
+                this.Enterprise_UpdateQuotaOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_UpdateQuotaOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_UpdateQuota", new object[] {
+                        itemId,
+                        siteCollectionId,
+                        maxSize,
+                        warningSize}, this.Enterprise_UpdateQuotaOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_UpdateQuotaOperationCompleted(object arg) {
+            if ((this.Enterprise_UpdateQuotaCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_UpdateQuotaCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        public new void CancelAsync(object userState) {
+            base.CancelAsync(userState);
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_GetSiteCollectionsPagedCompletedEventHandler(object sender, Enterprise_GetSiteCollectionsPagedCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_GetSiteCollectionsPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_GetSiteCollectionsPagedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public SharePointEnterpriseSiteCollectionListPaged Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((SharePointEnterpriseSiteCollectionListPaged)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_GetSupportedLanguagesCompletedEventHandler(object sender, Enterprise_GetSupportedLanguagesCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_GetSupportedLanguagesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_GetSupportedLanguagesCompletedEventArgs(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.3038")]
+    public delegate void Enterprise_GetSiteCollectionsCompletedEventHandler(object sender, Enterprise_GetSiteCollectionsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_GetSiteCollectionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_GetSiteCollectionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public SharePointEnterpriseSiteCollection[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((SharePointEnterpriseSiteCollection[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_SetStorageSettingsCompletedEventHandler(object sender, Enterprise_SetStorageSettingsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_SetStorageSettingsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_SetStorageSettingsCompletedEventArgs(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.3038")]
+    public delegate void Enterprise_GetSiteCollectionCompletedEventHandler(object sender, Enterprise_GetSiteCollectionCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_GetSiteCollectionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_GetSiteCollectionCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public SharePointEnterpriseSiteCollection Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((SharePointEnterpriseSiteCollection)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_GetSiteCollectionByDomainCompletedEventHandler(object sender, Enterprise_GetSiteCollectionByDomainCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_GetSiteCollectionByDomainCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_GetSiteCollectionByDomainCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public SharePointEnterpriseSiteCollection Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((SharePointEnterpriseSiteCollection)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_AddSiteCollectionCompletedEventHandler(object sender, Enterprise_AddSiteCollectionCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_AddSiteCollectionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_AddSiteCollectionCompletedEventArgs(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.3038")]
+    public delegate void Enterprise_DeleteSiteCollectionCompletedEventHandler(object sender, Enterprise_DeleteSiteCollectionCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_DeleteSiteCollectionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_DeleteSiteCollectionCompletedEventArgs(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.3038")]
+    public delegate void Enterprise_DeleteSiteCollectionsCompletedEventHandler(object sender, Enterprise_DeleteSiteCollectionsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_DeleteSiteCollectionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_DeleteSiteCollectionsCompletedEventArgs(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.3038")]
+    public delegate void Enterprise_BackupSiteCollectionCompletedEventHandler(object sender, Enterprise_BackupSiteCollectionCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_BackupSiteCollectionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_BackupSiteCollectionCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public string Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((string)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_RestoreSiteCollectionCompletedEventHandler(object sender, Enterprise_RestoreSiteCollectionCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_RestoreSiteCollectionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_RestoreSiteCollectionCompletedEventArgs(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.3038")]
+    public delegate void Enterprise_GetBackupBinaryChunkCompletedEventHandler(object sender, Enterprise_GetBackupBinaryChunkCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_GetBackupBinaryChunkCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_GetBackupBinaryChunkCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public byte[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((byte[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_AppendBackupBinaryChunkCompletedEventHandler(object sender, Enterprise_AppendBackupBinaryChunkCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_AppendBackupBinaryChunkCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_AppendBackupBinaryChunkCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public string Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((string)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_CalculateSharePointSitesDiskSpaceCompletedEventHandler(object sender, Enterprise_CalculateSharePointSitesDiskSpaceCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_CalculateSharePointSitesDiskSpaceCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_CalculateSharePointSitesDiskSpaceCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public SharePointEnterpriseSiteDiskSpace[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((SharePointEnterpriseSiteDiskSpace[])(this.results[0]));
+            }
+        }
+        
+        /// <remarks/>
+        public int errorCode {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((int)(this.results[1]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_UpdateQuotaCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/HostedSharePointServersProxy.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/HostedSharePointServersProxy.cs
index 0a2fb384..ccff6073 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/HostedSharePointServersProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/HostedSharePointServersProxy.cs
@@ -1,7 +1,35 @@
+// Copyright (c) 2015, 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.
-//     Runtime Version:2.0.50727.7905
+//     Runtime Version:2.0.50727.8009
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -22,6 +50,7 @@ namespace WebsitePanel.EnterpriseServer {
     using WebsitePanel.Providers;
     
     
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
@@ -112,7 +141,7 @@ namespace WebsitePanel.EnterpriseServer {
         
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetSiteCollectionsPaged", 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 SharePointSiteCollectionListPaged GetSiteCollectionsPaged(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, string groupName) {
+        public SharePointSiteCollectionListPaged GetSiteCollectionsPaged(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
             object[] results = this.Invoke("GetSiteCollectionsPaged", new object[] {
                         packageId,
                         organizationId,
@@ -120,13 +149,12 @@ namespace WebsitePanel.EnterpriseServer {
                         filterValue,
                         sortColumn,
                         startRow,
-                        maximumRows,
-                        groupName});
+                        maximumRows});
             return ((SharePointSiteCollectionListPaged)(results[0]));
         }
         
         /// <remarks/>
-        public System.IAsyncResult BeginGetSiteCollectionsPaged(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, string groupName, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetSiteCollectionsPaged(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetSiteCollectionsPaged", new object[] {
                         packageId,
                         organizationId,
@@ -134,8 +162,7 @@ namespace WebsitePanel.EnterpriseServer {
                         filterValue,
                         sortColumn,
                         startRow,
-                        maximumRows,
-                        groupName}, callback, asyncState);
+                        maximumRows}, callback, asyncState);
         }
         
         /// <remarks/>
@@ -145,12 +172,12 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public void GetSiteCollectionsPagedAsync(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, string groupName) {
-            this.GetSiteCollectionsPagedAsync(packageId, organizationId, filterColumn, filterValue, sortColumn, startRow, maximumRows, groupName, null);
+        public void GetSiteCollectionsPagedAsync(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
+            this.GetSiteCollectionsPagedAsync(packageId, organizationId, filterColumn, filterValue, sortColumn, startRow, maximumRows, null);
         }
         
         /// <remarks/>
-        public void GetSiteCollectionsPagedAsync(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, string groupName, object userState) {
+        public void GetSiteCollectionsPagedAsync(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState) {
             if ((this.GetSiteCollectionsPagedOperationCompleted == null)) {
                 this.GetSiteCollectionsPagedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSiteCollectionsPagedOperationCompleted);
             }
@@ -161,8 +188,7 @@ namespace WebsitePanel.EnterpriseServer {
                         filterValue,
                         sortColumn,
                         startRow,
-                        maximumRows,
-                        groupName}, this.GetSiteCollectionsPagedOperationCompleted, userState);
+                        maximumRows}, this.GetSiteCollectionsPagedOperationCompleted, userState);
         }
         
         private void OnGetSiteCollectionsPagedOperationCompleted(object arg) {
@@ -215,20 +241,18 @@ namespace WebsitePanel.EnterpriseServer {
         
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetSiteCollections", 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 SharePointSiteCollection[] GetSiteCollections(int packageId, bool recursive, string groupName) {
+        public SharePointSiteCollection[] GetSiteCollections(int packageId, bool recursive) {
             object[] results = this.Invoke("GetSiteCollections", new object[] {
                         packageId,
-                        recursive,
-                        groupName});
+                        recursive});
             return ((SharePointSiteCollection[])(results[0]));
         }
         
         /// <remarks/>
-        public System.IAsyncResult BeginGetSiteCollections(int packageId, bool recursive, string groupName, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginGetSiteCollections(int packageId, bool recursive, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("GetSiteCollections", new object[] {
                         packageId,
-                        recursive,
-                        groupName}, callback, asyncState);
+                        recursive}, callback, asyncState);
         }
         
         /// <remarks/>
@@ -238,19 +262,18 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public void GetSiteCollectionsAsync(int packageId, bool recursive, string groupName) {
-            this.GetSiteCollectionsAsync(packageId, recursive, groupName, null);
+        public void GetSiteCollectionsAsync(int packageId, bool recursive) {
+            this.GetSiteCollectionsAsync(packageId, recursive, null);
         }
         
         /// <remarks/>
-        public void GetSiteCollectionsAsync(int packageId, bool recursive, string groupName, object userState) {
+        public void GetSiteCollectionsAsync(int packageId, bool recursive, object userState) {
             if ((this.GetSiteCollectionsOperationCompleted == null)) {
                 this.GetSiteCollectionsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSiteCollectionsOperationCompleted);
             }
             this.InvokeAsync("GetSiteCollections", new object[] {
                         packageId,
-                        recursive,
-                        groupName}, this.GetSiteCollectionsOperationCompleted, userState);
+                        recursive}, this.GetSiteCollectionsOperationCompleted, userState);
         }
         
         private void OnGetSiteCollectionsOperationCompleted(object arg) {
@@ -397,18 +420,16 @@ namespace WebsitePanel.EnterpriseServer {
         
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddSiteCollection", 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 AddSiteCollection(SharePointSiteCollection item, string groupName) {
+        public int AddSiteCollection(SharePointSiteCollection item) {
             object[] results = this.Invoke("AddSiteCollection", new object[] {
-                        item,
-                        groupName});
+                        item});
             return ((int)(results[0]));
         }
         
         /// <remarks/>
-        public System.IAsyncResult BeginAddSiteCollection(SharePointSiteCollection item, string groupName, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginAddSiteCollection(SharePointSiteCollection item, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("AddSiteCollection", new object[] {
-                        item,
-                        groupName}, callback, asyncState);
+                        item}, callback, asyncState);
         }
         
         /// <remarks/>
@@ -418,18 +439,17 @@ namespace WebsitePanel.EnterpriseServer {
         }
         
         /// <remarks/>
-        public void AddSiteCollectionAsync(SharePointSiteCollection item, string groupName) {
-            this.AddSiteCollectionAsync(item, groupName, null);
+        public void AddSiteCollectionAsync(SharePointSiteCollection item) {
+            this.AddSiteCollectionAsync(item, null);
         }
         
         /// <remarks/>
-        public void AddSiteCollectionAsync(SharePointSiteCollection item, string groupName, object userState) {
+        public void AddSiteCollectionAsync(SharePointSiteCollection item, object userState) {
             if ((this.AddSiteCollectionOperationCompleted == null)) {
                 this.AddSiteCollectionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddSiteCollectionOperationCompleted);
             }
             this.InvokeAsync("AddSiteCollection", new object[] {
-                        item,
-                        groupName}, this.AddSiteCollectionOperationCompleted, userState);
+                        item}, this.AddSiteCollectionOperationCompleted, userState);
         }
         
         private void OnAddSiteCollectionOperationCompleted(object arg) {
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs
index d5b90304..f15a1b1c 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/RemoteDesktopServicesProxy.cs
@@ -20,8 +20,8 @@ namespace WebsitePanel.EnterpriseServer {
     using System.Diagnostics;
     using WebsitePanel.Providers.RemoteDesktopServices;
     using WebsitePanel.Providers.Common;
-    using WebsitePanel.Providers.HostedSolution;
     using WebsitePanel.EnterpriseServer.Base.RDS;
+    using WebsitePanel.Providers.HostedSolution;
     
     
     /// <remarks/>
@@ -137,6 +137,8 @@ namespace WebsitePanel.EnterpriseServer {
         
         private System.Threading.SendOrPostCallback UpdateRdsServerSettingsOperationCompleted;
         
+        private System.Threading.SendOrPostCallback ShadowSessionOperationCompleted;
+        
         /// <remarks/>
         public esRemoteDesktopServices() {
             this.Url = "http://localhost:9002/esRemoteDesktopServices.asmx";
@@ -301,6 +303,9 @@ namespace WebsitePanel.EnterpriseServer {
         /// <remarks/>
         public event UpdateRdsServerSettingsCompletedEventHandler UpdateRdsServerSettingsCompleted;
         
+        /// <remarks/>
+        public event ShadowSessionCompletedEventHandler ShadowSessionCompleted;
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetRdsCollection", 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 RdsCollection GetRdsCollection(int collectionId) {
@@ -2671,6 +2676,53 @@ namespace WebsitePanel.EnterpriseServer {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/ShadowSession", 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 ShadowSession(int itemId, string sessionId, bool control) {
+            object[] results = this.Invoke("ShadowSession", new object[] {
+                        itemId,
+                        sessionId,
+                        control});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginShadowSession(int itemId, string sessionId, bool control, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("ShadowSession", new object[] {
+                        itemId,
+                        sessionId,
+                        control}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndShadowSession(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void ShadowSessionAsync(int itemId, string sessionId, bool control) {
+            this.ShadowSessionAsync(itemId, sessionId, control, null);
+        }
+        
+        /// <remarks/>
+        public void ShadowSessionAsync(int itemId, string sessionId, bool control, object userState) {
+            if ((this.ShadowSessionOperationCompleted == null)) {
+                this.ShadowSessionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnShadowSessionOperationCompleted);
+            }
+            this.InvokeAsync("ShadowSession", new object[] {
+                        itemId,
+                        sessionId,
+                        control}, this.ShadowSessionOperationCompleted, userState);
+        }
+        
+        private void OnShadowSessionOperationCompleted(object arg) {
+            if ((this.ShadowSessionCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.ShadowSessionCompleted(this, new ShadowSessionCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         public new void CancelAsync(object userState) {
             base.CancelAsync(userState);
@@ -4054,4 +4106,30 @@ namespace WebsitePanel.EnterpriseServer {
             }
         }
     }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void ShadowSessionCompletedEventHandler(object sender, ShadowSessionCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class ShadowSessionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal ShadowSessionCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/VirtualizationServerProxy.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/VirtualizationServerProxy.cs
index 26699aa8..bd5a855b 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/VirtualizationServerProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/VirtualizationServerProxy.cs
@@ -3120,1435 +3120,1435 @@ namespace WebsitePanel.EnterpriseServer {
         }
     }
     
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetVirtualMachinesCompletedEventHandler(object sender, GetVirtualMachinesCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetVirtualMachinesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetVirtualMachinesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public VirtualMachineMetaItemsPaged Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((VirtualMachineMetaItemsPaged)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetVirtualMachinesByServiceIdCompletedEventHandler(object sender, GetVirtualMachinesByServiceIdCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetVirtualMachinesByServiceIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetVirtualMachinesByServiceIdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public VirtualMachine[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((VirtualMachine[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetVirtualMachineItemCompletedEventHandler(object sender, GetVirtualMachineItemCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetVirtualMachineItemCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetVirtualMachineItemCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public VirtualMachine Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((VirtualMachine)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void EvaluateVirtualMachineTemplateCompletedEventHandler(object sender, EvaluateVirtualMachineTemplateCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class EvaluateVirtualMachineTemplateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal EvaluateVirtualMachineTemplateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public string Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((string)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetExternalNetworkDetailsCompletedEventHandler(object sender, GetExternalNetworkDetailsCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetExternalNetworkDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetExternalNetworkDetailsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public NetworkAdapterDetails Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((NetworkAdapterDetails)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetPackagePrivateIPAddressesPagedCompletedEventHandler(object sender, GetPackagePrivateIPAddressesPagedCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetPackagePrivateIPAddressesPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetPackagePrivateIPAddressesPagedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public PrivateIPAddressesPaged Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((PrivateIPAddressesPaged)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetPackagePrivateIPAddressesCompletedEventHandler(object sender, GetPackagePrivateIPAddressesCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetPackagePrivateIPAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetPackagePrivateIPAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public PrivateIPAddress[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((PrivateIPAddress[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetPrivateNetworkDetailsCompletedEventHandler(object sender, GetPrivateNetworkDetailsCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetPrivateNetworkDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetPrivateNetworkDetailsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public NetworkAdapterDetails Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((NetworkAdapterDetails)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetSpaceUserPermissionsCompletedEventHandler(object sender, GetSpaceUserPermissionsCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetSpaceUserPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetSpaceUserPermissionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public VirtualMachinePermission[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((VirtualMachinePermission[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void UpdateSpaceUserPermissionsCompletedEventHandler(object sender, UpdateSpaceUserPermissionsCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class UpdateSpaceUserPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal UpdateSpaceUserPermissionsCompletedEventArgs(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 GetSpaceAuditLogCompletedEventHandler(object sender, GetSpaceAuditLogCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetSpaceAuditLogCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetSpaceAuditLogCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public LogRecord[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((LogRecord[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetVirtualMachineAuditLogCompletedEventHandler(object sender, GetVirtualMachineAuditLogCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetVirtualMachineAuditLogCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetVirtualMachineAuditLogCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public LogRecord[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((LogRecord[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetOperatingSystemTemplatesCompletedEventHandler(object sender, GetOperatingSystemTemplatesCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetOperatingSystemTemplatesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetOperatingSystemTemplatesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public LibraryItem[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((LibraryItem[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetOperatingSystemTemplatesByServiceIdCompletedEventHandler(object sender, GetOperatingSystemTemplatesByServiceIdCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetOperatingSystemTemplatesByServiceIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetOperatingSystemTemplatesByServiceIdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public LibraryItem[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((LibraryItem[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetMaximumCpuCoresNumberCompletedEventHandler(object sender, GetMaximumCpuCoresNumberCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetMaximumCpuCoresNumberCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetMaximumCpuCoresNumberCompletedEventArgs(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 GetDefaultExportPathCompletedEventHandler(object sender, GetDefaultExportPathCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetDefaultExportPathCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetDefaultExportPathCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public string Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((string)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void CreateDefaultVirtualMachineCompletedEventHandler(object sender, CreateDefaultVirtualMachineCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class CreateDefaultVirtualMachineCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal CreateDefaultVirtualMachineCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public IntResult Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((IntResult)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void CreateVirtualMachineCompletedEventHandler(object sender, CreateVirtualMachineCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class CreateVirtualMachineCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal CreateVirtualMachineCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public IntResult Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((IntResult)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void ImportVirtualMachineCompletedEventHandler(object sender, ImportVirtualMachineCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class ImportVirtualMachineCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal ImportVirtualMachineCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public IntResult Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((IntResult)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetVirtualMachineThumbnailCompletedEventHandler(object sender, GetVirtualMachineThumbnailCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetVirtualMachineThumbnailCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetVirtualMachineThumbnailCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public byte[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((byte[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetVirtualMachineGeneralDetailsCompletedEventHandler(object sender, GetVirtualMachineGeneralDetailsCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetVirtualMachineGeneralDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetVirtualMachineGeneralDetailsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public VirtualMachine Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((VirtualMachine)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetVirtualMachineExtendedInfoCompletedEventHandler(object sender, GetVirtualMachineExtendedInfoCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetVirtualMachineExtendedInfoCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetVirtualMachineExtendedInfoCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public VirtualMachine Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((VirtualMachine)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void CancelVirtualMachineJobCompletedEventHandler(object sender, CancelVirtualMachineJobCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class CancelVirtualMachineJobCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal CancelVirtualMachineJobCompletedEventArgs(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 UpdateVirtualMachineHostNameCompletedEventHandler(object sender, UpdateVirtualMachineHostNameCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class UpdateVirtualMachineHostNameCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal UpdateVirtualMachineHostNameCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void ChangeVirtualMachineStateCompletedEventHandler(object sender, ChangeVirtualMachineStateCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class ChangeVirtualMachineStateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal ChangeVirtualMachineStateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetVirtualMachineJobsCompletedEventHandler(object sender, GetVirtualMachineJobsCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetVirtualMachineJobsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetVirtualMachineJobsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ConcreteJob[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ConcreteJob[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void ChangeAdministratorPasswordCompletedEventHandler(object sender, ChangeAdministratorPasswordCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class ChangeAdministratorPasswordCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal ChangeAdministratorPasswordCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void UpdateVirtualMachineConfigurationCompletedEventHandler(object sender, UpdateVirtualMachineConfigurationCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class UpdateVirtualMachineConfigurationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal UpdateVirtualMachineConfigurationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetInsertedDvdDiskCompletedEventHandler(object sender, GetInsertedDvdDiskCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetInsertedDvdDiskCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetInsertedDvdDiskCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public LibraryItem Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((LibraryItem)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetLibraryDisksCompletedEventHandler(object sender, GetLibraryDisksCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetLibraryDisksCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetLibraryDisksCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public LibraryItem[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((LibraryItem[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void InsertDvdDiskCompletedEventHandler(object sender, InsertDvdDiskCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class InsertDvdDiskCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal InsertDvdDiskCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void EjectDvdDiskCompletedEventHandler(object sender, EjectDvdDiskCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class EjectDvdDiskCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal EjectDvdDiskCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetVirtualMachineSnapshotsCompletedEventHandler(object sender, GetVirtualMachineSnapshotsCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetVirtualMachineSnapshotsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetVirtualMachineSnapshotsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public VirtualMachineSnapshot[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((VirtualMachineSnapshot[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetSnapshotCompletedEventHandler(object sender, GetSnapshotCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetSnapshotCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetSnapshotCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public VirtualMachineSnapshot Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((VirtualMachineSnapshot)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void CreateSnapshotCompletedEventHandler(object sender, CreateSnapshotCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class CreateSnapshotCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal CreateSnapshotCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void ApplySnapshotCompletedEventHandler(object sender, ApplySnapshotCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class ApplySnapshotCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal ApplySnapshotCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void RenameSnapshotCompletedEventHandler(object sender, RenameSnapshotCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class RenameSnapshotCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal RenameSnapshotCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void DeleteSnapshotCompletedEventHandler(object sender, DeleteSnapshotCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeleteSnapshotCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal DeleteSnapshotCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void DeleteSnapshotSubtreeCompletedEventHandler(object sender, DeleteSnapshotSubtreeCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeleteSnapshotSubtreeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal DeleteSnapshotSubtreeCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetSnapshotThumbnailCompletedEventHandler(object sender, GetSnapshotThumbnailCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetSnapshotThumbnailCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetSnapshotThumbnailCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public byte[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((byte[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetExternalNetworkAdapterDetailsCompletedEventHandler(object sender, GetExternalNetworkAdapterDetailsCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetExternalNetworkAdapterDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetExternalNetworkAdapterDetailsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public NetworkAdapterDetails Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((NetworkAdapterDetails)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void AddVirtualMachineExternalIPAddressesCompletedEventHandler(object sender, AddVirtualMachineExternalIPAddressesCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class AddVirtualMachineExternalIPAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal AddVirtualMachineExternalIPAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void SetVirtualMachinePrimaryExternalIPAddressCompletedEventHandler(object sender, SetVirtualMachinePrimaryExternalIPAddressCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetVirtualMachinePrimaryExternalIPAddressCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal SetVirtualMachinePrimaryExternalIPAddressCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void DeleteVirtualMachineExternalIPAddressesCompletedEventHandler(object sender, DeleteVirtualMachineExternalIPAddressesCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeleteVirtualMachineExternalIPAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal DeleteVirtualMachineExternalIPAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetPrivateNetworkAdapterDetailsCompletedEventHandler(object sender, GetPrivateNetworkAdapterDetailsCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetPrivateNetworkAdapterDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetPrivateNetworkAdapterDetailsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public NetworkAdapterDetails Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((NetworkAdapterDetails)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void AddVirtualMachinePrivateIPAddressesCompletedEventHandler(object sender, AddVirtualMachinePrivateIPAddressesCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class AddVirtualMachinePrivateIPAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal AddVirtualMachinePrivateIPAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void SetVirtualMachinePrimaryPrivateIPAddressCompletedEventHandler(object sender, SetVirtualMachinePrimaryPrivateIPAddressCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SetVirtualMachinePrimaryPrivateIPAddressCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal SetVirtualMachinePrimaryPrivateIPAddressCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void DeleteVirtualMachinePrivateIPAddressesCompletedEventHandler(object sender, DeleteVirtualMachinePrivateIPAddressesCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeleteVirtualMachinePrivateIPAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal DeleteVirtualMachinePrivateIPAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void GetVirtualMachinePermissionsCompletedEventHandler(object sender, GetVirtualMachinePermissionsCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetVirtualMachinePermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetVirtualMachinePermissionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public VirtualMachinePermission[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((VirtualMachinePermission[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void UpdateVirtualMachineUserPermissionsCompletedEventHandler(object sender, UpdateVirtualMachineUserPermissionsCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class UpdateVirtualMachineUserPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal UpdateVirtualMachineUserPermissionsCompletedEventArgs(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 GetExternalSwitchesCompletedEventHandler(object sender, GetExternalSwitchesCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetExternalSwitchesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetExternalSwitchesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public VirtualSwitch[] Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((VirtualSwitch[])(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void DeleteVirtualMachineCompletedEventHandler(object sender, DeleteVirtualMachineCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class DeleteVirtualMachineCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal DeleteVirtualMachineCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void ReinstallVirtualMachineCompletedEventHandler(object sender, ReinstallVirtualMachineCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class ReinstallVirtualMachineCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal ReinstallVirtualMachineCompletedEventArgs(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 GetVirtualMachineSummaryTextCompletedEventHandler(object sender, GetVirtualMachineSummaryTextCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class GetVirtualMachineSummaryTextCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal GetVirtualMachineSummaryTextCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public string Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((string)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    public delegate void SendVirtualMachineSummaryLetterCompletedEventHandler(object sender, SendVirtualMachineSummaryLetterCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class SendVirtualMachineSummaryLetterCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal SendVirtualMachineSummaryLetterCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public ResultObject Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((ResultObject)(this.results[0]));
-            }
-        }
-    }
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetVirtualMachinesCompletedEventHandler(object sender, GetVirtualMachinesCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetVirtualMachinesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetVirtualMachinesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public VirtualMachineMetaItemsPaged Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((VirtualMachineMetaItemsPaged)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetVirtualMachinesByServiceIdCompletedEventHandler(object sender, GetVirtualMachinesByServiceIdCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetVirtualMachinesByServiceIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetVirtualMachinesByServiceIdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public VirtualMachine[] Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((VirtualMachine[])(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetVirtualMachineItemCompletedEventHandler(object sender, GetVirtualMachineItemCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetVirtualMachineItemCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetVirtualMachineItemCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public VirtualMachine Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((VirtualMachine)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void EvaluateVirtualMachineTemplateCompletedEventHandler(object sender, EvaluateVirtualMachineTemplateCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class EvaluateVirtualMachineTemplateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal EvaluateVirtualMachineTemplateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public string Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((string)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetExternalNetworkDetailsCompletedEventHandler(object sender, GetExternalNetworkDetailsCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetExternalNetworkDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetExternalNetworkDetailsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public NetworkAdapterDetails Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((NetworkAdapterDetails)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetPackagePrivateIPAddressesPagedCompletedEventHandler(object sender, GetPackagePrivateIPAddressesPagedCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetPackagePrivateIPAddressesPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetPackagePrivateIPAddressesPagedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public PrivateIPAddressesPaged Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((PrivateIPAddressesPaged)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetPackagePrivateIPAddressesCompletedEventHandler(object sender, GetPackagePrivateIPAddressesCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetPackagePrivateIPAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetPackagePrivateIPAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public PrivateIPAddress[] Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((PrivateIPAddress[])(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetPrivateNetworkDetailsCompletedEventHandler(object sender, GetPrivateNetworkDetailsCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetPrivateNetworkDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetPrivateNetworkDetailsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public NetworkAdapterDetails Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((NetworkAdapterDetails)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetSpaceUserPermissionsCompletedEventHandler(object sender, GetSpaceUserPermissionsCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetSpaceUserPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetSpaceUserPermissionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public VirtualMachinePermission[] Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((VirtualMachinePermission[])(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void UpdateSpaceUserPermissionsCompletedEventHandler(object sender, UpdateSpaceUserPermissionsCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class UpdateSpaceUserPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal UpdateSpaceUserPermissionsCompletedEventArgs(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 GetSpaceAuditLogCompletedEventHandler(object sender, GetSpaceAuditLogCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetSpaceAuditLogCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetSpaceAuditLogCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public LogRecord[] Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((LogRecord[])(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetVirtualMachineAuditLogCompletedEventHandler(object sender, GetVirtualMachineAuditLogCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetVirtualMachineAuditLogCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetVirtualMachineAuditLogCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public LogRecord[] Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((LogRecord[])(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetOperatingSystemTemplatesCompletedEventHandler(object sender, GetOperatingSystemTemplatesCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetOperatingSystemTemplatesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetOperatingSystemTemplatesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public LibraryItem[] Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((LibraryItem[])(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetOperatingSystemTemplatesByServiceIdCompletedEventHandler(object sender, GetOperatingSystemTemplatesByServiceIdCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetOperatingSystemTemplatesByServiceIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetOperatingSystemTemplatesByServiceIdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public LibraryItem[] Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((LibraryItem[])(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetMaximumCpuCoresNumberCompletedEventHandler(object sender, GetMaximumCpuCoresNumberCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetMaximumCpuCoresNumberCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetMaximumCpuCoresNumberCompletedEventArgs(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 GetDefaultExportPathCompletedEventHandler(object sender, GetDefaultExportPathCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetDefaultExportPathCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetDefaultExportPathCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public string Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((string)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void CreateDefaultVirtualMachineCompletedEventHandler(object sender, CreateDefaultVirtualMachineCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class CreateDefaultVirtualMachineCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal CreateDefaultVirtualMachineCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public IntResult Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((IntResult)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void CreateVirtualMachineCompletedEventHandler(object sender, CreateVirtualMachineCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class CreateVirtualMachineCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal CreateVirtualMachineCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public IntResult Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((IntResult)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void ImportVirtualMachineCompletedEventHandler(object sender, ImportVirtualMachineCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class ImportVirtualMachineCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal ImportVirtualMachineCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public IntResult Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((IntResult)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetVirtualMachineThumbnailCompletedEventHandler(object sender, GetVirtualMachineThumbnailCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetVirtualMachineThumbnailCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetVirtualMachineThumbnailCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public byte[] Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((byte[])(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetVirtualMachineGeneralDetailsCompletedEventHandler(object sender, GetVirtualMachineGeneralDetailsCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetVirtualMachineGeneralDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetVirtualMachineGeneralDetailsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public VirtualMachine Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((VirtualMachine)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetVirtualMachineExtendedInfoCompletedEventHandler(object sender, GetVirtualMachineExtendedInfoCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetVirtualMachineExtendedInfoCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetVirtualMachineExtendedInfoCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public VirtualMachine Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((VirtualMachine)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void CancelVirtualMachineJobCompletedEventHandler(object sender, CancelVirtualMachineJobCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class CancelVirtualMachineJobCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal CancelVirtualMachineJobCompletedEventArgs(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 UpdateVirtualMachineHostNameCompletedEventHandler(object sender, UpdateVirtualMachineHostNameCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class UpdateVirtualMachineHostNameCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal UpdateVirtualMachineHostNameCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void ChangeVirtualMachineStateCompletedEventHandler(object sender, ChangeVirtualMachineStateCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class ChangeVirtualMachineStateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal ChangeVirtualMachineStateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetVirtualMachineJobsCompletedEventHandler(object sender, GetVirtualMachineJobsCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetVirtualMachineJobsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetVirtualMachineJobsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ConcreteJob[] Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ConcreteJob[])(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void ChangeAdministratorPasswordCompletedEventHandler(object sender, ChangeAdministratorPasswordCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class ChangeAdministratorPasswordCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal ChangeAdministratorPasswordCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void UpdateVirtualMachineConfigurationCompletedEventHandler(object sender, UpdateVirtualMachineConfigurationCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class UpdateVirtualMachineConfigurationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal UpdateVirtualMachineConfigurationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetInsertedDvdDiskCompletedEventHandler(object sender, GetInsertedDvdDiskCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetInsertedDvdDiskCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetInsertedDvdDiskCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public LibraryItem Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((LibraryItem)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetLibraryDisksCompletedEventHandler(object sender, GetLibraryDisksCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetLibraryDisksCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetLibraryDisksCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public LibraryItem[] Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((LibraryItem[])(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void InsertDvdDiskCompletedEventHandler(object sender, InsertDvdDiskCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class InsertDvdDiskCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal InsertDvdDiskCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void EjectDvdDiskCompletedEventHandler(object sender, EjectDvdDiskCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class EjectDvdDiskCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal EjectDvdDiskCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetVirtualMachineSnapshotsCompletedEventHandler(object sender, GetVirtualMachineSnapshotsCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetVirtualMachineSnapshotsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetVirtualMachineSnapshotsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public VirtualMachineSnapshot[] Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((VirtualMachineSnapshot[])(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetSnapshotCompletedEventHandler(object sender, GetSnapshotCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetSnapshotCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetSnapshotCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public VirtualMachineSnapshot Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((VirtualMachineSnapshot)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void CreateSnapshotCompletedEventHandler(object sender, CreateSnapshotCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class CreateSnapshotCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal CreateSnapshotCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void ApplySnapshotCompletedEventHandler(object sender, ApplySnapshotCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class ApplySnapshotCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal ApplySnapshotCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void RenameSnapshotCompletedEventHandler(object sender, RenameSnapshotCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class RenameSnapshotCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal RenameSnapshotCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void DeleteSnapshotCompletedEventHandler(object sender, DeleteSnapshotCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class DeleteSnapshotCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal DeleteSnapshotCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void DeleteSnapshotSubtreeCompletedEventHandler(object sender, DeleteSnapshotSubtreeCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class DeleteSnapshotSubtreeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal DeleteSnapshotSubtreeCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetSnapshotThumbnailCompletedEventHandler(object sender, GetSnapshotThumbnailCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetSnapshotThumbnailCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetSnapshotThumbnailCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public byte[] Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((byte[])(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetExternalNetworkAdapterDetailsCompletedEventHandler(object sender, GetExternalNetworkAdapterDetailsCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetExternalNetworkAdapterDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetExternalNetworkAdapterDetailsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public NetworkAdapterDetails Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((NetworkAdapterDetails)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void AddVirtualMachineExternalIPAddressesCompletedEventHandler(object sender, AddVirtualMachineExternalIPAddressesCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class AddVirtualMachineExternalIPAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal AddVirtualMachineExternalIPAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void SetVirtualMachinePrimaryExternalIPAddressCompletedEventHandler(object sender, SetVirtualMachinePrimaryExternalIPAddressCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class SetVirtualMachinePrimaryExternalIPAddressCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal SetVirtualMachinePrimaryExternalIPAddressCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void DeleteVirtualMachineExternalIPAddressesCompletedEventHandler(object sender, DeleteVirtualMachineExternalIPAddressesCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class DeleteVirtualMachineExternalIPAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal DeleteVirtualMachineExternalIPAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetPrivateNetworkAdapterDetailsCompletedEventHandler(object sender, GetPrivateNetworkAdapterDetailsCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetPrivateNetworkAdapterDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetPrivateNetworkAdapterDetailsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public NetworkAdapterDetails Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((NetworkAdapterDetails)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void AddVirtualMachinePrivateIPAddressesCompletedEventHandler(object sender, AddVirtualMachinePrivateIPAddressesCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class AddVirtualMachinePrivateIPAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal AddVirtualMachinePrivateIPAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void SetVirtualMachinePrimaryPrivateIPAddressCompletedEventHandler(object sender, SetVirtualMachinePrimaryPrivateIPAddressCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class SetVirtualMachinePrimaryPrivateIPAddressCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal SetVirtualMachinePrimaryPrivateIPAddressCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void DeleteVirtualMachinePrivateIPAddressesCompletedEventHandler(object sender, DeleteVirtualMachinePrivateIPAddressesCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class DeleteVirtualMachinePrivateIPAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal DeleteVirtualMachinePrivateIPAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void GetVirtualMachinePermissionsCompletedEventHandler(object sender, GetVirtualMachinePermissionsCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetVirtualMachinePermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetVirtualMachinePermissionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public VirtualMachinePermission[] Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((VirtualMachinePermission[])(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void UpdateVirtualMachineUserPermissionsCompletedEventHandler(object sender, UpdateVirtualMachineUserPermissionsCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class UpdateVirtualMachineUserPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal UpdateVirtualMachineUserPermissionsCompletedEventArgs(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 GetExternalSwitchesCompletedEventHandler(object sender, GetExternalSwitchesCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetExternalSwitchesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetExternalSwitchesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public VirtualSwitch[] Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((VirtualSwitch[])(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void DeleteVirtualMachineCompletedEventHandler(object sender, DeleteVirtualMachineCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class DeleteVirtualMachineCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal DeleteVirtualMachineCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void ReinstallVirtualMachineCompletedEventHandler(object sender, ReinstallVirtualMachineCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class ReinstallVirtualMachineCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal ReinstallVirtualMachineCompletedEventArgs(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 GetVirtualMachineSummaryTextCompletedEventHandler(object sender, GetVirtualMachineSummaryTextCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class GetVirtualMachineSummaryTextCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal GetVirtualMachineSummaryTextCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public string Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((string)(this.results[0]));
+    //        }
+    //    }
+    //}
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //public delegate void SendVirtualMachineSummaryLetterCompletedEventHandler(object sender, SendVirtualMachineSummaryLetterCompletedEventArgs e);
+    
+    ///// <remarks/>
+    //[System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    //[System.Diagnostics.DebuggerStepThroughAttribute()]
+    //[System.ComponentModel.DesignerCategoryAttribute("code")]
+    //public partial class SendVirtualMachineSummaryLetterCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+    //    private object[] results;
+        
+    //    internal SendVirtualMachineSummaryLetterCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+    //            base(exception, cancelled, userState) {
+    //        this.results = results;
+    //    }
+        
+    //    /// <remarks/>
+    //    public ResultObject Result {
+    //        get {
+    //            this.RaiseExceptionIfNecessary();
+    //            return ((ResultObject)(this.results[0]));
+    //        }
+    //    }
+    //}
 
     //Hyper-V Cloud
     /// <remarks/>
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/VirtualizationServerProxy2012.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/VirtualizationServerProxy2012.cs
new file mode 100644
index 00000000..0798c760
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/VirtualizationServerProxy2012.cs
@@ -0,0 +1,4559 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.8000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+// 
+// This source code was auto-generated by wsdl, Version=2.0.50727.42.
+// 
+namespace WebsitePanel.EnterpriseServer {
+    using System.Xml.Serialization;
+    using System.Web.Services;
+    using System.ComponentModel;
+    using System.Web.Services.Protocols;
+    using System;
+    using System.Diagnostics;
+    using WebsitePanel.Providers;
+    using WebsitePanel.Providers.Common;
+    using WebsitePanel.Providers.Virtualization;
+    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="esVirtualizationServer2012Soap", Namespace="http://smbsaas/websitepanel/enterpriseserver")]
+    [System.Xml.Serialization.XmlIncludeAttribute(typeof(ServiceProviderItem))]
+    public partial class esVirtualizationServer2012 : Microsoft.Web.Services3.WebServicesClientProtocol {
+        
+        private System.Threading.SendOrPostCallback GetVirtualMachinesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetVirtualMachinesByServiceIdOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetVirtualMachineItemOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback EvaluateVirtualMachineTemplateOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetExternalNetworkDetailsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetPackagePrivateIPAddressesPagedOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetPackagePrivateIPAddressesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetPrivateNetworkDetailsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetSpaceUserPermissionsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback UpdateSpaceUserPermissionsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetSpaceAuditLogOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetVirtualMachineAuditLogOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetOperatingSystemTemplatesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetOperatingSystemTemplatesByServiceIdOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetMaximumCpuCoresNumberOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetDefaultExportPathOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback CreateDefaultVirtualMachineOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback CreateVirtualMachineOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback ImportVirtualMachineOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetVirtualMachineThumbnailOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetVirtualMachineGeneralDetailsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetVirtualMachineExtendedInfoOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback CancelVirtualMachineJobOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback UpdateVirtualMachineHostNameOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback ChangeVirtualMachineStateOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetVirtualMachineJobsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback ChangeAdministratorPasswordOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback UpdateVirtualMachineConfigurationOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetInsertedDvdDiskOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetLibraryDisksOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback InsertDvdDiskOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback EjectDvdDiskOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetVirtualMachineSnapshotsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetSnapshotOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback CreateSnapshotOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback ApplySnapshotOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback RenameSnapshotOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeleteSnapshotOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeleteSnapshotSubtreeOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetSnapshotThumbnailOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetExternalNetworkAdapterDetailsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback AddVirtualMachineExternalIPAddressesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetVirtualMachinePrimaryExternalIPAddressOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeleteVirtualMachineExternalIPAddressesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetPrivateNetworkAdapterDetailsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback AddVirtualMachinePrivateIPAddressesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SetVirtualMachinePrimaryPrivateIPAddressOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeleteVirtualMachinePrivateIPAddressesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetVirtualMachinePermissionsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback UpdateVirtualMachineUserPermissionsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetExternalSwitchesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback DeleteVirtualMachineOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback ReinstallVirtualMachineOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback GetVirtualMachineSummaryTextOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback SendVirtualMachineSummaryLetterOperationCompleted;
+        
+        /// <remarks/>
+        public esVirtualizationServer2012() {
+            this.Url = "http://127.0.0.1:9012/esVirtualizationServer2012.asmx";
+        }
+        
+        /// <remarks/>
+        public event GetVirtualMachinesCompletedEventHandler GetVirtualMachinesCompleted;
+        
+        /// <remarks/>
+        public event GetVirtualMachinesByServiceIdCompletedEventHandler GetVirtualMachinesByServiceIdCompleted;
+        
+        /// <remarks/>
+        public event GetVirtualMachineItemCompletedEventHandler GetVirtualMachineItemCompleted;
+        
+        /// <remarks/>
+        public event EvaluateVirtualMachineTemplateCompletedEventHandler EvaluateVirtualMachineTemplateCompleted;
+        
+        /// <remarks/>
+        public event GetExternalNetworkDetailsCompletedEventHandler GetExternalNetworkDetailsCompleted;
+        
+        /// <remarks/>
+        public event GetPackagePrivateIPAddressesPagedCompletedEventHandler GetPackagePrivateIPAddressesPagedCompleted;
+        
+        /// <remarks/>
+        public event GetPackagePrivateIPAddressesCompletedEventHandler GetPackagePrivateIPAddressesCompleted;
+        
+        /// <remarks/>
+        public event GetPrivateNetworkDetailsCompletedEventHandler GetPrivateNetworkDetailsCompleted;
+        
+        /// <remarks/>
+        public event GetSpaceUserPermissionsCompletedEventHandler GetSpaceUserPermissionsCompleted;
+        
+        /// <remarks/>
+        public event UpdateSpaceUserPermissionsCompletedEventHandler UpdateSpaceUserPermissionsCompleted;
+        
+        /// <remarks/>
+        public event GetSpaceAuditLogCompletedEventHandler GetSpaceAuditLogCompleted;
+        
+        /// <remarks/>
+        public event GetVirtualMachineAuditLogCompletedEventHandler GetVirtualMachineAuditLogCompleted;
+        
+        /// <remarks/>
+        public event GetOperatingSystemTemplatesCompletedEventHandler GetOperatingSystemTemplatesCompleted;
+        
+        /// <remarks/>
+        public event GetOperatingSystemTemplatesByServiceIdCompletedEventHandler GetOperatingSystemTemplatesByServiceIdCompleted;
+        
+        /// <remarks/>
+        public event GetMaximumCpuCoresNumberCompletedEventHandler GetMaximumCpuCoresNumberCompleted;
+        
+        /// <remarks/>
+        public event GetDefaultExportPathCompletedEventHandler GetDefaultExportPathCompleted;
+        
+        /// <remarks/>
+        public event CreateDefaultVirtualMachineCompletedEventHandler CreateDefaultVirtualMachineCompleted;
+        
+        /// <remarks/>
+        public event CreateVirtualMachineCompletedEventHandler CreateVirtualMachineCompleted;
+        
+        /// <remarks/>
+        public event ImportVirtualMachineCompletedEventHandler ImportVirtualMachineCompleted;
+        
+        /// <remarks/>
+        public event GetVirtualMachineThumbnailCompletedEventHandler GetVirtualMachineThumbnailCompleted;
+        
+        /// <remarks/>
+        public event GetVirtualMachineGeneralDetailsCompletedEventHandler GetVirtualMachineGeneralDetailsCompleted;
+        
+        /// <remarks/>
+        public event GetVirtualMachineExtendedInfoCompletedEventHandler GetVirtualMachineExtendedInfoCompleted;
+        
+        /// <remarks/>
+        public event CancelVirtualMachineJobCompletedEventHandler CancelVirtualMachineJobCompleted;
+        
+        /// <remarks/>
+        public event UpdateVirtualMachineHostNameCompletedEventHandler UpdateVirtualMachineHostNameCompleted;
+        
+        /// <remarks/>
+        public event ChangeVirtualMachineStateCompletedEventHandler ChangeVirtualMachineStateCompleted;
+        
+        /// <remarks/>
+        public event GetVirtualMachineJobsCompletedEventHandler GetVirtualMachineJobsCompleted;
+        
+        /// <remarks/>
+        public event ChangeAdministratorPasswordCompletedEventHandler ChangeAdministratorPasswordCompleted;
+        
+        /// <remarks/>
+        public event UpdateVirtualMachineConfigurationCompletedEventHandler UpdateVirtualMachineConfigurationCompleted;
+        
+        /// <remarks/>
+        public event GetInsertedDvdDiskCompletedEventHandler GetInsertedDvdDiskCompleted;
+        
+        /// <remarks/>
+        public event GetLibraryDisksCompletedEventHandler GetLibraryDisksCompleted;
+        
+        /// <remarks/>
+        public event InsertDvdDiskCompletedEventHandler InsertDvdDiskCompleted;
+        
+        /// <remarks/>
+        public event EjectDvdDiskCompletedEventHandler EjectDvdDiskCompleted;
+        
+        /// <remarks/>
+        public event GetVirtualMachineSnapshotsCompletedEventHandler GetVirtualMachineSnapshotsCompleted;
+        
+        /// <remarks/>
+        public event GetSnapshotCompletedEventHandler GetSnapshotCompleted;
+        
+        /// <remarks/>
+        public event CreateSnapshotCompletedEventHandler CreateSnapshotCompleted;
+        
+        /// <remarks/>
+        public event ApplySnapshotCompletedEventHandler ApplySnapshotCompleted;
+        
+        /// <remarks/>
+        public event RenameSnapshotCompletedEventHandler RenameSnapshotCompleted;
+        
+        /// <remarks/>
+        public event DeleteSnapshotCompletedEventHandler DeleteSnapshotCompleted;
+        
+        /// <remarks/>
+        public event DeleteSnapshotSubtreeCompletedEventHandler DeleteSnapshotSubtreeCompleted;
+        
+        /// <remarks/>
+        public event GetSnapshotThumbnailCompletedEventHandler GetSnapshotThumbnailCompleted;
+        
+        /// <remarks/>
+        public event GetExternalNetworkAdapterDetailsCompletedEventHandler GetExternalNetworkAdapterDetailsCompleted;
+        
+        /// <remarks/>
+        public event AddVirtualMachineExternalIPAddressesCompletedEventHandler AddVirtualMachineExternalIPAddressesCompleted;
+        
+        /// <remarks/>
+        public event SetVirtualMachinePrimaryExternalIPAddressCompletedEventHandler SetVirtualMachinePrimaryExternalIPAddressCompleted;
+        
+        /// <remarks/>
+        public event DeleteVirtualMachineExternalIPAddressesCompletedEventHandler DeleteVirtualMachineExternalIPAddressesCompleted;
+        
+        /// <remarks/>
+        public event GetPrivateNetworkAdapterDetailsCompletedEventHandler GetPrivateNetworkAdapterDetailsCompleted;
+        
+        /// <remarks/>
+        public event AddVirtualMachinePrivateIPAddressesCompletedEventHandler AddVirtualMachinePrivateIPAddressesCompleted;
+        
+        /// <remarks/>
+        public event SetVirtualMachinePrimaryPrivateIPAddressCompletedEventHandler SetVirtualMachinePrimaryPrivateIPAddressCompleted;
+        
+        /// <remarks/>
+        public event DeleteVirtualMachinePrivateIPAddressesCompletedEventHandler DeleteVirtualMachinePrivateIPAddressesCompleted;
+        
+        /// <remarks/>
+        public event GetVirtualMachinePermissionsCompletedEventHandler GetVirtualMachinePermissionsCompleted;
+        
+        /// <remarks/>
+        public event UpdateVirtualMachineUserPermissionsCompletedEventHandler UpdateVirtualMachineUserPermissionsCompleted;
+        
+        /// <remarks/>
+        public event GetExternalSwitchesCompletedEventHandler GetExternalSwitchesCompleted;
+        
+        /// <remarks/>
+        public event DeleteVirtualMachineCompletedEventHandler DeleteVirtualMachineCompleted;
+        
+        /// <remarks/>
+        public event ReinstallVirtualMachineCompletedEventHandler ReinstallVirtualMachineCompleted;
+        
+        /// <remarks/>
+        public event GetVirtualMachineSummaryTextCompletedEventHandler GetVirtualMachineSummaryTextCompleted;
+        
+        /// <remarks/>
+        public event SendVirtualMachineSummaryLetterCompletedEventHandler SendVirtualMachineSummaryLetterCompleted;
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetVirtualMachines", 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 VirtualMachineMetaItemsPaged GetVirtualMachines(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, bool recursive) {
+            object[] results = this.Invoke("GetVirtualMachines", new object[] {
+                        packageId,
+                        filterColumn,
+                        filterValue,
+                        sortColumn,
+                        startRow,
+                        maximumRows,
+                        recursive});
+            return ((VirtualMachineMetaItemsPaged)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetVirtualMachines(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, bool recursive, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetVirtualMachines", new object[] {
+                        packageId,
+                        filterColumn,
+                        filterValue,
+                        sortColumn,
+                        startRow,
+                        maximumRows,
+                        recursive}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public VirtualMachineMetaItemsPaged EndGetVirtualMachines(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((VirtualMachineMetaItemsPaged)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachinesAsync(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, bool recursive) {
+            this.GetVirtualMachinesAsync(packageId, filterColumn, filterValue, sortColumn, startRow, maximumRows, recursive, null);
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachinesAsync(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, bool recursive, object userState) {
+            if ((this.GetVirtualMachinesOperationCompleted == null)) {
+                this.GetVirtualMachinesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetVirtualMachinesOperationCompleted);
+            }
+            this.InvokeAsync("GetVirtualMachines", new object[] {
+                        packageId,
+                        filterColumn,
+                        filterValue,
+                        sortColumn,
+                        startRow,
+                        maximumRows,
+                        recursive}, this.GetVirtualMachinesOperationCompleted, userState);
+        }
+        
+        private void OnGetVirtualMachinesOperationCompleted(object arg) {
+            if ((this.GetVirtualMachinesCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetVirtualMachinesCompleted(this, new GetVirtualMachinesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetVirtualMachinesByServiceId", 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 VirtualMachine[] GetVirtualMachinesByServiceId(int serviceId) {
+            object[] results = this.Invoke("GetVirtualMachinesByServiceId", new object[] {
+                        serviceId});
+            return ((VirtualMachine[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetVirtualMachinesByServiceId(int serviceId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetVirtualMachinesByServiceId", new object[] {
+                        serviceId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public VirtualMachine[] EndGetVirtualMachinesByServiceId(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((VirtualMachine[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachinesByServiceIdAsync(int serviceId) {
+            this.GetVirtualMachinesByServiceIdAsync(serviceId, null);
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachinesByServiceIdAsync(int serviceId, object userState) {
+            if ((this.GetVirtualMachinesByServiceIdOperationCompleted == null)) {
+                this.GetVirtualMachinesByServiceIdOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetVirtualMachinesByServiceIdOperationCompleted);
+            }
+            this.InvokeAsync("GetVirtualMachinesByServiceId", new object[] {
+                        serviceId}, this.GetVirtualMachinesByServiceIdOperationCompleted, userState);
+        }
+        
+        private void OnGetVirtualMachinesByServiceIdOperationCompleted(object arg) {
+            if ((this.GetVirtualMachinesByServiceIdCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetVirtualMachinesByServiceIdCompleted(this, new GetVirtualMachinesByServiceIdCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetVirtualMachineItem", 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 VirtualMachine GetVirtualMachineItem(int itemId) {
+            object[] results = this.Invoke("GetVirtualMachineItem", new object[] {
+                        itemId});
+            return ((VirtualMachine)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetVirtualMachineItem(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetVirtualMachineItem", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public VirtualMachine EndGetVirtualMachineItem(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((VirtualMachine)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachineItemAsync(int itemId) {
+            this.GetVirtualMachineItemAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachineItemAsync(int itemId, object userState) {
+            if ((this.GetVirtualMachineItemOperationCompleted == null)) {
+                this.GetVirtualMachineItemOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetVirtualMachineItemOperationCompleted);
+            }
+            this.InvokeAsync("GetVirtualMachineItem", new object[] {
+                        itemId}, this.GetVirtualMachineItemOperationCompleted, userState);
+        }
+        
+        private void OnGetVirtualMachineItemOperationCompleted(object arg) {
+            if ((this.GetVirtualMachineItemCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetVirtualMachineItemCompleted(this, new GetVirtualMachineItemCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/EvaluateVirtualMachineTemplate", 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 EvaluateVirtualMachineTemplate(int itemId, string template) {
+            object[] results = this.Invoke("EvaluateVirtualMachineTemplate", new object[] {
+                        itemId,
+                        template});
+            return ((string)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEvaluateVirtualMachineTemplate(int itemId, string template, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("EvaluateVirtualMachineTemplate", new object[] {
+                        itemId,
+                        template}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public string EndEvaluateVirtualMachineTemplate(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((string)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void EvaluateVirtualMachineTemplateAsync(int itemId, string template) {
+            this.EvaluateVirtualMachineTemplateAsync(itemId, template, null);
+        }
+        
+        /// <remarks/>
+        public void EvaluateVirtualMachineTemplateAsync(int itemId, string template, object userState) {
+            if ((this.EvaluateVirtualMachineTemplateOperationCompleted == null)) {
+                this.EvaluateVirtualMachineTemplateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEvaluateVirtualMachineTemplateOperationCompleted);
+            }
+            this.InvokeAsync("EvaluateVirtualMachineTemplate", new object[] {
+                        itemId,
+                        template}, this.EvaluateVirtualMachineTemplateOperationCompleted, userState);
+        }
+        
+        private void OnEvaluateVirtualMachineTemplateOperationCompleted(object arg) {
+            if ((this.EvaluateVirtualMachineTemplateCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.EvaluateVirtualMachineTemplateCompleted(this, new EvaluateVirtualMachineTemplateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExternalNetworkDetails", 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 NetworkAdapterDetails GetExternalNetworkDetails(int packageId) {
+            object[] results = this.Invoke("GetExternalNetworkDetails", new object[] {
+                        packageId});
+            return ((NetworkAdapterDetails)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetExternalNetworkDetails(int packageId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetExternalNetworkDetails", new object[] {
+                        packageId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public NetworkAdapterDetails EndGetExternalNetworkDetails(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((NetworkAdapterDetails)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetExternalNetworkDetailsAsync(int packageId) {
+            this.GetExternalNetworkDetailsAsync(packageId, null);
+        }
+        
+        /// <remarks/>
+        public void GetExternalNetworkDetailsAsync(int packageId, object userState) {
+            if ((this.GetExternalNetworkDetailsOperationCompleted == null)) {
+                this.GetExternalNetworkDetailsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetExternalNetworkDetailsOperationCompleted);
+            }
+            this.InvokeAsync("GetExternalNetworkDetails", new object[] {
+                        packageId}, this.GetExternalNetworkDetailsOperationCompleted, userState);
+        }
+        
+        private void OnGetExternalNetworkDetailsOperationCompleted(object arg) {
+            if ((this.GetExternalNetworkDetailsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetExternalNetworkDetailsCompleted(this, new GetExternalNetworkDetailsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetPackagePrivateIPAddressesPaged", 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 PrivateIPAddressesPaged GetPackagePrivateIPAddressesPaged(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
+            object[] results = this.Invoke("GetPackagePrivateIPAddressesPaged", new object[] {
+                        packageId,
+                        filterColumn,
+                        filterValue,
+                        sortColumn,
+                        startRow,
+                        maximumRows});
+            return ((PrivateIPAddressesPaged)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetPackagePrivateIPAddressesPaged(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetPackagePrivateIPAddressesPaged", new object[] {
+                        packageId,
+                        filterColumn,
+                        filterValue,
+                        sortColumn,
+                        startRow,
+                        maximumRows}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public PrivateIPAddressesPaged EndGetPackagePrivateIPAddressesPaged(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((PrivateIPAddressesPaged)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetPackagePrivateIPAddressesPagedAsync(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows) {
+            this.GetPackagePrivateIPAddressesPagedAsync(packageId, filterColumn, filterValue, sortColumn, startRow, maximumRows, null);
+        }
+        
+        /// <remarks/>
+        public void GetPackagePrivateIPAddressesPagedAsync(int packageId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, object userState) {
+            if ((this.GetPackagePrivateIPAddressesPagedOperationCompleted == null)) {
+                this.GetPackagePrivateIPAddressesPagedOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetPackagePrivateIPAddressesPagedOperationCompleted);
+            }
+            this.InvokeAsync("GetPackagePrivateIPAddressesPaged", new object[] {
+                        packageId,
+                        filterColumn,
+                        filterValue,
+                        sortColumn,
+                        startRow,
+                        maximumRows}, this.GetPackagePrivateIPAddressesPagedOperationCompleted, userState);
+        }
+        
+        private void OnGetPackagePrivateIPAddressesPagedOperationCompleted(object arg) {
+            if ((this.GetPackagePrivateIPAddressesPagedCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetPackagePrivateIPAddressesPagedCompleted(this, new GetPackagePrivateIPAddressesPagedCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetPackagePrivateIPAddresses", 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 PrivateIPAddress[] GetPackagePrivateIPAddresses(int packageId) {
+            object[] results = this.Invoke("GetPackagePrivateIPAddresses", new object[] {
+                        packageId});
+            return ((PrivateIPAddress[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetPackagePrivateIPAddresses(int packageId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetPackagePrivateIPAddresses", new object[] {
+                        packageId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public PrivateIPAddress[] EndGetPackagePrivateIPAddresses(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((PrivateIPAddress[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetPackagePrivateIPAddressesAsync(int packageId) {
+            this.GetPackagePrivateIPAddressesAsync(packageId, null);
+        }
+        
+        /// <remarks/>
+        public void GetPackagePrivateIPAddressesAsync(int packageId, object userState) {
+            if ((this.GetPackagePrivateIPAddressesOperationCompleted == null)) {
+                this.GetPackagePrivateIPAddressesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetPackagePrivateIPAddressesOperationCompleted);
+            }
+            this.InvokeAsync("GetPackagePrivateIPAddresses", new object[] {
+                        packageId}, this.GetPackagePrivateIPAddressesOperationCompleted, userState);
+        }
+        
+        private void OnGetPackagePrivateIPAddressesOperationCompleted(object arg) {
+            if ((this.GetPackagePrivateIPAddressesCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetPackagePrivateIPAddressesCompleted(this, new GetPackagePrivateIPAddressesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetPrivateNetworkDetails", 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 NetworkAdapterDetails GetPrivateNetworkDetails(int packageId) {
+            object[] results = this.Invoke("GetPrivateNetworkDetails", new object[] {
+                        packageId});
+            return ((NetworkAdapterDetails)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetPrivateNetworkDetails(int packageId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetPrivateNetworkDetails", new object[] {
+                        packageId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public NetworkAdapterDetails EndGetPrivateNetworkDetails(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((NetworkAdapterDetails)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetPrivateNetworkDetailsAsync(int packageId) {
+            this.GetPrivateNetworkDetailsAsync(packageId, null);
+        }
+        
+        /// <remarks/>
+        public void GetPrivateNetworkDetailsAsync(int packageId, object userState) {
+            if ((this.GetPrivateNetworkDetailsOperationCompleted == null)) {
+                this.GetPrivateNetworkDetailsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetPrivateNetworkDetailsOperationCompleted);
+            }
+            this.InvokeAsync("GetPrivateNetworkDetails", new object[] {
+                        packageId}, this.GetPrivateNetworkDetailsOperationCompleted, userState);
+        }
+        
+        private void OnGetPrivateNetworkDetailsOperationCompleted(object arg) {
+            if ((this.GetPrivateNetworkDetailsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetPrivateNetworkDetailsCompleted(this, new GetPrivateNetworkDetailsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetSpaceUserPermissions", 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 VirtualMachinePermission[] GetSpaceUserPermissions(int packageId) {
+            object[] results = this.Invoke("GetSpaceUserPermissions", new object[] {
+                        packageId});
+            return ((VirtualMachinePermission[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetSpaceUserPermissions(int packageId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetSpaceUserPermissions", new object[] {
+                        packageId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public VirtualMachinePermission[] EndGetSpaceUserPermissions(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((VirtualMachinePermission[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetSpaceUserPermissionsAsync(int packageId) {
+            this.GetSpaceUserPermissionsAsync(packageId, null);
+        }
+        
+        /// <remarks/>
+        public void GetSpaceUserPermissionsAsync(int packageId, object userState) {
+            if ((this.GetSpaceUserPermissionsOperationCompleted == null)) {
+                this.GetSpaceUserPermissionsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSpaceUserPermissionsOperationCompleted);
+            }
+            this.InvokeAsync("GetSpaceUserPermissions", new object[] {
+                        packageId}, this.GetSpaceUserPermissionsOperationCompleted, userState);
+        }
+        
+        private void OnGetSpaceUserPermissionsOperationCompleted(object arg) {
+            if ((this.GetSpaceUserPermissionsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetSpaceUserPermissionsCompleted(this, new GetSpaceUserPermissionsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/UpdateSpaceUserPermissions", 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 UpdateSpaceUserPermissions(int packageId, VirtualMachinePermission[] permissions) {
+            object[] results = this.Invoke("UpdateSpaceUserPermissions", new object[] {
+                        packageId,
+                        permissions});
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginUpdateSpaceUserPermissions(int packageId, VirtualMachinePermission[] permissions, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("UpdateSpaceUserPermissions", new object[] {
+                        packageId,
+                        permissions}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public int EndUpdateSpaceUserPermissions(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void UpdateSpaceUserPermissionsAsync(int packageId, VirtualMachinePermission[] permissions) {
+            this.UpdateSpaceUserPermissionsAsync(packageId, permissions, null);
+        }
+        
+        /// <remarks/>
+        public void UpdateSpaceUserPermissionsAsync(int packageId, VirtualMachinePermission[] permissions, object userState) {
+            if ((this.UpdateSpaceUserPermissionsOperationCompleted == null)) {
+                this.UpdateSpaceUserPermissionsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateSpaceUserPermissionsOperationCompleted);
+            }
+            this.InvokeAsync("UpdateSpaceUserPermissions", new object[] {
+                        packageId,
+                        permissions}, this.UpdateSpaceUserPermissionsOperationCompleted, userState);
+        }
+        
+        private void OnUpdateSpaceUserPermissionsOperationCompleted(object arg) {
+            if ((this.UpdateSpaceUserPermissionsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.UpdateSpaceUserPermissionsCompleted(this, new UpdateSpaceUserPermissionsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetSpaceAuditLog", 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 LogRecord[] GetSpaceAuditLog(int packageId, System.DateTime startPeriod, System.DateTime endPeriod, int severity, string sortColumn, int startRow, int maximumRows) {
+            object[] results = this.Invoke("GetSpaceAuditLog", new object[] {
+                        packageId,
+                        startPeriod,
+                        endPeriod,
+                        severity,
+                        sortColumn,
+                        startRow,
+                        maximumRows});
+            return ((LogRecord[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetSpaceAuditLog(int packageId, System.DateTime startPeriod, System.DateTime endPeriod, int severity, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetSpaceAuditLog", new object[] {
+                        packageId,
+                        startPeriod,
+                        endPeriod,
+                        severity,
+                        sortColumn,
+                        startRow,
+                        maximumRows}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public LogRecord[] EndGetSpaceAuditLog(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((LogRecord[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetSpaceAuditLogAsync(int packageId, System.DateTime startPeriod, System.DateTime endPeriod, int severity, string sortColumn, int startRow, int maximumRows) {
+            this.GetSpaceAuditLogAsync(packageId, startPeriod, endPeriod, severity, sortColumn, startRow, maximumRows, null);
+        }
+        
+        /// <remarks/>
+        public void GetSpaceAuditLogAsync(int packageId, System.DateTime startPeriod, System.DateTime endPeriod, int severity, string sortColumn, int startRow, int maximumRows, object userState) {
+            if ((this.GetSpaceAuditLogOperationCompleted == null)) {
+                this.GetSpaceAuditLogOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSpaceAuditLogOperationCompleted);
+            }
+            this.InvokeAsync("GetSpaceAuditLog", new object[] {
+                        packageId,
+                        startPeriod,
+                        endPeriod,
+                        severity,
+                        sortColumn,
+                        startRow,
+                        maximumRows}, this.GetSpaceAuditLogOperationCompleted, userState);
+        }
+        
+        private void OnGetSpaceAuditLogOperationCompleted(object arg) {
+            if ((this.GetSpaceAuditLogCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetSpaceAuditLogCompleted(this, new GetSpaceAuditLogCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetVirtualMachineAuditLog", 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 LogRecord[] GetVirtualMachineAuditLog(int itemId, System.DateTime startPeriod, System.DateTime endPeriod, int severity, string sortColumn, int startRow, int maximumRows) {
+            object[] results = this.Invoke("GetVirtualMachineAuditLog", new object[] {
+                        itemId,
+                        startPeriod,
+                        endPeriod,
+                        severity,
+                        sortColumn,
+                        startRow,
+                        maximumRows});
+            return ((LogRecord[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetVirtualMachineAuditLog(int itemId, System.DateTime startPeriod, System.DateTime endPeriod, int severity, string sortColumn, int startRow, int maximumRows, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetVirtualMachineAuditLog", new object[] {
+                        itemId,
+                        startPeriod,
+                        endPeriod,
+                        severity,
+                        sortColumn,
+                        startRow,
+                        maximumRows}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public LogRecord[] EndGetVirtualMachineAuditLog(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((LogRecord[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachineAuditLogAsync(int itemId, System.DateTime startPeriod, System.DateTime endPeriod, int severity, string sortColumn, int startRow, int maximumRows) {
+            this.GetVirtualMachineAuditLogAsync(itemId, startPeriod, endPeriod, severity, sortColumn, startRow, maximumRows, null);
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachineAuditLogAsync(int itemId, System.DateTime startPeriod, System.DateTime endPeriod, int severity, string sortColumn, int startRow, int maximumRows, object userState) {
+            if ((this.GetVirtualMachineAuditLogOperationCompleted == null)) {
+                this.GetVirtualMachineAuditLogOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetVirtualMachineAuditLogOperationCompleted);
+            }
+            this.InvokeAsync("GetVirtualMachineAuditLog", new object[] {
+                        itemId,
+                        startPeriod,
+                        endPeriod,
+                        severity,
+                        sortColumn,
+                        startRow,
+                        maximumRows}, this.GetVirtualMachineAuditLogOperationCompleted, userState);
+        }
+        
+        private void OnGetVirtualMachineAuditLogOperationCompleted(object arg) {
+            if ((this.GetVirtualMachineAuditLogCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetVirtualMachineAuditLogCompleted(this, new GetVirtualMachineAuditLogCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetOperatingSystemTemplates", 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 LibraryItem[] GetOperatingSystemTemplates(int packageId) {
+            object[] results = this.Invoke("GetOperatingSystemTemplates", new object[] {
+                        packageId});
+            return ((LibraryItem[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetOperatingSystemTemplates(int packageId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetOperatingSystemTemplates", new object[] {
+                        packageId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public LibraryItem[] EndGetOperatingSystemTemplates(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((LibraryItem[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetOperatingSystemTemplatesAsync(int packageId) {
+            this.GetOperatingSystemTemplatesAsync(packageId, null);
+        }
+        
+        /// <remarks/>
+        public void GetOperatingSystemTemplatesAsync(int packageId, object userState) {
+            if ((this.GetOperatingSystemTemplatesOperationCompleted == null)) {
+                this.GetOperatingSystemTemplatesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetOperatingSystemTemplatesOperationCompleted);
+            }
+            this.InvokeAsync("GetOperatingSystemTemplates", new object[] {
+                        packageId}, this.GetOperatingSystemTemplatesOperationCompleted, userState);
+        }
+        
+        private void OnGetOperatingSystemTemplatesOperationCompleted(object arg) {
+            if ((this.GetOperatingSystemTemplatesCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetOperatingSystemTemplatesCompleted(this, new GetOperatingSystemTemplatesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetOperatingSystemTemplatesByService" +
+            "Id", 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 LibraryItem[] GetOperatingSystemTemplatesByServiceId(int serviceId) {
+            object[] results = this.Invoke("GetOperatingSystemTemplatesByServiceId", new object[] {
+                        serviceId});
+            return ((LibraryItem[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetOperatingSystemTemplatesByServiceId(int serviceId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetOperatingSystemTemplatesByServiceId", new object[] {
+                        serviceId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public LibraryItem[] EndGetOperatingSystemTemplatesByServiceId(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((LibraryItem[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetOperatingSystemTemplatesByServiceIdAsync(int serviceId) {
+            this.GetOperatingSystemTemplatesByServiceIdAsync(serviceId, null);
+        }
+        
+        /// <remarks/>
+        public void GetOperatingSystemTemplatesByServiceIdAsync(int serviceId, object userState) {
+            if ((this.GetOperatingSystemTemplatesByServiceIdOperationCompleted == null)) {
+                this.GetOperatingSystemTemplatesByServiceIdOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetOperatingSystemTemplatesByServiceIdOperationCompleted);
+            }
+            this.InvokeAsync("GetOperatingSystemTemplatesByServiceId", new object[] {
+                        serviceId}, this.GetOperatingSystemTemplatesByServiceIdOperationCompleted, userState);
+        }
+        
+        private void OnGetOperatingSystemTemplatesByServiceIdOperationCompleted(object arg) {
+            if ((this.GetOperatingSystemTemplatesByServiceIdCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetOperatingSystemTemplatesByServiceIdCompleted(this, new GetOperatingSystemTemplatesByServiceIdCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetMaximumCpuCoresNumber", 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 GetMaximumCpuCoresNumber(int packageId) {
+            object[] results = this.Invoke("GetMaximumCpuCoresNumber", new object[] {
+                        packageId});
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetMaximumCpuCoresNumber(int packageId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetMaximumCpuCoresNumber", new object[] {
+                        packageId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public int EndGetMaximumCpuCoresNumber(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetMaximumCpuCoresNumberAsync(int packageId) {
+            this.GetMaximumCpuCoresNumberAsync(packageId, null);
+        }
+        
+        /// <remarks/>
+        public void GetMaximumCpuCoresNumberAsync(int packageId, object userState) {
+            if ((this.GetMaximumCpuCoresNumberOperationCompleted == null)) {
+                this.GetMaximumCpuCoresNumberOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetMaximumCpuCoresNumberOperationCompleted);
+            }
+            this.InvokeAsync("GetMaximumCpuCoresNumber", new object[] {
+                        packageId}, this.GetMaximumCpuCoresNumberOperationCompleted, userState);
+        }
+        
+        private void OnGetMaximumCpuCoresNumberOperationCompleted(object arg) {
+            if ((this.GetMaximumCpuCoresNumberCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetMaximumCpuCoresNumberCompleted(this, new GetMaximumCpuCoresNumberCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetDefaultExportPath", 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 GetDefaultExportPath(int itemId) {
+            object[] results = this.Invoke("GetDefaultExportPath", new object[] {
+                        itemId});
+            return ((string)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetDefaultExportPath(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetDefaultExportPath", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public string EndGetDefaultExportPath(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((string)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetDefaultExportPathAsync(int itemId) {
+            this.GetDefaultExportPathAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void GetDefaultExportPathAsync(int itemId, object userState) {
+            if ((this.GetDefaultExportPathOperationCompleted == null)) {
+                this.GetDefaultExportPathOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetDefaultExportPathOperationCompleted);
+            }
+            this.InvokeAsync("GetDefaultExportPath", new object[] {
+                        itemId}, this.GetDefaultExportPathOperationCompleted, userState);
+        }
+        
+        private void OnGetDefaultExportPathOperationCompleted(object arg) {
+            if ((this.GetDefaultExportPathCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetDefaultExportPathCompleted(this, new GetDefaultExportPathCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CreateDefaultVirtualMachine", 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 IntResult CreateDefaultVirtualMachine(int packageId, string hostname, string osTemplate, string password, string summaryLetterEmail) {
+            object[] results = this.Invoke("CreateDefaultVirtualMachine", new object[] {
+                        packageId,
+                        hostname,
+                        osTemplate,
+                        password,
+                        summaryLetterEmail});
+            return ((IntResult)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginCreateDefaultVirtualMachine(int packageId, string hostname, string osTemplate, string password, string summaryLetterEmail, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("CreateDefaultVirtualMachine", new object[] {
+                        packageId,
+                        hostname,
+                        osTemplate,
+                        password,
+                        summaryLetterEmail}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public IntResult EndCreateDefaultVirtualMachine(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((IntResult)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void CreateDefaultVirtualMachineAsync(int packageId, string hostname, string osTemplate, string password, string summaryLetterEmail) {
+            this.CreateDefaultVirtualMachineAsync(packageId, hostname, osTemplate, password, summaryLetterEmail, null);
+        }
+        
+        /// <remarks/>
+        public void CreateDefaultVirtualMachineAsync(int packageId, string hostname, string osTemplate, string password, string summaryLetterEmail, object userState) {
+            if ((this.CreateDefaultVirtualMachineOperationCompleted == null)) {
+                this.CreateDefaultVirtualMachineOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCreateDefaultVirtualMachineOperationCompleted);
+            }
+            this.InvokeAsync("CreateDefaultVirtualMachine", new object[] {
+                        packageId,
+                        hostname,
+                        osTemplate,
+                        password,
+                        summaryLetterEmail}, this.CreateDefaultVirtualMachineOperationCompleted, userState);
+        }
+        
+        private void OnCreateDefaultVirtualMachineOperationCompleted(object arg) {
+            if ((this.CreateDefaultVirtualMachineCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.CreateDefaultVirtualMachineCompleted(this, new CreateDefaultVirtualMachineCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CreateVirtualMachine", 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 IntResult CreateVirtualMachine(
+                    int packageId, 
+                    string hostname, 
+                    string osTemplateFile, 
+                    string password, 
+                    string summaryLetterEmail, 
+                    int cpuCores, 
+                    int ramMB, 
+                    int hddGB, 
+                    int snapshots, 
+                    bool dvdInstalled, 
+                    bool bootFromCD, 
+                    bool numLock, 
+                    bool startShutdownAllowed, 
+                    bool pauseResumeAllowed, 
+                    bool rebootAllowed, 
+                    bool resetAllowed, 
+                    bool reinstallAllowed, 
+                    bool externalNetworkEnabled, 
+                    int externalAddressesNumber, 
+                    bool randomExternalAddresses, 
+                    int[] externalAddresses, 
+                    bool privateNetworkEnabled, 
+                    int privateAddressesNumber, 
+                    bool randomPrivateAddresses, 
+                    string[] privateAddresses, 
+                    VirtualMachine otherSettings) {
+            object[] results = this.Invoke("CreateVirtualMachine", new object[] {
+                        packageId,
+                        hostname,
+                        osTemplateFile,
+                        password,
+                        summaryLetterEmail,
+                        cpuCores,
+                        ramMB,
+                        hddGB,
+                        snapshots,
+                        dvdInstalled,
+                        bootFromCD,
+                        numLock,
+                        startShutdownAllowed,
+                        pauseResumeAllowed,
+                        rebootAllowed,
+                        resetAllowed,
+                        reinstallAllowed,
+                        externalNetworkEnabled,
+                        externalAddressesNumber,
+                        randomExternalAddresses,
+                        externalAddresses,
+                        privateNetworkEnabled,
+                        privateAddressesNumber,
+                        randomPrivateAddresses,
+                        privateAddresses,
+                        otherSettings});
+            return ((IntResult)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginCreateVirtualMachine(
+                    int packageId, 
+                    string hostname, 
+                    string osTemplateFile, 
+                    string password, 
+                    string summaryLetterEmail, 
+                    int cpuCores, 
+                    int ramMB, 
+                    int hddGB, 
+                    int snapshots, 
+                    bool dvdInstalled, 
+                    bool bootFromCD, 
+                    bool numLock, 
+                    bool startShutdownAllowed, 
+                    bool pauseResumeAllowed, 
+                    bool rebootAllowed, 
+                    bool resetAllowed, 
+                    bool reinstallAllowed, 
+                    bool externalNetworkEnabled, 
+                    int externalAddressesNumber, 
+                    bool randomExternalAddresses, 
+                    int[] externalAddresses, 
+                    bool privateNetworkEnabled, 
+                    int privateAddressesNumber, 
+                    bool randomPrivateAddresses, 
+                    string[] privateAddresses, 
+                    VirtualMachine otherSettings, 
+                    System.AsyncCallback callback, 
+                    object asyncState) {
+            return this.BeginInvoke("CreateVirtualMachine", new object[] {
+                        packageId,
+                        hostname,
+                        osTemplateFile,
+                        password,
+                        summaryLetterEmail,
+                        cpuCores,
+                        ramMB,
+                        hddGB,
+                        snapshots,
+                        dvdInstalled,
+                        bootFromCD,
+                        numLock,
+                        startShutdownAllowed,
+                        pauseResumeAllowed,
+                        rebootAllowed,
+                        resetAllowed,
+                        reinstallAllowed,
+                        externalNetworkEnabled,
+                        externalAddressesNumber,
+                        randomExternalAddresses,
+                        externalAddresses,
+                        privateNetworkEnabled,
+                        privateAddressesNumber,
+                        randomPrivateAddresses,
+                        privateAddresses,
+                        otherSettings}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public IntResult EndCreateVirtualMachine(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((IntResult)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void CreateVirtualMachineAsync(
+                    int packageId, 
+                    string hostname, 
+                    string osTemplateFile, 
+                    string password, 
+                    string summaryLetterEmail, 
+                    int cpuCores, 
+                    int ramMB, 
+                    int hddGB, 
+                    int snapshots, 
+                    bool dvdInstalled, 
+                    bool bootFromCD, 
+                    bool numLock, 
+                    bool startShutdownAllowed, 
+                    bool pauseResumeAllowed, 
+                    bool rebootAllowed, 
+                    bool resetAllowed, 
+                    bool reinstallAllowed, 
+                    bool externalNetworkEnabled, 
+                    int externalAddressesNumber, 
+                    bool randomExternalAddresses, 
+                    int[] externalAddresses, 
+                    bool privateNetworkEnabled, 
+                    int privateAddressesNumber, 
+                    bool randomPrivateAddresses, 
+                    string[] privateAddresses, 
+                    VirtualMachine otherSettings) {
+            this.CreateVirtualMachineAsync(packageId, hostname, osTemplateFile, password, summaryLetterEmail, cpuCores, ramMB, hddGB, snapshots, dvdInstalled, bootFromCD, numLock, startShutdownAllowed, pauseResumeAllowed, rebootAllowed, resetAllowed, reinstallAllowed, externalNetworkEnabled, externalAddressesNumber, randomExternalAddresses, externalAddresses, privateNetworkEnabled, privateAddressesNumber, randomPrivateAddresses, privateAddresses, otherSettings, null);
+        }
+        
+        /// <remarks/>
+        public void CreateVirtualMachineAsync(
+                    int packageId, 
+                    string hostname, 
+                    string osTemplateFile, 
+                    string password, 
+                    string summaryLetterEmail, 
+                    int cpuCores, 
+                    int ramMB, 
+                    int hddGB, 
+                    int snapshots, 
+                    bool dvdInstalled, 
+                    bool bootFromCD, 
+                    bool numLock, 
+                    bool startShutdownAllowed, 
+                    bool pauseResumeAllowed, 
+                    bool rebootAllowed, 
+                    bool resetAllowed, 
+                    bool reinstallAllowed, 
+                    bool externalNetworkEnabled, 
+                    int externalAddressesNumber, 
+                    bool randomExternalAddresses, 
+                    int[] externalAddresses, 
+                    bool privateNetworkEnabled, 
+                    int privateAddressesNumber, 
+                    bool randomPrivateAddresses, 
+                    string[] privateAddresses, 
+                    VirtualMachine otherSettings, 
+                    object userState) {
+            if ((this.CreateVirtualMachineOperationCompleted == null)) {
+                this.CreateVirtualMachineOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCreateVirtualMachineOperationCompleted);
+            }
+            this.InvokeAsync("CreateVirtualMachine", new object[] {
+                        packageId,
+                        hostname,
+                        osTemplateFile,
+                        password,
+                        summaryLetterEmail,
+                        cpuCores,
+                        ramMB,
+                        hddGB,
+                        snapshots,
+                        dvdInstalled,
+                        bootFromCD,
+                        numLock,
+                        startShutdownAllowed,
+                        pauseResumeAllowed,
+                        rebootAllowed,
+                        resetAllowed,
+                        reinstallAllowed,
+                        externalNetworkEnabled,
+                        externalAddressesNumber,
+                        randomExternalAddresses,
+                        externalAddresses,
+                        privateNetworkEnabled,
+                        privateAddressesNumber,
+                        randomPrivateAddresses,
+                        privateAddresses,
+                        otherSettings}, this.CreateVirtualMachineOperationCompleted, userState);
+        }
+        
+        private void OnCreateVirtualMachineOperationCompleted(object arg) {
+            if ((this.CreateVirtualMachineCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.CreateVirtualMachineCompleted(this, new CreateVirtualMachineCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/ImportVirtualMachine", 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 IntResult ImportVirtualMachine(int packageId, int serviceId, string vmId, string osTemplateFile, string adminPassword, bool startShutdownAllowed, bool pauseResumeAllowed, bool rebootAllowed, bool resetAllowed, bool reinstallAllowed, string externalNicMacAddress, int[] externalAddresses, string managementNicMacAddress, int managementAddress) {
+            object[] results = this.Invoke("ImportVirtualMachine", new object[] {
+                        packageId,
+                        serviceId,
+                        vmId,
+                        osTemplateFile,
+                        adminPassword,
+                        startShutdownAllowed,
+                        pauseResumeAllowed,
+                        rebootAllowed,
+                        resetAllowed,
+                        reinstallAllowed,
+                        externalNicMacAddress,
+                        externalAddresses,
+                        managementNicMacAddress,
+                        managementAddress});
+            return ((IntResult)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginImportVirtualMachine(
+                    int packageId, 
+                    int serviceId, 
+                    string vmId, 
+                    string osTemplateFile, 
+                    string adminPassword, 
+                    bool startShutdownAllowed, 
+                    bool pauseResumeAllowed, 
+                    bool rebootAllowed, 
+                    bool resetAllowed, 
+                    bool reinstallAllowed, 
+                    string externalNicMacAddress, 
+                    int[] externalAddresses, 
+                    string managementNicMacAddress, 
+                    int managementAddress, 
+                    System.AsyncCallback callback, 
+                    object asyncState) {
+            return this.BeginInvoke("ImportVirtualMachine", new object[] {
+                        packageId,
+                        serviceId,
+                        vmId,
+                        osTemplateFile,
+                        adminPassword,
+                        startShutdownAllowed,
+                        pauseResumeAllowed,
+                        rebootAllowed,
+                        resetAllowed,
+                        reinstallAllowed,
+                        externalNicMacAddress,
+                        externalAddresses,
+                        managementNicMacAddress,
+                        managementAddress}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public IntResult EndImportVirtualMachine(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((IntResult)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void ImportVirtualMachineAsync(int packageId, int serviceId, string vmId, string osTemplateFile, string adminPassword, bool startShutdownAllowed, bool pauseResumeAllowed, bool rebootAllowed, bool resetAllowed, bool reinstallAllowed, string externalNicMacAddress, int[] externalAddresses, string managementNicMacAddress, int managementAddress) {
+            this.ImportVirtualMachineAsync(packageId, serviceId, vmId, osTemplateFile, adminPassword, startShutdownAllowed, pauseResumeAllowed, rebootAllowed, resetAllowed, reinstallAllowed, externalNicMacAddress, externalAddresses, managementNicMacAddress, managementAddress, null);
+        }
+        
+        /// <remarks/>
+        public void ImportVirtualMachineAsync(int packageId, int serviceId, string vmId, string osTemplateFile, string adminPassword, bool startShutdownAllowed, bool pauseResumeAllowed, bool rebootAllowed, bool resetAllowed, bool reinstallAllowed, string externalNicMacAddress, int[] externalAddresses, string managementNicMacAddress, int managementAddress, object userState) {
+            if ((this.ImportVirtualMachineOperationCompleted == null)) {
+                this.ImportVirtualMachineOperationCompleted = new System.Threading.SendOrPostCallback(this.OnImportVirtualMachineOperationCompleted);
+            }
+            this.InvokeAsync("ImportVirtualMachine", new object[] {
+                        packageId,
+                        serviceId,
+                        vmId,
+                        osTemplateFile,
+                        adminPassword,
+                        startShutdownAllowed,
+                        pauseResumeAllowed,
+                        rebootAllowed,
+                        resetAllowed,
+                        reinstallAllowed,
+                        externalNicMacAddress,
+                        externalAddresses,
+                        managementNicMacAddress,
+                        managementAddress}, this.ImportVirtualMachineOperationCompleted, userState);
+        }
+        
+        private void OnImportVirtualMachineOperationCompleted(object arg) {
+            if ((this.ImportVirtualMachineCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.ImportVirtualMachineCompleted(this, new ImportVirtualMachineCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetVirtualMachineThumbnail", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        [return: System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")]
+        public byte[] GetVirtualMachineThumbnail(int itemId, ThumbnailSize size) {
+            object[] results = this.Invoke("GetVirtualMachineThumbnail", new object[] {
+                        itemId,
+                        size});
+            return ((byte[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetVirtualMachineThumbnail(int itemId, ThumbnailSize size, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetVirtualMachineThumbnail", new object[] {
+                        itemId,
+                        size}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public byte[] EndGetVirtualMachineThumbnail(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((byte[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachineThumbnailAsync(int itemId, ThumbnailSize size) {
+            this.GetVirtualMachineThumbnailAsync(itemId, size, null);
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachineThumbnailAsync(int itemId, ThumbnailSize size, object userState) {
+            if ((this.GetVirtualMachineThumbnailOperationCompleted == null)) {
+                this.GetVirtualMachineThumbnailOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetVirtualMachineThumbnailOperationCompleted);
+            }
+            this.InvokeAsync("GetVirtualMachineThumbnail", new object[] {
+                        itemId,
+                        size}, this.GetVirtualMachineThumbnailOperationCompleted, userState);
+        }
+        
+        private void OnGetVirtualMachineThumbnailOperationCompleted(object arg) {
+            if ((this.GetVirtualMachineThumbnailCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetVirtualMachineThumbnailCompleted(this, new GetVirtualMachineThumbnailCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetVirtualMachineGeneralDetails", 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 VirtualMachine GetVirtualMachineGeneralDetails(int itemId) {
+            object[] results = this.Invoke("GetVirtualMachineGeneralDetails", new object[] {
+                        itemId});
+            return ((VirtualMachine)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetVirtualMachineGeneralDetails(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetVirtualMachineGeneralDetails", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public VirtualMachine EndGetVirtualMachineGeneralDetails(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((VirtualMachine)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachineGeneralDetailsAsync(int itemId) {
+            this.GetVirtualMachineGeneralDetailsAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachineGeneralDetailsAsync(int itemId, object userState) {
+            if ((this.GetVirtualMachineGeneralDetailsOperationCompleted == null)) {
+                this.GetVirtualMachineGeneralDetailsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetVirtualMachineGeneralDetailsOperationCompleted);
+            }
+            this.InvokeAsync("GetVirtualMachineGeneralDetails", new object[] {
+                        itemId}, this.GetVirtualMachineGeneralDetailsOperationCompleted, userState);
+        }
+        
+        private void OnGetVirtualMachineGeneralDetailsOperationCompleted(object arg) {
+            if ((this.GetVirtualMachineGeneralDetailsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetVirtualMachineGeneralDetailsCompleted(this, new GetVirtualMachineGeneralDetailsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetVirtualMachineExtendedInfo", 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 VirtualMachine GetVirtualMachineExtendedInfo(int serviceId, string vmId) {
+            object[] results = this.Invoke("GetVirtualMachineExtendedInfo", new object[] {
+                        serviceId,
+                        vmId});
+            return ((VirtualMachine)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetVirtualMachineExtendedInfo(int serviceId, string vmId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetVirtualMachineExtendedInfo", new object[] {
+                        serviceId,
+                        vmId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public VirtualMachine EndGetVirtualMachineExtendedInfo(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((VirtualMachine)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachineExtendedInfoAsync(int serviceId, string vmId) {
+            this.GetVirtualMachineExtendedInfoAsync(serviceId, vmId, null);
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachineExtendedInfoAsync(int serviceId, string vmId, object userState) {
+            if ((this.GetVirtualMachineExtendedInfoOperationCompleted == null)) {
+                this.GetVirtualMachineExtendedInfoOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetVirtualMachineExtendedInfoOperationCompleted);
+            }
+            this.InvokeAsync("GetVirtualMachineExtendedInfo", new object[] {
+                        serviceId,
+                        vmId}, this.GetVirtualMachineExtendedInfoOperationCompleted, userState);
+        }
+        
+        private void OnGetVirtualMachineExtendedInfoOperationCompleted(object arg) {
+            if ((this.GetVirtualMachineExtendedInfoCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetVirtualMachineExtendedInfoCompleted(this, new GetVirtualMachineExtendedInfoCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CancelVirtualMachineJob", 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 CancelVirtualMachineJob(string jobId) {
+            object[] results = this.Invoke("CancelVirtualMachineJob", new object[] {
+                        jobId});
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginCancelVirtualMachineJob(string jobId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("CancelVirtualMachineJob", new object[] {
+                        jobId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public int EndCancelVirtualMachineJob(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void CancelVirtualMachineJobAsync(string jobId) {
+            this.CancelVirtualMachineJobAsync(jobId, null);
+        }
+        
+        /// <remarks/>
+        public void CancelVirtualMachineJobAsync(string jobId, object userState) {
+            if ((this.CancelVirtualMachineJobOperationCompleted == null)) {
+                this.CancelVirtualMachineJobOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCancelVirtualMachineJobOperationCompleted);
+            }
+            this.InvokeAsync("CancelVirtualMachineJob", new object[] {
+                        jobId}, this.CancelVirtualMachineJobOperationCompleted, userState);
+        }
+        
+        private void OnCancelVirtualMachineJobOperationCompleted(object arg) {
+            if ((this.CancelVirtualMachineJobCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.CancelVirtualMachineJobCompleted(this, new CancelVirtualMachineJobCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/UpdateVirtualMachineHostName", 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 UpdateVirtualMachineHostName(int itemId, string hostname, bool updateNetBIOS) {
+            object[] results = this.Invoke("UpdateVirtualMachineHostName", new object[] {
+                        itemId,
+                        hostname,
+                        updateNetBIOS});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginUpdateVirtualMachineHostName(int itemId, string hostname, bool updateNetBIOS, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("UpdateVirtualMachineHostName", new object[] {
+                        itemId,
+                        hostname,
+                        updateNetBIOS}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndUpdateVirtualMachineHostName(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void UpdateVirtualMachineHostNameAsync(int itemId, string hostname, bool updateNetBIOS) {
+            this.UpdateVirtualMachineHostNameAsync(itemId, hostname, updateNetBIOS, null);
+        }
+        
+        /// <remarks/>
+        public void UpdateVirtualMachineHostNameAsync(int itemId, string hostname, bool updateNetBIOS, object userState) {
+            if ((this.UpdateVirtualMachineHostNameOperationCompleted == null)) {
+                this.UpdateVirtualMachineHostNameOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateVirtualMachineHostNameOperationCompleted);
+            }
+            this.InvokeAsync("UpdateVirtualMachineHostName", new object[] {
+                        itemId,
+                        hostname,
+                        updateNetBIOS}, this.UpdateVirtualMachineHostNameOperationCompleted, userState);
+        }
+        
+        private void OnUpdateVirtualMachineHostNameOperationCompleted(object arg) {
+            if ((this.UpdateVirtualMachineHostNameCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.UpdateVirtualMachineHostNameCompleted(this, new UpdateVirtualMachineHostNameCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/ChangeVirtualMachineState", 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 ChangeVirtualMachineState(int itemId, VirtualMachineRequestedState state) {
+            object[] results = this.Invoke("ChangeVirtualMachineState", new object[] {
+                        itemId,
+                        state});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginChangeVirtualMachineState(int itemId, VirtualMachineRequestedState state, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("ChangeVirtualMachineState", new object[] {
+                        itemId,
+                        state}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndChangeVirtualMachineState(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void ChangeVirtualMachineStateAsync(int itemId, VirtualMachineRequestedState state) {
+            this.ChangeVirtualMachineStateAsync(itemId, state, null);
+        }
+        
+        /// <remarks/>
+        public void ChangeVirtualMachineStateAsync(int itemId, VirtualMachineRequestedState state, object userState) {
+            if ((this.ChangeVirtualMachineStateOperationCompleted == null)) {
+                this.ChangeVirtualMachineStateOperationCompleted = new System.Threading.SendOrPostCallback(this.OnChangeVirtualMachineStateOperationCompleted);
+            }
+            this.InvokeAsync("ChangeVirtualMachineState", new object[] {
+                        itemId,
+                        state}, this.ChangeVirtualMachineStateOperationCompleted, userState);
+        }
+        
+        private void OnChangeVirtualMachineStateOperationCompleted(object arg) {
+            if ((this.ChangeVirtualMachineStateCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.ChangeVirtualMachineStateCompleted(this, new ChangeVirtualMachineStateCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetVirtualMachineJobs", 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 ConcreteJob[] GetVirtualMachineJobs(int itemId) {
+            object[] results = this.Invoke("GetVirtualMachineJobs", new object[] {
+                        itemId});
+            return ((ConcreteJob[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetVirtualMachineJobs(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetVirtualMachineJobs", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ConcreteJob[] EndGetVirtualMachineJobs(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ConcreteJob[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachineJobsAsync(int itemId) {
+            this.GetVirtualMachineJobsAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachineJobsAsync(int itemId, object userState) {
+            if ((this.GetVirtualMachineJobsOperationCompleted == null)) {
+                this.GetVirtualMachineJobsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetVirtualMachineJobsOperationCompleted);
+            }
+            this.InvokeAsync("GetVirtualMachineJobs", new object[] {
+                        itemId}, this.GetVirtualMachineJobsOperationCompleted, userState);
+        }
+        
+        private void OnGetVirtualMachineJobsOperationCompleted(object arg) {
+            if ((this.GetVirtualMachineJobsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetVirtualMachineJobsCompleted(this, new GetVirtualMachineJobsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/ChangeAdministratorPassword", 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 ChangeAdministratorPassword(int itemId, string password) {
+            object[] results = this.Invoke("ChangeAdministratorPassword", new object[] {
+                        itemId,
+                        password});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginChangeAdministratorPassword(int itemId, string password, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("ChangeAdministratorPassword", new object[] {
+                        itemId,
+                        password}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndChangeAdministratorPassword(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void ChangeAdministratorPasswordAsync(int itemId, string password) {
+            this.ChangeAdministratorPasswordAsync(itemId, password, null);
+        }
+        
+        /// <remarks/>
+        public void ChangeAdministratorPasswordAsync(int itemId, string password, object userState) {
+            if ((this.ChangeAdministratorPasswordOperationCompleted == null)) {
+                this.ChangeAdministratorPasswordOperationCompleted = new System.Threading.SendOrPostCallback(this.OnChangeAdministratorPasswordOperationCompleted);
+            }
+            this.InvokeAsync("ChangeAdministratorPassword", new object[] {
+                        itemId,
+                        password}, this.ChangeAdministratorPasswordOperationCompleted, userState);
+        }
+        
+        private void OnChangeAdministratorPasswordOperationCompleted(object arg) {
+            if ((this.ChangeAdministratorPasswordCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.ChangeAdministratorPasswordCompleted(this, new ChangeAdministratorPasswordCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/UpdateVirtualMachineConfiguration", 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 UpdateVirtualMachineConfiguration(
+                    int itemId, 
+                    int cpuCores, 
+                    int ramMB, 
+                    int hddGB, 
+                    int snapshots, 
+                    bool dvdInstalled, 
+                    bool bootFromCD, 
+                    bool numLock, 
+                    bool startShutdownAllowed, 
+                    bool pauseResumeAllowed, 
+                    bool rebootAllowed, 
+                    bool resetAllowed, 
+                    bool reinstallAllowed, 
+                    bool externalNetworkEnabled, 
+                    bool privateNetworkEnabled, 
+                    VirtualMachine otherSettings) {
+            object[] results = this.Invoke("UpdateVirtualMachineConfiguration", new object[] {
+                        itemId,
+                        cpuCores,
+                        ramMB,
+                        hddGB,
+                        snapshots,
+                        dvdInstalled,
+                        bootFromCD,
+                        numLock,
+                        startShutdownAllowed,
+                        pauseResumeAllowed,
+                        rebootAllowed,
+                        resetAllowed,
+                        reinstallAllowed,
+                        externalNetworkEnabled,
+                        privateNetworkEnabled,
+                        otherSettings});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginUpdateVirtualMachineConfiguration(
+                    int itemId, 
+                    int cpuCores, 
+                    int ramMB, 
+                    int hddGB, 
+                    int snapshots, 
+                    bool dvdInstalled, 
+                    bool bootFromCD, 
+                    bool numLock, 
+                    bool startShutdownAllowed, 
+                    bool pauseResumeAllowed, 
+                    bool rebootAllowed, 
+                    bool resetAllowed, 
+                    bool reinstallAllowed, 
+                    bool externalNetworkEnabled, 
+                    bool privateNetworkEnabled, 
+                    VirtualMachine otherSettings, 
+                    System.AsyncCallback callback, 
+                    object asyncState) {
+            return this.BeginInvoke("UpdateVirtualMachineConfiguration", new object[] {
+                        itemId,
+                        cpuCores,
+                        ramMB,
+                        hddGB,
+                        snapshots,
+                        dvdInstalled,
+                        bootFromCD,
+                        numLock,
+                        startShutdownAllowed,
+                        pauseResumeAllowed,
+                        rebootAllowed,
+                        resetAllowed,
+                        reinstallAllowed,
+                        externalNetworkEnabled,
+                        privateNetworkEnabled,
+                        otherSettings}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndUpdateVirtualMachineConfiguration(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void UpdateVirtualMachineConfigurationAsync(
+                    int itemId, 
+                    int cpuCores, 
+                    int ramMB, 
+                    int hddGB, 
+                    int snapshots, 
+                    bool dvdInstalled, 
+                    bool bootFromCD, 
+                    bool numLock, 
+                    bool startShutdownAllowed, 
+                    bool pauseResumeAllowed, 
+                    bool rebootAllowed, 
+                    bool resetAllowed, 
+                    bool reinstallAllowed, 
+                    bool externalNetworkEnabled, 
+                    bool privateNetworkEnabled, 
+                    VirtualMachine otherSettings) {
+            this.UpdateVirtualMachineConfigurationAsync(itemId, cpuCores, ramMB, hddGB, snapshots, dvdInstalled, bootFromCD, numLock, startShutdownAllowed, pauseResumeAllowed, rebootAllowed, resetAllowed, reinstallAllowed, externalNetworkEnabled, privateNetworkEnabled, otherSettings, null);
+        }
+        
+        /// <remarks/>
+        public void UpdateVirtualMachineConfigurationAsync(
+                    int itemId, 
+                    int cpuCores, 
+                    int ramMB, 
+                    int hddGB, 
+                    int snapshots, 
+                    bool dvdInstalled, 
+                    bool bootFromCD, 
+                    bool numLock, 
+                    bool startShutdownAllowed, 
+                    bool pauseResumeAllowed, 
+                    bool rebootAllowed, 
+                    bool resetAllowed, 
+                    bool reinstallAllowed, 
+                    bool externalNetworkEnabled, 
+                    bool privateNetworkEnabled, 
+                    VirtualMachine otherSettings, 
+                    object userState) {
+            if ((this.UpdateVirtualMachineConfigurationOperationCompleted == null)) {
+                this.UpdateVirtualMachineConfigurationOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateVirtualMachineConfigurationOperationCompleted);
+            }
+            this.InvokeAsync("UpdateVirtualMachineConfiguration", new object[] {
+                        itemId,
+                        cpuCores,
+                        ramMB,
+                        hddGB,
+                        snapshots,
+                        dvdInstalled,
+                        bootFromCD,
+                        numLock,
+                        startShutdownAllowed,
+                        pauseResumeAllowed,
+                        rebootAllowed,
+                        resetAllowed,
+                        reinstallAllowed,
+                        externalNetworkEnabled,
+                        privateNetworkEnabled,
+                        otherSettings}, this.UpdateVirtualMachineConfigurationOperationCompleted, userState);
+        }
+        
+        private void OnUpdateVirtualMachineConfigurationOperationCompleted(object arg) {
+            if ((this.UpdateVirtualMachineConfigurationCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.UpdateVirtualMachineConfigurationCompleted(this, new UpdateVirtualMachineConfigurationCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetInsertedDvdDisk", 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 LibraryItem GetInsertedDvdDisk(int itemId) {
+            object[] results = this.Invoke("GetInsertedDvdDisk", new object[] {
+                        itemId});
+            return ((LibraryItem)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetInsertedDvdDisk(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetInsertedDvdDisk", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public LibraryItem EndGetInsertedDvdDisk(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((LibraryItem)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetInsertedDvdDiskAsync(int itemId) {
+            this.GetInsertedDvdDiskAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void GetInsertedDvdDiskAsync(int itemId, object userState) {
+            if ((this.GetInsertedDvdDiskOperationCompleted == null)) {
+                this.GetInsertedDvdDiskOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetInsertedDvdDiskOperationCompleted);
+            }
+            this.InvokeAsync("GetInsertedDvdDisk", new object[] {
+                        itemId}, this.GetInsertedDvdDiskOperationCompleted, userState);
+        }
+        
+        private void OnGetInsertedDvdDiskOperationCompleted(object arg) {
+            if ((this.GetInsertedDvdDiskCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetInsertedDvdDiskCompleted(this, new GetInsertedDvdDiskCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetLibraryDisks", 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 LibraryItem[] GetLibraryDisks(int itemId) {
+            object[] results = this.Invoke("GetLibraryDisks", new object[] {
+                        itemId});
+            return ((LibraryItem[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetLibraryDisks(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetLibraryDisks", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public LibraryItem[] EndGetLibraryDisks(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((LibraryItem[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetLibraryDisksAsync(int itemId) {
+            this.GetLibraryDisksAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void GetLibraryDisksAsync(int itemId, object userState) {
+            if ((this.GetLibraryDisksOperationCompleted == null)) {
+                this.GetLibraryDisksOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetLibraryDisksOperationCompleted);
+            }
+            this.InvokeAsync("GetLibraryDisks", new object[] {
+                        itemId}, this.GetLibraryDisksOperationCompleted, userState);
+        }
+        
+        private void OnGetLibraryDisksOperationCompleted(object arg) {
+            if ((this.GetLibraryDisksCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetLibraryDisksCompleted(this, new GetLibraryDisksCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/InsertDvdDisk", 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 InsertDvdDisk(int itemId, string isoPath) {
+            object[] results = this.Invoke("InsertDvdDisk", new object[] {
+                        itemId,
+                        isoPath});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginInsertDvdDisk(int itemId, string isoPath, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("InsertDvdDisk", new object[] {
+                        itemId,
+                        isoPath}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndInsertDvdDisk(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void InsertDvdDiskAsync(int itemId, string isoPath) {
+            this.InsertDvdDiskAsync(itemId, isoPath, null);
+        }
+        
+        /// <remarks/>
+        public void InsertDvdDiskAsync(int itemId, string isoPath, object userState) {
+            if ((this.InsertDvdDiskOperationCompleted == null)) {
+                this.InsertDvdDiskOperationCompleted = new System.Threading.SendOrPostCallback(this.OnInsertDvdDiskOperationCompleted);
+            }
+            this.InvokeAsync("InsertDvdDisk", new object[] {
+                        itemId,
+                        isoPath}, this.InsertDvdDiskOperationCompleted, userState);
+        }
+        
+        private void OnInsertDvdDiskOperationCompleted(object arg) {
+            if ((this.InsertDvdDiskCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.InsertDvdDiskCompleted(this, new InsertDvdDiskCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/EjectDvdDisk", 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 EjectDvdDisk(int itemId) {
+            object[] results = this.Invoke("EjectDvdDisk", new object[] {
+                        itemId});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEjectDvdDisk(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("EjectDvdDisk", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndEjectDvdDisk(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void EjectDvdDiskAsync(int itemId) {
+            this.EjectDvdDiskAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void EjectDvdDiskAsync(int itemId, object userState) {
+            if ((this.EjectDvdDiskOperationCompleted == null)) {
+                this.EjectDvdDiskOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEjectDvdDiskOperationCompleted);
+            }
+            this.InvokeAsync("EjectDvdDisk", new object[] {
+                        itemId}, this.EjectDvdDiskOperationCompleted, userState);
+        }
+        
+        private void OnEjectDvdDiskOperationCompleted(object arg) {
+            if ((this.EjectDvdDiskCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.EjectDvdDiskCompleted(this, new EjectDvdDiskCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetVirtualMachineSnapshots", 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 VirtualMachineSnapshot[] GetVirtualMachineSnapshots(int itemId) {
+            object[] results = this.Invoke("GetVirtualMachineSnapshots", new object[] {
+                        itemId});
+            return ((VirtualMachineSnapshot[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetVirtualMachineSnapshots(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetVirtualMachineSnapshots", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public VirtualMachineSnapshot[] EndGetVirtualMachineSnapshots(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((VirtualMachineSnapshot[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachineSnapshotsAsync(int itemId) {
+            this.GetVirtualMachineSnapshotsAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachineSnapshotsAsync(int itemId, object userState) {
+            if ((this.GetVirtualMachineSnapshotsOperationCompleted == null)) {
+                this.GetVirtualMachineSnapshotsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetVirtualMachineSnapshotsOperationCompleted);
+            }
+            this.InvokeAsync("GetVirtualMachineSnapshots", new object[] {
+                        itemId}, this.GetVirtualMachineSnapshotsOperationCompleted, userState);
+        }
+        
+        private void OnGetVirtualMachineSnapshotsOperationCompleted(object arg) {
+            if ((this.GetVirtualMachineSnapshotsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetVirtualMachineSnapshotsCompleted(this, new GetVirtualMachineSnapshotsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetSnapshot", 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 VirtualMachineSnapshot GetSnapshot(int itemId, string snaphostId) {
+            object[] results = this.Invoke("GetSnapshot", new object[] {
+                        itemId,
+                        snaphostId});
+            return ((VirtualMachineSnapshot)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetSnapshot(int itemId, string snaphostId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetSnapshot", new object[] {
+                        itemId,
+                        snaphostId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public VirtualMachineSnapshot EndGetSnapshot(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((VirtualMachineSnapshot)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetSnapshotAsync(int itemId, string snaphostId) {
+            this.GetSnapshotAsync(itemId, snaphostId, null);
+        }
+        
+        /// <remarks/>
+        public void GetSnapshotAsync(int itemId, string snaphostId, object userState) {
+            if ((this.GetSnapshotOperationCompleted == null)) {
+                this.GetSnapshotOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSnapshotOperationCompleted);
+            }
+            this.InvokeAsync("GetSnapshot", new object[] {
+                        itemId,
+                        snaphostId}, this.GetSnapshotOperationCompleted, userState);
+        }
+        
+        private void OnGetSnapshotOperationCompleted(object arg) {
+            if ((this.GetSnapshotCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetSnapshotCompleted(this, new GetSnapshotCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/CreateSnapshot", 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 CreateSnapshot(int itemId) {
+            object[] results = this.Invoke("CreateSnapshot", new object[] {
+                        itemId});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginCreateSnapshot(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("CreateSnapshot", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndCreateSnapshot(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void CreateSnapshotAsync(int itemId) {
+            this.CreateSnapshotAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void CreateSnapshotAsync(int itemId, object userState) {
+            if ((this.CreateSnapshotOperationCompleted == null)) {
+                this.CreateSnapshotOperationCompleted = new System.Threading.SendOrPostCallback(this.OnCreateSnapshotOperationCompleted);
+            }
+            this.InvokeAsync("CreateSnapshot", new object[] {
+                        itemId}, this.CreateSnapshotOperationCompleted, userState);
+        }
+        
+        private void OnCreateSnapshotOperationCompleted(object arg) {
+            if ((this.CreateSnapshotCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.CreateSnapshotCompleted(this, new CreateSnapshotCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/ApplySnapshot", 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 ApplySnapshot(int itemId, string snapshotId) {
+            object[] results = this.Invoke("ApplySnapshot", new object[] {
+                        itemId,
+                        snapshotId});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginApplySnapshot(int itemId, string snapshotId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("ApplySnapshot", new object[] {
+                        itemId,
+                        snapshotId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndApplySnapshot(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void ApplySnapshotAsync(int itemId, string snapshotId) {
+            this.ApplySnapshotAsync(itemId, snapshotId, null);
+        }
+        
+        /// <remarks/>
+        public void ApplySnapshotAsync(int itemId, string snapshotId, object userState) {
+            if ((this.ApplySnapshotOperationCompleted == null)) {
+                this.ApplySnapshotOperationCompleted = new System.Threading.SendOrPostCallback(this.OnApplySnapshotOperationCompleted);
+            }
+            this.InvokeAsync("ApplySnapshot", new object[] {
+                        itemId,
+                        snapshotId}, this.ApplySnapshotOperationCompleted, userState);
+        }
+        
+        private void OnApplySnapshotOperationCompleted(object arg) {
+            if ((this.ApplySnapshotCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.ApplySnapshotCompleted(this, new ApplySnapshotCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/RenameSnapshot", 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 RenameSnapshot(int itemId, string snapshotId, string newName) {
+            object[] results = this.Invoke("RenameSnapshot", new object[] {
+                        itemId,
+                        snapshotId,
+                        newName});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginRenameSnapshot(int itemId, string snapshotId, string newName, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("RenameSnapshot", new object[] {
+                        itemId,
+                        snapshotId,
+                        newName}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndRenameSnapshot(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void RenameSnapshotAsync(int itemId, string snapshotId, string newName) {
+            this.RenameSnapshotAsync(itemId, snapshotId, newName, null);
+        }
+        
+        /// <remarks/>
+        public void RenameSnapshotAsync(int itemId, string snapshotId, string newName, object userState) {
+            if ((this.RenameSnapshotOperationCompleted == null)) {
+                this.RenameSnapshotOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRenameSnapshotOperationCompleted);
+            }
+            this.InvokeAsync("RenameSnapshot", new object[] {
+                        itemId,
+                        snapshotId,
+                        newName}, this.RenameSnapshotOperationCompleted, userState);
+        }
+        
+        private void OnRenameSnapshotOperationCompleted(object arg) {
+            if ((this.RenameSnapshotCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.RenameSnapshotCompleted(this, new RenameSnapshotCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteSnapshot", 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 DeleteSnapshot(int itemId, string snapshotId) {
+            object[] results = this.Invoke("DeleteSnapshot", new object[] {
+                        itemId,
+                        snapshotId});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginDeleteSnapshot(int itemId, string snapshotId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("DeleteSnapshot", new object[] {
+                        itemId,
+                        snapshotId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndDeleteSnapshot(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void DeleteSnapshotAsync(int itemId, string snapshotId) {
+            this.DeleteSnapshotAsync(itemId, snapshotId, null);
+        }
+        
+        /// <remarks/>
+        public void DeleteSnapshotAsync(int itemId, string snapshotId, object userState) {
+            if ((this.DeleteSnapshotOperationCompleted == null)) {
+                this.DeleteSnapshotOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteSnapshotOperationCompleted);
+            }
+            this.InvokeAsync("DeleteSnapshot", new object[] {
+                        itemId,
+                        snapshotId}, this.DeleteSnapshotOperationCompleted, userState);
+        }
+        
+        private void OnDeleteSnapshotOperationCompleted(object arg) {
+            if ((this.DeleteSnapshotCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.DeleteSnapshotCompleted(this, new DeleteSnapshotCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteSnapshotSubtree", 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 DeleteSnapshotSubtree(int itemId, string snapshotId) {
+            object[] results = this.Invoke("DeleteSnapshotSubtree", new object[] {
+                        itemId,
+                        snapshotId});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginDeleteSnapshotSubtree(int itemId, string snapshotId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("DeleteSnapshotSubtree", new object[] {
+                        itemId,
+                        snapshotId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndDeleteSnapshotSubtree(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void DeleteSnapshotSubtreeAsync(int itemId, string snapshotId) {
+            this.DeleteSnapshotSubtreeAsync(itemId, snapshotId, null);
+        }
+        
+        /// <remarks/>
+        public void DeleteSnapshotSubtreeAsync(int itemId, string snapshotId, object userState) {
+            if ((this.DeleteSnapshotSubtreeOperationCompleted == null)) {
+                this.DeleteSnapshotSubtreeOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteSnapshotSubtreeOperationCompleted);
+            }
+            this.InvokeAsync("DeleteSnapshotSubtree", new object[] {
+                        itemId,
+                        snapshotId}, this.DeleteSnapshotSubtreeOperationCompleted, userState);
+        }
+        
+        private void OnDeleteSnapshotSubtreeOperationCompleted(object arg) {
+            if ((this.DeleteSnapshotSubtreeCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.DeleteSnapshotSubtreeCompleted(this, new DeleteSnapshotSubtreeCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetSnapshotThumbnail", RequestNamespace="http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace="http://smbsaas/websitepanel/enterpriseserver", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        [return: System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")]
+        public byte[] GetSnapshotThumbnail(int itemId, string snapshotId, ThumbnailSize size) {
+            object[] results = this.Invoke("GetSnapshotThumbnail", new object[] {
+                        itemId,
+                        snapshotId,
+                        size});
+            return ((byte[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetSnapshotThumbnail(int itemId, string snapshotId, ThumbnailSize size, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetSnapshotThumbnail", new object[] {
+                        itemId,
+                        snapshotId,
+                        size}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public byte[] EndGetSnapshotThumbnail(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((byte[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetSnapshotThumbnailAsync(int itemId, string snapshotId, ThumbnailSize size) {
+            this.GetSnapshotThumbnailAsync(itemId, snapshotId, size, null);
+        }
+        
+        /// <remarks/>
+        public void GetSnapshotThumbnailAsync(int itemId, string snapshotId, ThumbnailSize size, object userState) {
+            if ((this.GetSnapshotThumbnailOperationCompleted == null)) {
+                this.GetSnapshotThumbnailOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetSnapshotThumbnailOperationCompleted);
+            }
+            this.InvokeAsync("GetSnapshotThumbnail", new object[] {
+                        itemId,
+                        snapshotId,
+                        size}, this.GetSnapshotThumbnailOperationCompleted, userState);
+        }
+        
+        private void OnGetSnapshotThumbnailOperationCompleted(object arg) {
+            if ((this.GetSnapshotThumbnailCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetSnapshotThumbnailCompleted(this, new GetSnapshotThumbnailCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExternalNetworkAdapterDetails", 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 NetworkAdapterDetails GetExternalNetworkAdapterDetails(int itemId) {
+            object[] results = this.Invoke("GetExternalNetworkAdapterDetails", new object[] {
+                        itemId});
+            return ((NetworkAdapterDetails)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetExternalNetworkAdapterDetails(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetExternalNetworkAdapterDetails", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public NetworkAdapterDetails EndGetExternalNetworkAdapterDetails(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((NetworkAdapterDetails)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetExternalNetworkAdapterDetailsAsync(int itemId) {
+            this.GetExternalNetworkAdapterDetailsAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void GetExternalNetworkAdapterDetailsAsync(int itemId, object userState) {
+            if ((this.GetExternalNetworkAdapterDetailsOperationCompleted == null)) {
+                this.GetExternalNetworkAdapterDetailsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetExternalNetworkAdapterDetailsOperationCompleted);
+            }
+            this.InvokeAsync("GetExternalNetworkAdapterDetails", new object[] {
+                        itemId}, this.GetExternalNetworkAdapterDetailsOperationCompleted, userState);
+        }
+        
+        private void OnGetExternalNetworkAdapterDetailsOperationCompleted(object arg) {
+            if ((this.GetExternalNetworkAdapterDetailsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetExternalNetworkAdapterDetailsCompleted(this, new GetExternalNetworkAdapterDetailsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddVirtualMachineExternalIPAddresses" +
+            "", 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 AddVirtualMachineExternalIPAddresses(int itemId, bool selectRandom, int addressesNumber, int[] addressId) {
+            object[] results = this.Invoke("AddVirtualMachineExternalIPAddresses", new object[] {
+                        itemId,
+                        selectRandom,
+                        addressesNumber,
+                        addressId});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginAddVirtualMachineExternalIPAddresses(int itemId, bool selectRandom, int addressesNumber, int[] addressId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("AddVirtualMachineExternalIPAddresses", new object[] {
+                        itemId,
+                        selectRandom,
+                        addressesNumber,
+                        addressId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndAddVirtualMachineExternalIPAddresses(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void AddVirtualMachineExternalIPAddressesAsync(int itemId, bool selectRandom, int addressesNumber, int[] addressId) {
+            this.AddVirtualMachineExternalIPAddressesAsync(itemId, selectRandom, addressesNumber, addressId, null);
+        }
+        
+        /// <remarks/>
+        public void AddVirtualMachineExternalIPAddressesAsync(int itemId, bool selectRandom, int addressesNumber, int[] addressId, object userState) {
+            if ((this.AddVirtualMachineExternalIPAddressesOperationCompleted == null)) {
+                this.AddVirtualMachineExternalIPAddressesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddVirtualMachineExternalIPAddressesOperationCompleted);
+            }
+            this.InvokeAsync("AddVirtualMachineExternalIPAddresses", new object[] {
+                        itemId,
+                        selectRandom,
+                        addressesNumber,
+                        addressId}, this.AddVirtualMachineExternalIPAddressesOperationCompleted, userState);
+        }
+        
+        private void OnAddVirtualMachineExternalIPAddressesOperationCompleted(object arg) {
+            if ((this.AddVirtualMachineExternalIPAddressesCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.AddVirtualMachineExternalIPAddressesCompleted(this, new AddVirtualMachineExternalIPAddressesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetVirtualMachinePrimaryExternalIPAd" +
+            "dress", 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 SetVirtualMachinePrimaryExternalIPAddress(int itemId, int addressId) {
+            object[] results = this.Invoke("SetVirtualMachinePrimaryExternalIPAddress", new object[] {
+                        itemId,
+                        addressId});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginSetVirtualMachinePrimaryExternalIPAddress(int itemId, int addressId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("SetVirtualMachinePrimaryExternalIPAddress", new object[] {
+                        itemId,
+                        addressId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndSetVirtualMachinePrimaryExternalIPAddress(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void SetVirtualMachinePrimaryExternalIPAddressAsync(int itemId, int addressId) {
+            this.SetVirtualMachinePrimaryExternalIPAddressAsync(itemId, addressId, null);
+        }
+        
+        /// <remarks/>
+        public void SetVirtualMachinePrimaryExternalIPAddressAsync(int itemId, int addressId, object userState) {
+            if ((this.SetVirtualMachinePrimaryExternalIPAddressOperationCompleted == null)) {
+                this.SetVirtualMachinePrimaryExternalIPAddressOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetVirtualMachinePrimaryExternalIPAddressOperationCompleted);
+            }
+            this.InvokeAsync("SetVirtualMachinePrimaryExternalIPAddress", new object[] {
+                        itemId,
+                        addressId}, this.SetVirtualMachinePrimaryExternalIPAddressOperationCompleted, userState);
+        }
+        
+        private void OnSetVirtualMachinePrimaryExternalIPAddressOperationCompleted(object arg) {
+            if ((this.SetVirtualMachinePrimaryExternalIPAddressCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.SetVirtualMachinePrimaryExternalIPAddressCompleted(this, new SetVirtualMachinePrimaryExternalIPAddressCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteVirtualMachineExternalIPAddres" +
+            "ses", 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 DeleteVirtualMachineExternalIPAddresses(int itemId, int[] addressId) {
+            object[] results = this.Invoke("DeleteVirtualMachineExternalIPAddresses", new object[] {
+                        itemId,
+                        addressId});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginDeleteVirtualMachineExternalIPAddresses(int itemId, int[] addressId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("DeleteVirtualMachineExternalIPAddresses", new object[] {
+                        itemId,
+                        addressId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndDeleteVirtualMachineExternalIPAddresses(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void DeleteVirtualMachineExternalIPAddressesAsync(int itemId, int[] addressId) {
+            this.DeleteVirtualMachineExternalIPAddressesAsync(itemId, addressId, null);
+        }
+        
+        /// <remarks/>
+        public void DeleteVirtualMachineExternalIPAddressesAsync(int itemId, int[] addressId, object userState) {
+            if ((this.DeleteVirtualMachineExternalIPAddressesOperationCompleted == null)) {
+                this.DeleteVirtualMachineExternalIPAddressesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteVirtualMachineExternalIPAddressesOperationCompleted);
+            }
+            this.InvokeAsync("DeleteVirtualMachineExternalIPAddresses", new object[] {
+                        itemId,
+                        addressId}, this.DeleteVirtualMachineExternalIPAddressesOperationCompleted, userState);
+        }
+        
+        private void OnDeleteVirtualMachineExternalIPAddressesOperationCompleted(object arg) {
+            if ((this.DeleteVirtualMachineExternalIPAddressesCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.DeleteVirtualMachineExternalIPAddressesCompleted(this, new DeleteVirtualMachineExternalIPAddressesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetPrivateNetworkAdapterDetails", 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 NetworkAdapterDetails GetPrivateNetworkAdapterDetails(int itemId) {
+            object[] results = this.Invoke("GetPrivateNetworkAdapterDetails", new object[] {
+                        itemId});
+            return ((NetworkAdapterDetails)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetPrivateNetworkAdapterDetails(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetPrivateNetworkAdapterDetails", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public NetworkAdapterDetails EndGetPrivateNetworkAdapterDetails(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((NetworkAdapterDetails)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetPrivateNetworkAdapterDetailsAsync(int itemId) {
+            this.GetPrivateNetworkAdapterDetailsAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void GetPrivateNetworkAdapterDetailsAsync(int itemId, object userState) {
+            if ((this.GetPrivateNetworkAdapterDetailsOperationCompleted == null)) {
+                this.GetPrivateNetworkAdapterDetailsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetPrivateNetworkAdapterDetailsOperationCompleted);
+            }
+            this.InvokeAsync("GetPrivateNetworkAdapterDetails", new object[] {
+                        itemId}, this.GetPrivateNetworkAdapterDetailsOperationCompleted, userState);
+        }
+        
+        private void OnGetPrivateNetworkAdapterDetailsOperationCompleted(object arg) {
+            if ((this.GetPrivateNetworkAdapterDetailsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetPrivateNetworkAdapterDetailsCompleted(this, new GetPrivateNetworkAdapterDetailsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/AddVirtualMachinePrivateIPAddresses", 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 AddVirtualMachinePrivateIPAddresses(int itemId, bool selectRandom, int addressesNumber, string[] addresses) {
+            object[] results = this.Invoke("AddVirtualMachinePrivateIPAddresses", new object[] {
+                        itemId,
+                        selectRandom,
+                        addressesNumber,
+                        addresses});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginAddVirtualMachinePrivateIPAddresses(int itemId, bool selectRandom, int addressesNumber, string[] addresses, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("AddVirtualMachinePrivateIPAddresses", new object[] {
+                        itemId,
+                        selectRandom,
+                        addressesNumber,
+                        addresses}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndAddVirtualMachinePrivateIPAddresses(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void AddVirtualMachinePrivateIPAddressesAsync(int itemId, bool selectRandom, int addressesNumber, string[] addresses) {
+            this.AddVirtualMachinePrivateIPAddressesAsync(itemId, selectRandom, addressesNumber, addresses, null);
+        }
+        
+        /// <remarks/>
+        public void AddVirtualMachinePrivateIPAddressesAsync(int itemId, bool selectRandom, int addressesNumber, string[] addresses, object userState) {
+            if ((this.AddVirtualMachinePrivateIPAddressesOperationCompleted == null)) {
+                this.AddVirtualMachinePrivateIPAddressesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnAddVirtualMachinePrivateIPAddressesOperationCompleted);
+            }
+            this.InvokeAsync("AddVirtualMachinePrivateIPAddresses", new object[] {
+                        itemId,
+                        selectRandom,
+                        addressesNumber,
+                        addresses}, this.AddVirtualMachinePrivateIPAddressesOperationCompleted, userState);
+        }
+        
+        private void OnAddVirtualMachinePrivateIPAddressesOperationCompleted(object arg) {
+            if ((this.AddVirtualMachinePrivateIPAddressesCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.AddVirtualMachinePrivateIPAddressesCompleted(this, new AddVirtualMachinePrivateIPAddressesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SetVirtualMachinePrimaryPrivateIPAdd" +
+            "ress", 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 SetVirtualMachinePrimaryPrivateIPAddress(int itemId, int addressId) {
+            object[] results = this.Invoke("SetVirtualMachinePrimaryPrivateIPAddress", new object[] {
+                        itemId,
+                        addressId});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginSetVirtualMachinePrimaryPrivateIPAddress(int itemId, int addressId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("SetVirtualMachinePrimaryPrivateIPAddress", new object[] {
+                        itemId,
+                        addressId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndSetVirtualMachinePrimaryPrivateIPAddress(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void SetVirtualMachinePrimaryPrivateIPAddressAsync(int itemId, int addressId) {
+            this.SetVirtualMachinePrimaryPrivateIPAddressAsync(itemId, addressId, null);
+        }
+        
+        /// <remarks/>
+        public void SetVirtualMachinePrimaryPrivateIPAddressAsync(int itemId, int addressId, object userState) {
+            if ((this.SetVirtualMachinePrimaryPrivateIPAddressOperationCompleted == null)) {
+                this.SetVirtualMachinePrimaryPrivateIPAddressOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSetVirtualMachinePrimaryPrivateIPAddressOperationCompleted);
+            }
+            this.InvokeAsync("SetVirtualMachinePrimaryPrivateIPAddress", new object[] {
+                        itemId,
+                        addressId}, this.SetVirtualMachinePrimaryPrivateIPAddressOperationCompleted, userState);
+        }
+        
+        private void OnSetVirtualMachinePrimaryPrivateIPAddressOperationCompleted(object arg) {
+            if ((this.SetVirtualMachinePrimaryPrivateIPAddressCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.SetVirtualMachinePrimaryPrivateIPAddressCompleted(this, new SetVirtualMachinePrimaryPrivateIPAddressCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteVirtualMachinePrivateIPAddress" +
+            "es", 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 DeleteVirtualMachinePrivateIPAddresses(int itemId, int[] addressId) {
+            object[] results = this.Invoke("DeleteVirtualMachinePrivateIPAddresses", new object[] {
+                        itemId,
+                        addressId});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginDeleteVirtualMachinePrivateIPAddresses(int itemId, int[] addressId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("DeleteVirtualMachinePrivateIPAddresses", new object[] {
+                        itemId,
+                        addressId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndDeleteVirtualMachinePrivateIPAddresses(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void DeleteVirtualMachinePrivateIPAddressesAsync(int itemId, int[] addressId) {
+            this.DeleteVirtualMachinePrivateIPAddressesAsync(itemId, addressId, null);
+        }
+        
+        /// <remarks/>
+        public void DeleteVirtualMachinePrivateIPAddressesAsync(int itemId, int[] addressId, object userState) {
+            if ((this.DeleteVirtualMachinePrivateIPAddressesOperationCompleted == null)) {
+                this.DeleteVirtualMachinePrivateIPAddressesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteVirtualMachinePrivateIPAddressesOperationCompleted);
+            }
+            this.InvokeAsync("DeleteVirtualMachinePrivateIPAddresses", new object[] {
+                        itemId,
+                        addressId}, this.DeleteVirtualMachinePrivateIPAddressesOperationCompleted, userState);
+        }
+        
+        private void OnDeleteVirtualMachinePrivateIPAddressesOperationCompleted(object arg) {
+            if ((this.DeleteVirtualMachinePrivateIPAddressesCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.DeleteVirtualMachinePrivateIPAddressesCompleted(this, new DeleteVirtualMachinePrivateIPAddressesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetVirtualMachinePermissions", 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 VirtualMachinePermission[] GetVirtualMachinePermissions(int itemId) {
+            object[] results = this.Invoke("GetVirtualMachinePermissions", new object[] {
+                        itemId});
+            return ((VirtualMachinePermission[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetVirtualMachinePermissions(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetVirtualMachinePermissions", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public VirtualMachinePermission[] EndGetVirtualMachinePermissions(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((VirtualMachinePermission[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachinePermissionsAsync(int itemId) {
+            this.GetVirtualMachinePermissionsAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachinePermissionsAsync(int itemId, object userState) {
+            if ((this.GetVirtualMachinePermissionsOperationCompleted == null)) {
+                this.GetVirtualMachinePermissionsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetVirtualMachinePermissionsOperationCompleted);
+            }
+            this.InvokeAsync("GetVirtualMachinePermissions", new object[] {
+                        itemId}, this.GetVirtualMachinePermissionsOperationCompleted, userState);
+        }
+        
+        private void OnGetVirtualMachinePermissionsOperationCompleted(object arg) {
+            if ((this.GetVirtualMachinePermissionsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetVirtualMachinePermissionsCompleted(this, new GetVirtualMachinePermissionsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/UpdateVirtualMachineUserPermissions", 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 UpdateVirtualMachineUserPermissions(int itemId, VirtualMachinePermission[] permissions) {
+            object[] results = this.Invoke("UpdateVirtualMachineUserPermissions", new object[] {
+                        itemId,
+                        permissions});
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginUpdateVirtualMachineUserPermissions(int itemId, VirtualMachinePermission[] permissions, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("UpdateVirtualMachineUserPermissions", new object[] {
+                        itemId,
+                        permissions}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public int EndUpdateVirtualMachineUserPermissions(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void UpdateVirtualMachineUserPermissionsAsync(int itemId, VirtualMachinePermission[] permissions) {
+            this.UpdateVirtualMachineUserPermissionsAsync(itemId, permissions, null);
+        }
+        
+        /// <remarks/>
+        public void UpdateVirtualMachineUserPermissionsAsync(int itemId, VirtualMachinePermission[] permissions, object userState) {
+            if ((this.UpdateVirtualMachineUserPermissionsOperationCompleted == null)) {
+                this.UpdateVirtualMachineUserPermissionsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnUpdateVirtualMachineUserPermissionsOperationCompleted);
+            }
+            this.InvokeAsync("UpdateVirtualMachineUserPermissions", new object[] {
+                        itemId,
+                        permissions}, this.UpdateVirtualMachineUserPermissionsOperationCompleted, userState);
+        }
+        
+        private void OnUpdateVirtualMachineUserPermissionsOperationCompleted(object arg) {
+            if ((this.UpdateVirtualMachineUserPermissionsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.UpdateVirtualMachineUserPermissionsCompleted(this, new UpdateVirtualMachineUserPermissionsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetExternalSwitches", 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 VirtualSwitch[] GetExternalSwitches(int serviceId, string computerName) {
+            object[] results = this.Invoke("GetExternalSwitches", new object[] {
+                        serviceId,
+                        computerName});
+            return ((VirtualSwitch[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetExternalSwitches(int serviceId, string computerName, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetExternalSwitches", new object[] {
+                        serviceId,
+                        computerName}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public VirtualSwitch[] EndGetExternalSwitches(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((VirtualSwitch[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetExternalSwitchesAsync(int serviceId, string computerName) {
+            this.GetExternalSwitchesAsync(serviceId, computerName, null);
+        }
+        
+        /// <remarks/>
+        public void GetExternalSwitchesAsync(int serviceId, string computerName, object userState) {
+            if ((this.GetExternalSwitchesOperationCompleted == null)) {
+                this.GetExternalSwitchesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetExternalSwitchesOperationCompleted);
+            }
+            this.InvokeAsync("GetExternalSwitches", new object[] {
+                        serviceId,
+                        computerName}, this.GetExternalSwitchesOperationCompleted, userState);
+        }
+        
+        private void OnGetExternalSwitchesOperationCompleted(object arg) {
+            if ((this.GetExternalSwitchesCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetExternalSwitchesCompleted(this, new GetExternalSwitchesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/DeleteVirtualMachine", 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 DeleteVirtualMachine(int itemId, bool saveFiles, bool exportVps, string exportPath) {
+            object[] results = this.Invoke("DeleteVirtualMachine", new object[] {
+                        itemId,
+                        saveFiles,
+                        exportVps,
+                        exportPath});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginDeleteVirtualMachine(int itemId, bool saveFiles, bool exportVps, string exportPath, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("DeleteVirtualMachine", new object[] {
+                        itemId,
+                        saveFiles,
+                        exportVps,
+                        exportPath}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndDeleteVirtualMachine(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void DeleteVirtualMachineAsync(int itemId, bool saveFiles, bool exportVps, string exportPath) {
+            this.DeleteVirtualMachineAsync(itemId, saveFiles, exportVps, exportPath, null);
+        }
+        
+        /// <remarks/>
+        public void DeleteVirtualMachineAsync(int itemId, bool saveFiles, bool exportVps, string exportPath, object userState) {
+            if ((this.DeleteVirtualMachineOperationCompleted == null)) {
+                this.DeleteVirtualMachineOperationCompleted = new System.Threading.SendOrPostCallback(this.OnDeleteVirtualMachineOperationCompleted);
+            }
+            this.InvokeAsync("DeleteVirtualMachine", new object[] {
+                        itemId,
+                        saveFiles,
+                        exportVps,
+                        exportPath}, this.DeleteVirtualMachineOperationCompleted, userState);
+        }
+        
+        private void OnDeleteVirtualMachineOperationCompleted(object arg) {
+            if ((this.DeleteVirtualMachineCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.DeleteVirtualMachineCompleted(this, new DeleteVirtualMachineCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/ReinstallVirtualMachine", 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 ReinstallVirtualMachine(int itemId, string adminPassword, bool preserveVirtualDiskFiles, bool saveVirtualDisk, bool exportVps, string exportPath) {
+            object[] results = this.Invoke("ReinstallVirtualMachine", new object[] {
+                        itemId,
+                        adminPassword,
+                        preserveVirtualDiskFiles,
+                        saveVirtualDisk,
+                        exportVps,
+                        exportPath});
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginReinstallVirtualMachine(int itemId, string adminPassword, bool preserveVirtualDiskFiles, bool saveVirtualDisk, bool exportVps, string exportPath, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("ReinstallVirtualMachine", new object[] {
+                        itemId,
+                        adminPassword,
+                        preserveVirtualDiskFiles,
+                        saveVirtualDisk,
+                        exportVps,
+                        exportPath}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public int EndReinstallVirtualMachine(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void ReinstallVirtualMachineAsync(int itemId, string adminPassword, bool preserveVirtualDiskFiles, bool saveVirtualDisk, bool exportVps, string exportPath) {
+            this.ReinstallVirtualMachineAsync(itemId, adminPassword, preserveVirtualDiskFiles, saveVirtualDisk, exportVps, exportPath, null);
+        }
+        
+        /// <remarks/>
+        public void ReinstallVirtualMachineAsync(int itemId, string adminPassword, bool preserveVirtualDiskFiles, bool saveVirtualDisk, bool exportVps, string exportPath, object userState) {
+            if ((this.ReinstallVirtualMachineOperationCompleted == null)) {
+                this.ReinstallVirtualMachineOperationCompleted = new System.Threading.SendOrPostCallback(this.OnReinstallVirtualMachineOperationCompleted);
+            }
+            this.InvokeAsync("ReinstallVirtualMachine", new object[] {
+                        itemId,
+                        adminPassword,
+                        preserveVirtualDiskFiles,
+                        saveVirtualDisk,
+                        exportVps,
+                        exportPath}, this.ReinstallVirtualMachineOperationCompleted, userState);
+        }
+        
+        private void OnReinstallVirtualMachineOperationCompleted(object arg) {
+            if ((this.ReinstallVirtualMachineCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.ReinstallVirtualMachineCompleted(this, new ReinstallVirtualMachineCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetVirtualMachineSummaryText", 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 GetVirtualMachineSummaryText(int itemId) {
+            object[] results = this.Invoke("GetVirtualMachineSummaryText", new object[] {
+                        itemId});
+            return ((string)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetVirtualMachineSummaryText(int itemId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetVirtualMachineSummaryText", new object[] {
+                        itemId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public string EndGetVirtualMachineSummaryText(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((string)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachineSummaryTextAsync(int itemId) {
+            this.GetVirtualMachineSummaryTextAsync(itemId, null);
+        }
+        
+        /// <remarks/>
+        public void GetVirtualMachineSummaryTextAsync(int itemId, object userState) {
+            if ((this.GetVirtualMachineSummaryTextOperationCompleted == null)) {
+                this.GetVirtualMachineSummaryTextOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetVirtualMachineSummaryTextOperationCompleted);
+            }
+            this.InvokeAsync("GetVirtualMachineSummaryText", new object[] {
+                        itemId}, this.GetVirtualMachineSummaryTextOperationCompleted, userState);
+        }
+        
+        private void OnGetVirtualMachineSummaryTextOperationCompleted(object arg) {
+            if ((this.GetVirtualMachineSummaryTextCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetVirtualMachineSummaryTextCompleted(this, new GetVirtualMachineSummaryTextCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/SendVirtualMachineSummaryLetter", 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 SendVirtualMachineSummaryLetter(int itemId, string to, string bcc) {
+            object[] results = this.Invoke("SendVirtualMachineSummaryLetter", new object[] {
+                        itemId,
+                        to,
+                        bcc});
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginSendVirtualMachineSummaryLetter(int itemId, string to, string bcc, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("SendVirtualMachineSummaryLetter", new object[] {
+                        itemId,
+                        to,
+                        bcc}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public ResultObject EndSendVirtualMachineSummaryLetter(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((ResultObject)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void SendVirtualMachineSummaryLetterAsync(int itemId, string to, string bcc) {
+            this.SendVirtualMachineSummaryLetterAsync(itemId, to, bcc, null);
+        }
+        
+        /// <remarks/>
+        public void SendVirtualMachineSummaryLetterAsync(int itemId, string to, string bcc, object userState) {
+            if ((this.SendVirtualMachineSummaryLetterOperationCompleted == null)) {
+                this.SendVirtualMachineSummaryLetterOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSendVirtualMachineSummaryLetterOperationCompleted);
+            }
+            this.InvokeAsync("SendVirtualMachineSummaryLetter", new object[] {
+                        itemId,
+                        to,
+                        bcc}, this.SendVirtualMachineSummaryLetterOperationCompleted, userState);
+        }
+        
+        private void OnSendVirtualMachineSummaryLetterOperationCompleted(object arg) {
+            if ((this.SendVirtualMachineSummaryLetterCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.SendVirtualMachineSummaryLetterCompleted(this, new SendVirtualMachineSummaryLetterCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        public new void CancelAsync(object userState) {
+            base.CancelAsync(userState);
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetVirtualMachinesCompletedEventHandler(object sender, GetVirtualMachinesCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetVirtualMachinesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetVirtualMachinesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public VirtualMachineMetaItemsPaged Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((VirtualMachineMetaItemsPaged)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetVirtualMachinesByServiceIdCompletedEventHandler(object sender, GetVirtualMachinesByServiceIdCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetVirtualMachinesByServiceIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetVirtualMachinesByServiceIdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public VirtualMachine[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((VirtualMachine[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetVirtualMachineItemCompletedEventHandler(object sender, GetVirtualMachineItemCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetVirtualMachineItemCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetVirtualMachineItemCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public VirtualMachine Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((VirtualMachine)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void EvaluateVirtualMachineTemplateCompletedEventHandler(object sender, EvaluateVirtualMachineTemplateCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class EvaluateVirtualMachineTemplateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal EvaluateVirtualMachineTemplateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public string Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((string)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetExternalNetworkDetailsCompletedEventHandler(object sender, GetExternalNetworkDetailsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetExternalNetworkDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetExternalNetworkDetailsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public NetworkAdapterDetails Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((NetworkAdapterDetails)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetPackagePrivateIPAddressesPagedCompletedEventHandler(object sender, GetPackagePrivateIPAddressesPagedCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetPackagePrivateIPAddressesPagedCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetPackagePrivateIPAddressesPagedCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public PrivateIPAddressesPaged Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((PrivateIPAddressesPaged)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetPackagePrivateIPAddressesCompletedEventHandler(object sender, GetPackagePrivateIPAddressesCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetPackagePrivateIPAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetPackagePrivateIPAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public PrivateIPAddress[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((PrivateIPAddress[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetPrivateNetworkDetailsCompletedEventHandler(object sender, GetPrivateNetworkDetailsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetPrivateNetworkDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetPrivateNetworkDetailsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public NetworkAdapterDetails Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((NetworkAdapterDetails)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetSpaceUserPermissionsCompletedEventHandler(object sender, GetSpaceUserPermissionsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetSpaceUserPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetSpaceUserPermissionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public VirtualMachinePermission[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((VirtualMachinePermission[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void UpdateSpaceUserPermissionsCompletedEventHandler(object sender, UpdateSpaceUserPermissionsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class UpdateSpaceUserPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal UpdateSpaceUserPermissionsCompletedEventArgs(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 GetSpaceAuditLogCompletedEventHandler(object sender, GetSpaceAuditLogCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetSpaceAuditLogCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetSpaceAuditLogCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public LogRecord[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((LogRecord[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetVirtualMachineAuditLogCompletedEventHandler(object sender, GetVirtualMachineAuditLogCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetVirtualMachineAuditLogCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetVirtualMachineAuditLogCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public LogRecord[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((LogRecord[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetOperatingSystemTemplatesCompletedEventHandler(object sender, GetOperatingSystemTemplatesCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetOperatingSystemTemplatesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetOperatingSystemTemplatesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public LibraryItem[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((LibraryItem[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetOperatingSystemTemplatesByServiceIdCompletedEventHandler(object sender, GetOperatingSystemTemplatesByServiceIdCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetOperatingSystemTemplatesByServiceIdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetOperatingSystemTemplatesByServiceIdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public LibraryItem[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((LibraryItem[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetMaximumCpuCoresNumberCompletedEventHandler(object sender, GetMaximumCpuCoresNumberCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetMaximumCpuCoresNumberCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetMaximumCpuCoresNumberCompletedEventArgs(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 GetDefaultExportPathCompletedEventHandler(object sender, GetDefaultExportPathCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetDefaultExportPathCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetDefaultExportPathCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public string Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((string)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void CreateDefaultVirtualMachineCompletedEventHandler(object sender, CreateDefaultVirtualMachineCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class CreateDefaultVirtualMachineCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal CreateDefaultVirtualMachineCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public IntResult Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((IntResult)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void CreateVirtualMachineCompletedEventHandler(object sender, CreateVirtualMachineCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class CreateVirtualMachineCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal CreateVirtualMachineCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public IntResult Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((IntResult)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void ImportVirtualMachineCompletedEventHandler(object sender, ImportVirtualMachineCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class ImportVirtualMachineCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal ImportVirtualMachineCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public IntResult Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((IntResult)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetVirtualMachineThumbnailCompletedEventHandler(object sender, GetVirtualMachineThumbnailCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetVirtualMachineThumbnailCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetVirtualMachineThumbnailCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public byte[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((byte[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetVirtualMachineGeneralDetailsCompletedEventHandler(object sender, GetVirtualMachineGeneralDetailsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetVirtualMachineGeneralDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetVirtualMachineGeneralDetailsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public VirtualMachine Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((VirtualMachine)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetVirtualMachineExtendedInfoCompletedEventHandler(object sender, GetVirtualMachineExtendedInfoCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetVirtualMachineExtendedInfoCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetVirtualMachineExtendedInfoCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public VirtualMachine Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((VirtualMachine)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void CancelVirtualMachineJobCompletedEventHandler(object sender, CancelVirtualMachineJobCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class CancelVirtualMachineJobCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal CancelVirtualMachineJobCompletedEventArgs(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 UpdateVirtualMachineHostNameCompletedEventHandler(object sender, UpdateVirtualMachineHostNameCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class UpdateVirtualMachineHostNameCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal UpdateVirtualMachineHostNameCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void ChangeVirtualMachineStateCompletedEventHandler(object sender, ChangeVirtualMachineStateCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class ChangeVirtualMachineStateCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal ChangeVirtualMachineStateCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetVirtualMachineJobsCompletedEventHandler(object sender, GetVirtualMachineJobsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetVirtualMachineJobsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetVirtualMachineJobsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ConcreteJob[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ConcreteJob[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void ChangeAdministratorPasswordCompletedEventHandler(object sender, ChangeAdministratorPasswordCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class ChangeAdministratorPasswordCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal ChangeAdministratorPasswordCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void UpdateVirtualMachineConfigurationCompletedEventHandler(object sender, UpdateVirtualMachineConfigurationCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class UpdateVirtualMachineConfigurationCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal UpdateVirtualMachineConfigurationCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetInsertedDvdDiskCompletedEventHandler(object sender, GetInsertedDvdDiskCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetInsertedDvdDiskCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetInsertedDvdDiskCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public LibraryItem Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((LibraryItem)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetLibraryDisksCompletedEventHandler(object sender, GetLibraryDisksCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetLibraryDisksCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetLibraryDisksCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public LibraryItem[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((LibraryItem[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void InsertDvdDiskCompletedEventHandler(object sender, InsertDvdDiskCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class InsertDvdDiskCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal InsertDvdDiskCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void EjectDvdDiskCompletedEventHandler(object sender, EjectDvdDiskCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class EjectDvdDiskCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal EjectDvdDiskCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetVirtualMachineSnapshotsCompletedEventHandler(object sender, GetVirtualMachineSnapshotsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetVirtualMachineSnapshotsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetVirtualMachineSnapshotsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public VirtualMachineSnapshot[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((VirtualMachineSnapshot[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetSnapshotCompletedEventHandler(object sender, GetSnapshotCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetSnapshotCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetSnapshotCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public VirtualMachineSnapshot Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((VirtualMachineSnapshot)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void CreateSnapshotCompletedEventHandler(object sender, CreateSnapshotCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class CreateSnapshotCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal CreateSnapshotCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void ApplySnapshotCompletedEventHandler(object sender, ApplySnapshotCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class ApplySnapshotCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal ApplySnapshotCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void RenameSnapshotCompletedEventHandler(object sender, RenameSnapshotCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class RenameSnapshotCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal RenameSnapshotCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void DeleteSnapshotCompletedEventHandler(object sender, DeleteSnapshotCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class DeleteSnapshotCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal DeleteSnapshotCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void DeleteSnapshotSubtreeCompletedEventHandler(object sender, DeleteSnapshotSubtreeCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class DeleteSnapshotSubtreeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal DeleteSnapshotSubtreeCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetSnapshotThumbnailCompletedEventHandler(object sender, GetSnapshotThumbnailCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetSnapshotThumbnailCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetSnapshotThumbnailCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public byte[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((byte[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetExternalNetworkAdapterDetailsCompletedEventHandler(object sender, GetExternalNetworkAdapterDetailsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetExternalNetworkAdapterDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetExternalNetworkAdapterDetailsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public NetworkAdapterDetails Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((NetworkAdapterDetails)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void AddVirtualMachineExternalIPAddressesCompletedEventHandler(object sender, AddVirtualMachineExternalIPAddressesCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class AddVirtualMachineExternalIPAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal AddVirtualMachineExternalIPAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void SetVirtualMachinePrimaryExternalIPAddressCompletedEventHandler(object sender, SetVirtualMachinePrimaryExternalIPAddressCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class SetVirtualMachinePrimaryExternalIPAddressCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal SetVirtualMachinePrimaryExternalIPAddressCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void DeleteVirtualMachineExternalIPAddressesCompletedEventHandler(object sender, DeleteVirtualMachineExternalIPAddressesCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class DeleteVirtualMachineExternalIPAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal DeleteVirtualMachineExternalIPAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetPrivateNetworkAdapterDetailsCompletedEventHandler(object sender, GetPrivateNetworkAdapterDetailsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetPrivateNetworkAdapterDetailsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetPrivateNetworkAdapterDetailsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public NetworkAdapterDetails Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((NetworkAdapterDetails)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void AddVirtualMachinePrivateIPAddressesCompletedEventHandler(object sender, AddVirtualMachinePrivateIPAddressesCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class AddVirtualMachinePrivateIPAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal AddVirtualMachinePrivateIPAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void SetVirtualMachinePrimaryPrivateIPAddressCompletedEventHandler(object sender, SetVirtualMachinePrimaryPrivateIPAddressCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class SetVirtualMachinePrimaryPrivateIPAddressCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal SetVirtualMachinePrimaryPrivateIPAddressCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void DeleteVirtualMachinePrivateIPAddressesCompletedEventHandler(object sender, DeleteVirtualMachinePrivateIPAddressesCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class DeleteVirtualMachinePrivateIPAddressesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal DeleteVirtualMachinePrivateIPAddressesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void GetVirtualMachinePermissionsCompletedEventHandler(object sender, GetVirtualMachinePermissionsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetVirtualMachinePermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetVirtualMachinePermissionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public VirtualMachinePermission[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((VirtualMachinePermission[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void UpdateVirtualMachineUserPermissionsCompletedEventHandler(object sender, UpdateVirtualMachineUserPermissionsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class UpdateVirtualMachineUserPermissionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal UpdateVirtualMachineUserPermissionsCompletedEventArgs(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 GetExternalSwitchesCompletedEventHandler(object sender, GetExternalSwitchesCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetExternalSwitchesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetExternalSwitchesCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public VirtualSwitch[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((VirtualSwitch[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void DeleteVirtualMachineCompletedEventHandler(object sender, DeleteVirtualMachineCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class DeleteVirtualMachineCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal DeleteVirtualMachineCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void ReinstallVirtualMachineCompletedEventHandler(object sender, ReinstallVirtualMachineCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class ReinstallVirtualMachineCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal ReinstallVirtualMachineCompletedEventArgs(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 GetVirtualMachineSummaryTextCompletedEventHandler(object sender, GetVirtualMachineSummaryTextCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetVirtualMachineSummaryTextCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetVirtualMachineSummaryTextCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public string Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((string)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    public delegate void SendVirtualMachineSummaryLetterCompletedEventHandler(object sender, SendVirtualMachineSummaryLetterCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.42")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class SendVirtualMachineSummaryLetterCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal SendVirtualMachineSummaryLetterCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public ResultObject Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((ResultObject)(this.results[0]));
+            }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/WebsitePanel.EnterpriseServer.Client.csproj b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/WebsitePanel.EnterpriseServer.Client.csproj
index 481ef66f..0c4b26ca 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/WebsitePanel.EnterpriseServer.Client.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/WebsitePanel.EnterpriseServer.Client.csproj
@@ -89,8 +89,10 @@
       <SubType>code</SubType>
     </Compile>
     <Compile Include="HeliconZooProxy.cs" />
+    <Compile Include="HostedSharePointServersEntProxy.cs" />
     <Compile Include="LyncProxy.cs" />
     <Compile Include="RemoteDesktopServicesProxy.cs" />
+    <Compile Include="VirtualizationServerProxy2012.cs" />
     <Compile Include="VirtualizationServerProxyForPrivateCloud.cs" />
     <Compile Include="CRMProxy.cs" />
     <Compile Include="DatabaseServersProxy.cs" />
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Common/ObjectUtils.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Common/ObjectUtils.cs
index ea5744ca..0756c3b3 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Common/ObjectUtils.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Common/ObjectUtils.cs
@@ -100,6 +100,19 @@ namespace WebsitePanel.EnterpriseServer
                                 svals[i] = ivals[i].ToString();
                             s = String.Join(";", svals);
                         }
+                        // when property is custom class with Persistent attribute
+                        else if (prop.PropertyType.GetCustomAttributes(typeof(PersistentAttribute), false).Length > 0)
+                        {
+                            // add sub-class properties to hash
+                            var childHash = GetObjectProperties(val, persistentOnly);
+                            foreach (var hashKey in childHash.Keys)
+                            {
+                                var value = childHash[hashKey];
+                                hash.Add(prop.Name + "." + hashKey, value);
+                            }
+                            // exit
+                            continue;
+                        }
                         else
                             s = val.ToString();
                     }
@@ -478,6 +491,41 @@ namespace WebsitePanel.EnterpriseServer
             }
         }
 
+        private static Hashtable GetPropertiesForCache(Type type, bool persistentOnly)
+        {
+            // create properties cache
+            var props = new Hashtable();
+            PropertyInfo[] objProps = type.GetProperties(BindingFlags.Instance
+                //| BindingFlags.DeclaredOnly
+                | BindingFlags.Public);
+            foreach (PropertyInfo prop in objProps)
+            {
+                // check for persistent attribute
+                object[] attrs = prop.GetCustomAttributes(typeof(PersistentAttribute), false);
+                if (!persistentOnly || (persistentOnly && attrs.Length > 0) && !props.ContainsKey(prop.Name))
+                {
+                    // when property is custom class with Persistent attribute
+                    if (prop.PropertyType.GetCustomAttributes(typeof (PersistentAttribute), false).Length > 0)
+                    {
+                        // add sub-class properties to hash
+                        var childHash = GetPropertiesForCache(prop.PropertyType, persistentOnly);
+                        foreach (var hashKey in childHash.Keys)
+                        {
+                            var value = childHash[hashKey];
+                            props.Add(prop.Name + "." + hashKey, value);
+                        }
+                        // exit
+                        continue;
+                    }
+
+                    // add property to hash
+                    props.Add(prop.Name, prop);
+                }
+            }
+
+            return props;
+        }
+
         public static void CreateObjectFromHash(object obj, Hashtable propValues, bool persistentOnly)
         {
             Type type = obj.GetType();
@@ -491,21 +539,7 @@ namespace WebsitePanel.EnterpriseServer
             }
             else
             {
-                // create properties cache
-                props = new Hashtable();
-                PropertyInfo[] objProps = type.GetProperties(BindingFlags.Instance
-                    //| BindingFlags.DeclaredOnly
-                    | BindingFlags.Public);
-                foreach (PropertyInfo prop in objProps)
-                {
-                    // check for persistent attribute
-                    object[] attrs = prop.GetCustomAttributes(typeof(PersistentAttribute), false);
-                    if (!persistentOnly || (persistentOnly && attrs.Length > 0) && !props.ContainsKey(prop.Name))
-                    {
-                        // add property to hash
-                        props.Add(prop.Name, prop);
-                    }
-                }
+                props = GetPropertiesForCache(type, persistentOnly);
 
                 if (!propertiesCache.ContainsKey(type.Name))
                 {
@@ -520,38 +554,63 @@ namespace WebsitePanel.EnterpriseServer
                 // try to locate specified property
                 if (props[propName] != null)
                 {
+                    PropertyInfo prop = (PropertyInfo)props[propName];
+                    string val = propValues[propName].ToString();
+                    var currentObj = obj;
+
+                    // when property is custom class with Persistent attribute
+                    if (propName.Contains("."))
+                    {
+                        var mainPropertyName = propName.Split('.')[0];
+                        var childPropertyName = propName.Split('.')[1];
+
+                        var mainProperty = type.GetProperty(mainPropertyName);
+                        if (mainProperty == null) continue;
+
+                        var mainVal = mainProperty.GetValue(obj, null);
+                        if (mainVal == null)
+                        {
+                            mainVal = Activator.CreateInstance(mainProperty.PropertyType);
+                            mainProperty.SetValue(obj, mainVal, null);
+                        }
+                        currentObj = mainVal;
+
+                        var childProperty = mainProperty.PropertyType.GetProperty(childPropertyName);
+                        if (childProperty == null) continue;
+                        prop = childProperty;
+                    }
+
                     // set property
                     // we support:
                     //	String
                     //	Int32
                     //	Boolean
                     //	Float
-                    PropertyInfo prop = (PropertyInfo)props[propName];
-                    string val = propValues[propName].ToString();
+
                     if (prop.PropertyType == typeof(String))
-                        prop.SetValue(obj, val, null);
+                        prop.SetValue(currentObj, val, null);
                     else if (prop.PropertyType == typeof(Int32))
-                        prop.SetValue(obj, Int32.Parse(val), null);
+                        prop.SetValue(currentObj, Int32.Parse(val), null);
                     else
                         if (prop.PropertyType == typeof(long))
-                            prop.SetValue(obj, long.Parse(val), null);
+                            prop.SetValue(currentObj, long.Parse(val), null);
                         else
                             if (prop.PropertyType == typeof(Boolean))
-                                prop.SetValue(obj, Boolean.Parse(val), null);
+                                prop.SetValue(currentObj, Boolean.Parse(val), null);
                             else if (prop.PropertyType == typeof(Single))
-                                prop.SetValue(obj, Single.Parse(val), null);
+                                prop.SetValue(currentObj, Single.Parse(val), null);
                             else if (prop.PropertyType.IsEnum)
-                                prop.SetValue(obj, Enum.Parse(prop.PropertyType, val, true), null);
+                                prop.SetValue(currentObj, Enum.Parse(prop.PropertyType, val, true), null);
                             else
                                 if (prop.PropertyType == typeof(Guid))
-                                    prop.SetValue(obj, new Guid(val), null);
+                                    prop.SetValue(currentObj, new Guid(val), null);
                                 else
                                     if (prop.PropertyType == typeof(string[]))
                                     {
                                         if (val == "")
-                                            prop.SetValue(obj, new string[0], null);
+                                            prop.SetValue(currentObj, new string[0], null);
                                         else
-                                            prop.SetValue(obj, val.Split(';'), null);
+                                            prop.SetValue(currentObj, val.Split(';'), null);
                                     }
                                     else if (prop.PropertyType == typeof(int[]))
                                     {
@@ -564,7 +623,7 @@ namespace WebsitePanel.EnterpriseServer
                                         if (val == "")
                                             ivals = new int[0];
 
-                                        prop.SetValue(obj, ivals, null);
+                                        prop.SetValue(currentObj, ivals, null);
                                     }
                 }
             }
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
index 0bd8c366..53f979e1 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
@@ -3540,6 +3540,21 @@ namespace WebsitePanel.EnterpriseServer
                                         new SqlParameter("@Recursive", recursive));
             return reader;
         }
+        public static IDataReader GetVirtualMachinesPaged2012(int actorId, int packageId, string filterColumn, string filterValue,
+            string sortColumn, int startRow, int maximumRows, bool recursive)
+        {
+            IDataReader reader = SqlHelper.ExecuteReader(ConnectionString, CommandType.StoredProcedure,
+                                     "GetVirtualMachinesPaged2012",
+                                        new SqlParameter("@ActorID", actorId),
+                                        new SqlParameter("@PackageID", packageId),
+                                        new SqlParameter("@FilterColumn", VerifyColumnName(filterColumn)),
+                                        new SqlParameter("@FilterValue", VerifyColumnValue(filterValue)),
+                                        new SqlParameter("@SortColumn", VerifyColumnName(sortColumn)),
+                                        new SqlParameter("@StartRow", startRow),
+                                        new SqlParameter("@MaximumRows", maximumRows),
+                                        new SqlParameter("@Recursive", recursive));
+            return reader;
+        }
         #endregion
 
         public static IDataReader GetVirtualMachinesForPCPaged(int actorId, int packageId, string filterColumn, string filterValue,
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/EnterpriseStorage/EnterpriseStorageController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/EnterpriseStorage/EnterpriseStorageController.cs
index 6402a7b0..200a52fb 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/EnterpriseStorage/EnterpriseStorageController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/EnterpriseStorage/EnterpriseStorageController.cs
@@ -76,6 +76,11 @@ namespace WebsitePanel.EnterpriseServer
             return GetFoldersInternal(itemId);
         }
 
+        public static SystemFile[] GetUserRootFolders(int itemId, int accountId, string userName, string displayName)
+        {
+            return GetUserRootFoldersInternal(itemId, accountId, userName, displayName);
+        }
+
         public static SystemFile GetFolder(int itemId, string folderName)
         {
             return GetFolderInternal(itemId, folderName);
@@ -554,6 +559,57 @@ namespace WebsitePanel.EnterpriseServer
             }
         }
 
+        protected static SystemFile[] GetUserRootFoldersInternal(int itemId, int accountId, string userName, string displayName)
+        {
+            try
+            {
+                var rootFolders = new List<SystemFile>();
+
+                // load organization
+                Organization org = OrganizationController.GetOrganization(itemId);
+                if (org == null)
+                {
+                    return new SystemFile[0];
+                }
+
+                int serviceId = GetEnterpriseStorageServiceID(org.PackageId);
+
+                if (serviceId == 0)
+                {
+                    return new SystemFile[0];
+                }
+
+                EnterpriseStorage es = GetEnterpriseStorage(serviceId);
+
+                var webDavSettings = ObjectUtils.CreateListFromDataReader<WebDavSetting>(
+                    DataProvider.GetEnterpriseFolders(itemId)).ToArray();
+
+                var userGroups = OrganizationController.GetSecurityGroupsByMember(itemId, accountId);
+
+                foreach (var folder in es.GetFoldersWithoutFrsm(org.OrganizationId, webDavSettings))
+                {
+                    var permissions = ConvertToESPermission(itemId,folder.Rules);
+
+                    foreach (var permission in permissions)
+                    {
+                        if ((!permission.IsGroup
+                                && (permission.DisplayName == userName || permission.DisplayName == displayName))
+                            || (permission.IsGroup && userGroups.Any(x => x.DisplayName == permission.DisplayName)))
+                        {
+                            rootFolders.Add(folder);
+                            break;
+                        }
+                    }
+                }
+
+                return rootFolders.ToArray();
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
         protected static SystemFile GetFolderInternal(int itemId, string folderName)
         {
             try
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
index 1c819656..43e9ec0d 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
@@ -383,6 +383,13 @@ namespace WebsitePanel.EnterpriseServer
                 if (cntx.Quotas[Quotas.HOSTED_SHAREPOINT_STORAGE_SIZE] != null)
                     org.WarningSharePointStorage = cntx.Quotas[Quotas.HOSTED_SHAREPOINT_STORAGE_SIZE].QuotaAllocatedValue;
 
+                if (cntx.Quotas[Quotas.HOSTED_SHAREPOINT_ENTERPRISE_STORAGE_SIZE] != null)
+                    org.MaxSharePointEnterpriseStorage = cntx.Quotas[Quotas.HOSTED_SHAREPOINT_ENTERPRISE_STORAGE_SIZE].QuotaAllocatedValue;
+
+
+                if (cntx.Quotas[Quotas.HOSTED_SHAREPOINT_ENTERPRISE_STORAGE_SIZE] != null)
+                    org.WarningSharePointEnterpriseStorage = cntx.Quotas[Quotas.HOSTED_SHAREPOINT_ENTERPRISE_STORAGE_SIZE].QuotaAllocatedValue;
+
 
                 //add organization to package items                
                 itemId = AddOrganizationToPackageItems(org, serviceId, packageId, organizationName, organizationId, domainName);
@@ -670,6 +677,16 @@ namespace WebsitePanel.EnterpriseServer
                     TaskManager.WriteError(ex);
                 }
 
+                try
+                {
+                    HostedSharePointServerEntController.DeleteSiteCollections(itemId);
+                }
+                catch (Exception ex)
+                {
+                    successful = false;
+                    TaskManager.WriteError(ex);
+                }
+
                 if (org.IsOCSOrganization)
                 {
                     DeleteOCSUsers(itemId, ref successful);
@@ -939,7 +956,9 @@ namespace WebsitePanel.EnterpriseServer
                 stats.CreatedUsers = 5;
                 stats.AllocatedUsers = 10;
                 stats.CreatedSharePointSiteCollections = 1;
+                stats.CreatedSharePointEnterpriseSiteCollections = 1;
                 stats.AllocatedSharePointSiteCollections = 5;
+                stats.AllocatedSharePointEnterpriseSiteCollections = 5;
                 return stats;
             }
             #endregion
@@ -971,6 +990,13 @@ namespace WebsitePanel.EnterpriseServer
                         stats.CreatedSharePointSiteCollections = sharePointStats.TotalRowCount;
                     }
 
+                    if (cntxTmp.Groups.ContainsKey(ResourceGroups.SharepointEnterpriseServer))
+                    {
+                        SharePointEnterpriseSiteCollectionListPaged sharePointStats = HostedSharePointServerEntController.GetSiteCollectionsPaged(org.PackageId, org.Id, string.Empty, string.Empty, string.Empty, 0, 0);
+                        stats.CreatedSharePointEnterpriseSiteCollections = sharePointStats.TotalRowCount;
+                    }
+
+
                     if (cntxTmp.Groups.ContainsKey(ResourceGroups.HostedCRM))
                     {
                         stats.CreatedCRMUsers = CRMController.GetCRMUsersCount(org.Id, string.Empty, string.Empty, CRMUserLycenseTypes.FULL).Value;
@@ -1050,8 +1076,15 @@ namespace WebsitePanel.EnterpriseServer
                                     {
                                         SharePointSiteCollectionListPaged sharePointStats = HostedSharePointServerController.GetSiteCollectionsPaged(org.PackageId, o.Id, string.Empty, string.Empty, string.Empty, 0, 0);
                                         stats.CreatedSharePointSiteCollections += sharePointStats.TotalRowCount;
+                                    }
+
+                                    if (cntxTmp.Groups.ContainsKey(ResourceGroups.SharepointEnterpriseServer))
+                                    {
+                                        SharePointEnterpriseSiteCollectionListPaged sharePointStats = HostedSharePointServerEntController.GetSiteCollectionsPaged(org.PackageId, o.Id, string.Empty, string.Empty, string.Empty, 0, 0);
+                                        stats.CreatedSharePointEnterpriseSiteCollections += sharePointStats.TotalRowCount;
                                     }                                    
 
+
                                     if (cntxTmp.Groups.ContainsKey(ResourceGroups.HostedCRM))
                                     {
                                         stats.CreatedCRMUsers += CRMController.GetCRMUsersCount(o.Id, string.Empty, string.Empty, CRMUserLycenseTypes.FULL ).Value;
@@ -1119,6 +1152,11 @@ namespace WebsitePanel.EnterpriseServer
                     stats.AllocatedSharePointSiteCollections = cntx.Quotas[Quotas.HOSTED_SHAREPOINT_SITES].QuotaAllocatedValue;
                 }
 
+                if (cntx.Groups.ContainsKey(ResourceGroups.SharepointEnterpriseServer))
+                {
+                    stats.AllocatedSharePointEnterpriseSiteCollections = cntx.Quotas[Quotas.HOSTED_SHAREPOINT_ENTERPRISE_SITES].QuotaAllocatedValue;
+                }
+
                 if (cntx.Groups.ContainsKey(ResourceGroups.HostedCRM))
                 {
                     stats.AllocatedCRMUsers = cntx.Quotas[Quotas.CRM_USERS].QuotaAllocatedValue;
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/ReportController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/ReportController.cs
index 82589f64..16bf13ef 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/ReportController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/ReportController.cs
@@ -116,6 +116,21 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
                     }                
             }
 
+            if (report.SharePointEnterpriseReport != null)
+            {
+                List<SharePointEnterpriseStatistics> sharePoints =
+                        report.SharePointEnterpriseReport.Items.FindAll(
+                            delegate(SharePointEnterpriseStatistics stats) { return stats.OrganizationID == org.OrganizationId; });
+
+                item.TotalSharePointEnterpriseSiteCollections = sharePoints.Count;
+                foreach (SharePointEnterpriseStatistics current in sharePoints)
+                {
+                    item.TotalSharePointEnterpriseSiteCollectionsSize += current.SiteCollectionSize;
+                }
+            }
+
+
+
             if (report.CRMReport != null)
             {
                 List<CRMOrganizationStatistics> crmOrganizationStatistics =
@@ -158,6 +173,18 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
             return PackageController.GetPackageServiceId(packageId, ResourceGroups.SharepointFoundationServer);
         }
 
+
+        private static HostedSharePointServerEnt GetHostedSharePointServerEnt(int serviceId)
+        {
+            HostedSharePointServerEnt sps = new HostedSharePointServerEnt();
+            ServiceProviderProxy.Init(sps, serviceId);
+            return sps;
+        }
+
+        private static int GetHostedSharePointEntServiceId(int packageId)
+        {
+            return PackageController.GetPackageServiceId(packageId, ResourceGroups.SharepointEnterpriseServer);
+        }
         
         private static void PopulateBaseItem(BaseStatistics stats, Organization org, string topReseller)
         {
@@ -324,6 +351,21 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
                 }
             }
 
+            if (report.SharePointEnterpriseReport != null)
+            {
+                try
+                {
+                    TaskManager.Write("Populate SharePoint Enterprise item ");
+
+                    PopulateSharePointEnterpriseItem(org, report, topReseller);
+                }
+                catch (Exception ex)
+                {
+                    TaskManager.WriteError(ex);
+                }
+            }
+
+
             if (report.LyncReport != null)
             {
                 try
@@ -394,6 +436,7 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
                     string.Format("Could not get sharepoint server. PackageId: {0}", org.PackageId), ex);
             }
 
+
             foreach (SharePointSiteCollection siteCollection in siteCollections)
             {
                 try
@@ -419,6 +462,59 @@ namespace WebsitePanel.EnterpriseServer.Code.HostedSolution
         }
 
 
+        private static void PopulateSharePointEnterpriseItem(Organization org, EnterpriseSolutionStatisticsReport report, string topReseller)
+        {
+            List<SharePointEnterpriseSiteCollection> siteCollections;
+
+            try
+            {
+                siteCollections = HostedSharePointServerEntController.GetSiteCollections(org.Id);
+            }
+            catch (Exception ex)
+            {
+                throw new ApplicationException(string.Format("Could not get site collections. OrgId: {0}", org.Id), ex);
+            }
+
+            if (siteCollections == null || siteCollections.Count == 0)
+                return;
+
+
+            HostedSharePointServerEnt srvEnt;
+            try
+            {
+                int serviceId = GetHostedSharePointEntServiceId(org.PackageId);
+                srvEnt = GetHostedSharePointServerEnt(serviceId);
+            }
+            catch (Exception ex)
+            {
+                throw new ApplicationException(
+                    string.Format("Could not get sharepoint enterprise server. PackageId: {0}", org.PackageId), ex);
+            }
+
+            foreach (SharePointEnterpriseSiteCollection siteCollection in siteCollections)
+            {
+                try
+                {
+                    SharePointEnterpriseStatistics stats = new SharePointEnterpriseStatistics();
+                    PopulateBaseItem(stats, org, topReseller);
+
+                    stats.SiteCollectionUrl = siteCollection.PhysicalAddress;
+                    stats.SiteCollectionOwner = siteCollection.OwnerName;
+                    stats.SiteCollectionQuota = siteCollection.MaxSiteStorage;
+
+                    stats.SiteCollectionCreated = siteCollection.CreatedDate;
+
+                    stats.SiteCollectionSize = srvEnt.Enterprise_GetSiteCollectionSize(siteCollection.PhysicalAddress);
+
+                    report.SharePointEnterpriseReport.Items.Add(stats);
+                }
+                catch (Exception ex)
+                {
+                    TaskManager.WriteError(ex);
+                }
+            }
+        }
+
         private static void PopulateExchangeReportItems(Organization org, EnterpriseSolutionStatisticsReport report, string topReseller)
         {
             TaskManager.Write("Exchange Report Items " + org.Name);
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs
index 292abb2a..b47b2088 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs
@@ -488,6 +488,7 @@ namespace WebsitePanel.EnterpriseServer
                                     ServerController.AddServiceDNSRecords(packageId, ResourceGroups.MySql5, domain, "");
                                     ServerController.AddServiceDNSRecords(packageId, ResourceGroups.Statistics, domain, "");
                                     ServerController.AddServiceDNSRecords(packageId, ResourceGroups.VPS, domain, "");
+                                    ServerController.AddServiceDNSRecords(packageId, ResourceGroups.VPS2012, domain, "");
                                     ServerController.AddServiceDNSRecords(packageId, ResourceGroups.VPSForPC, domain, "");
                                 }
                             }
@@ -711,6 +712,11 @@ namespace WebsitePanel.EnterpriseServer
                 if (Utils.ParseBool(vpsSettings["AutoAssignExternalIP"], true))
                     ServerController.AllocateMaximumPackageIPAddresses(packageId, ResourceGroups.VPS, IPAddressPool.VpsExternalNetwork);
 
+                // allocate "VPS" IP addresses
+                int vps2012ServiceId = PackageController.GetPackageServiceId(packageId, ResourceGroups.VPS2012);
+                StringDictionary vps2012Settings = ServerController.GetServiceSettings(vps2012ServiceId);
+                if (Utils.ParseBool(vps2012Settings["AutoAssignExternalIP"], true))
+                    ServerController.AllocateMaximumPackageIPAddresses(packageId, ResourceGroups.VPS2012, IPAddressPool.VpsExternalNetwork);
 
                 // allocate "VPSForPC" IP addresses
                 int vpsfcpServiceId = PackageController.GetPackageServiceId(packageId, ResourceGroups.VPSForPC);
@@ -1681,6 +1687,18 @@ namespace WebsitePanel.EnterpriseServer
                     }
                 }
 
+                // VPS2012
+                else if (String.Compare(PackageSettings.VIRTUAL_PRIVATE_SERVERS_2012, settingsName, true) == 0)
+                {
+                    // load Exchange service settings
+                    int vpsServiceId = GetPackageServiceId(packageId, ResourceGroups.VPS2012);
+                    if (vpsServiceId > 0)
+                    {
+                        StringDictionary vpsSettings = ServerController.GetServiceSettings(vpsServiceId);
+                        settings["HostnamePattern"] = vpsSettings["HostnamePattern"];
+                    }
+                }
+
                 //vpforCP
                 else if (String.Compare(PackageSettings.VIRTUAL_PRIVATE_SERVERS_FOR_PRIVATE_CLOUD, settingsName, true) == 0)
                 {
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
index 7d585e28..b2388d93 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
@@ -331,6 +331,49 @@ namespace WebsitePanel.EnterpriseServer
             return UpdateRdsServerSettingsInternal(serverId, settingsName, settings);
         }
 
+        public static ResultObject ShadowSession(int itemId, string sessionId, bool control)
+        {
+            return ShadowSessionInternal(itemId, sessionId, control);
+        }
+
+        private static ResultObject ShadowSessionInternal(int itemId, string sessionId, bool control)
+        {
+            var result = TaskManager.StartResultTask<ResultObject>("REMOTE_DESKTOP_SERVICES", "SHADOW_RDS_SESSION");
+
+            try
+            {
+                Organization org = OrganizationController.GetOrganization(itemId);
+
+                if (org == null)
+                {
+                    result.IsSuccess = false;
+                    result.AddError("SHADOW_RDS_SESSION", new NullReferenceException("Organization not found"));
+
+                    return result;
+                }
+
+                var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId));
+                rds.ShadowSession(sessionId, control);
+            }
+            catch (Exception ex)
+            {
+                result.AddError("REMOTE_DESKTOP_SERVICES_SHADOW_RDS_SESSION", ex);
+            }
+            finally
+            {
+                if (!result.IsSuccess)
+                {
+                    TaskManager.CompleteResultTask(result);
+                }
+                else
+                {
+                    TaskManager.CompleteResultTask();
+                }
+            }
+
+            return result;
+        }
+
         private static RdsServerSettings GetRdsServerSettingsInternal(int serverId, string settingsName)
         {
             IDataReader reader = DataProvider.GetRdsServerSettings(serverId, settingsName);
@@ -363,25 +406,9 @@ namespace WebsitePanel.EnterpriseServer
             {                
                 var collection = ObjectUtils.FillObjectFromDataReader<RdsCollection>(DataProvider.GetRDSCollectionById(serverId));
                 var rds = GetRemoteDesktopServices(GetRdsServiceId(collection.ItemId));
-                rds.ApplyGPO(collection.Name, settings);
-
-                XmlDocument doc = new XmlDocument();
-                XmlElement nodeProps = doc.CreateElement("properties");
-
-                if (settings != null)
-                {
-                    foreach (var setting in settings.Settings)
-                    {
-                        XmlElement nodeProp = doc.CreateElement("property");
-                        nodeProp.SetAttribute("name", setting.PropertyName);
-                        nodeProp.SetAttribute("value", setting.PropertyValue);
-                        nodeProp.SetAttribute("applyUsers", setting.ApplyUsers ? "1" : "0");
-                        nodeProp.SetAttribute("applyAdministrators", setting.ApplyAdministrators ? "1" : "0");
-                        nodeProps.AppendChild(nodeProp);
-                    }
-                }
-
-                string xml = nodeProps.OuterXml;                
+                Organization org = OrganizationController.GetOrganization(collection.ItemId);
+                rds.ApplyGPO(org.OrganizationId, collection.Name, settings);
+                string xml = GetSettingsXml(settings);
 
                 DataProvider.UpdateRdsServerSettings(serverId, settingsName, xml);
 
@@ -748,8 +775,11 @@ namespace WebsitePanel.EnterpriseServer
                 };                
 
                 rds.CreateCollection(org.OrganizationId, collection);
-                rds.ApplyGPO(collection.Name, GetDefaultGpoSettings());
-                collection.Id = DataProvider.AddRDSCollection(itemId, collection.Name, collection.Description, collection.DisplayName);                
+                var defaultGpoSettings = GetDefaultGpoSettings();                
+                rds.ApplyGPO(org.OrganizationId, collection.Name, defaultGpoSettings);                
+                collection.Id = DataProvider.AddRDSCollection(itemId, collection.Name, collection.Description, collection.DisplayName);
+                string xml = GetSettingsXml(defaultGpoSettings);
+                DataProvider.UpdateRdsServerSettings(collection.Id, string.Format("Collection-{0}-Settings", collection.Id), xml);
                 
                 collection.Settings.RdsCollectionId = collection.Id;
                 int settingsId = DataProvider.AddRdsCollectionSettings(collection.Settings);
@@ -806,6 +836,7 @@ namespace WebsitePanel.EnterpriseServer
                 }
 
                 rds.AddSessionHostServersToCollection(org.OrganizationId, collection.Name, newServers.ToArray());
+                rds.MoveSessionHostsToCollectionOU(collection.Servers.ToArray(), collection.Name, org.OrganizationId);
 
                 foreach (var server in newServers)
                 {                    
@@ -2098,7 +2129,52 @@ namespace WebsitePanel.EnterpriseServer
                 ApplyUsers = Convert.ToBoolean(defaultSettings[RdsServerSettings.SCREEN_SAVER_DISABLED_USERS])
             });
 
+            settings.Settings.Add(new RdsServerSetting
+            {
+                PropertyName = RdsServerSettings.RDS_VIEW_WITHOUT_PERMISSION,
+                PropertyValue = "",
+                ApplyAdministrators = Convert.ToBoolean(defaultSettings[RdsServerSettings.RDS_VIEW_WITHOUT_PERMISSION_ADMINISTRATORS]),
+                ApplyUsers = Convert.ToBoolean(defaultSettings[RdsServerSettings.RDS_VIEW_WITHOUT_PERMISSION_Users])
+            });
+
+            settings.Settings.Add(new RdsServerSetting
+            {
+                PropertyName = RdsServerSettings.RDS_CONTROL_WITHOUT_PERMISSION,
+                PropertyValue = "",
+                ApplyAdministrators = Convert.ToBoolean(defaultSettings[RdsServerSettings.RDS_CONTROL_WITHOUT_PERMISSION_ADMINISTRATORS]),
+                ApplyUsers = Convert.ToBoolean(defaultSettings[RdsServerSettings.RDS_CONTROL_WITHOUT_PERMISSION_Users])
+            });
+
+            settings.Settings.Add(new RdsServerSetting
+            {
+                PropertyName = RdsServerSettings.DISABLE_CMD,
+                PropertyValue = "",
+                ApplyAdministrators = Convert.ToBoolean(defaultSettings[RdsServerSettings.DISABLE_CMD_ADMINISTRATORS]),
+                ApplyUsers = Convert.ToBoolean(defaultSettings[RdsServerSettings.DISABLE_CMD_USERS])
+            });
+
             return settings;
         }
+
+        private static string GetSettingsXml(RdsServerSettings settings)
+        {
+            XmlDocument doc = new XmlDocument();
+            XmlElement nodeProps = doc.CreateElement("properties");
+
+            if (settings != null)
+            {
+                foreach (var setting in settings.Settings)
+                {
+                    XmlElement nodeProp = doc.CreateElement("property");
+                    nodeProp.SetAttribute("name", setting.PropertyName);
+                    nodeProp.SetAttribute("value", setting.PropertyValue);
+                    nodeProp.SetAttribute("applyUsers", setting.ApplyUsers ? "1" : "0");
+                    nodeProp.SetAttribute("applyAdministrators", setting.ApplyAdministrators ? "1" : "0");
+                    nodeProps.AppendChild(nodeProp);
+                }
+            }
+
+            return nodeProps.OuterXml;
+        }
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/CalculatePackagesDiskspaceTask.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/CalculatePackagesDiskspaceTask.cs
index 272c6e8a..9d6302fb 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/CalculatePackagesDiskspaceTask.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SchedulerTasks/CalculatePackagesDiskspaceTask.cs
@@ -179,6 +179,20 @@ namespace WebsitePanel.EnterpriseServer
                             }
                         }
                     }
+
+                    if (cntx.Groups.ContainsKey(ResourceGroups.SharepointEnterpriseServer))
+                    {
+                        SharePointSiteDiskSpace[] sharePointSiteDiskSpaces =
+                            HostedSharePointServerEntController.CalculateSharePointSitesDiskSpace(org.Id, out res);
+                        if (res == 0)
+                        {
+                            foreach (SharePointSiteDiskSpace currecnt in sharePointSiteDiskSpaces)
+                            {
+                                size += currecnt.DiskSpace;
+                            }
+                        }
+                    }
+
                     ServiceProviderItemDiskSpace tmp = new ServiceProviderItemDiskSpace();
                     tmp.ItemId = item.Id;
                     tmp.DiskSpace = size;
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs
index c9aec104..9f87f606 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Servers/ServerController.cs
@@ -1481,6 +1481,10 @@ namespace WebsitePanel.EnterpriseServer
             {
                 return Quotas.VPS_EXTERNAL_IP_ADDRESSES_NUMBER;
             }
+            else if (String.Compare(groupName, ResourceGroups.VPS2012, true) == 0)
+            {
+                return Quotas.VPS2012_EXTERNAL_IP_ADDRESSES_NUMBER;
+            }
             else if (String.Compare(groupName, ResourceGroups.VPSForPC, true) == 0)
             {
                 return Quotas.VPSForPC_EXTERNAL_IP_ADDRESSES_NUMBER;
@@ -1840,6 +1844,7 @@ namespace WebsitePanel.EnterpriseServer
                     ServerController.AddServiceDNSRecords(packageId, ResourceGroups.MySql5, domain, "");
                     ServerController.AddServiceDNSRecords(packageId, ResourceGroups.Statistics, domain, "");
                     ServerController.AddServiceDNSRecords(packageId, ResourceGroups.VPS, domain, "");
+                    ServerController.AddServiceDNSRecords(packageId, ResourceGroups.VPS2012, domain, "");
                     ServerController.AddServiceDNSRecords(packageId, ResourceGroups.VPSForPC, domain, "");
                 }
 
@@ -2403,6 +2408,7 @@ namespace WebsitePanel.EnterpriseServer
                                         ServerController.AddServiceDNSRecords(domain.PackageId, ResourceGroups.MySql5, domain, "");
                                         ServerController.AddServiceDNSRecords(domain.PackageId, ResourceGroups.Statistics, domain, "");
                                         ServerController.AddServiceDNSRecords(domain.PackageId, ResourceGroups.VPS, domain, "");
+                                        ServerController.AddServiceDNSRecords(domain.PackageId, ResourceGroups.VPS2012, domain, "");
                                         ServerController.AddServiceDNSRecords(domain.PackageId, ResourceGroups.VPSForPC, domain, "");
                                         ServerController.AddServiceDNSRecords(domain.PackageId, ResourceGroups.Dns, domain, "");
                                         break;
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SharePoint/HostedSharePointServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SharePoint/HostedSharePointServerController.cs
index 3915a855..6dfe1bd3 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SharePoint/HostedSharePointServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SharePoint/HostedSharePointServerController.cs
@@ -58,18 +58,18 @@ namespace WebsitePanel.EnterpriseServer.Code.SharePoint
         /// <param name="startRow">Row index to start from.</param>
         /// <param name="maximumRows">Maximum number of rows to retrieve.</param>
         /// <returns>Site collections that match.</returns>
-        public static SharePointSiteCollectionListPaged GetSiteCollectionsPaged(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, string groupName = null)
+        public static SharePointSiteCollectionListPaged GetSiteCollectionsPaged(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
         {
             if (IsDemoMode)
             {
                 SharePointSiteCollectionListPaged demoResult = new SharePointSiteCollectionListPaged();
-                demoResult.SiteCollections = GetSiteCollections(1, false, null);
+                demoResult.SiteCollections = GetSiteCollections(1, false);
                 demoResult.TotalRowCount = demoResult.SiteCollections.Count;
                 return demoResult;
             }
 
             SharePointSiteCollectionListPaged paged = new SharePointSiteCollectionListPaged();
-            DataSet result = PackageController.GetRawPackageItemsPaged(packageId, groupName, typeof(SharePointSiteCollection),
+            DataSet result = PackageController.GetRawPackageItemsPaged(packageId,  ResourceGroups.SharepointFoundationServer, typeof(SharePointSiteCollection),
                 true, filterColumn, filterValue, sortColumn, startRow, Int32.MaxValue);
             List<SharePointSiteCollection> items = PackageController.CreateServiceItemsList(result, 1).ConvertAll<SharePointSiteCollection>(delegate(ServiceProviderItem item) { return (SharePointSiteCollection)item; });
 
@@ -149,9 +149,8 @@ namespace WebsitePanel.EnterpriseServer.Code.SharePoint
         /// </summary>
         /// <param name="packageId">Package that owns site collections.</param>
         /// <param name="recursive">A value which shows whether nested spaces must be searched as well.</param>
-        /// <param name="groupName">Resource group name.</param>
         /// <returns>List of found site collections.</returns>
-        public static List<SharePointSiteCollection> GetSiteCollections(int packageId, bool recursive, string groupName)
+        public static List<SharePointSiteCollection> GetSiteCollections(int packageId, bool recursive)
         {
             if (IsDemoMode)
             {
@@ -184,7 +183,7 @@ namespace WebsitePanel.EnterpriseServer.Code.SharePoint
             }
 
 
-            List<ServiceProviderItem> items = PackageController.GetPackageItemsByType(packageId, groupName, typeof(SharePointSiteCollection), recursive);
+            List<ServiceProviderItem> items = PackageController.GetPackageItemsByType(packageId, typeof(SharePointSiteCollection), recursive);
             return items.ConvertAll<SharePointSiteCollection>(delegate(ServiceProviderItem item) { return (SharePointSiteCollection)item; });
         }
 
@@ -197,7 +196,7 @@ namespace WebsitePanel.EnterpriseServer.Code.SharePoint
         {
             if (IsDemoMode)
             {
-                return GetSiteCollections(1, false, null)[itemId - 1];
+                return GetSiteCollections(1, false)[itemId - 1];
             }
 
             SharePointSiteCollection item = PackageController.GetPackageItem(itemId) as SharePointSiteCollection;
@@ -208,9 +207,8 @@ namespace WebsitePanel.EnterpriseServer.Code.SharePoint
         /// Adds SharePoint site collection.
         /// </summary>
         /// <param name="item">Site collection description.</param>
-        /// <param name="groupName">Resource group name.</param>
         /// <returns>Created site collection id within metabase.</returns>
-        public static int AddSiteCollection(SharePointSiteCollection item, string groupName)
+        public static int AddSiteCollection(SharePointSiteCollection item)
         {
 
             // Check account.
@@ -238,7 +236,7 @@ namespace WebsitePanel.EnterpriseServer.Code.SharePoint
             }
 
             // Check if stats resource is available
-            int serviceId = PackageController.GetPackageServiceId(item.PackageId, groupName);
+            int serviceId = PackageController.GetPackageServiceId(item.PackageId, ResourceGroups.SharepointFoundationServer);
 
             if (serviceId == 0)
             {
@@ -276,7 +274,7 @@ namespace WebsitePanel.EnterpriseServer.Code.SharePoint
                 item.Name = String.Format("{0}://{1}", rootWebApplicationUri.Scheme, hostNameBase + "-" + counter.ToString() + "." + sslRoot);
                 siteName = String.Format("{0}", hostNameBase + "-" + counter.ToString() + "." + sslRoot);                
 
-                while (CheckServiceItemExists(item.Name, item.PackageId))
+                while  ( DataProvider. CheckServiceItemExists( serviceId,   item. Name,   "WebsitePanel.Providers.SharePoint.SharePointSiteCollection,   WebsitePanel.Providers.Base"))  
                 {
                     counter++;
                     item.Name = String.Format("{0}://{1}", rootWebApplicationUri.Scheme, hostNameBase + "-" + counter.ToString() + "." + sslRoot);
@@ -306,7 +304,7 @@ namespace WebsitePanel.EnterpriseServer.Code.SharePoint
 
 
             // Check package item with given name already exists.
-            if (PackageController.GetPackageItemByName(item.PackageId, groupName, item.Name, typeof(SharePointSiteCollection)) != null)
+            if (PackageController.GetPackageItemByName(item.PackageId,  item.Name, typeof(SharePointSiteCollection)) != null)
             {
                 return BusinessErrorCodes.ERROR_SHAREPOINT_PACKAGE_ITEM_EXISTS;
             }
@@ -1016,16 +1014,5 @@ namespace WebsitePanel.EnterpriseServer.Code.SharePoint
             }
         }
 
-        private static bool CheckServiceItemExists(string name, int packageId)
-        {
-            bool exists = PackageController.GetPackageItemByName(packageId, ResourceGroups.SharepointFoundationServer, name, typeof(SharePointSiteCollection)) != null;
-
-            if (!exists)
-            {
-                exists = PackageController.GetPackageItemByName(packageId, ResourceGroups.SharepointServer, name, typeof(SharePointSiteCollection)) != null;
-            }
-
-            return exists;
-        }
-    }
+     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SharePoint/HostedSharePointServerEntController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SharePoint/HostedSharePointServerEntController.cs
new file mode 100644
index 00000000..c15bcb58
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/SharePoint/HostedSharePointServerEntController.cs
@@ -0,0 +1,1018 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Data;
+using System.IO;
+using System.Xml;
+using System.Xml.Serialization;
+using WebsitePanel.Providers;
+using WebsitePanel.Providers.DNS;
+using WebsitePanel.Providers.HostedSolution;
+using WebsitePanel.Providers.SharePoint;
+
+namespace WebsitePanel.EnterpriseServer.Code.SharePoint
+{
+    /// <summary>
+    /// Exposes handful API on hosted SharePoint site collections management.
+    /// </summary>
+    public class HostedSharePointServerEntController : IImportController, IBackupController
+    {
+        private const int FILE_BUFFER_LENGTH = 5000000; // ~5MB
+
+        /// <summary>
+        /// Gets site collections in raw form.
+        /// </summary>
+        /// <param name="packageId">Package to which desired site collections belong.</param>
+        /// <param name="organizationId">Organization to which desired site collections belong.</param>
+        /// <param name="filterColumn">Filter column name.</param>
+        /// <param name="filterValue">Filter value.</param>
+        /// <param name="sortColumn">Sort column name.</param>
+        /// <param name="startRow">Row index to start from.</param>
+        /// <param name="maximumRows">Maximum number of rows to retrieve.</param>
+        /// <returns>Site collections that match.</returns>
+        public static SharePointEnterpriseSiteCollectionListPaged GetSiteCollectionsPaged(int packageId, int organizationId, string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
+        {
+            if (IsDemoMode)
+            {
+                SharePointEnterpriseSiteCollectionListPaged demoResult = new SharePointEnterpriseSiteCollectionListPaged();
+                demoResult.SiteCollections = GetSiteCollections(1, false);
+                demoResult.TotalRowCount = demoResult.SiteCollections.Count;
+                return demoResult;
+            }
+
+            SharePointEnterpriseSiteCollectionListPaged paged = new SharePointEnterpriseSiteCollectionListPaged();
+            DataSet result = PackageController.GetRawPackageItemsPaged(packageId, ResourceGroups.SharepointEnterpriseServer, typeof(SharePointEnterpriseSiteCollection),
+                true, filterColumn, filterValue, sortColumn, startRow, Int32.MaxValue);
+            List<SharePointEnterpriseSiteCollection> items = PackageController.CreateServiceItemsList(result, 1).ConvertAll<SharePointEnterpriseSiteCollection>(delegate(ServiceProviderItem item) { return (SharePointEnterpriseSiteCollection)item; });
+
+            if (organizationId > 0)
+            {
+                items = items.FindAll(delegate(SharePointEnterpriseSiteCollection siteCollection) { return siteCollection.OrganizationId == organizationId; });
+            }
+            paged.TotalRowCount = items.Count;
+
+            if (items.Count > maximumRows)
+            {
+                items.RemoveRange(maximumRows, items.Count - maximumRows);
+            }
+
+            paged.SiteCollections = items;
+
+            return paged;
+        }
+
+        public static List<SharePointEnterpriseSiteCollection> GetSiteCollections(int organizationId)
+        {
+            Organization org = OrganizationController.GetOrganization(organizationId);
+
+            List<ServiceProviderItem> items = PackageController.GetPackageItemsByType(org.PackageId, typeof(SharePointEnterpriseSiteCollection), false);
+            items.ConvertAll<SharePointEnterpriseSiteCollection>(delegate(ServiceProviderItem item) { return (SharePointEnterpriseSiteCollection)item; });
+            List<SharePointEnterpriseSiteCollection> ret = new List<SharePointEnterpriseSiteCollection>();
+            foreach (ServiceProviderItem item in items)
+            {
+                SharePointEnterpriseSiteCollection siteCollection = item as SharePointEnterpriseSiteCollection;
+                if (siteCollection != null && siteCollection.OrganizationId == organizationId)
+                {
+                    ret.Add(siteCollection);
+                }
+            }
+
+            return ret;
+        }
+
+        /// <summary>
+        /// Gets list of supported languages by this installation of SharePoint.
+        /// </summary>
+        /// <returns>List of supported languages</returns>
+        public static int[] GetSupportedLanguages(int packageId)
+        {
+            if (IsDemoMode)
+            {
+                return new int[] { 1033 };
+            }
+
+            // Log operation.
+            TaskManager.StartTask("HOSTED_SHAREPOINT_ENTERPRISE", "GET_LANGUAGES");
+
+            int serviceId = PackageController.GetPackageServiceId(packageId, ResourceGroups.SharepointEnterpriseServer);
+            if (serviceId == 0)
+            {
+                return new int[] { };
+            }
+
+            try
+            {
+                // Create site collection on server.
+                HostedSharePointServerEnt hostedSharePointServer = GetHostedSharePointServer(serviceId);
+                return hostedSharePointServer.Enterprise_GetSupportedLanguages();
+            }
+            catch (Exception ex)
+            {
+                throw TaskManager.WriteError(ex);
+            }
+            finally
+            {
+                TaskManager.CompleteTask();
+            }
+        }
+
+        /// <summary>
+        ///  Gets list of SharePoint site collections that belong to the package.
+        /// </summary>
+        /// <param name="packageId">Package that owns site collections.</param>
+        /// <param name="recursive">A value which shows whether nested spaces must be searched as well.</param>
+        /// <returns>List of found site collections.</returns>
+        public static List<SharePointEnterpriseSiteCollection> GetSiteCollections(int packageId, bool recursive)
+        {
+            if (IsDemoMode)
+            {
+                List<SharePointEnterpriseSiteCollection> demoResult = new List<SharePointEnterpriseSiteCollection>();
+                SharePointEnterpriseSiteCollection siteCollection1 = new SharePointEnterpriseSiteCollection();
+                siteCollection1.Id = 1;
+                siteCollection1.OrganizationId = 1;
+                siteCollection1.LocaleId = 1033;
+                siteCollection1.Name = "http://john.fabrikam.com";
+                siteCollection1.OwnerEmail = "john@fabrikam.com";
+                siteCollection1.OwnerLogin = "john@fabrikam.com";
+                siteCollection1.OwnerName = "John Smith";
+                siteCollection1.PhysicalAddress = "http://john.fabrikam.com";
+                siteCollection1.Title = "John Smith's Team Site";
+                siteCollection1.Url = "http://john.fabrikam.com";
+                demoResult.Add(siteCollection1);
+                SharePointEnterpriseSiteCollection siteCollection2 = new SharePointEnterpriseSiteCollection();
+                siteCollection2.Id = 2;
+                siteCollection1.OrganizationId = 1;
+                siteCollection2.LocaleId = 1033;
+                siteCollection2.Name = "http://mark.contoso.com";
+                siteCollection2.OwnerEmail = "mark@contoso.com";
+                siteCollection2.OwnerLogin = "mark@contoso.com";
+                siteCollection2.OwnerName = "Mark Jonsons";
+                siteCollection2.PhysicalAddress = "http://mark.contoso.com";
+                siteCollection2.Title = "Mark Jonsons' Blog";
+                siteCollection2.Url = "http://mark.contoso.com";
+                demoResult.Add(siteCollection2);
+                return demoResult;
+            }
+
+
+            List<ServiceProviderItem> items = PackageController.GetPackageItemsByType(packageId,  typeof(SharePointEnterpriseSiteCollection), recursive);
+            return items.ConvertAll<SharePointEnterpriseSiteCollection>(delegate(ServiceProviderItem item) { return (SharePointEnterpriseSiteCollection)item; });
+        }
+
+        /// <summary>
+        /// Gets SharePoint site collection with given id.
+        /// </summary>
+        /// <param name="itemId">Site collection id within metabase.</param>
+        /// <returns>Site collection or null in case no such item exist.</returns>
+        public static SharePointEnterpriseSiteCollection GetSiteCollection(int itemId)
+        {
+            if (IsDemoMode)
+            {
+                return GetSiteCollections(1, false)[itemId - 1];
+            }
+
+            SharePointEnterpriseSiteCollection item = PackageController.GetPackageItem(itemId) as SharePointEnterpriseSiteCollection;
+            return item;
+        }
+
+        /// <summary>
+        /// Adds SharePoint site collection.
+        /// </summary>
+        /// <param name="item">Site collection description.</param>
+        /// <returns>Created site collection id within metabase.</returns>
+        public static int AddSiteCollection(SharePointEnterpriseSiteCollection item)
+        {
+
+            // Check account.
+            int accountCheck = SecurityContext.CheckAccount(DemandAccount.NotDemo | DemandAccount.IsActive);
+            if (accountCheck < 0)
+            {
+                return accountCheck;
+            }
+
+            // Check package.
+            int packageCheck = SecurityContext.CheckPackage(item.PackageId, DemandPackage.IsActive);
+            if (packageCheck < 0)
+            {
+                return packageCheck;
+            }
+
+            // Check quota.
+            OrganizationStatistics orgStats = OrganizationController.GetOrganizationStatistics(item.OrganizationId);
+            //QuotaValueInfo quota = PackageController.GetPackageQuota(item.PackageId, Quotas.HOSTED_SHAREPOINT_SITES);
+
+            if (orgStats.AllocatedSharePointEnterpriseSiteCollections > -1
+                && orgStats.CreatedSharePointEnterpriseSiteCollections >= orgStats.AllocatedSharePointEnterpriseSiteCollections)
+            {
+                return BusinessErrorCodes.ERROR_SHAREPOINT_RESOURCE_QUOTA_LIMIT;
+            }
+
+            // Check if stats resource is available
+            int serviceId = PackageController.GetPackageServiceId(item.PackageId, ResourceGroups.SharepointEnterpriseServer);
+
+            if (serviceId == 0)
+            {
+                return BusinessErrorCodes.ERROR_SHAREPOINT_RESOURCE_UNAVAILABLE;
+            }
+
+            StringDictionary hostedSharePointSettings = ServerController.GetServiceSettings(serviceId);
+            QuotaValueInfo quota = PackageController.GetPackageQuota(item.PackageId, Quotas.HOSTED_SHAREPOINT_ENTERPRISE_USESHAREDSSL);
+            Uri rootWebApplicationUri = new Uri(hostedSharePointSettings["RootWebApplicationUri"]);
+            Organization org = OrganizationController.GetOrganization(item.OrganizationId);
+            string siteName = item.Name;
+
+            if (quota.QuotaAllocatedValue == 1)
+            {
+                string sslRoot = hostedSharePointSettings["SharedSSLRoot"];
+
+
+                string defaultDomain = org.DefaultDomain;
+                string hostNameBase = string.Empty;
+
+                string[] tmp = defaultDomain.Split('.');
+                if (tmp.Length == 2)
+                {
+                    hostNameBase = tmp[0];
+                }
+                else
+                {
+                    if (tmp.Length > 2)
+                    {
+                        hostNameBase = tmp[0] + tmp[1];
+                    }
+                }
+
+                int counter = 0;
+                item.Name = String.Format("{0}://{1}", rootWebApplicationUri.Scheme, hostNameBase + "-" + counter.ToString() + "." + sslRoot);
+                siteName = String.Format("{0}", hostNameBase + "-" + counter.ToString() + "." + sslRoot);
+
+                while (DataProvider.CheckServiceItemExists(serviceId, item.Name, "WebsitePanel.Providers.SharePoint.SharePointEnterpriseSiteCollection,   WebsitePanel.Providers.Base")) 
+                {
+                    counter++;
+                    item.Name = String.Format("{0}://{1}", rootWebApplicationUri.Scheme, hostNameBase + "-" + counter.ToString() + "." + sslRoot);
+                    siteName = String.Format("{0}", hostNameBase + "-" + counter.ToString() + "." + sslRoot);
+                }
+            }
+            else
+                item.Name = String.Format("{0}://{1}", rootWebApplicationUri.Scheme, item.Name);
+
+            if (rootWebApplicationUri.Port > 0 && rootWebApplicationUri.Port != 80 && rootWebApplicationUri.Port != 443)
+            {
+                item.PhysicalAddress = String.Format("{0}:{1}", item.Name, rootWebApplicationUri.Port);
+            }
+            else
+            {
+                item.PhysicalAddress = item.Name;
+            }
+
+            if (Utils.ParseBool(hostedSharePointSettings["LocalHostFile"], false))
+            {
+                item.RootWebApplicationInteralIpAddress = hostedSharePointSettings["RootWebApplicationInteralIpAddress"];
+                item.RootWebApplicationFQDN = item.Name.Replace(rootWebApplicationUri.Scheme + "://", "");
+            }
+
+            item.MaxSiteStorage = RecalculateMaxSize(org.MaxSharePointEnterpriseStorage, (int)item.MaxSiteStorage);
+            item.WarningStorage = item.MaxSiteStorage == -1 ? -1 : Math.Min((int)item.WarningStorage, item.MaxSiteStorage);
+
+
+            // Check package item with given name already exists.
+            if (PackageController.GetPackageItemByName(item.PackageId, item.Name, typeof(SharePointEnterpriseSiteCollection)) != null)
+            {
+                return BusinessErrorCodes.ERROR_SHAREPOINT_PACKAGE_ITEM_EXISTS;
+            }
+
+            // Log operation.
+            TaskManager.StartTask("HOSTED_SHAREPOINT_ENTERPRISE", "ADD_SITE_COLLECTION", item.Name);
+
+            try
+            {
+                // Create site collection on server.
+                HostedSharePointServerEnt hostedSharePointServer = GetHostedSharePointServer(serviceId);
+
+                hostedSharePointServer.Enterprise_CreateSiteCollection(item);
+
+                // Make record in metabase.
+                item.ServiceId = serviceId;
+                int itemId = PackageController.AddPackageItem(item);
+
+                hostedSharePointServer.Enterprise_SetPeoplePickerOu(item.Name, org.DistinguishedName);
+
+                int dnsServiceId = PackageController.GetPackageServiceId(item.PackageId, ResourceGroups.Dns);
+                if (dnsServiceId > 0)
+                {
+                    string[] tmpStr = siteName.Split('.');
+                    string hostName = tmpStr[0];
+                    string domainName = siteName.Substring(hostName.Length + 1, siteName.Length - (hostName.Length + 1));
+
+                    List<GlobalDnsRecord> dnsRecords = ServerController.GetDnsRecordsByService(serviceId);
+                    List<DnsRecord> resourceRecords = DnsServerController.BuildDnsResourceRecords(dnsRecords, hostName, domainName, "");
+                    DNSServer dns = new DNSServer();
+
+                    ServiceProviderProxy.Init(dns, dnsServiceId);
+                    // add new resource records
+                    dns.AddZoneRecords(domainName, resourceRecords.ToArray());
+                }
+
+                TaskManager.ItemId = itemId;
+
+                return itemId;
+            }
+            catch (Exception ex)
+            {
+                throw TaskManager.WriteError(ex);
+            }
+            finally
+            {
+                TaskManager.CompleteTask();
+            }
+        }
+
+        /// <summary>
+        /// Deletes SharePoint site collection with given id.
+        /// </summary>
+        /// <param name="itemId">Site collection id within metabase.</param>
+        /// <returns>?</returns>
+        public static int DeleteSiteCollection(int itemId)
+        {
+            // Check account.
+            int accountCheck = SecurityContext.CheckAccount(DemandAccount.NotDemo | DemandAccount.IsActive);
+            if (accountCheck < 0)
+            {
+                return accountCheck;
+            }
+
+            // Load original meta item
+            SharePointEnterpriseSiteCollection origItem = (SharePointEnterpriseSiteCollection)PackageController.GetPackageItem(itemId);
+            if (origItem == null)
+            {
+                return BusinessErrorCodes.ERROR_SHAREPOINT_PACKAGE_ITEM_NOT_FOUND;
+            }
+
+            // Get service settings.
+            StringDictionary hostedSharePointSettings = ServerController.GetServiceSettings(origItem.ServiceId);
+            Uri rootWebApplicationUri = new Uri(hostedSharePointSettings["RootWebApplicationUri"]);
+            string siteName = origItem.Name.Replace(String.Format("{0}://", rootWebApplicationUri.Scheme), String.Empty);
+
+            // Log operation.
+            TaskManager.StartTask("HOSTED_SHAREPOINT_ENTERPRISE", "DELETE_SITE", origItem.Name, itemId);
+
+            try
+            {
+                // Delete site collection on server.
+                HostedSharePointServerEnt hostedSharePointServer = GetHostedSharePointServer(origItem.ServiceId);
+                hostedSharePointServer.Enterprise_DeleteSiteCollection(origItem);
+                // Delete record in metabase.
+                PackageController.DeletePackageItem(origItem.Id);
+
+                int dnsServiceId = PackageController.GetPackageServiceId(origItem.PackageId, ResourceGroups.Dns);
+                if (dnsServiceId > 0)
+                {
+                    string[] tmpStr = siteName.Split('.');
+                    string hostName = tmpStr[0];
+                    string domainName = siteName.Substring(hostName.Length + 1, siteName.Length - (hostName.Length + 1));
+
+                    List<GlobalDnsRecord> dnsRecords = ServerController.GetDnsRecordsByService(origItem.ServiceId);
+                    List<DnsRecord> resourceRecords = DnsServerController.BuildDnsResourceRecords(dnsRecords, hostName, domainName, "");
+                    DNSServer dns = new DNSServer();
+
+                    ServiceProviderProxy.Init(dns, dnsServiceId);
+                    // add new resource records
+                    dns.DeleteZoneRecords(domainName, resourceRecords.ToArray());
+                }
+
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                throw TaskManager.WriteError(ex);
+            }
+            finally
+            {
+                TaskManager.CompleteTask();
+            }
+        }
+
+        /// <summary>
+        /// Deletes SharePoint site collections which belong to organization.
+        /// </summary>
+        /// <param name="organizationId">Site collection id within metabase.</param>
+        public static void DeleteSiteCollections(int organizationId)
+        {
+            Organization org = OrganizationController.GetOrganization(organizationId);
+            SharePointEnterpriseSiteCollectionListPaged existentSiteCollections = GetSiteCollectionsPaged(org.PackageId, org.Id, String.Empty, String.Empty, String.Empty, 0, Int32.MaxValue);
+            foreach (SharePointEnterpriseSiteCollection existentSiteCollection in existentSiteCollections.SiteCollections)
+            {
+                DeleteSiteCollection(existentSiteCollection.Id);
+            }
+        }
+
+        /// <summary>
+        /// Backups SharePoint site collection.
+        /// </summary>
+        /// <param name="itemId">Site collection id within metabase.</param>
+        /// <param name="fileName">Backed up site collection file name.</param>
+        /// <param name="zipBackup">A value which shows whether back up must be archived.</param>
+        /// <param name="download">A value which shows whether created back up must be downloaded.</param>
+        /// <param name="folderName">Local folder to store downloaded backup.</param>
+        /// <returns>Created backup file name. </returns>
+        public static string BackupSiteCollection(int itemId, string fileName, bool zipBackup, bool download, string folderName)
+        {
+            // Check account.
+            int accountCheck = SecurityContext.CheckAccount(DemandAccount.NotDemo | DemandAccount.IsActive);
+            if (accountCheck < 0)
+            {
+                return null;
+            }
+
+            // Load original meta item
+            SharePointEnterpriseSiteCollection origItem = (SharePointEnterpriseSiteCollection)PackageController.GetPackageItem(itemId);
+            if (origItem == null)
+            {
+                return null;
+            }
+
+            // Log operation.
+            TaskManager.StartTask("HOSTED_SHAREPOINT_ENTERPRISE", "BACKUP_SITE_COLLECTION", origItem.Name, itemId);
+
+            try
+            {
+                // Create site collection on server.
+                HostedSharePointServerEnt hostedSharePointServer = GetHostedSharePointServer(origItem.ServiceId);
+                string backFile = hostedSharePointServer.Enterprise_BackupSiteCollection(origItem.Name, fileName, zipBackup);
+
+                if (!download)
+                {
+                    // Copy backup files to space folder.
+                    string relFolderName = FilesController.CorrectRelativePath(folderName);
+                    if (!relFolderName.EndsWith("\\"))
+                    {
+                        relFolderName = relFolderName + "\\";
+                    }
+
+                    // Create backup folder if not exists
+                    if (!FilesController.DirectoryExists(origItem.PackageId, relFolderName))
+                    {
+                        FilesController.CreateFolder(origItem.PackageId, relFolderName);
+                    }
+
+                    string packageFile = relFolderName + Path.GetFileName(backFile);
+
+                    // Delete destination file if exists
+                    if (FilesController.FileExists(origItem.PackageId, packageFile))
+                    {
+                        FilesController.DeleteFiles(origItem.PackageId, new string[] { packageFile });
+                    }
+
+                    byte[] buffer = null;
+
+                    int offset = 0;
+                    do
+                    {
+                        // Read remote content.
+                        buffer = hostedSharePointServer.Enterprise_GetTempFileBinaryChunk(backFile, offset, FILE_BUFFER_LENGTH);
+
+                        // Write remote content.
+                        FilesController.AppendFileBinaryChunk(origItem.PackageId, packageFile, buffer);
+
+                        offset += FILE_BUFFER_LENGTH;
+                    }
+                    while (buffer.Length == FILE_BUFFER_LENGTH);
+                }
+
+                return backFile;
+            }
+            catch (Exception ex)
+            {
+                throw TaskManager.WriteError(ex);
+            }
+            finally
+            {
+                TaskManager.CompleteTask();
+            }
+        }
+
+        /// <summary>
+        /// Restores SharePoint site collection.
+        /// </summary>
+        /// <param name="itemId">Site collection id within metabase.</param>
+        /// <param name="uploadedFile"></param>
+        /// <param name="packageFile"></param>
+        /// <returns></returns>
+        public static int RestoreSiteCollection(int itemId, string uploadedFile, string packageFile)
+        {
+            // Check account.
+            int accountCheck = SecurityContext.CheckAccount(DemandAccount.NotDemo | DemandAccount.IsActive);
+            if (accountCheck < 0)
+            {
+                return accountCheck;
+            }
+
+            // Load original meta item.
+            SharePointEnterpriseSiteCollection origItem = (SharePointEnterpriseSiteCollection)PackageController.GetPackageItem(itemId);
+            if (origItem == null)
+            {
+                return BusinessErrorCodes.ERROR_SHAREPOINT_PACKAGE_ITEM_NOT_FOUND;
+            }
+
+            // Check package.
+            int packageCheck = SecurityContext.CheckPackage(origItem.PackageId, DemandPackage.IsActive);
+            if (packageCheck < 0)
+            {
+                return packageCheck;
+            }
+
+            // Log operation.
+            TaskManager.StartTask("HOSTED_SHAREPOINT_ENTERPRISE", "BACKUP_SITE_COLLECTION", origItem.Name, itemId);
+
+            try
+            {
+                // Create site collection on server.
+                HostedSharePointServerEnt hostedSharePointServer = GetHostedSharePointServer(origItem.ServiceId);
+
+                string backupFile = null;
+                if (!String.IsNullOrEmpty(packageFile))
+                {
+                    // Copy package files to the remote SharePoint Server.
+                    string path = null;
+                    byte[] buffer = null;
+
+                    int offset = 0;
+                    do
+                    {
+                        // Read package file.
+                        buffer = FilesController.GetFileBinaryChunk(origItem.PackageId, packageFile, offset, FILE_BUFFER_LENGTH);
+
+                        // Write remote backup file
+                        string tempPath = hostedSharePointServer.Enterprise_AppendTempFileBinaryChunk(Path.GetFileName(packageFile), path, buffer);
+                        if (path == null)
+                        {
+                            path = tempPath;
+                            backupFile = path;
+                        }
+
+                        offset += FILE_BUFFER_LENGTH;
+                    }
+                    while (buffer.Length == FILE_BUFFER_LENGTH);
+                }
+                else if (!String.IsNullOrEmpty(uploadedFile))
+                {
+                    // Upladed files.
+                    backupFile = uploadedFile;
+                }
+
+                // Restore.
+                if (!String.IsNullOrEmpty(backupFile))
+                {
+                    hostedSharePointServer.Enterprise_RestoreSiteCollection(origItem, backupFile);
+                }
+
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                throw TaskManager.WriteError(ex);
+            }
+            finally
+            {
+                TaskManager.CompleteTask();
+            }
+        }
+
+        /// <summary>
+        /// Gets binary data chunk of specified size from specified offset.
+        /// </summary>
+        /// <param name="itemId">Item id to obtain realted service id.</param>
+        /// <param name="path">Path to file to get bunary data chunk from.</param>
+        /// <param name="offset">Offset from which to start data reading.</param>
+        /// <param name="length">Binary data chunk length.</param>
+        /// <returns>Binary data chunk read from file.</returns>
+        public static byte[] GetBackupBinaryChunk(int itemId, string path, int offset, int length)
+        {
+            // Load original meta item.
+            SharePointEnterpriseSiteCollection item = (SharePointEnterpriseSiteCollection)PackageController.GetPackageItem(itemId);
+            if (item == null)
+            {
+                return null;
+            }
+
+            HostedSharePointServerEnt hostedSharePointServer = GetHostedSharePointServer(item.ServiceId);
+            return hostedSharePointServer.Enterprise_GetTempFileBinaryChunk(path, offset, length);
+        }
+
+        /// <summary>
+        /// Appends supplied binary data chunk to file.
+        /// </summary>
+        /// <param name="itemId">Item id to obtain realted service id.</param>
+        /// <param name="fileName">Non existent file name to append to.</param>
+        /// <param name="path">Full path to existent file to append to.</param>
+        /// <param name="chunk">Binary data chunk to append to.</param>
+        /// <returns>Path to file that was appended with chunk.</returns>
+        public static string AppendBackupBinaryChunk(int itemId, string fileName, string path, byte[] chunk)
+        {
+            // Load original meta item.
+            SharePointEnterpriseSiteCollection item = (SharePointEnterpriseSiteCollection)PackageController.GetPackageItem(itemId);
+            if (item == null)
+            {
+                return null;
+            }
+
+            HostedSharePointServerEnt hostedSharePointServer = GetHostedSharePointServer(item.ServiceId);
+            return hostedSharePointServer.Enterprise_AppendTempFileBinaryChunk(fileName, path, chunk);
+        }
+
+        /// <summary>
+        /// Initializes a new hosted SharePoint server proxy.
+        ///  </summary>
+        /// <param name="serviceId">Hosted SharePoint service id.</param>
+        /// <returns>Hosted SharePoint server proxy.</returns>
+        private static HostedSharePointServerEnt GetHostedSharePointServer(int serviceId)
+        {
+
+            HostedSharePointServerEnt sps = new HostedSharePointServerEnt();
+            ServiceProviderProxy.Init(sps, serviceId);
+            return sps;
+        }
+
+        /// <summary>
+        /// Gets list of importable items.
+        /// </summary>
+        /// <param name="packageId">Package that owns importable items.</param>
+        /// <param name="itemTypeId">Item type id.</param>
+        /// <param name="itemType">Item type.</param>
+        /// <param name="group">Item resource group.</param>
+        /// <returns>List of importable item names.</returns>
+        public List<string> GetImportableItems(int packageId, int itemTypeId, Type itemType, ResourceGroupInfo group)
+        {
+            List<string> items = new List<string>();
+
+            // Get service id
+            int serviceId = PackageController.GetPackageServiceId(packageId, group.GroupName);
+            if (serviceId == 0)
+            {
+                return items;
+            }
+
+            HostedSharePointServerEnt hostedSharePointServer = GetHostedSharePointServer(serviceId);
+            if (itemType == typeof(SharePointEnterpriseSiteCollection))
+            {
+                foreach (SharePointEnterpriseSiteCollection siteCollection in hostedSharePointServer.Enterprise_GetSiteCollections())
+                {
+                    items.Add(siteCollection.Url);
+                }
+            }
+
+            return items;
+        }
+
+        /// <summary>
+        /// Imports selected item into metabase.
+        /// </summary>
+        /// <param name="packageId">Package to which items must be imported.</param>
+        /// <param name="itemTypeId">Item type id.</param>
+        /// <param name="itemType">Item type.</param>
+        /// <param name="group">Item resource group.</param>
+        /// <param name="itemName">Item name to import.</param>
+        public void ImportItem(int packageId, int itemTypeId, Type itemType, ResourceGroupInfo group, string itemName)
+        {
+            // Get service id
+            int serviceId = PackageController.GetPackageServiceId(packageId, group.GroupName);
+            if (serviceId == 0)
+            {
+                return;
+            }
+
+            HostedSharePointServerEnt hostedSharePointServer = GetHostedSharePointServer(serviceId);
+            if (itemType == typeof(SharePointEnterpriseSiteCollection))
+            {
+                SharePointEnterpriseSiteCollection siteCollection = hostedSharePointServer.Enterprise_GetSiteCollection(itemName);
+                PackageController.AddPackageItem(siteCollection);
+            }
+        }
+
+        /// <summary>
+        /// Backups service item by serializing it into supplied writer.
+        /// </summary>
+        /// <param name="tempFolder">Temporary directory path.</param>
+        /// <param name="writer">Xml wirter used to store backuped service provider items.</param>
+        /// <param name="item">Service provider item to be backed up..</param>
+        /// <param name="group">Service provider resource group.</param>
+        /// <returns>Resulting code.</returns>
+        public int BackupItem(string tempFolder, XmlWriter writer, ServiceProviderItem item, ResourceGroupInfo group)
+        {
+            SharePointEnterpriseSiteCollection siteCollection = item as SharePointEnterpriseSiteCollection;
+            if (siteCollection != null)
+            {
+                HostedSharePointServerEnt hostedSharePointServer = GetHostedSharePointServer(siteCollection.ServiceId);
+                SharePointEnterpriseSiteCollection loadedSiteCollection = hostedSharePointServer.Enterprise_GetSiteCollection(siteCollection.Url);
+                // Update item
+                siteCollection.Url = loadedSiteCollection.Url;
+                siteCollection.OwnerLogin = loadedSiteCollection.OwnerLogin;
+                siteCollection.OwnerName = loadedSiteCollection.OwnerName;
+                siteCollection.OwnerEmail = loadedSiteCollection.OwnerEmail;
+                siteCollection.LocaleId = loadedSiteCollection.LocaleId;
+                siteCollection.Title = loadedSiteCollection.Title;
+                siteCollection.Description = loadedSiteCollection.Description;
+                // Serialize it.
+                XmlSerializer serializer = new XmlSerializer(typeof(SharePointEnterpriseSiteCollection));
+                serializer.Serialize(writer, siteCollection);
+
+            }
+            return 0;
+        }
+
+        /// <summary>
+        /// Restore backed up previously service provider item.
+        /// </summary>
+        /// <param name="tempFolder">Temporary directory path.</param>
+        /// <param name="itemNode">Serialized service provider item.</param>
+        /// <param name="itemId">Service provider item id.</param>
+        /// <param name="itemType">Service provider item type.</param>
+        /// <param name="itemName">Service provider item name.</param>
+        /// <param name="packageId">Service provider item package.</param>
+        /// <param name="serviceId">Service provider item service id.</param>
+        /// <param name="group">Service provider item resource group.</param>
+        /// <returns>Resulting code.</returns>
+        public int RestoreItem(string tempFolder, XmlNode itemNode, int itemId, Type itemType, string itemName, int packageId, int serviceId, ResourceGroupInfo group)
+        {
+            if (itemType == typeof(SharePointEnterpriseSiteCollection))
+            {
+                HostedSharePointServerEnt hostedSharePointServer = GetHostedSharePointServer(serviceId);
+                // Deserialize item.								                 
+                XmlSerializer serializer = new XmlSerializer(typeof(SharePointEnterpriseSiteCollection));
+                SharePointEnterpriseSiteCollection siteCollection = (SharePointEnterpriseSiteCollection)serializer.Deserialize(new XmlNodeReader(itemNode.SelectSingleNode("SharePointEnterpriseSiteCollection")));
+                siteCollection.PackageId = packageId;
+                siteCollection.ServiceId = serviceId;
+
+                // Create site collection if needed.
+                if (hostedSharePointServer.Enterprise_GetSiteCollection(siteCollection.Url) == null)
+                {
+                    hostedSharePointServer.Enterprise_CreateSiteCollection(siteCollection);
+                }
+
+                // Add metabase record if needed.
+                SharePointEnterpriseSiteCollection metaSiteCollection = (SharePointEnterpriseSiteCollection)PackageController.GetPackageItemByName(packageId, itemName, typeof(SharePointEnterpriseSiteCollection));
+                if (metaSiteCollection == null)
+                {
+                    PackageController.AddPackageItem(siteCollection);
+                }
+            }
+
+            return 0;
+        }
+
+
+        private static int GetHostedSharePointServiceId(int packageId)
+        {
+            return PackageController.GetPackageServiceId(packageId, ResourceGroups.SharepointEnterpriseServer);
+        }
+
+        private static List<SharePointEnterpriseSiteCollection> GetOrganizationSharePointEnterpriseSiteCollections(int orgId)
+        {
+            Organization org = OrganizationController.GetOrganization(orgId);
+
+            SharePointEnterpriseSiteCollectionListPaged siteCollections = GetSiteCollectionsPaged(org.PackageId, org.Id, String.Empty, String.Empty, String.Empty, 0, Int32.MaxValue);
+            return siteCollections.SiteCollections;
+        }
+
+        private static int RecalculateStorageMaxSize(int size, int packageId)
+        {
+            PackageContext cntx = PackageController.GetPackageContext(packageId);
+            QuotaValueInfo quota = cntx.Quotas[Quotas.HOSTED_SHAREPOINT_ENTERPRISE_STORAGE_SIZE];
+
+            if (quota.QuotaAllocatedValue == -1)
+            {
+                if (size == -1)//Unlimited 
+                    return -1;
+                else
+                    return size;
+            }
+            else
+            {
+                if (size == -1)
+                    return quota.QuotaAllocatedValue;
+
+                return Math.Min(size, quota.QuotaAllocatedValue);
+            }
+        }
+
+        private static int RecalculateMaxSize(int parentSize, int realSize)
+        {
+            if (parentSize == -1)
+            {
+                if (realSize == -1 || realSize == 0)
+                    return -1;
+                else
+                    return realSize;
+            }
+
+
+            if (realSize == -1 || realSize == 0)
+                return parentSize;
+
+            return Math.Min(parentSize, realSize);
+
+        }
+
+
+        public static int SetStorageSettings(int itemId, int maxStorage, int warningStorage, bool applyToSiteCollections)
+        {
+            // check account
+            int accountCheck = SecurityContext.CheckAccount(DemandAccount.NotDemo | DemandAccount.IsActive);
+            if (accountCheck < 0) return accountCheck;
+
+            // place log record
+            TaskManager.StartTask("HOSTED_SHAREPOINT_ENTERPRISE", "SET_ORG_LIMITS", itemId);
+
+            try
+            {
+                Organization org = (Organization)PackageController.GetPackageItem(itemId);
+                if (org == null)
+                    return 0;
+
+                // set limits
+                int realMaxSizeValue = RecalculateStorageMaxSize(maxStorage, org.PackageId);
+
+                org.MaxSharePointEnterpriseStorage = realMaxSizeValue;
+
+                org.WarningSharePointEnterpriseStorage = realMaxSizeValue == -1 ? -1 : Math.Min(warningStorage, realMaxSizeValue);
+
+                // save organization
+                UpdateOrganization(org);
+
+                if (applyToSiteCollections)
+                {
+                    int serviceId = GetHostedSharePointServiceId(org.PackageId);
+
+                    HostedSharePointServerEnt hostedSharePointServer = GetHostedSharePointServer(serviceId);
+
+                    List<SharePointEnterpriseSiteCollection> currentOrgSiteCollection =
+                        GetOrganizationSharePointEnterpriseSiteCollections(org.Id);
+
+
+                    foreach (SharePointEnterpriseSiteCollection siteCollection in currentOrgSiteCollection)
+                    {
+                        try
+                        {
+                            SharePointEnterpriseSiteCollection sc = GetSiteCollection(siteCollection.Id);
+                            sc.MaxSiteStorage = realMaxSizeValue;
+                            sc.WarningStorage = realMaxSizeValue == -1 ? -1 : warningStorage;
+                            PackageController.UpdatePackageItem(sc);
+
+                            hostedSharePointServer.Enterprise_UpdateQuotas(siteCollection.PhysicalAddress, realMaxSizeValue,
+                                                                warningStorage);
+                        }
+                        catch (Exception ex)
+                        {
+                            TaskManager.WriteError(ex);
+                        }
+                    }
+                }
+
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                throw TaskManager.WriteError(ex);
+            }
+            finally
+            {
+                TaskManager.CompleteTask();
+            }
+        }
+
+        public static SharePointSiteDiskSpace[] CalculateSharePointSitesDiskSpace(int itemId, out int errorCode)
+        {
+            SharePointSiteDiskSpace[] retDiskSpace = null;
+            errorCode = 0;
+            // check account
+            int accountCheck = SecurityContext.CheckAccount(DemandAccount.NotDemo | DemandAccount.IsActive);
+            if (accountCheck < 0)
+            {
+                errorCode = accountCheck;
+                return null;
+            }
+
+            // place log record
+            TaskManager.StartTask("HOSTED_SHAREPOINT_ENTERPRISE", "CALCULATE_DISK_SPACE", itemId);
+
+            try
+            {
+                Organization org = (Organization)PackageController.GetPackageItem(itemId);
+                if (org == null)
+                    return null;
+
+                int serviceId = GetHostedSharePointServiceId(org.PackageId);
+
+                HostedSharePointServerEnt hostedSharePointServer = GetHostedSharePointServer(serviceId);
+
+                List<SharePointEnterpriseSiteCollection> currentOrgSiteCollection =
+                    GetOrganizationSharePointEnterpriseSiteCollections(org.Id);
+
+                List<string> urls = new List<string>();
+                foreach (SharePointEnterpriseSiteCollection siteCollection in currentOrgSiteCollection)
+                {
+                    urls.Add(siteCollection.PhysicalAddress);
+                }
+                if (urls.Count > 0)
+                    retDiskSpace = hostedSharePointServer.Enterprise_CalculateSiteCollectionsDiskSpace(urls.ToArray());
+                else
+                {
+                    retDiskSpace = new SharePointSiteDiskSpace[1];
+                    retDiskSpace[0] = new SharePointSiteDiskSpace();
+                    retDiskSpace[0].DiskSpace = 0;
+                    retDiskSpace[0].Url = string.Empty;
+                }
+            }
+            catch (Exception ex)
+            {
+                throw TaskManager.WriteError(ex);
+            }
+            finally
+            {
+                TaskManager.CompleteTask();
+            }
+            return retDiskSpace;
+        }
+
+        private static void UpdateOrganization(Organization organization)
+        {
+            PackageController.UpdatePackageItem(organization);
+        }
+
+
+        public static void UpdateQuota(int itemId, int siteCollectionId, int maxStorage, int warningStorage)
+        {
+            TaskManager.StartTask("HOSTED_SHAREPOINT_ENTERPRISE", "UPDATE_QUOTA");
+            try
+            {
+                Organization org = (Organization)PackageController.GetPackageItem(itemId);
+                if (org == null)
+                    return;
+
+                int serviceId = GetHostedSharePointServiceId(org.PackageId);
+
+                HostedSharePointServerEnt hostedSharePointServer = GetHostedSharePointServer(serviceId);
+
+                SharePointEnterpriseSiteCollection sc = GetSiteCollection(siteCollectionId);
+
+                int maxSize = RecalculateMaxSize(org.MaxSharePointEnterpriseStorage, maxStorage);
+                int warningSize = warningStorage;
+
+
+                sc.MaxSiteStorage = maxSize;
+                sc.WarningStorage = maxSize == -1 ? -1 : Math.Min(warningSize, maxSize);
+                PackageController.UpdatePackageItem(sc);
+
+                hostedSharePointServer.Enterprise_UpdateQuotas(sc.PhysicalAddress, maxSize,
+                                                    warningStorage);
+            }
+            catch (Exception ex)
+            {
+                throw TaskManager.WriteError(ex);
+            }
+            finally
+            {
+                TaskManager.CompleteTask();
+            }
+        }
+        /// <summary>
+        /// Gets a value if caller is in demo mode.
+        /// </summary>
+        private static bool IsDemoMode
+        {
+            get
+            {
+                return (SecurityContext.CheckAccount(DemandAccount.NotDemo) < 0);
+            }
+        }
+
+     }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Virtualization/VirtualizationServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Virtualization/VirtualizationServerController.cs
index 254ff3e9..4dfe23b5 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Virtualization/VirtualizationServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Virtualization/VirtualizationServerController.cs
@@ -612,6 +612,7 @@ namespace WebsitePanel.EnterpriseServer
 
                 #region Setup External network
                 TaskManager.Write("VPS_CREATE_SETUP_EXTERNAL_NETWORK");
+                TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress 
 
                 try
                 {
@@ -644,6 +645,7 @@ namespace WebsitePanel.EnterpriseServer
 
                 #region Setup Management network
                 TaskManager.Write("VPS_CREATE_SETUP_MANAGEMENT_NETWORK");
+                TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress 
 
                 try
                 {
@@ -704,6 +706,7 @@ namespace WebsitePanel.EnterpriseServer
 
                 #region Setup Private network
                 TaskManager.Write("VPS_CREATE_SETUP_PRIVATE_NETWORK");
+                TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress 
 
                 try
                 {
@@ -759,6 +762,7 @@ namespace WebsitePanel.EnterpriseServer
                 TaskManager.Write("VPS_CREATE_CONVERT_VHD");
                 TaskManager.Write("VPS_CREATE_CONVERT_SOURCE_VHD", vm.OperatingSystemTemplatePath);
                 TaskManager.Write("VPS_CREATE_CONVERT_DEST_VHD", vm.VirtualHardDrivePath);
+                TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress 
                 try
                 {
                     // convert VHD
@@ -817,6 +821,7 @@ namespace WebsitePanel.EnterpriseServer
                 if (vm.HddSize > hddSizeGB)
                 {
                     TaskManager.Write("VPS_CREATE_EXPAND_VHD");
+                    TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress 
 
                     // expand VHD
                     try
@@ -958,6 +963,7 @@ namespace WebsitePanel.EnterpriseServer
                 TaskManager.Write("VPS_CREATE_CPU_CORES", vm.CpuCores.ToString());
                 TaskManager.Write("VPS_CREATE_RAM_SIZE", vm.RamSize.ToString());
                 TaskManager.Write("VPS_CREATE_CREATE_VM");
+                TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress 
                 // create virtual machine
                 try
                 {
@@ -1031,6 +1037,7 @@ namespace WebsitePanel.EnterpriseServer
 
                 #region Start VPS
                 TaskManager.Write("VPS_CREATE_START_VPS");
+                TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress 
 
                 try
                 {
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Virtualization2012/CreateServerAsyncWorker2012.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Virtualization2012/CreateServerAsyncWorker2012.cs
new file mode 100644
index 00000000..5bc09f46
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Virtualization2012/CreateServerAsyncWorker2012.cs
@@ -0,0 +1,85 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Threading;
+
+using WebsitePanel.Providers.Virtualization;
+
+namespace WebsitePanel.EnterpriseServer
+{
+    public class CreateServerAsyncWorker2012
+    {
+        #region Properties
+        public int ThreadUserId { get; set; }
+        public string TaskId { get; set; }
+
+        public VirtualMachine Item { get; set; }
+        public LibraryItem OsTemplate { get; set; }
+
+        public int ExternalAddressesNumber { get; set; }
+        public bool RandomExternalAddresses { get; set; }
+        public int[] ExternalAddresses { get; set; }
+
+        public int PrivateAddressesNumber { get; set; }
+        public bool RandomPrivateAddresses { get; set; }
+        public string[] PrivateAddresses { get; set; }
+
+        public string SummaryLetterEmail { get; set; }
+        #endregion
+
+        public CreateServerAsyncWorker2012()
+        {
+            ThreadUserId = -1; // admin
+        }
+
+        #region Create
+        public void CreateAsync()
+        {
+            // start asynchronously
+            Thread t = new Thread(new ThreadStart(Create));
+            t.Start();
+        }
+
+        private void Create()
+        {
+            // impersonate thread
+            if (ThreadUserId != -1)
+                SecurityContext.SetThreadPrincipal(ThreadUserId);
+
+            // perform backup
+            VirtualizationServerController2012.CreateVirtualMachineInternal(TaskId, Item, OsTemplate,
+                ExternalAddressesNumber, RandomExternalAddresses, ExternalAddresses,
+                PrivateAddressesNumber, RandomPrivateAddresses, PrivateAddresses,
+                SummaryLetterEmail);
+        }
+        #endregion
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Virtualization2012/VirtualizationServerController2012.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Virtualization2012/VirtualizationServerController2012.cs
new file mode 100644
index 00000000..8f4402e7
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Virtualization2012/VirtualizationServerController2012.cs
@@ -0,0 +1,3719 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Data;
+using System.Xml;
+using WebsitePanel.Providers.Common;
+using WebsitePanel.Providers.ResultObjects;
+using WebsitePanel.Providers.Virtualization;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.IO;
+using WebsitePanel.Providers;
+using System.Text;
+using System.Collections;
+using System.Net.Mail;
+using System.Diagnostics;
+using System.Linq;
+using System.Net;
+
+namespace WebsitePanel.EnterpriseServer
+{
+    public class VirtualizationServerController2012
+    {
+        private const string SHUTDOWN_REASON = "WebsitePanel - Initiated by user";
+        private const string SHUTDOWN_REASON_CHANGE_CONFIG = "WebsitePanel - changing VPS configuration";
+        private const Int64 Size1G = 0x40000000;
+        private const string MS_MAC_PREFIX = "00155D"; // IEEE prefix of MS MAC addresses
+
+        // default server creation (if "Unlimited" was specified in the hosting plan)
+        private const int DEFAULT_PASSWORD_LENGTH = 12;
+        private const int DEFAULT_RAM_SIZE = 512; // megabytes
+        private const int DEFAULT_HDD_SIZE = 20; // gigabytes
+        private const int DEFAULT_PRIVATE_IPS_NUMBER = 1;
+        private const int DEFAULT_SNAPSHOTS_NUMBER = 5;
+
+        #region Virtual Machines
+        public static VirtualMachineMetaItemsPaged GetVirtualMachines(int packageId,
+            string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, bool recursive)
+        {
+            VirtualMachineMetaItemsPaged result = new VirtualMachineMetaItemsPaged();
+
+            // get reader
+            IDataReader reader = DataProvider.GetVirtualMachinesPaged2012(
+                    SecurityContext.User.UserId,
+                    packageId, filterColumn, filterValue, sortColumn, startRow, maximumRows, recursive);
+
+            // number of items = first data reader
+            reader.Read();
+            result.Count = (int)reader[0];
+
+            // items = second data reader
+            reader.NextResult();
+            result.Items = ObjectUtils.CreateListFromDataReader<VirtualMachineMetaItem>(reader).ToArray();
+
+            return result;
+        }
+
+        public static VirtualMachine[] GetVirtualMachinesByServiceId(int serviceId)
+        {
+            // get proxy
+            VirtualizationServer vps = GetVirtualizationProxy(serviceId);
+
+            // load details
+            return vps.GetVirtualMachines();
+        }
+        #endregion
+
+        #region Private Network
+        public static PrivateIPAddressesPaged GetPackagePrivateIPAddressesPaged(int packageId,
+            string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
+        {
+            PrivateIPAddressesPaged result = new PrivateIPAddressesPaged();
+
+            // get reader
+            IDataReader reader = DataProvider.GetPackagePrivateIPAddressesPaged(packageId, filterColumn, filterValue,
+                sortColumn, startRow, maximumRows);
+
+            // number of items = first data reader
+            reader.Read();
+            result.Count = (int)reader[0];
+
+            // items = second data reader
+            reader.NextResult();
+            result.Items = ObjectUtils.CreateListFromDataReader<PrivateIPAddress>(reader).ToArray();
+
+            return result;
+        }
+
+        public static List<PrivateIPAddress> GetPackagePrivateIPAddresses(int packageId)
+        {
+            return ObjectUtils.CreateListFromDataReader<PrivateIPAddress>(
+                DataProvider.GetPackagePrivateIPAddresses(packageId));
+        }
+        #endregion
+
+        #region User Permissions
+        public static List<VirtualMachinePermission> GetSpaceUserPermissions(int packageId)
+        {
+            List<VirtualMachinePermission> result = new List<VirtualMachinePermission>();
+            return result;
+        }
+
+        public static int UpdateSpaceUserPermissions(int packageId, VirtualMachinePermission[] permissions)
+        {
+            // VDC - UPDATE_PERMISSIONS
+            return 0;
+        }
+        #endregion
+
+        #region Audit Log
+        public static List<LogRecord> GetSpaceAuditLog(int packageId, DateTime startPeriod, DateTime endPeriod,
+            int severity, string sortColumn, int startRow, int maximumRows)
+        {
+            List<LogRecord> result = new List<LogRecord>();
+            return result;
+        }
+
+        public static List<LogRecord> GetVirtualMachineAuditLog(int itemId, DateTime startPeriod, DateTime endPeriod,
+            int severity, string sortColumn, int startRow, int maximumRows)
+        {
+            List<LogRecord> result = new List<LogRecord>();
+            return result;
+        }
+        #endregion
+
+        #region VPS Create – Name & OS
+        public static LibraryItem[] GetOperatingSystemTemplates(int packageId)
+        {
+            // load service settings
+            int serviceId = GetServiceId(packageId);
+
+            // return templates
+            return GetOperatingSystemTemplatesByServiceId(serviceId);
+        }
+
+        public static LibraryItem[] GetOperatingSystemTemplatesByServiceId(int serviceId)
+        {
+            // load service settings
+            StringDictionary settings = ServerController.GetServiceSettings(serviceId);
+            string path = settings["OsTemplatesPath"];
+
+            // get proxy
+            VirtualizationServer vs = GetVirtualizationProxy(serviceId);
+
+            return vs.GetLibraryItems(path);
+        }
+        #endregion
+
+        #region VPS Create - Configuration
+        public static int GetMaximumCpuCoresNumber(int packageId)
+        {
+            // get proxy
+            VirtualizationServer vs = GetVirtualizationProxyByPackageId(packageId);
+
+            return vs.GetProcessorCoresNumber();
+        }
+
+        public static string GetDefaultExportPath(int itemId)
+        {
+            // load meta item
+            VirtualMachine vm = GetVirtualMachineByItemId(itemId);
+
+            if (vm == null)
+                return null;
+
+            // load settings
+            StringDictionary settings = ServerController.GetServiceSettings(vm.ServiceId);
+            return settings["ExportedVpsPath"];
+        }
+        #endregion
+
+        #region VPS Create
+        public static IntResult CreateDefaultVirtualMachine(int packageId,
+            string hostname, string osTemplate, string password, string summaryLetterEmail)
+        {
+            if (String.IsNullOrEmpty(osTemplate))
+                throw new ArgumentNullException("osTemplate");
+
+            IntResult res = new IntResult();
+
+            // load package info
+            PackageInfo package = PackageController.GetPackage(packageId);
+            if (package == null)
+            {
+                res.ErrorCodes.Add("VPS_CREATE_PACKAGE_NOT_FOUND");
+                return res;
+            }
+
+            // generate host name if not specified
+            if (String.IsNullOrEmpty(hostname))
+            {
+                // load hostname pattern
+                PackageSettings spaceSettings = PackageController.GetPackageSettings(packageId, PackageSettings.VIRTUAL_PRIVATE_SERVERS_2012);
+                string hostnamePattern = spaceSettings["HostnamePattern"];
+                if (String.IsNullOrEmpty(hostnamePattern))
+                {
+                    res.ErrorCodes.Add("VPS_CREATE_EMPTY_HOSTNAME_PATTERN");
+                    return res;
+                }
+
+                hostname = EvaluateSpaceVariables(hostnamePattern, packageId);
+            }
+
+            // generate password if not specified
+            if (String.IsNullOrEmpty(password))
+            {
+                int passwordLength = DEFAULT_PASSWORD_LENGTH; // default length
+
+                // load password policy
+                UserSettings userSettings = UserController.GetUserSettings(package.UserId, UserSettings.VPS_POLICY);
+                string passwordPolicy = userSettings["AdministratorPasswordPolicy"];
+
+                if (!String.IsNullOrEmpty(passwordPolicy))
+                {
+                    // get second parameter - max length
+                    passwordLength = Utils.ParseInt(passwordPolicy.Split(';')[1].Trim(), passwordLength);
+                }
+
+                // generate password
+                password = Utils.GetRandomString(passwordLength);
+            }
+
+            // load quotas
+            PackageContext cntx = PackageController.GetPackageContext(packageId);
+            if (cntx.Groups.ContainsKey(ResourceGroups.VPS2012))
+            {
+                res.ErrorCodes.Add("VPS_CREATE_VPS_GROUP_DISABLED");
+                return res;
+            }
+
+            // CPU cores
+            int cpuCores = cntx.Quotas[Quotas.VPS2012_CPU_NUMBER].QuotaAllocatedValue;
+            if (cpuCores == -1) // unlimited is not possible
+                cpuCores = GetMaximumCpuCoresNumber(packageId);
+
+            // RAM
+            int ramMB = cntx.Quotas[Quotas.VPS2012_RAM].QuotaAllocatedValue;
+            if (ramMB == -1) // unlimited is not possible
+                ramMB = DEFAULT_RAM_SIZE;
+
+            // HDD
+            int hddGB = cntx.Quotas[Quotas.VPS2012_HDD].QuotaAllocatedValue;
+            if (hddGB == -1) // unlimited is not possible
+                hddGB = DEFAULT_HDD_SIZE;
+
+            // snapshots
+            int snapshots = cntx.Quotas[Quotas.VPS2012_SNAPSHOTS_NUMBER].QuotaAllocatedValue;
+            if (snapshots == -1) // unlimited is not possible
+                snapshots = DEFAULT_SNAPSHOTS_NUMBER;
+
+            bool dvdInstalled = !cntx.Quotas[Quotas.VPS2012_DVD_ENABLED].QuotaExhausted;
+            bool bootFromCD = !cntx.Quotas[Quotas.VPS2012_BOOT_CD_ENABLED].QuotaExhausted;
+            bool numLock = true;
+
+            bool startShutdownAllowed = !cntx.Quotas[Quotas.VPS2012_START_SHUTDOWN_ALLOWED].QuotaExhausted;
+            bool pauseResumeAllowed = !cntx.Quotas[Quotas.VPS2012_PAUSE_RESUME_ALLOWED].QuotaExhausted;
+            bool rebootAllowed = !cntx.Quotas[Quotas.VPS2012_REBOOT_ALLOWED].QuotaExhausted;
+            bool resetAllowed = !cntx.Quotas[Quotas.VPS2012_RESET_ALOWED].QuotaExhausted;
+            bool reinstallAllowed = !cntx.Quotas[Quotas.VPS2012_REINSTALL_ALLOWED].QuotaExhausted;
+
+            bool externalNetworkEnabled = !cntx.Quotas[Quotas.VPS2012_EXTERNAL_NETWORK_ENABLED].QuotaExhausted;
+            int externalAddressesNumber = cntx.Quotas[Quotas.VPS2012_EXTERNAL_IP_ADDRESSES_NUMBER].QuotaAllocatedValue;
+            bool randomExternalAddresses = true;
+            int[] externalAddresses = new int[0]; // empty array
+            if (externalNetworkEnabled)
+            {
+                int maxExternalAddresses = ServerController.GetPackageUnassignedIPAddresses(packageId, IPAddressPool.VpsExternalNetwork).Count;
+                if (externalAddressesNumber == -1
+                    || externalAddressesNumber > maxExternalAddresses)
+                    externalAddressesNumber = maxExternalAddresses;
+            }
+
+            bool privateNetworkEnabled = !cntx.Quotas[Quotas.VPS2012_PRIVATE_NETWORK_ENABLED].QuotaExhausted;
+            int privateAddressesNumber = cntx.Quotas[Quotas.VPS2012_PRIVATE_IP_ADDRESSES_NUMBER].QuotaAllocatedValue;
+            bool randomPrivateAddresses = true;
+            string[] privateAddresses = new string[0]; // empty array
+            if (privateAddressesNumber == -1) // unlimited is not possible
+            {
+                privateAddressesNumber = DEFAULT_PRIVATE_IPS_NUMBER;
+            }
+
+            // create server and return result
+            return CreateVirtualMachine(packageId, hostname, osTemplate, password, summaryLetterEmail,
+                cpuCores, ramMB, hddGB, snapshots,
+                dvdInstalled, bootFromCD, numLock,
+                startShutdownAllowed, pauseResumeAllowed, rebootAllowed, resetAllowed, reinstallAllowed,
+                externalNetworkEnabled, externalAddressesNumber, randomExternalAddresses, externalAddresses,
+                privateNetworkEnabled, privateAddressesNumber, randomPrivateAddresses, privateAddresses, new VirtualMachine());
+        }
+
+        public static IntResult CreateVirtualMachine(int packageId,
+                string hostname, string osTemplateFile, string password, string summaryLetterEmail,
+                int cpuCores, int ramMB, int hddGB, int snapshots,
+                bool dvdInstalled, bool bootFromCD, bool numLock,
+                bool startShutdownAllowed, bool pauseResumeAllowed, bool rebootAllowed, bool resetAllowed, bool reinstallAllowed,
+                bool externalNetworkEnabled, int externalAddressesNumber, bool randomExternalAddresses, int[] externalAddresses,
+                bool privateNetworkEnabled, int privateAddressesNumber, bool randomPrivateAddresses, string[] privateAddresses, VirtualMachine otherSettings)
+        {
+            // result object
+            IntResult res = new IntResult();
+
+            // meta item
+            VirtualMachine vm = null;
+
+            try
+            {
+                #region Check account and space statuses
+                // check account
+                if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                    return res;
+
+                // check package
+                if (!SecurityContext.CheckPackage(res, packageId, DemandPackage.IsActive))
+                    return res;
+                
+                #endregion
+
+                #region Check if host name is already used
+
+                try
+                {
+                    ServiceProviderItem item = PackageController.GetPackageItemByName(packageId, hostname,
+                                                                                      typeof (VirtualMachine));
+                    if (item != null)
+                    {
+                        res.ErrorCodes.Add(VirtualizationErrorCodes.HOST_NAMER_IS_ALREADY_USED);
+                        return res;
+                    }
+                }
+                catch(Exception ex)
+                {
+                    res.AddError(VirtualizationErrorCodes.CANNOT_CHECK_HOST_EXISTS, ex);
+                    return res;   
+                }
+
+                #endregion
+
+                #region Check Quotas
+                // check quotas
+                List<string> quotaResults = new List<string>();
+                PackageContext cntx = PackageController.GetPackageContext(packageId);
+
+                // dynamic memory
+                var newRam = ramMB;
+                if (otherSettings.DynamicMemory != null && otherSettings.DynamicMemory.Enabled)
+                {
+                    newRam = otherSettings.DynamicMemory.Maximum;
+
+                    if (ramMB > otherSettings.DynamicMemory.Maximum || ramMB < otherSettings.DynamicMemory.Minimum)
+                        quotaResults.Add(VirtualizationErrorCodes.QUOTA_NOT_IN_DYNAMIC_RAM);
+                }
+
+                CheckListsQuota(cntx, quotaResults, Quotas.VPS2012_SERVERS_NUMBER, VirtualizationErrorCodes.QUOTA_EXCEEDED_SERVERS_NUMBER);
+
+                CheckNumericQuota(cntx, quotaResults, Quotas.VPS2012_CPU_NUMBER, cpuCores, VirtualizationErrorCodes.QUOTA_EXCEEDED_CPU);
+                CheckNumericQuota(cntx, quotaResults, Quotas.VPS2012_RAM, newRam, VirtualizationErrorCodes.QUOTA_EXCEEDED_RAM);
+                CheckNumericQuota(cntx, quotaResults, Quotas.VPS2012_HDD, hddGB, VirtualizationErrorCodes.QUOTA_EXCEEDED_HDD);
+                CheckNumericQuota(cntx, quotaResults, Quotas.VPS2012_SNAPSHOTS_NUMBER, snapshots, VirtualizationErrorCodes.QUOTA_EXCEEDED_SNAPSHOTS);
+
+                CheckBooleanQuota(cntx, quotaResults, Quotas.VPS2012_DVD_ENABLED, dvdInstalled, VirtualizationErrorCodes.QUOTA_EXCEEDED_DVD_ENABLED);
+                CheckBooleanQuota(cntx, quotaResults, Quotas.VPS2012_BOOT_CD_ALLOWED, bootFromCD, VirtualizationErrorCodes.QUOTA_EXCEEDED_CD_ALLOWED);
+
+                CheckBooleanQuota(cntx, quotaResults, Quotas.VPS2012_START_SHUTDOWN_ALLOWED, startShutdownAllowed, VirtualizationErrorCodes.QUOTA_EXCEEDED_START_SHUTDOWN_ALLOWED);
+                CheckBooleanQuota(cntx, quotaResults, Quotas.VPS2012_PAUSE_RESUME_ALLOWED, pauseResumeAllowed, VirtualizationErrorCodes.QUOTA_EXCEEDED_PAUSE_RESUME_ALLOWED);
+                CheckBooleanQuota(cntx, quotaResults, Quotas.VPS2012_REBOOT_ALLOWED, rebootAllowed, VirtualizationErrorCodes.QUOTA_EXCEEDED_REBOOT_ALLOWED);
+                CheckBooleanQuota(cntx, quotaResults, Quotas.VPS2012_RESET_ALOWED, resetAllowed, VirtualizationErrorCodes.QUOTA_EXCEEDED_RESET_ALOWED);
+                CheckBooleanQuota(cntx, quotaResults, Quotas.VPS2012_REINSTALL_ALLOWED, reinstallAllowed, VirtualizationErrorCodes.QUOTA_EXCEEDED_REINSTALL_ALLOWED);
+
+                CheckBooleanQuota(cntx, quotaResults, Quotas.VPS2012_EXTERNAL_NETWORK_ENABLED, externalNetworkEnabled, VirtualizationErrorCodes.QUOTA_EXCEEDED_EXTERNAL_NETWORK_ENABLED);
+                CheckBooleanQuota(cntx, quotaResults, Quotas.VPS2012_PRIVATE_NETWORK_ENABLED, privateNetworkEnabled, VirtualizationErrorCodes.QUOTA_EXCEEDED_PRIVATE_NETWORK_ENABLED);
+
+                // check external addresses number
+                if (!randomExternalAddresses && externalAddresses != null)
+                    externalAddressesNumber = externalAddresses.Length;
+
+                int maxAddresses = ServerController.GetPackageUnassignedIPAddresses(packageId, IPAddressPool.VpsExternalNetwork).Count;
+                if (externalNetworkEnabled && externalAddressesNumber > maxAddresses)
+                    quotaResults.Add(VirtualizationErrorCodes.QUOTA_EXCEEDED_EXTERNAL_ADDRESSES_NUMBER + ":" + maxAddresses.ToString());
+
+                // check private addresses number
+                if (!randomPrivateAddresses && privateAddresses != null)
+                    privateAddressesNumber = privateAddresses.Length;
+                CheckNumericQuota(cntx, quotaResults, Quotas.VPS2012_PRIVATE_IP_ADDRESSES_NUMBER, privateAddressesNumber, VirtualizationErrorCodes.QUOTA_EXCEEDED_PRIVATE_ADDRESSES_NUMBER);
+
+                // check management network parameters
+                NetworkAdapterDetails manageNic = GetManagementNetworkDetails(packageId);
+                if (!String.IsNullOrEmpty(manageNic.NetworkId))
+                {
+                    // network enabled - check management IPs pool
+                    int manageIpsNumber = ServerController.GetUnallottedIPAddresses(
+                            packageId, ResourceGroups.VPS2012, IPAddressPool.VpsManagementNetwork).Count;
+
+                    if (manageIpsNumber == 0)
+                        quotaResults.Add(VirtualizationErrorCodes.QUOTA_EXCEEDED_MANAGEMENT_NETWORK);
+                }
+
+                // check acceptable values
+                if (ramMB <= 0)
+                    quotaResults.Add(VirtualizationErrorCodes.QUOTA_WRONG_RAM);
+                if (hddGB <= 0)
+                    quotaResults.Add(VirtualizationErrorCodes.QUOTA_WRONG_HDD);
+                if (snapshots < 0)
+                    quotaResults.Add(VirtualizationErrorCodes.QUOTA_WRONG_SNAPSHOTS);
+
+                if (quotaResults.Count > 0)
+                {
+                    res.ErrorCodes.AddRange(quotaResults);
+                    return res;
+                }
+                #endregion
+
+                #region Check input parameters
+                // check private network IP addresses if they are specified
+                List<string> checkResults = CheckPrivateIPAddresses(packageId, privateAddresses);
+                if (checkResults.Count > 0)
+                {
+                    res.ErrorCodes.AddRange(checkResults);
+                    return res;
+                }
+                #endregion
+
+                #region Context variables
+                // service ID
+                int serviceId = GetServiceId(packageId);
+
+                // load service settings
+                StringDictionary settings = ServerController.GetServiceSettings(serviceId);
+                #endregion
+
+                #region Create meta item
+                // create meta item
+                vm = new VirtualMachine();
+
+                vm.Name = hostname;
+                vm.AdministratorPassword = CryptoUtils.Encrypt(password);
+                vm.PackageId = packageId;
+                vm.VirtualMachineId = null; // from service
+                vm.ServiceId = serviceId;
+
+                vm.CurrentTaskId = Guid.NewGuid().ToString("N"); // generate creation task id
+                vm.ProvisioningStatus = VirtualMachineProvisioningStatus.InProgress;
+
+                vm.Generation = otherSettings.Generation;
+                vm.CpuCores = cpuCores;
+                vm.RamSize = ramMB;
+                vm.HddSize = hddGB;
+                vm.SnapshotsNumber = snapshots;
+                vm.DvdDriveInstalled = dvdInstalled;
+                vm.BootFromCD = bootFromCD;
+                vm.NumLockEnabled = numLock;
+                vm.StartTurnOffAllowed = startShutdownAllowed;
+                vm.PauseResumeAllowed = pauseResumeAllowed;
+                vm.RebootAllowed = rebootAllowed;
+                vm.ResetAllowed = resetAllowed;
+                vm.ReinstallAllowed = reinstallAllowed;
+
+                // dynamic memory
+                if (otherSettings.DynamicMemory != null && otherSettings.DynamicMemory.Enabled)
+                    vm.DynamicMemory = otherSettings.DynamicMemory;
+                else
+                    vm.DynamicMemory = null;
+
+                // networking
+                vm.ExternalNetworkEnabled = externalNetworkEnabled;
+                vm.PrivateNetworkEnabled = privateNetworkEnabled;
+                vm.ManagementNetworkEnabled = !String.IsNullOrEmpty(manageNic.NetworkId);
+
+                // load OS templates
+                LibraryItem osTemplate = null;
+
+                try
+                {
+                    LibraryItem[] osTemplates = GetOperatingSystemTemplates(vm.PackageId);
+                    foreach (LibraryItem item in osTemplates)
+                    {
+                        if (String.Compare(item.Path, osTemplateFile, true) == 0)
+                        {
+                            osTemplate = item;
+
+                            // check minimal disk size
+                            if (osTemplate.DiskSize > 0 && vm.HddSize < osTemplate.DiskSize)
+                            {
+                                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.QUOTA_TEMPLATE_DISK_MINIMAL_SIZE + ":" + osTemplate.DiskSize);
+                                return res;
+                            }
+
+                            vm.OperatingSystemTemplate = osTemplate.Name;
+                            vm.LegacyNetworkAdapter = osTemplate.LegacyNetworkAdapter;
+                            vm.RemoteDesktopEnabled = osTemplate.RemoteDesktop;
+                            break;
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    res.AddError(VirtualizationErrorCodes.GET_OS_TEMPLATES_ERROR, ex);
+                    return res;
+                }
+
+                // setup VM paths
+                string templatesPath = settings["OsTemplatesPath"];
+                string rootFolderPattern = settings["RootFolder"];
+                if(rootFolderPattern.IndexOf("[") == -1)
+                {
+                    // no pattern has been specified
+                    if(!rootFolderPattern.EndsWith("\\"))
+                        rootFolderPattern += "\\";
+                    rootFolderPattern += "[username]\\[vps_hostname]";
+                }
+
+                vm.RootFolderPath = EvaluateItemVariables(rootFolderPattern, vm);
+                var correctVhdPath = GetCorrectTemplateFilePath(templatesPath, osTemplateFile);
+                vm.OperatingSystemTemplatePath = correctVhdPath;
+                vm.VirtualHardDrivePath = Path.Combine(vm.RootFolderPath, hostname + Path.GetExtension(correctVhdPath));
+
+                // save meta-item
+                try
+                {
+                    vm.Id = PackageController.AddPackageItem(vm);
+                }
+                catch (Exception ex)
+                {
+                    res.AddError(VirtualizationErrorCodes.CREATE_META_ITEM_ERROR, ex);
+                    return res;
+                }
+                
+                #endregion
+
+                #region Start Asynchronous task
+                try
+                {
+                    // asynchronous process starts here
+                    CreateServerAsyncWorker worker = new CreateServerAsyncWorker();
+
+                    worker.TaskId = vm.CurrentTaskId; // async task ID
+                    worker.ThreadUserId = SecurityContext.User.UserId;
+                    worker.Item = vm;
+                    worker.OsTemplate = osTemplate;
+
+                    worker.ExternalAddressesNumber = externalAddressesNumber;
+                    worker.RandomExternalAddresses = randomExternalAddresses;
+                    worker.ExternalAddresses = externalAddresses;
+
+                    worker.PrivateAddressesNumber = privateAddressesNumber;
+                    worker.RandomPrivateAddresses = randomPrivateAddresses;
+                    worker.PrivateAddresses = privateAddresses;
+
+                    worker.SummaryLetterEmail = summaryLetterEmail;
+
+                    worker.CreateAsync();
+                }
+                catch (Exception ex)
+                {
+                    // delete meta item
+                    PackageController.DeletePackageItem(vm.Id);
+
+                    // return from method
+                    res.AddError(VirtualizationErrorCodes.CREATE_TASK_START_ERROR, ex);
+                    return res;
+                }
+                #endregion
+            }
+            catch (Exception ex)
+            {
+                res.AddError(VirtualizationErrorCodes.CREATE_ERROR, ex);
+                return res;
+            }
+
+            res.Value = vm.Id;
+            res.IsSuccess = true;
+            return res;
+        }
+
+        private static string GetCorrectTemplateFilePath(string templatesPath, string osTemplateFile)
+        {
+            if (osTemplateFile.Trim().EndsWith(".vhdx"))
+                return Path.Combine(templatesPath, osTemplateFile);
+
+            return Path.Combine(templatesPath, osTemplateFile + ".vhd");
+        }
+
+        internal static void CreateVirtualMachineInternal(string taskId, VirtualMachine vm, LibraryItem osTemplate,
+                int externalAddressesNumber, bool randomExternalAddresses, int[] externalAddresses,
+                int privateAddressesNumber, bool randomPrivateAddresses, string[] privateAddresses,
+                string summaryLetterEmail)
+        {
+            // start task
+            TaskManager.StartTask(taskId, "VPS2012", "CREATE", vm.Name, vm.Id, vm.PackageId);
+
+            try
+            {
+                // set Error flag
+                vm.ProvisioningStatus = VirtualMachineProvisioningStatus.Error;
+
+                // load proxy
+                VirtualizationServer vs = GetVirtualizationProxy(vm.ServiceId);
+
+                // load service settings
+                StringDictionary settings = ServerController.GetServiceSettings(vm.ServiceId);
+
+                #region Setup External network
+                TaskManager.Write("VPS_CREATE_SETUP_EXTERNAL_NETWORK");
+                TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress 
+
+                try
+                {
+                    if (vm.ExternalNetworkEnabled)
+                    {
+                        // provision IP addresses
+                        ResultObject privResult = AddVirtualMachineExternalIPAddresses(vm.Id, randomExternalAddresses,
+                            externalAddressesNumber, externalAddresses, false);
+
+                        // set primary IP address
+                        NetworkAdapterDetails extNic = GetExternalNetworkAdapterDetails(vm.Id);
+                        if (extNic.IPAddresses.Length > 0)
+                            SetVirtualMachinePrimaryExternalIPAddress(vm.Id, extNic.IPAddresses[0].AddressId, false);
+
+                        // connect to network
+                        vm.ExternalSwitchId = settings["ExternalNetworkId"];
+                        vm.ExternalNicMacAddress = GenerateMacAddress();
+                    }
+                    else
+                    {
+                        TaskManager.Write("VPS_CREATE_SETUP_EXTERNAL_NETWORK_SKIP");
+                    }
+                }
+                catch (Exception ex)
+                {
+                    TaskManager.WriteError(ex, "VPS_CREATE_SETUP_EXTERNAL_NETWORK_ERROR");
+                    return;
+                }
+                #endregion
+
+                #region Setup Management network
+                TaskManager.Write("VPS_CREATE_SETUP_MANAGEMENT_NETWORK");
+                TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress 
+
+                try
+                {
+                    if (vm.ManagementNetworkEnabled)
+                    {
+                        // check that package contains unassigned IP
+                        // that could be re-used
+                        List<PackageIPAddress> packageIps = ServerController.GetPackageUnassignedIPAddresses(
+                            vm.PackageId, IPAddressPool.VpsManagementNetwork);
+
+                        if (packageIps.Count == 0)
+                        {
+                            // must be fresh space
+                            // allocate package IP from the pool
+                            List<IPAddressInfo> ips = ServerController.GetUnallottedIPAddresses(
+                                vm.PackageId, ResourceGroups.VPS2012, IPAddressPool.VpsManagementNetwork);
+
+                            if (ips.Count > 0)
+                            {
+                                // assign IP to the package
+                                ServerController.AllocatePackageIPAddresses(vm.PackageId, new int[] { ips[0].AddressId });
+
+                                // re-read package IPs
+                                packageIps = ServerController.GetPackageUnassignedIPAddresses(
+                                                vm.PackageId, IPAddressPool.VpsManagementNetwork);
+                            }
+                            else
+                            {
+                                // nothing to allocate - pool empty
+                                TaskManager.WriteWarning("VPS_CREATE_SETUP_MANAGEMENT_NETWORK_POOL_EMPTY");
+                            }
+                        }
+
+                        if (packageIps.Count > 0)
+                        {
+                            // assign to the item
+                            ServerController.AddItemIPAddress(vm.Id, packageIps[0].PackageAddressID);
+
+                            // set primary IP address
+                            ServerController.SetItemPrimaryIPAddress(vm.Id, packageIps[0].PackageAddressID);
+
+                            // connect to network
+                            vm.ManagementSwitchId = settings["ManagementNetworkId"];
+                            vm.ManagementNicMacAddress = GenerateMacAddress();
+                        }
+                    }
+                    else
+                    {
+                        TaskManager.Write("VPS_CREATE_SETUP_MANAGEMENT_NETWORK_SKIP");
+                    }
+                }
+                catch (Exception ex)
+                {
+                    TaskManager.WriteError(ex, "VPS_CREATE_SETUP_MANAGEMENT_NETWORK_ERROR");
+                    return;
+                }
+                #endregion
+
+                #region Setup Private network
+                TaskManager.Write("VPS_CREATE_SETUP_PRIVATE_NETWORK");
+                TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress 
+
+                try
+                {
+                    if (vm.PrivateNetworkEnabled)
+                    {
+                        NetworkAdapterDetails privNic = GetPrivateNetworkDetailsInternal(vm.ServiceId);
+
+                        if (!privNic.IsDHCP)
+                        {
+                            // provision IP addresses
+                            ResultObject extResult = AddVirtualMachinePrivateIPAddresses(vm.Id, randomPrivateAddresses, privateAddressesNumber, privateAddresses, false);
+
+                            // set primary IP address
+                            privNic = GetPrivateNetworkAdapterDetails(vm.Id);
+                            if (privNic.IPAddresses.Length > 0)
+                                SetVirtualMachinePrimaryPrivateIPAddress(vm.Id, privNic.IPAddresses[0].AddressId, false);
+                        }
+
+                        // connecto to network
+                        vm.PrivateSwitchId = settings["PrivateNetworkId"];
+
+                        if (String.IsNullOrEmpty(vm.PrivateSwitchId))
+                        {
+                            // create/load private virtual switch
+                            vm.PrivateSwitchId = EnsurePrivateVirtualSwitch(vm);
+                            if (vm.PrivateSwitchId == null)
+                                return; // exit on error
+                        }
+                        vm.PrivateNicMacAddress = GenerateMacAddress();
+                    }
+                    else
+                    {
+                        TaskManager.Write("VPS_CREATE_SETUP_PRIVATE_NETWORK_SKIP");
+                    }
+                }
+                catch (Exception ex)
+                {
+                    TaskManager.WriteError(ex, "VPS_CREATE_SETUP_PRIVATE_NETWORK_ERROR");
+                    return;
+                }
+                #endregion
+
+                // update service item
+                VirtualMachineProvisioningStatus status = vm.ProvisioningStatus;
+                vm.ProvisioningStatus = VirtualMachineProvisioningStatus.InProgress;
+                PackageController.UpdatePackageItem(vm);
+                vm.ProvisioningStatus = status;
+
+                #region Copy/convert VHD
+                JobResult result = null;
+                ReturnCode code = ReturnCode.OK;
+                TaskManager.Write("VPS_CREATE_OS_TEMPLATE", osTemplate.Name);
+                TaskManager.Write("VPS_CREATE_CONVERT_VHD");
+                TaskManager.Write("VPS_CREATE_CONVERT_SOURCE_VHD", vm.OperatingSystemTemplatePath);
+                TaskManager.Write("VPS_CREATE_CONVERT_DEST_VHD", vm.VirtualHardDrivePath);
+                TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress 
+                try
+                {
+                    // convert VHD
+                    VirtualHardDiskType vhdType = (VirtualHardDiskType)Enum.Parse(typeof(VirtualHardDiskType), settings["VirtualDiskType"], true);
+                    result = vs.ConvertVirtualHardDisk(vm.OperatingSystemTemplatePath, vm.VirtualHardDrivePath, vhdType);
+
+                    // check return
+                    if (result.ReturnValue != ReturnCode.JobStarted)
+                    {
+                        TaskManager.WriteError("VPS_CREATE_CONVERT_VHD_ERROR_JOB_START", result.ReturnValue.ToString());
+                        return;
+                    }
+
+                    // wait for completion
+                    if (!JobCompleted(vs, result.Job))
+                    {
+                        TaskManager.WriteError("VPS_CREATE_CONVERT_VHD_ERROR_JOB_EXEC", result.Job.ErrorDescription.ToString());
+                        return;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    TaskManager.WriteError(ex, "VPS_CREATE_CONVERT_VHD_ERROR");
+                    return;
+                }
+                #endregion
+
+                #region Get VHD info
+                VirtualHardDiskInfo vhdInfo = null;
+                try
+                {
+                    vhdInfo = vs.GetVirtualHardDiskInfo(vm.VirtualHardDrivePath);
+                }
+                catch (Exception ex)
+                {
+                    TaskManager.WriteError(ex, "VPS_CREATE_GET_VHD_INFO");
+                    return;
+                }
+
+                if (vhdInfo == null || vhdInfo.InUse)
+                {
+                    // master VHD is in use
+                    TaskManager.WriteError("VPS_CREATE_MASTER_VHD_IN_USE");
+                    return;
+                }
+
+                // check if it should be expanded
+                int hddSizeGB = Convert.ToInt32(vhdInfo.MaxInternalSize / Size1G);
+
+                TaskManager.Write("VPS_CREATE_EXPAND_SOURCE_VHD_SIZE", hddSizeGB.ToString());
+                TaskManager.Write("VPS_CREATE_EXPAND_DEST_VHD_SIZE", vm.HddSize.ToString());
+                #endregion
+
+                #region Expand VHD
+                bool expanded = false;
+                if (vm.HddSize > hddSizeGB)
+                {
+                    TaskManager.Write("VPS_CREATE_EXPAND_VHD");
+                    TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress 
+
+                    // expand VHD
+                    try
+                    {
+                        result = vs.ExpandVirtualHardDisk(vm.VirtualHardDrivePath, (ulong)vm.HddSize);
+                    }
+                    catch (Exception ex)
+                    {
+                        TaskManager.WriteError(ex, "VPS_CREATE_EXPAND_VHD_ERROR");
+                        return;
+                    }
+
+                    // check return
+                    if (result.ReturnValue != ReturnCode.JobStarted)
+                    {
+                        // error starting Expand job
+                        TaskManager.WriteError("VPS_CREATE_EXPAND_VHD_ERROR_JOB_START", result.ReturnValue.ToString());
+                        return;
+                    }
+
+                    // wait for completion
+                    if (!JobCompleted(vs, result.Job))
+                    {
+                        // error executing Expand job
+                        TaskManager.WriteError("VPS_CREATE_EXPAND_VHD_ERROR_JOB_EXEC", result.Job.ErrorDescription);
+                        return;
+                    }
+                    expanded = true;
+                }
+                else
+                {
+                    // skip expanding
+                    TaskManager.Write("VPS_CREATE_EXPAND_VHD_SKIP");
+                }
+                #endregion
+
+                #region Process VHD contents
+                // mount VHD
+                if ((expanded && osTemplate.ProcessVolume != -1)
+                    || (osTemplate.SysprepFiles != null && osTemplate.SysprepFiles.Length > 0))
+                {
+                    try
+                    {
+                        #region Mount VHD
+                        MountedDiskInfo mountedInfo = vs.MountVirtualHardDisk(vm.VirtualHardDrivePath);
+                        if (mountedInfo == null)
+                        {
+                            // mount returned NULL
+                            TaskManager.WriteError("VPS_CREATE_MOUNT_VHD_NULL");
+                            return;
+                        }
+                        #endregion
+
+                        #region Expand volume
+                        if (expanded && osTemplate.ProcessVolume != -1 && mountedInfo.DiskVolumes.Length > 0)
+                        {
+                            try
+                            {
+                                vs.ExpandDiskVolume(mountedInfo.DiskAddress, mountedInfo.DiskVolumes[osTemplate.ProcessVolume]);
+                            }
+                            catch (Exception ex)
+                            {
+                                TaskManager.WriteError(ex, "VPS_CREATE_DISKPART_ERROR");
+                            }
+                        }
+                        else
+                        {
+                            TaskManager.Write("VPS_CREATE_EXPAND_VHD_SKIP_NO_VOLUMES");
+                        }
+                        #endregion
+
+                        #region Sysprep
+                        if (mountedInfo.DiskVolumes.Length > 0
+                            && osTemplate.ProcessVolume != -1
+                            && osTemplate.SysprepFiles != null && osTemplate.SysprepFiles.Length > 0)
+                        {
+                            foreach (string remoteFile in osTemplate.SysprepFiles)
+                            {
+                                try
+                                {
+                                    TaskManager.Write("VPS_CREATE_SYSPREP_FILE", remoteFile);
+
+                                    // build remote path
+                                    string path = remoteFile;
+                                    if (!remoteFile.StartsWith("\\"))
+                                        path = remoteFile.Substring(remoteFile.IndexOf("\\"));
+
+                                    path = String.Format("{0}:{1}", mountedInfo.DiskVolumes[osTemplate.ProcessVolume], path);
+
+                                    // read remote file
+                                    string contents = vs.ReadRemoteFile(path);
+                                    if (contents == null)
+                                    {
+                                        TaskManager.Write("VPS_CREATE_SYSPREP_FILE_NOT_FOUND", remoteFile);
+                                        continue;
+                                    }
+
+                                    // process file contents
+                                    contents = EvaluateVirtualMachineTemplate(vm.Id, false, false, contents);
+
+                                    // write remote file
+                                    vs.WriteRemoteFile(path, contents);
+                                }
+                                catch (Exception ex)
+                                {
+                                    TaskManager.WriteError("VPS_CREATE_SYSPREP_FILE_ERROR", ex.Message);
+                                }
+                            }
+                        }
+                        #endregion
+
+                        #region Unmount VHD
+                        try
+                        {
+                            code = vs.UnmountVirtualHardDisk(vm.VirtualHardDrivePath);
+                            if (code != ReturnCode.OK)
+                            {
+                                TaskManager.WriteError("VPS_CREATE_UNMOUNT_ERROR_JOB_START", code.ToString());
+                                return;
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            TaskManager.WriteError(ex, "VPS_CREATE_UNMOUNT_ERROR");
+                            return;
+                        }
+                        #endregion
+                    }
+                    catch (Exception ex)
+                    {
+                        // error mounting
+                        TaskManager.WriteError(ex, "VPS_CREATE_MOUNT_VHD");
+                        return;
+                    }
+                } // end if (expanded ...
+                #endregion
+
+                #region Create Virtual Machine
+                TaskManager.Write("VPS_CREATE_CPU_CORES", vm.CpuCores.ToString());
+                TaskManager.Write("VPS_CREATE_RAM_SIZE", vm.RamSize.ToString());
+                TaskManager.Write("VPS_CREATE_CREATE_VM");
+                TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress 
+                // create virtual machine
+                try
+                {
+                    // create
+                    vm = vs.CreateVirtualMachine(vm);
+                }
+                catch (Exception ex)
+                {
+                    TaskManager.WriteError(ex, "VPS_CREATE_CREATE_VM_ERROR");
+                    return;
+                }
+
+                // update meta item
+                PackageController.UpdatePackageItem(vm);
+
+                TaskManager.Write("VPS_CREATE_CREATED_VM");
+                #endregion
+
+                // set OK flag
+                vm.ProvisioningStatus = VirtualMachineProvisioningStatus.OK;
+
+                #region Send KVP
+                // configure computer name
+                if (osTemplate.ProvisionComputerName)
+                {
+                    TaskManager.Write("VPS_CREATE_SET_COMPUTER_NAME_KVP");
+                    SendComputerNameKVP(vm.Id, vm.Name);
+                }
+
+                // change administrator password
+                if (osTemplate.ProvisionAdministratorPassword)
+                {
+                    TaskManager.Write("VPS_CREATE_SET_PASSWORD_KVP");
+                    SendAdministratorPasswordKVP(vm.Id, CryptoUtils.Decrypt(vm.AdministratorPassword));
+                }
+
+                // configure network adapters
+                if(osTemplate.ProvisionNetworkAdapters)
+                {
+                    // external NIC
+                    TaskManager.Write("VPS_CREATE_SET_EXTERNAL_NIC_KVP");
+                    if (vm.ExternalNetworkEnabled)
+                    {
+                        result = SendNetworkAdapterKVP(vm.Id, "External");
+
+                        if (result.ReturnValue != ReturnCode.JobStarted)
+                            TaskManager.WriteWarning("VPS_CREATE_SET_EXTERNAL_NIC_KVP_ERROR", result.ReturnValue.ToString());
+                    }
+
+                    // management NIC
+                    TaskManager.Write("VPS_CREATE_SET_MANAGEMENT_NIC_KVP");
+                    if (vm.ManagementNetworkEnabled)
+                    {
+                        result = SendNetworkAdapterKVP(vm.Id, "Management");
+
+                        if (result.ReturnValue != ReturnCode.JobStarted)
+                            TaskManager.WriteWarning("VPS_CREATE_SET_MANAGEMENT_NIC_KVP_ERROR", result.ReturnValue.ToString());
+                    }
+
+                    // private NIC
+                    TaskManager.Write("VPS_CREATE_SET_PRIVATE_NIC_KVP");
+                    if (vm.PrivateNetworkEnabled)
+                    {
+                        result = SendNetworkAdapterKVP(vm.Id, "Private");
+
+                        if (result.ReturnValue != ReturnCode.JobStarted)
+                            TaskManager.WriteWarning("VPS_CREATE_SET_PRIVATE_NIC_KVP_ERROR", result.ReturnValue.ToString());
+                    }
+                }
+                #endregion
+
+                #region Start VPS
+                TaskManager.Write("VPS_CREATE_START_VPS");
+                TaskManager.IndicatorCurrent = -1; // Some providers (for example HyperV2012R2) could not provide progress 
+
+                try
+                {
+                    // start virtual machine
+                    result = vs.ChangeVirtualMachineState(vm.VirtualMachineId, VirtualMachineRequestedState.Start);
+
+                    // check return
+                    if (result.ReturnValue == ReturnCode.JobStarted)
+                    {
+                        // wait for completion
+                        if (!JobCompleted(vs, result.Job))
+                        {
+                            TaskManager.WriteWarning("VPS_CREATE_START_VPS_ERROR_JOB_EXEC", result.Job.ErrorDescription.ToString());
+                        }
+                    }
+                    else
+                    {
+                        TaskManager.WriteWarning("VPS_CREATE_START_VPS_ERROR_JOB_START", result.ReturnValue.ToString());
+                    }
+                }
+                catch (Exception ex)
+                {
+                    TaskManager.WriteWarning("VPS_CREATE_START_VPS_ERROR", ex.Message);
+                }
+                TaskManager.Write("VPS_CREATE_STARTED_VPS");
+                #endregion
+
+                #region Send Summary letter
+                // send summary e-mail
+                if (!String.IsNullOrEmpty(summaryLetterEmail))
+                {
+                    SendVirtualMachineSummaryLetter(vm.Id, summaryLetterEmail, null, true);
+                }
+                #endregion
+
+            }
+            catch (Exception ex)
+            {
+                TaskManager.WriteError(ex, VirtualizationErrorCodes.CREATE_ERROR);
+                return;
+            }
+            finally
+            {
+                // reset task ID
+                vm.CurrentTaskId = null;
+                PackageController.UpdatePackageItem(vm);
+
+                if (vm.ProvisioningStatus == VirtualMachineProvisioningStatus.OK)
+                    TaskManager.Write("VPS_CREATE_SUCCESS");
+                else if (vm.ProvisioningStatus == VirtualMachineProvisioningStatus.Error)
+                    TaskManager.Write("VPS_CREATE_ERROR_END");
+
+                // complete task
+                TaskManager.CompleteTask();
+            }
+        }
+
+        private static void CheckNumericQuota(PackageContext cntx, List<string> errors, string quotaName, long currentVal, long val, string messageKey)
+        {
+            CheckQuotaValue(cntx, errors, quotaName, currentVal, val, messageKey);
+        }
+        private static void CheckNumericQuota(PackageContext cntx, List<string> errors, string quotaName, int currentVal, int val, string messageKey)
+        {
+            CheckQuotaValue(cntx, errors, quotaName, Convert.ToInt64(currentVal), Convert.ToInt64(val), messageKey);
+        }
+
+        private static void CheckNumericQuota(PackageContext cntx, List<string> errors, string quotaName, int val, string messageKey)
+        {
+            CheckQuotaValue(cntx, errors, quotaName, 0, val, messageKey);
+        }
+
+        private static void CheckBooleanQuota(PackageContext cntx, List<string> errors, string quotaName, bool val, string messageKey)
+        {
+            CheckQuotaValue(cntx, errors, quotaName, 0, val ? 1 : 0, messageKey);
+        }
+
+        private static void CheckListsQuota(PackageContext cntx, List<string> errors, string quotaName, string messageKey)
+        {
+            CheckQuotaValue(cntx, errors, quotaName, 0, -1, messageKey);
+        }
+
+        private static void CheckQuotaValue(PackageContext cntx, List<string> errors, string quotaName, long currentVal, long val, string messageKey)
+        {
+            if (!cntx.Quotas.ContainsKey(quotaName))
+                return;
+
+            QuotaValueInfo quota = cntx.Quotas[quotaName];
+
+            if(val == -1 && quota.QuotaExhausted) // check if quota already reached
+            {
+                errors.Add(messageKey + ":" + quota.QuotaAllocatedValue);
+            }
+            else if(quota.QuotaAllocatedValue == -1)
+                return; // unlimited
+            else if (quota.QuotaTypeId == 1 && val == 1 && quota.QuotaAllocatedValue == 0) // bool quota
+                errors.Add(messageKey);
+            else if (quota.QuotaTypeId == 2)
+            {
+                long maxValue = quota.QuotaAllocatedValue - quota.QuotaUsedValue + currentVal;
+                if(val > maxValue)
+                    errors.Add(messageKey + ":" + maxValue);
+            }
+            else if (quota.QuotaTypeId == 3 && val > quota.QuotaAllocatedValue)
+            {
+                int maxValue = quota.QuotaAllocatedValue;
+                errors.Add(messageKey + ":" + maxValue);
+            }
+        }
+
+        public static IntResult ImportVirtualMachine(int packageId,
+            int serviceId, string vmId,
+            string osTemplateFile, string adminPassword,
+            bool startShutdownAllowed, bool pauseResumeAllowed, bool rebootAllowed, bool resetAllowed, bool reinstallAllowed,
+            string externalNicMacAddress, int[] externalAddresses,
+            string managementNicMacAddress, int managementAddress)
+        {
+            // result object
+            IntResult res = new IntResult();
+
+            // meta item
+            VirtualMachine item = null;
+
+            try
+            {
+                #region Check account and space statuses
+                // check account
+                if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive | DemandAccount.IsAdmin))
+                    return res;
+
+                // check package
+                if (!SecurityContext.CheckPackage(res, packageId, DemandPackage.IsActive))
+                    return res;
+
+                #endregion
+
+                // load package context
+                PackageContext cntx = PackageController.GetPackageContext(packageId);
+
+                item = new VirtualMachine();
+                item.ServiceId = serviceId;
+                item.PackageId = packageId;
+                item.VirtualMachineId = vmId;
+
+                // load service settings
+                StringDictionary settings = ServerController.GetServiceSettings(serviceId);
+
+                // load virtual machine info from service
+                VirtualizationServer vs = GetVirtualizationProxy(serviceId);
+                VirtualMachine vm = vs.GetVirtualMachineEx(vmId);
+
+                // set VM properties
+                item.Name = vm.Name;
+                item.ProvisioningStatus = VirtualMachineProvisioningStatus.OK;
+
+                item.Generation = vm.Generation;
+                item.CpuCores = vm.CpuCores;
+                item.RamSize = vm.RamSize;
+                item.DynamicMemory = vm.DynamicMemory;
+                item.HddSize = vm.HddSize;
+                item.VirtualHardDrivePath = vm.VirtualHardDrivePath;
+                item.RootFolderPath = Path.GetDirectoryName(vm.VirtualHardDrivePath);
+                item.SnapshotsNumber = cntx.Quotas[Quotas.VPS2012_SNAPSHOTS_NUMBER].QuotaAllocatedValue;
+                item.DvdDriveInstalled = vm.DvdDriveInstalled;
+                item.BootFromCD = vm.BootFromCD;
+                item.NumLockEnabled = vm.NumLockEnabled;
+                item.StartTurnOffAllowed = startShutdownAllowed;
+                item.PauseResumeAllowed = pauseResumeAllowed;
+                item.RebootAllowed = rebootAllowed;
+                item.ResetAllowed = resetAllowed;
+                item.ReinstallAllowed = reinstallAllowed;
+
+                // remote desktop
+                if(!String.IsNullOrEmpty(adminPassword))
+                {
+                    item.RemoteDesktopEnabled = true;
+                    item.AdministratorPassword = CryptoUtils.Encrypt(adminPassword);
+                }
+
+                // set OS template
+                string templatesPath = settings["OsTemplatesPath"];
+                var correctVhdPath = GetCorrectTemplateFilePath(templatesPath, osTemplateFile);
+                item.OperatingSystemTemplatePath = correctVhdPath;
+                try
+                {
+                    LibraryItem[] osTemplates = GetOperatingSystemTemplatesByServiceId(serviceId);
+                    foreach (LibraryItem osTemplate in osTemplates)
+                    {
+                        if (String.Compare(osTemplate.Path, osTemplateFile, true) == 0)
+                        {
+                            item.OperatingSystemTemplate = osTemplate.Name;
+                            item.LegacyNetworkAdapter = osTemplate.LegacyNetworkAdapter;
+                            break;
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    res.AddError(VirtualizationErrorCodes.GET_OS_TEMPLATES_ERROR, ex);
+                    return res;
+                }
+
+                // save item
+                int itemId = PackageController.AddPackageItem(item);
+                item.Id = itemId;
+                res.Value = itemId;
+
+                #region Setup external network
+                // setup external network
+                if (!String.IsNullOrEmpty(externalNicMacAddress))
+                {
+                    item.ExternalNetworkEnabled = true;
+                    item.ExternalNicMacAddress = externalNicMacAddress;
+                    item.ExternalSwitchId = settings["ExternalNetworkId"];
+
+                    // assign selected IP addresses to package
+                    ServerController.AllocatePackageIPAddresses(packageId, externalAddresses);
+
+                    // re-read package IPs
+                    List<PackageIPAddress> packageIPs = ServerController.GetPackageUnassignedIPAddresses(
+                                    packageId, IPAddressPool.VpsExternalNetwork);
+
+                    // assign IP addresses to VM
+                    for(int i = 0; i < externalAddresses.Length; i++)
+                    {
+                        foreach (PackageIPAddress ip in packageIPs)
+                        {
+                            if (ip.AddressID == externalAddresses[i])
+                            {
+                                // assign to the item
+                                ServerController.AddItemIPAddress(itemId, ip.PackageAddressID);
+
+                                // set primary IP address
+                                if(i == 0)
+                                    ServerController.SetItemPrimaryIPAddress(itemId, ip.PackageAddressID);
+
+                                break;
+                            }
+                        }
+                    }
+                }
+                #endregion
+
+                #region Setup management network
+                // setup management network
+                if (!String.IsNullOrEmpty(managementNicMacAddress))
+                {
+                    item.ManagementNetworkEnabled = true;
+                    item.ManagementNicMacAddress = managementNicMacAddress;
+                    item.ManagementSwitchId = settings["ManagementNetworkId"];
+
+                    // assign selected IP addresses to package
+                    ServerController.AllocatePackageIPAddresses(packageId, new int[] { managementAddress });
+
+                    // re-read package IPs
+                    List<PackageIPAddress> packageIPs = ServerController.GetPackageUnassignedIPAddresses(
+                                    packageId, IPAddressPool.VpsManagementNetwork);
+
+                    // assign IP addresses to VM
+                    foreach (PackageIPAddress ip in packageIPs)
+                    {
+                        if (ip.AddressID == managementAddress)
+                        {
+                            // assign to the item
+                            ServerController.AddItemIPAddress(itemId, ip.PackageAddressID);
+
+                            break;
+                        }
+                    }
+                }
+                #endregion
+
+                // save item once again
+                PackageController.UpdatePackageItem(item);
+            }
+            catch (Exception ex)
+            {
+                res.AddError(VirtualizationErrorCodes.IMPORT_ERROR, ex);
+                return res;
+            }
+
+            res.IsSuccess = true;
+            return res;
+        }
+
+        private static JobResult SendNetworkAdapterKVP(int itemId, string adapterName)
+        {
+            // load item
+            VirtualMachine vm = GetVirtualMachineByItemId(itemId);
+            if (vm == null)
+                return null;
+
+            // build task parameters
+            Dictionary<string, string> props = new Dictionary<string, string>();
+            NetworkAdapterDetails nic = null;
+
+            if(String.Compare(adapterName, "external", true) == 0)
+            {
+                // external
+                nic = GetExternalNetworkAdapterDetails(itemId);
+            }
+            else if(String.Compare(adapterName, "private", true) == 0)
+            {
+                // private
+                nic = GetPrivateNetworkAdapterDetails(itemId);
+            }
+            else
+            {
+                // management
+                nic = GetManagementNetworkAdapterDetails(itemId);
+            }
+            
+            // network format
+            if (nic != null && !String.IsNullOrEmpty(nic.MacAddress))
+            {
+                props["MAC"] = nic.MacAddress.Replace("-", ":");
+                props["EnableDHCP"] = nic.IsDHCP.ToString();
+                if (!nic.IsDHCP)
+                {
+                    string[] ips = new string[nic.IPAddresses.Length];
+                    string[] subnetMasks = new string[nic.IPAddresses.Length];
+                    for (int i = 0; i < ips.Length; i++)
+                    {
+                        ips[i] = nic.IPAddresses[i].IPAddress;
+                        subnetMasks[i] = nic.IPAddresses[i].SubnetMask;
+
+                        // set gateway from the first (primary) IP
+                        if (i == 0)
+                            props["DefaultIPGateway"] = nic.IPAddresses[i].DefaultGateway;
+                    }
+
+                    props["IPAddress"] = String.Join(";", ips);
+                    props["SubnetMask"] = String.Join(";", subnetMasks);
+
+                    // name servers
+                    props["PreferredDNSServer"] = nic.PreferredNameServer;
+                    if (!String.IsNullOrEmpty(nic.AlternateNameServer))
+                        props["PreferredDNSServer"] += ";" + nic.AlternateNameServer;
+                }
+            }
+
+            // DNS
+            if (!props.ContainsKey("PreferredDNSServer")
+                || String.IsNullOrEmpty(props["PreferredDNSServer"]))
+            {
+                props["PreferredDNSServer"] = "0.0.0.0"; // obtain automatically
+            }
+
+            // send items
+            return SendKvpItems(itemId, "SetupNetworkAdapter", props);
+        }
+
+        private static string GetSymbolDelimitedMacAddress(string mac, string delimiter)
+        {
+            if (String.IsNullOrEmpty(mac))
+                return mac;
+
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < 6; i++)
+            {
+                sb.Append(mac[i * 2]).Append(mac[i * 2 + 1]);
+                if (i < 5) sb.Append(delimiter);
+            }
+            return sb.ToString();
+        }
+
+        private static JobResult SendComputerNameKVP(int itemId, string computerName)
+        {
+            // load item
+            VirtualMachine vm = GetVirtualMachineByItemId(itemId);
+            if (vm == null)
+                return null;
+
+            // build task parameters
+            Dictionary<string, string> props = new Dictionary<string, string>();
+
+            props["FullComputerName"] = computerName;
+
+            // send items
+            return SendKvpItems(itemId, "ChangeComputerName", props);
+        }
+
+        private static JobResult SendAdministratorPasswordKVP(int itemId, string password)
+        {
+            // load item
+            VirtualMachine vm = GetVirtualMachineByItemId(itemId);
+            if (vm == null)
+                return null;
+
+            // build task parameters
+            Dictionary<string, string> props = new Dictionary<string, string>();
+
+            props["Password"] = password;
+
+            // send items
+            return SendKvpItems(itemId, "ChangeAdministratorPassword", props);
+        }
+
+        private static JobResult SendKvpItems(int itemId, string taskName, Dictionary<string, string> taskProps)
+        {
+            string TASK_PREFIX = "WSP-";
+
+            // load item
+            VirtualMachine vm = GetVirtualMachineByItemId(itemId);
+            if (vm == null)
+                return null;
+
+            JobResult result = null;
+
+            // load proxy
+            VirtualizationServer vs = GetVirtualizationProxy(vm.ServiceId);
+
+            try
+            {
+                // delete completed task definitions
+                List<string> completedTasks = new List<string>();
+                KvpExchangeDataItem[] vmKvps = vs.GetKVPItems(vm.VirtualMachineId);
+                foreach (KvpExchangeDataItem vmKvp in vmKvps)
+                {
+                    if (vmKvp.Name.StartsWith(TASK_PREFIX))
+                        completedTasks.Add(vmKvp.Name);
+                }
+
+                // delete completed items
+                vs.RemoveKVPItems(vm.VirtualMachineId, completedTasks.ToArray());
+            }
+            catch (Exception ex)
+            {
+                // log error
+                TaskManager.WriteWarning(String.Format("Error deleting KVP items: {0}", ex.Message));
+            }
+
+            // build items array
+            List<string> items = new List<string>();
+            foreach (string propName in taskProps.Keys)
+                items.Add(propName + "=" + taskProps[propName]);
+
+            taskName = String.Format("{0}{1}-{2}", TASK_PREFIX, taskName, DateTime.Now.Ticks);
+            string taskData = String.Join("|", items.ToArray());
+
+            // create KVP item
+            KvpExchangeDataItem[] kvp = new KvpExchangeDataItem[1];
+            kvp[0] = new KvpExchangeDataItem();
+            kvp[0].Name = taskName;
+            kvp[0].Data = taskData;
+
+            try
+            {
+                // try adding KVP items
+                result = vs.AddKVPItems(vm.VirtualMachineId, kvp);
+
+                if (result.Job != null && result.Job.JobState == ConcreteJobState.Exception)
+                {
+                    // try updating KVP items
+                    return vs.ModifyKVPItems(vm.VirtualMachineId, kvp);
+                }
+                else
+                {
+                    return result;
+                }
+            }
+            catch (Exception ex)
+            {
+                // log error
+                TaskManager.WriteWarning(String.Format("Error setting KVP items '{0}': {1}", kvp[0].Data, ex.Message));
+            }
+
+            return null;
+        }
+
+        private static string EnsurePrivateVirtualSwitch(ServiceProviderItem item)
+        {
+            // try locate switch in the package
+            List<ServiceProviderItem> items = PackageController.GetPackageItemsByType(item.PackageId, typeof(VirtualSwitch));
+
+            // exists - return ID
+            if (items.Count > 0)
+                return ((VirtualSwitch)items[0]).SwitchId;
+
+            // switch name
+            string name = EvaluateItemVariables("[username] - [space_name]", item);
+
+            // log
+            TaskManager.Write("VPS_CREATE_PRIVATE_VIRTUAL_SWITCH", name);
+
+            try
+            {
+                // create switch
+                // load proxy
+                VirtualizationServer vs = GetVirtualizationProxy(item.ServiceId);
+
+                // create switch
+                VirtualSwitch sw = vs.CreateSwitch(name);
+                sw.ServiceId = item.ServiceId;
+                sw.PackageId = item.PackageId;
+
+                // save item
+                PackageController.AddPackageItem(sw);
+
+                return sw.SwitchId;
+            }
+            catch (Exception ex)
+            {
+                TaskManager.WriteError(ex, "VPS_CREATE_PRIVATE_VIRTUAL_SWITCH_ERROR");
+                return null;
+            }
+        }
+
+        private static string EvaluateItemVariables(string str, ServiceProviderItem item)
+        {
+            str = Utils.ReplaceStringVariable(str, "vps_hostname", item.Name);
+
+            return EvaluateSpaceVariables(str, item.PackageId);
+        }
+
+        private static string EvaluateSpaceVariables(string str, int packageId)
+        {
+            // load package
+            PackageInfo package = PackageController.GetPackage(packageId);
+            UserInfo user = UserController.GetUser(package.UserId);
+            str = Utils.ReplaceStringVariable(str, "space_id", packageId.ToString());
+            str = Utils.ReplaceStringVariable(str, "space_name", package.PackageName);
+            str = Utils.ReplaceStringVariable(str, "user_id", user.UserId.ToString());
+            str = Utils.ReplaceStringVariable(str, "username", user.Username);
+
+            return str;
+        }
+        #endregion
+
+        #region VPS – General
+
+        public static List<ConcreteJob> GetVirtualMachineJobs(int itemId)
+        {
+            // load meta item
+            VirtualMachine vm = GetVirtualMachineByItemId(itemId);
+
+            if (vm == null)
+                return null;
+
+            // get proxy
+            VirtualizationServer vps = GetVirtualizationProxy(vm.ServiceId);
+
+            // load jobs
+            ConcreteJob[] jobs = vps.GetVirtualMachineJobs(vm.VirtualMachineId);
+            List<ConcreteJob> retJobs = new List<ConcreteJob>();
+
+            foreach (ConcreteJob job in jobs)
+            {
+                if (job.JobState == ConcreteJobState.Running)
+                {
+                    retJobs.Add(job);
+                }
+            }
+
+            return retJobs;
+        }
+        
+        public static byte[] GetVirtualMachineThumbnail(int itemId, ThumbnailSize size)
+        {
+            // load meta item
+            VirtualMachine vm = GetVirtualMachineByItemId(itemId);
+
+            if (vm == null)
+                return null;
+
+            // get proxy
+            VirtualizationServer vps = GetVirtualizationProxy(vm.ServiceId);
+
+            // return thumbnail
+            return vps.GetVirtualMachineThumbnailImage(vm.VirtualMachineId, size);
+        }
+
+        public static VirtualMachine GetVirtualMachineGeneralDetails(int itemId)
+        {
+            // load meta item
+            VirtualMachine machine = GetVirtualMachineByItemId(itemId);
+
+            if (machine == null || String.IsNullOrEmpty(machine.VirtualMachineId))
+                return null;
+
+            // get proxy
+            VirtualizationServer vps = GetVirtualizationProxy(machine.ServiceId);
+
+            // load details
+            VirtualMachine vm = vps.GetVirtualMachine(machine.VirtualMachineId);
+
+            // add meta props
+            vm.Id = machine.Id;
+            vm.Name = machine.Name;
+            vm.RamSize = machine.RamSize;
+            vm.ServiceId = machine.ServiceId;
+
+            return vm;
+        }
+
+        public static VirtualMachine GetVirtualMachineExtendedInfo(int serviceId, string vmId)
+        {
+            // get proxy
+            VirtualizationServer vps = GetVirtualizationProxy(serviceId);
+
+            // load details
+            return vps.GetVirtualMachineEx(vmId);
+        }
+
+        public static int CancelVirtualMachineJob(string jobId)
+        {
+            // VPS - CANCEL_JOB
+            return 0;
+        }
+
+        public static ResultObject UpdateVirtualMachineHostName(int itemId, string hostname, bool updateNetBIOS)
+        {
+            if (String.IsNullOrEmpty(hostname))
+                throw new ArgumentNullException("hostname");
+
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            // start task
+            res = TaskManager.StartResultTask<ResultObject>("VPS", "UPDATE_HOSTNAME", vm.Id, vm.Name, vm.PackageId);
+
+            try
+            {
+                // get proxy
+                VirtualizationServer vs = GetVirtualizationProxy(vm.ServiceId);
+
+                // update virtual machine name
+                JobResult result = vs.RenameVirtualMachine(vm.VirtualMachineId, hostname);
+                if (result.ReturnValue != ReturnCode.OK)
+                {
+                    LogReturnValueResult(res, result);
+                    TaskManager.CompleteResultTask(res);
+                    return res;
+                }
+
+                // update meta item
+                vm.Name = hostname;
+                PackageController.UpdatePackageItem(vm);
+                
+                // update NetBIOS name if required
+                if (updateNetBIOS)
+                {
+                    result = SendComputerNameKVP(itemId, hostname);
+                    if (result.ReturnValue != ReturnCode.JobStarted
+                        && result.Job.JobState == ConcreteJobState.Completed)
+                    {
+                        LogReturnValueResult(res, result);
+                        TaskManager.CompleteResultTask(res);
+                        return res;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.CHANGE_ADMIN_PASSWORD_ERROR, ex);
+                return res;
+            }
+
+            TaskManager.CompleteResultTask();
+            return res;
+        }
+
+        public static ResultObject ChangeVirtualMachineStateExternal(int itemId, VirtualMachineRequestedState state)
+        {
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            #region Check Quotas
+            // check quotas
+            List<string> quotaResults = new List<string>();
+
+            if ((state == VirtualMachineRequestedState.Start
+                || state == VirtualMachineRequestedState.TurnOff
+                || state == VirtualMachineRequestedState.ShutDown)
+                && !vm.StartTurnOffAllowed)
+                quotaResults.Add(VirtualizationErrorCodes.QUOTA_EXCEEDED_START_SHUTDOWN_ALLOWED);
+
+            else if ((state == VirtualMachineRequestedState.Pause
+                || state == VirtualMachineRequestedState.Resume)
+                && !vm.PauseResumeAllowed)
+                quotaResults.Add(VirtualizationErrorCodes.QUOTA_EXCEEDED_PAUSE_RESUME_ALLOWED);
+
+            else if (state == VirtualMachineRequestedState.Reboot
+                && !vm.RebootAllowed)
+                quotaResults.Add(VirtualizationErrorCodes.QUOTA_EXCEEDED_REBOOT_ALLOWED);
+
+            else if (state == VirtualMachineRequestedState.Reset
+                && !vm.ResetAllowed)
+                quotaResults.Add(VirtualizationErrorCodes.QUOTA_EXCEEDED_RESET_ALOWED);
+
+            if (quotaResults.Count > 0)
+            {
+                res.ErrorCodes.AddRange(quotaResults);
+                res.IsSuccess = false;
+                TaskManager.CompleteResultTask();
+                return res;
+            }
+            #endregion
+
+            return ChangeVirtualMachineState(itemId, state);
+        }
+
+        private static ResultObject ChangeVirtualMachineState(int itemId, VirtualMachineRequestedState state)
+        {
+            // start task
+            ResultObject res = TaskManager.StartResultTask<ResultObject>("VPS", "CHANGE_STATE");
+                                                
+            try
+            {
+                // load service item
+                VirtualMachine machine = (VirtualMachine)PackageController.GetPackageItem(itemId);
+                if (machine == null)
+                {
+                    TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                    return res;
+                }
+
+                BackgroundTask topTask = TaskManager.TopTask;
+                topTask.ItemId = machine.Id;
+                topTask.ItemName = machine.Name;
+                topTask.PackageId = machine.PackageId;
+
+                TaskController.UpdateTask(topTask);
+
+                TaskManager.WriteParameter("New state", state);
+
+                // load proxy
+                VirtualizationServer vps = GetVirtualizationProxy(machine.ServiceId);                    
+
+                try
+                {
+                    if (state == VirtualMachineRequestedState.ShutDown)
+                    {
+                        ReturnCode code = vps.ShutDownVirtualMachine(machine.VirtualMachineId, true, SHUTDOWN_REASON);
+                        if (code != ReturnCode.OK)
+                        {
+                            res.ErrorCodes.Add(VirtualizationErrorCodes.JOB_START_ERROR + ":" + code);
+                            TaskManager.CompleteResultTask(res);
+                            return res;
+                        }
+
+                        // spin until fully stopped
+                        VirtualMachine vm = vps.GetVirtualMachine(machine.VirtualMachineId);
+                        while (vm.State != VirtualMachineState.Off)
+                        {
+                            System.Threading.Thread.Sleep(1000); // sleep 1 second
+                            vm = vps.GetVirtualMachine(machine.VirtualMachineId);
+                        }
+                    }
+                    else if (state == VirtualMachineRequestedState.Reboot)
+                    {
+                        // shutdown first
+                        ResultObject shutdownResult = ChangeVirtualMachineState(itemId,
+                            VirtualMachineRequestedState.ShutDown);
+                        if (!shutdownResult.IsSuccess)
+                        {
+                            TaskManager.CompleteResultTask(res);
+                            return shutdownResult;
+                        }
+
+                        // start machine
+                        ResultObject startResult = ChangeVirtualMachineState(itemId, VirtualMachineRequestedState.Start);
+                        if (!startResult.IsSuccess)
+                        {
+                            TaskManager.CompleteResultTask(res);
+                            return startResult;
+                        }
+                    }
+                    else
+                    {
+                        if (state == VirtualMachineRequestedState.Resume)
+                            state = VirtualMachineRequestedState.Start;
+
+                        JobResult result = vps.ChangeVirtualMachineState(machine.VirtualMachineId, state);
+
+                        if (result.Job.JobState == ConcreteJobState.Completed)
+                        {
+                            LogReturnValueResult(res, result);
+                            TaskManager.CompleteTask();
+                            return res;
+                        }
+                        else
+                        {
+                            // check return
+                            if (result.ReturnValue != ReturnCode.JobStarted)
+                            {
+                                LogReturnValueResult(res, result);
+                                TaskManager.CompleteResultTask(res);
+                                return res;
+                            }
+
+                            // wait for completion
+                            if (!JobCompleted(vps, result.Job))
+                            {
+                                LogJobResult(res, result.Job);
+                                TaskManager.CompleteResultTask(res);
+                                return res;
+                            }
+                        }
+                    }
+                }
+                catch(Exception ex)
+                {
+                    res.IsSuccess = false;
+                    res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_CHANGE_VIRTUAL_SERVER_STATE);
+                    TaskManager.WriteError(ex);
+                }
+            }
+            catch (Exception ex)
+            {
+                res.IsSuccess = false;
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CHANGE_VIRTUAL_MACHINE_STATE_GENERAL_ERROR);
+                TaskManager.WriteError(ex);
+                return res;
+            }
+
+            TaskManager.CompleteTask();
+            return res;
+        }
+        #endregion
+
+        #region VPS - Configuration
+        public static ResultObject ChangeAdministratorPassword(int itemId, string password)
+        {
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            // start task
+            res = TaskManager.StartResultTask<ResultObject>("VPS", "CHANGE_ADMIN_PASSWORD", vm.Id, vm.Name, vm.PackageId);
+
+            try
+            {
+                // get proxy
+                VirtualizationServer vs = GetVirtualizationProxy(vm.ServiceId);
+
+                // change administrator password
+                JobResult result = SendAdministratorPasswordKVP(itemId, password);
+                if (result.ReturnValue != ReturnCode.JobStarted
+                    && result.Job.JobState == ConcreteJobState.Completed)
+                {
+                    LogReturnValueResult(res, result);
+                    TaskManager.CompleteResultTask(res);
+                    return res;
+                }
+
+                // update meta item
+                vm.AdministratorPassword = CryptoUtils.Encrypt(password);
+                PackageController.UpdatePackageItem(vm);
+            }
+            catch (Exception ex)
+            {
+                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.CHANGE_ADMIN_PASSWORD_ERROR, ex);
+                return res;
+            }
+
+            TaskManager.CompleteResultTask();
+            return res;
+        }
+        #endregion
+
+        #region VPS – Edit Configuration
+        public static ResultObject UpdateVirtualMachineConfiguration(int itemId, int cpuCores, int ramMB, int hddGB, int snapshots, bool dvdInstalled, bool bootFromCD, bool numLock, bool startShutdownAllowed, bool pauseResumeAllowed, bool rebootAllowed, bool resetAllowed, bool reinstallAllowed, bool externalNetworkEnabled, bool privateNetworkEnabled, VirtualMachine otherSettings)
+        {
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            #region Check Quotas
+            // check quotas
+            List<string> quotaResults = new List<string>();
+            PackageContext cntx = PackageController.GetPackageContext(vm.PackageId);
+
+            var currentRam = vm.RamSize;
+            var newRam = ramMB;
+
+            // dynamic memory
+            if (vm.DynamicMemory != null && vm.DynamicMemory.Enabled)
+                currentRam = vm.DynamicMemory.Maximum;
+            if (otherSettings.DynamicMemory != null && otherSettings.DynamicMemory.Enabled)
+            {
+                newRam = otherSettings.DynamicMemory.Maximum;
+
+                if (ramMB > otherSettings.DynamicMemory.Maximum || ramMB < otherSettings.DynamicMemory.Minimum)
+                    quotaResults.Add(VirtualizationErrorCodes.QUOTA_NOT_IN_DYNAMIC_RAM);
+            }
+
+            CheckNumericQuota(cntx, quotaResults, Quotas.VPS2012_CPU_NUMBER, cpuCores, VirtualizationErrorCodes.QUOTA_EXCEEDED_CPU);
+            CheckNumericQuota(cntx, quotaResults, Quotas.VPS2012_RAM, currentRam, newRam, VirtualizationErrorCodes.QUOTA_EXCEEDED_RAM);
+            CheckNumericQuota(cntx, quotaResults, Quotas.VPS2012_HDD, vm.HddSize, hddGB, VirtualizationErrorCodes.QUOTA_EXCEEDED_HDD);
+            CheckNumericQuota(cntx, quotaResults, Quotas.VPS2012_SNAPSHOTS_NUMBER, snapshots, VirtualizationErrorCodes.QUOTA_EXCEEDED_SNAPSHOTS);
+
+            CheckBooleanQuota(cntx, quotaResults, Quotas.VPS2012_DVD_ENABLED, dvdInstalled, VirtualizationErrorCodes.QUOTA_EXCEEDED_DVD_ENABLED);
+            CheckBooleanQuota(cntx, quotaResults, Quotas.VPS2012_BOOT_CD_ALLOWED, bootFromCD, VirtualizationErrorCodes.QUOTA_EXCEEDED_CD_ALLOWED);
+
+            CheckBooleanQuota(cntx, quotaResults, Quotas.VPS2012_START_SHUTDOWN_ALLOWED, startShutdownAllowed, VirtualizationErrorCodes.QUOTA_EXCEEDED_START_SHUTDOWN_ALLOWED);
+            CheckBooleanQuota(cntx, quotaResults, Quotas.VPS2012_PAUSE_RESUME_ALLOWED, pauseResumeAllowed, VirtualizationErrorCodes.QUOTA_EXCEEDED_PAUSE_RESUME_ALLOWED);
+            CheckBooleanQuota(cntx, quotaResults, Quotas.VPS2012_REBOOT_ALLOWED, rebootAllowed, VirtualizationErrorCodes.QUOTA_EXCEEDED_REBOOT_ALLOWED);
+            CheckBooleanQuota(cntx, quotaResults, Quotas.VPS2012_RESET_ALOWED, resetAllowed, VirtualizationErrorCodes.QUOTA_EXCEEDED_RESET_ALOWED);
+            CheckBooleanQuota(cntx, quotaResults, Quotas.VPS2012_REINSTALL_ALLOWED, reinstallAllowed, VirtualizationErrorCodes.QUOTA_EXCEEDED_REINSTALL_ALLOWED);
+
+            CheckBooleanQuota(cntx, quotaResults, Quotas.VPS2012_EXTERNAL_NETWORK_ENABLED, externalNetworkEnabled, VirtualizationErrorCodes.QUOTA_EXCEEDED_EXTERNAL_NETWORK_ENABLED);
+            CheckBooleanQuota(cntx, quotaResults, Quotas.VPS2012_PRIVATE_NETWORK_ENABLED, privateNetworkEnabled, VirtualizationErrorCodes.QUOTA_EXCEEDED_PRIVATE_NETWORK_ENABLED);
+
+            // check acceptable values
+            if (ramMB <= 0)
+                quotaResults.Add(VirtualizationErrorCodes.QUOTA_WRONG_RAM);
+            if (hddGB <= 0)
+                quotaResults.Add(VirtualizationErrorCodes.QUOTA_WRONG_HDD);
+            if (snapshots < 0)
+                quotaResults.Add(VirtualizationErrorCodes.QUOTA_WRONG_SNAPSHOTS);
+
+            if (quotaResults.Count > 0)
+            {
+                res.ErrorCodes.AddRange(quotaResults);
+                return res;
+            }
+            #endregion
+
+            // start task
+            res = TaskManager.StartResultTask<ResultObject>("VPS", "UPDATE_CONFIGURATION", vm.Id, vm.Name, vm.PackageId);
+
+            try
+            {
+                JobResult result = null;
+
+                // get proxy
+                VirtualizationServer vs = GetVirtualizationProxy(vm.ServiceId);
+
+                // stop VPS if required
+                VirtualMachine vps = vs.GetVirtualMachine(vm.VirtualMachineId);
+
+                bool wasStarted = false;
+
+                // stop (shut down) virtual machine
+                if (vps.State != VirtualMachineState.Off)
+                {
+                    wasStarted = true;
+                    ReturnCode code = vs.ShutDownVirtualMachine(vm.VirtualMachineId, true, SHUTDOWN_REASON_CHANGE_CONFIG);
+                    if (code == ReturnCode.OK)
+                    {
+                        // spin until fully stopped
+                        vps = vs.GetVirtualMachine(vm.VirtualMachineId);
+                        while (vps.State != VirtualMachineState.Off)
+                        {
+                            System.Threading.Thread.Sleep(1000); // sleep 1 second
+                            vps = vs.GetVirtualMachine(vm.VirtualMachineId);
+                        }
+                    }
+                    else
+                    {
+                        // turn off
+                        result = vs.ChangeVirtualMachineState(vm.VirtualMachineId, VirtualMachineRequestedState.TurnOff);
+                        if (!JobCompleted(vs, result.Job))
+                        {
+                            LogJobResult(res, result.Job);
+                            TaskManager.CompleteResultTask(res);
+                            return res;
+                        }
+                    }
+                } // end OFF
+
+                // update meta-item
+                vm.CpuCores = cpuCores;
+                vm.RamSize = ramMB;
+                vm.HddSize = hddGB;
+                vm.SnapshotsNumber = snapshots;
+                
+                vm.BootFromCD = bootFromCD;
+                vm.NumLockEnabled = numLock;
+                vm.DvdDriveInstalled = dvdInstalled;
+
+                vm.StartTurnOffAllowed = startShutdownAllowed;
+                vm.PauseResumeAllowed = pauseResumeAllowed;
+                vm.ResetAllowed = resetAllowed;
+                vm.RebootAllowed = rebootAllowed;
+                vm.ReinstallAllowed = reinstallAllowed;
+
+                vm.ExternalNetworkEnabled = externalNetworkEnabled;
+                vm.PrivateNetworkEnabled = privateNetworkEnabled;
+
+                // dynamic memory
+                if (otherSettings.DynamicMemory != null && otherSettings.DynamicMemory.Enabled)
+                    vm.DynamicMemory = otherSettings.DynamicMemory;
+                else
+                    vm.DynamicMemory = null;
+
+                // load service settings
+                StringDictionary settings = ServerController.GetServiceSettings(vm.ServiceId);
+
+                #region setup external network
+                if (vm.ExternalNetworkEnabled
+                    && String.IsNullOrEmpty(vm.ExternalNicMacAddress))
+                {
+                    // connect to network
+                    vm.ExternalSwitchId = settings["ExternalNetworkId"];
+                    vm.ExternalNicMacAddress = GenerateMacAddress();
+                }
+                #endregion
+
+                #region setup private network
+                if (vm.PrivateNetworkEnabled
+                    && String.IsNullOrEmpty(vm.PrivateNicMacAddress))
+                {
+                    // connecto to network
+                    vm.PrivateSwitchId = settings["PrivateNetworkId"];
+
+                    if (String.IsNullOrEmpty(vm.PrivateSwitchId))
+                    {
+                        // create/load private virtual switch
+                        vm.PrivateSwitchId = EnsurePrivateVirtualSwitch(vm);
+                    }
+                    vm.PrivateNicMacAddress = GenerateMacAddress();
+                }
+                #endregion
+
+                // update configuration on virtualization server
+                vm = vs.UpdateVirtualMachine(vm);
+
+                // update meta item
+                PackageController.UpdatePackageItem(vm);
+
+                // unprovision external IP addresses
+                if (!vm.ExternalNetworkEnabled)
+                    ServerController.DeleteItemIPAddresses(itemId);
+                else
+                    // send KVP config items
+                    SendNetworkAdapterKVP(itemId, "External");
+
+                // unprovision private IP addresses
+                if (!vm.PrivateNetworkEnabled)
+                    DataProvider.DeleteItemPrivateIPAddresses(SecurityContext.User.UserId, itemId);
+                else
+                    // send KVP config items
+                    SendNetworkAdapterKVP(itemId, "Private");
+
+                // start if required
+                if (wasStarted)
+                {
+                    result = vs.ChangeVirtualMachineState(vm.VirtualMachineId, VirtualMachineRequestedState.Start);
+                    if (!JobCompleted(vs, result.Job))
+                    {
+                        LogJobResult(res, result.Job);
+                        TaskManager.CompleteResultTask(res);
+                        return res;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.CHANGE_VM_CONFIGURATION, ex);
+                return res;
+            }
+
+            TaskManager.CompleteResultTask();
+            return res;
+        }
+        #endregion
+
+        #region DVD
+        public static LibraryItem GetInsertedDvdDisk(int itemId)
+        {
+            // load item
+            VirtualMachine vm = GetVirtualMachineByItemId(itemId);
+
+            // get proxy
+            VirtualizationServer vs = GetVirtualizationProxy(vm.ServiceId);
+            string isoPath = vs.GetInsertedDVD(vm.VirtualMachineId);
+
+            if (String.IsNullOrEmpty(isoPath))
+                return null;
+
+            // load library items
+            LibraryItem[] disks = GetLibraryDisks(itemId);
+
+            // find required disk
+            isoPath = Path.GetFileName(isoPath);
+            foreach (LibraryItem disk in disks)
+            {
+                if (String.Compare(isoPath, disk.Path, true) == 0)
+                    return disk;
+            }
+            return null;
+        }
+
+        public static LibraryItem[] GetLibraryDisks(int itemId)
+        {
+            // load item
+            VirtualMachine vm = GetVirtualMachineByItemId(itemId);
+
+            // load service settings
+            StringDictionary settings = ServerController.GetServiceSettings(vm.ServiceId);
+            string path = settings["DvdLibraryPath"];
+
+            // get proxy
+            VirtualizationServer vs = GetVirtualizationProxy(vm.ServiceId);
+
+            return vs.GetLibraryItems(path);
+        }
+
+        public static ResultObject InsertDvdDisk(int itemId, string isoPath)
+        {
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            // start task
+            res = TaskManager.StartResultTask<ResultObject>("VPS", "INSERT_DVD_DISK", vm.Id, vm.Name, vm.PackageId);
+
+            try
+            {
+                // load service settings
+                StringDictionary settings = ServerController.GetServiceSettings(vm.ServiceId);
+                string libPath = settings["DvdLibraryPath"];
+
+                // combine full path
+                string fullPath = Path.Combine(libPath, isoPath);
+
+                // get proxy
+                VirtualizationServer vs = GetVirtualizationProxy(vm.ServiceId);
+
+                // insert DVD
+                JobResult result = vs.InsertDVD(vm.VirtualMachineId, fullPath);
+                if (result.ReturnValue != ReturnCode.OK)
+                {
+                    LogReturnValueResult(res, result);
+                    TaskManager.CompleteResultTask(res);
+                    return res;
+                }
+            }
+            catch (Exception ex)
+            {
+                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.INSERT_DVD_DISK_ERROR, ex);
+                return res;
+            }
+
+            TaskManager.CompleteResultTask();
+            return res;
+        }
+
+        public static ResultObject EjectDvdDisk(int itemId)
+        {
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            // start task
+            res = TaskManager.StartResultTask<ResultObject>("VPS", "EJECT_DVD_DISK", vm.Id, vm.Name, vm.PackageId);
+
+            try
+            {
+                // get proxy
+                VirtualizationServer vs = GetVirtualizationProxy(vm.ServiceId);
+
+                // insert DVD
+                JobResult result = vs.EjectDVD(vm.VirtualMachineId);
+                if (result.ReturnValue != ReturnCode.OK)
+                {
+                    LogReturnValueResult(res, result);
+                    TaskManager.CompleteResultTask(res);
+                    return res;
+                }
+            }
+            catch (Exception ex)
+            {
+                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.EJECT_DVD_DISK_ERROR, ex);
+                return res;
+            }
+
+            TaskManager.CompleteResultTask();
+            return res;
+        }
+        #endregion
+
+        #region Snaphosts
+        public static VirtualMachineSnapshot[] GetVirtualMachineSnapshots(int itemId)
+        {
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+                return null;
+
+            // get proxy
+            VirtualizationServer vs = GetVirtualizationProxy(vm.ServiceId);
+            return vs.GetVirtualMachineSnapshots(vm.VirtualMachineId);
+        }
+
+        public static VirtualMachineSnapshot GetSnapshot(int itemId, string snaphostId)
+        {
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+                return null;
+
+            // get proxy
+            VirtualizationServer vs = GetVirtualizationProxy(vm.ServiceId);
+            return vs.GetSnapshot(snaphostId);
+        }
+
+        public static ResultObject CreateSnapshot(int itemId)
+        {
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            // start task
+            res = TaskManager.StartResultTask<ResultObject>("VPS", "TAKE_SNAPSHOT", vm.Id, vm.Name, vm.PackageId);
+
+            try
+            {
+                // get proxy
+                VirtualizationServer vs = GetVirtualizationProxy(vm.ServiceId);
+
+                #region Check Quotas
+                // check quotas
+                List<string> quotaResults = new List<string>();
+                PackageContext cntx = PackageController.GetPackageContext(vm.PackageId);
+
+                                // check the number of created snapshots
+                int createdNumber = vs.GetVirtualMachineSnapshots(vm.VirtualMachineId).Length;
+                if (createdNumber >= vm.SnapshotsNumber)
+                {
+                    TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.QUOTA_EXCEEDED_SNAPSHOTS + ":" + vm.SnapshotsNumber);
+                    return res;
+                }
+                #endregion
+
+                // take snapshot
+                JobResult result = vs.CreateSnapshot(vm.VirtualMachineId);
+                if (result.ReturnValue != ReturnCode.JobStarted)
+                {
+                    LogReturnValueResult(res, result);
+                    TaskManager.CompleteResultTask(res);
+                    return res;
+                }
+
+                if (!JobCompleted(vs, result.Job))
+                {
+                    LogJobResult(res, result.Job);
+                    TaskManager.CompleteResultTask(res);
+                    return res;
+                }
+            }
+            catch (Exception ex)
+            {
+                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.TAKE_SNAPSHOT_ERROR, ex);
+                return res;
+            }
+
+            TaskManager.CompleteResultTask();
+            return res;
+        }
+
+        public static ResultObject ApplySnapshot(int itemId, string snapshotId)
+        {
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            // start task
+            res = TaskManager.StartResultTask<ResultObject>("VPS", "APPLY_SNAPSHOT", vm.Id, vm.Name, vm.PackageId);
+
+            try
+            {
+                JobResult result = null;
+
+                // get proxy
+                VirtualizationServer vs = GetVirtualizationProxy(vm.ServiceId);
+
+                // check VM state
+                VirtualMachine vps = vs.GetVirtualMachine(vm.VirtualMachineId);
+
+                // stop virtual machine
+                if (vps.State != VirtualMachineState.Off)
+                {
+                    result = vs.ChangeVirtualMachineState(vm.VirtualMachineId, VirtualMachineRequestedState.TurnOff);
+                    if (!JobCompleted(vs, result.Job))
+                    {
+                        LogJobResult(res, result.Job);
+                        TaskManager.CompleteResultTask(res);
+                        return res;
+                    }
+                }
+
+                // take snapshot
+                result = vs.ApplySnapshot(vm.VirtualMachineId, snapshotId);
+                if (result.ReturnValue != ReturnCode.OK)
+                {
+                    LogReturnValueResult(res, result);
+                    TaskManager.CompleteResultTask(res);
+                    return res;
+                }
+            }
+            catch (Exception ex)
+            {
+                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.APPLY_SNAPSHOT_ERROR, ex);
+                return res;
+            }
+
+            TaskManager.CompleteResultTask();
+            return res;
+        }
+
+        public static ResultObject RenameSnapshot(int itemId, string snapshotId, string newName)
+        {
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            // start task
+            res = TaskManager.StartResultTask<ResultObject>("VPS", "RENAME_SNAPSHOT", vm.Id, vm.Name, vm.PackageId);
+
+            try
+            {
+                // get proxy
+                VirtualizationServer vs = GetVirtualizationProxy(vm.ServiceId);
+
+                // take snapshot
+                JobResult result = vs.RenameSnapshot(vm.VirtualMachineId, snapshotId, newName);
+                if (result.ReturnValue != ReturnCode.OK)
+                {
+                    LogReturnValueResult(res, result);
+                    TaskManager.CompleteResultTask(res);
+                    return res;
+                }
+            }
+            catch (Exception ex)
+            {
+                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.RENAME_SNAPSHOT_ERROR, ex);
+                return res;
+            }
+
+            TaskManager.CompleteResultTask();
+            return res;
+        }
+
+        public static ResultObject DeleteSnapshot(int itemId, string snapshotId)
+        {
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            // start task
+            res = TaskManager.StartResultTask<ResultObject>("VPS", "DELETE_SNAPSHOT", vm.Id, vm.Name, vm.PackageId);
+
+            try
+            {
+                // get proxy
+                VirtualizationServer vs = GetVirtualizationProxy(vm.ServiceId);
+
+                // take snapshot
+                JobResult result = vs.DeleteSnapshot(snapshotId);
+                if (result.ReturnValue != ReturnCode.JobStarted)
+                {
+                    LogReturnValueResult(res, result);
+                    TaskManager.CompleteResultTask(res);
+                    return res;
+                }
+
+                if (!JobCompleted(vs, result.Job))
+                {
+                    LogJobResult(res, result.Job);
+                    TaskManager.CompleteResultTask(res);
+                    return res;
+                }
+            }
+            catch (Exception ex)
+            {
+                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.DELETE_SNAPSHOT_ERROR, ex);
+                return res;
+            }
+
+            TaskManager.CompleteResultTask();
+            return res;
+        }
+
+        public static ResultObject DeleteSnapshotSubtree(int itemId, string snapshotId)
+        {
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            // start task
+            res = TaskManager.StartResultTask<ResultObject>("VPS", "DELETE_SNAPSHOT_SUBTREE", vm.Id, vm.Name, vm.PackageId);
+
+            try
+            {
+                // get proxy
+                VirtualizationServer vs = GetVirtualizationProxy(vm.ServiceId);
+
+                // take snapshot
+                JobResult result = vs.DeleteSnapshotSubtree(snapshotId);
+                if (result.ReturnValue != ReturnCode.JobStarted)
+                {
+                    LogReturnValueResult(res, result);
+                    TaskManager.CompleteResultTask(res);
+                    return res;
+                }
+
+                if (!JobCompleted(vs, result.Job))
+                {
+                    LogJobResult(res, result.Job);
+                    TaskManager.CompleteResultTask(res);
+                    return res;
+                }
+            }
+            catch (Exception ex)
+            {
+                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.DELETE_SNAPSHOT_SUBTREE_ERROR, ex);
+                return res;
+            }
+
+            TaskManager.CompleteResultTask();
+            return res;
+        }
+
+        public static byte[] GetSnapshotThumbnail(int itemId, string snapshotId, ThumbnailSize size)
+        {
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+                return null;
+
+            // get proxy
+            VirtualizationServer vs = GetVirtualizationProxy(vm.ServiceId);
+
+            return vs.GetSnapshotThumbnailImage(snapshotId, size);
+        }
+        #endregion
+
+        #region Network - External
+        public static NetworkAdapterDetails GetExternalNetworkDetails(int packageId)
+        {
+            // load service
+            int serviceId = PackageController.GetPackageServiceId(packageId, ResourceGroups.VPS2012);
+
+            return GetExternalNetworkDetailsInternal(serviceId);
+        }
+
+        public static NetworkAdapterDetails GetExternalNetworkAdapterDetails(int itemId)
+        {
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+                return null;
+
+            // get default NIC
+            NetworkAdapterDetails nic = GetExternalNetworkDetailsInternal(vm.ServiceId);
+
+            // update NIC
+            nic.MacAddress = GetSymbolDelimitedMacAddress(vm.ExternalNicMacAddress, "-");
+
+            // load IP addresses
+            nic.IPAddresses = ObjectUtils.CreateListFromDataReader<NetworkAdapterIPAddress>(
+                DataProvider.GetItemIPAddresses(SecurityContext.User.UserId, itemId, (int)IPAddressPool.VpsExternalNetwork)).ToArray();
+
+            // update subnet CIDR
+            foreach (NetworkAdapterIPAddress ip in nic.IPAddresses)
+                ip.SubnetMaskCidr = GetSubnetMaskCidr(ip.SubnetMask);
+
+            if (nic.IPAddresses.Length > 0)
+            {
+                // from primary address
+                nic.SubnetMask = nic.IPAddresses[0].SubnetMask;
+                nic.SubnetMaskCidr = GetSubnetMaskCidr(nic.SubnetMask);
+                nic.DefaultGateway = nic.IPAddresses[0].DefaultGateway;
+            }
+
+            return nic;
+        }
+
+        public static NetworkAdapterDetails GetManagementNetworkDetails(int packageId)
+        {
+            // load service
+            int serviceId = PackageController.GetPackageServiceId(packageId, ResourceGroups.VPS2012);
+            return GetManagementNetworkDetailsInternal(serviceId);
+        }
+
+        private static NetworkAdapterDetails GetExternalNetworkDetailsInternal(int serviceId)
+        {
+            // load service settings
+            StringDictionary settings = ServerController.GetServiceSettings(serviceId);
+
+            // create NIC object
+            NetworkAdapterDetails nic = new NetworkAdapterDetails();
+            nic.NetworkId = settings["ExternalNetworkId"];
+            nic.PreferredNameServer = settings["ExternalPreferredNameServer"];
+            nic.AlternateNameServer = settings["ExternalAlternateNameServer"];
+            return nic;
+        }
+
+        public static NetworkAdapterDetails GetManagementNetworkAdapterDetails(int itemId)
+        {
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+                return null;
+
+            // get default NIC
+            NetworkAdapterDetails nic = GetManagementNetworkDetailsInternal(vm.ServiceId);
+
+            // update NIC
+            nic.MacAddress = GetSymbolDelimitedMacAddress(vm.ManagementNicMacAddress, "-");
+
+            // load IP addresses
+            nic.IPAddresses = ObjectUtils.CreateListFromDataReader<NetworkAdapterIPAddress>(
+                DataProvider.GetItemIPAddresses(SecurityContext.User.UserId, itemId, (int)IPAddressPool.VpsManagementNetwork)).ToArray();
+
+            // update subnet CIDR
+            foreach (NetworkAdapterIPAddress ip in nic.IPAddresses)
+                ip.SubnetMaskCidr = GetSubnetMaskCidr(ip.SubnetMask);
+
+            if (nic.IPAddresses.Length > 0)
+            {
+                // from primary address
+                nic.SubnetMask = nic.IPAddresses[0].SubnetMask;
+                nic.SubnetMaskCidr = GetSubnetMaskCidr(nic.SubnetMask);
+                nic.DefaultGateway = nic.IPAddresses[0].DefaultGateway;
+            }
+
+            return nic;
+        }
+
+        private static NetworkAdapterDetails GetManagementNetworkDetailsInternal(int serviceId)
+        {
+            // load service settings
+            StringDictionary settings = ServerController.GetServiceSettings(serviceId);
+
+            // create NIC object
+            NetworkAdapterDetails nic = new NetworkAdapterDetails();
+            nic.NetworkId = settings["ManagementNetworkId"];
+            nic.IsDHCP = (String.Compare(settings["ManagementNicConfig"], "DHCP", true) == 0);
+
+            if (!nic.IsDHCP)
+            {
+                nic.PreferredNameServer = settings["ManagementPreferredNameServer"];
+                nic.AlternateNameServer = settings["ManagementAlternateNameServer"];
+            }
+            return nic;
+        }
+
+        public static ResultObject AddVirtualMachineExternalIPAddresses(int itemId, bool selectRandom, int addressesNumber, int[] addressIds, bool provisionKvp)
+        {
+            if (addressIds == null)
+                throw new ArgumentNullException("addressIds");
+
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            // start task
+            res = TaskManager.StartResultTask<ResultObject>("VPS", "ADD_EXTERNAL_IP", vm.Id, vm.Name, vm.PackageId);
+
+            try
+            {
+                if (selectRandom)
+                {
+                    List<PackageIPAddress> ips = ServerController.GetPackageUnassignedIPAddresses(vm.PackageId, IPAddressPool.VpsExternalNetwork);
+                    if (addressesNumber > ips.Count)
+                    {
+                        TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.NOT_ENOUGH_PACKAGE_IP_ADDRESSES);
+                        return res;
+                    }
+
+                    // get next N unassigned addresses
+                    addressIds = new int[addressesNumber];
+                    for (int i = 0; i < addressesNumber; i++)
+                        addressIds[i] = ips[i].PackageAddressID;
+                }
+
+                // add addresses
+                foreach (int addressId in addressIds)
+                    ServerController.AddItemIPAddress(itemId, addressId);
+
+                // send KVP config items
+                if(provisionKvp)
+                    SendNetworkAdapterKVP(itemId, "External");
+            }
+            catch (Exception ex)
+            {
+                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.ADD_VIRTUAL_MACHINE_EXTERNAL_IP_ADDRESS_ERROR, ex);
+                return res;
+            }
+
+            TaskManager.CompleteResultTask();
+            return res;
+        }
+
+        public static ResultObject SetVirtualMachinePrimaryExternalIPAddress(int itemId, int packageAddressId, bool provisionKvp)
+        {
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            // start task
+            res = TaskManager.StartResultTask<ResultObject>("VPS", "SET_PRIMARY_EXTERNAL_IP", vm.Id, vm.Name, vm.PackageId);
+
+            try
+            {
+                // call database
+                ServerController.SetItemPrimaryIPAddress(itemId, packageAddressId);
+
+                // send KVP config items
+                if(provisionKvp)
+                    SendNetworkAdapterKVP(itemId, "External");
+            }
+            catch (Exception ex)
+            {
+                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.SET_VIRTUAL_MACHINE_PRIMARY_EXTERNAL_IP_ADDRESS_ERROR, ex);
+                return res;
+            }
+
+            TaskManager.CompleteResultTask();
+            return res;
+        }
+
+        public static ResultObject DeleteVirtualMachineExternalIPAddresses(int itemId, int[] packageAddressIds, bool provisionKvp)
+        {
+            if (packageAddressIds == null)
+                throw new ArgumentNullException("addressIds");
+
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            // start task
+            res = TaskManager.StartResultTask<ResultObject>("VPS", "DELETE_EXTERNAL_IP", vm.Id, vm.Name, vm.PackageId);
+
+            try
+            {
+                // call database
+                foreach (int packageAddressId in packageAddressIds)
+                    ServerController.DeleteItemIPAddress(itemId, packageAddressId);
+
+                // send KVP config items
+                if(provisionKvp)
+                    SendNetworkAdapterKVP(itemId, "External");
+            }
+            catch (Exception ex)
+            {
+                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.DELETE_VIRTUAL_MACHINE_EXTERNAL_IP_ADDRESS_ERROR, ex);
+                return res;
+            }
+
+            TaskManager.CompleteResultTask();
+            return res;
+        }
+        #endregion
+
+        #region Network – Private
+        public static NetworkAdapterDetails GetPrivateNetworkDetails(int packageId)
+        {
+            // load service
+            int serviceId = PackageController.GetPackageServiceId(packageId, ResourceGroups.VPS2012);
+
+            return GetPrivateNetworkDetailsInternal(serviceId);
+        }
+
+        public static NetworkAdapterDetails GetPrivateNetworkAdapterDetails(int itemId)
+        {
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+                return null;
+
+            // load default internal adapter
+            NetworkAdapterDetails nic = GetPrivateNetworkDetailsInternal(vm.ServiceId);
+
+            // update NIC
+            nic.MacAddress = GetSymbolDelimitedMacAddress(vm.PrivateNicMacAddress, "-");
+
+            // load IP addresses
+            nic.IPAddresses = ObjectUtils.CreateListFromDataReader<NetworkAdapterIPAddress>(
+                DataProvider.GetItemPrivateIPAddresses(SecurityContext.User.UserId, itemId)).ToArray();
+
+            foreach (NetworkAdapterIPAddress ip in nic.IPAddresses)
+            {
+                ip.SubnetMask = nic.SubnetMask;
+                ip.SubnetMaskCidr = nic.SubnetMaskCidr;
+                ip.DefaultGateway = nic.DefaultGateway;
+            }
+
+            return nic;
+        }
+
+        private static NetworkAdapterDetails GetPrivateNetworkDetailsInternal(int serviceId)
+        {
+            // load service settings
+            StringDictionary settings = ServerController.GetServiceSettings(serviceId);
+
+            // create NIC object
+            NetworkAdapterDetails nic = new NetworkAdapterDetails();
+
+            string networkFormat = settings["PrivateNetworkFormat"];
+            if (String.IsNullOrEmpty(networkFormat))
+            {
+                // custom format
+				nic.NetworkFormat = settings["PrivateIPAddress"];
+				var v6 = IPAddress.Parse(nic.NetworkFormat).V6;
+                nic.SubnetMask = GetPrivateNetworkSubnetMask(settings["PrivateSubnetMask"], v6);
+            }
+            else
+            {
+                // standard format
+                string[] formatPair = settings["PrivateNetworkFormat"].Split('/');
+                nic.NetworkFormat = formatPair[0];
+				var v6 = IPAddress.Parse(nic.NetworkFormat).V6;
+				nic.SubnetMask = GetPrivateNetworkSubnetMask(formatPair[1], v6);
+            }
+
+            nic.SubnetMaskCidr = GetSubnetMaskCidr(nic.SubnetMask);
+            nic.DefaultGateway = settings["PrivateDefaultGateway"];
+            nic.PreferredNameServer = settings["PrivatePreferredNameServer"];
+            nic.AlternateNameServer = settings["PrivateAlternateNameServer"];
+
+            return nic;
+        }
+
+        public static ResultObject AddVirtualMachinePrivateIPAddresses(int itemId, bool selectRandom, int addressesNumber, string[] addresses, bool provisionKvp)
+        {
+            // trace info
+            Trace.TraceInformation("Entering AddVirtualMachinePrivateIPAddresses()");
+            Trace.TraceInformation("Item ID: {0}", itemId);
+            Trace.TraceInformation("SelectRandom: {0}", selectRandom);
+            Trace.TraceInformation("AddressesNumber: {0}", addressesNumber);
+
+            if (addresses != null)
+            {
+                foreach(var address in addresses)
+                    Trace.TraceInformation("addresses[n]: {0}", address);
+            }
+
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            // start task
+            res = TaskManager.StartResultTask<ResultObject>("VPS", "ADD_PRIVATE_IP", vm.Id, vm.Name, vm.PackageId);
+
+            try
+            {
+                // load network adapter
+                NetworkAdapterDetails nic = GetPrivateNetworkAdapterDetails(itemId);
+
+                bool wasEmptyList = (nic.IPAddresses.Length == 0);
+
+                if(wasEmptyList)
+                    Trace.TraceInformation("NIC IP addresses list is empty");
+
+                // check IP addresses if they are specified
+                List<string> checkResults = CheckPrivateIPAddresses(vm.PackageId, addresses);
+                if (checkResults.Count > 0)
+                {
+                    res.ErrorCodes.AddRange(checkResults);
+                    res.IsSuccess = false;
+                    TaskManager.CompleteResultTask();
+                    return res;
+                }
+
+                // load all existing private IP addresses
+                List<PrivateIPAddress> ips = GetPackagePrivateIPAddresses(vm.PackageId);
+
+                // sort them
+                SortedList<IPAddress, string> sortedIps = GetSortedNormalizedIPAddresses(ips, nic.SubnetMask);
+
+                if (selectRandom)
+                {
+                    // generate N number of IP addresses
+                    addresses = new string[addressesNumber];
+                    for (int i = 0; i < addressesNumber; i++)
+                        addresses[i] = GenerateNextAvailablePrivateIP(sortedIps, nic.SubnetMask, nic.NetworkFormat);
+                }
+
+                PackageContext cntx = PackageController.GetPackageContext(vm.PackageId);
+                QuotaValueInfo quota = cntx.Quotas[Quotas.VPS2012_PRIVATE_IP_ADDRESSES_NUMBER];
+                if (quota.QuotaAllocatedValue != -1)
+                {
+                    int maxAddresses = quota.QuotaAllocatedValue - nic.IPAddresses.Length;
+
+                    if (addresses.Length > maxAddresses)
+                    {
+                        TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.QUOTA_EXCEEDED_PRIVATE_ADDRESSES_NUMBER + ":" + maxAddresses);
+                        return res;
+                    }
+                }
+
+                // add addresses to database
+                foreach (string address in addresses)
+                    DataProvider.AddItemPrivateIPAddress(SecurityContext.User.UserId, itemId, address);
+
+                // set primary IP address
+                if (wasEmptyList)
+                {
+                    nic = GetPrivateNetworkAdapterDetails(itemId);
+                    if (nic.IPAddresses.Length > 0)
+                        SetVirtualMachinePrimaryPrivateIPAddress(itemId, nic.IPAddresses[0].AddressId, false);
+                }
+
+                // send KVP config items
+                if(provisionKvp)
+                    SendNetworkAdapterKVP(itemId, "Private");
+            }
+            catch (Exception ex)
+            {
+                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.ADD_VIRTUAL_MACHINE_PRIVATE_IP_ADDRESS_ERROR, ex);
+                return res;
+            }
+
+            TaskManager.CompleteResultTask();
+            return res;
+        }
+
+        private static List<string> CheckPrivateIPAddresses(int packageId, string[] addresses)
+        {
+            List<string> codes = new List<string>();
+
+            // check IP addresses if they are specified
+            if (addresses != null && addresses.Length > 0)
+            {
+                // load network adapter
+                NetworkAdapterDetails nic = GetPrivateNetworkDetails(packageId);
+
+                foreach (string address in addresses)
+                {
+                    if (!CheckPrivateIPAddress(nic.SubnetMask, address))
+                        codes.Add(VirtualizationErrorCodes.WRONG_PRIVATE_IP_ADDRESS_FORMAT + ":" + address);
+                }
+            }
+
+            return codes;
+        }
+
+        public static ResultObject SetVirtualMachinePrimaryPrivateIPAddress(int itemId, int addressId, bool provisionKvp)
+        {
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            // start task
+            res = TaskManager.StartResultTask<ResultObject>("VPS", "SET_PRIMARY_PRIVATE_IP", vm.Id, vm.Name, vm.PackageId);
+
+            try
+            {
+                // call data access layer
+                DataProvider.SetItemPrivatePrimaryIPAddress(SecurityContext.User.UserId, itemId, addressId);
+
+                // send KVP config items
+                if(provisionKvp)
+                    SendNetworkAdapterKVP(itemId, "Private");
+            }
+            catch (Exception ex)
+            {
+                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.SET_VIRTUAL_MACHINE_PRIMARY_PRIVATE_IP_ADDRESS_ERROR, ex);
+                return res;
+            }
+
+            TaskManager.CompleteResultTask();
+            return res;
+        }
+
+        public static ResultObject DeleteVirtualMachinePrivateIPAddresses(int itemId, int[] addressIds, bool provisionKvp)
+        {
+            if (addressIds == null)
+                throw new ArgumentNullException("addressIds");
+
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            // start task
+            res = TaskManager.StartResultTask<ResultObject>("VPS", "DELETE_PRIVATE_IP", vm.Id, vm.Name, vm.PackageId);
+
+            try
+            {
+                // call data access layer
+                foreach (int addressId in addressIds)
+                    DataProvider.DeleteItemPrivateIPAddress(SecurityContext.User.UserId, itemId, addressId);
+
+                // send KVP config items
+                if(provisionKvp)
+                    SendNetworkAdapterKVP(itemId, "Private");
+            }
+            catch (Exception ex)
+            {
+                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.DELETE_VIRTUAL_MACHINE_PRIVATE_IP_ADDRESS_ERROR, ex);
+                return res;
+            }
+
+            TaskManager.CompleteResultTask();
+            return res;
+        }
+
+        private static string GenerateNextAvailablePrivateIP(SortedList<IPAddress, string> ips, string subnetMask, string startIPAddress)
+        {
+            Trace.TraceInformation("Entering GenerateNextAvailablePrivateIP()");
+            Trace.TraceInformation("Param - number of sorted IPs in the list: {0}", ips.Count);
+            Trace.TraceInformation("Param - startIPAddress: {0}", startIPAddress);
+            Trace.TraceInformation("Param - subnetMask: {0}", subnetMask);
+
+            // start IP address
+            var ip = IPAddress.Parse(startIPAddress) - 1;
+
+            Trace.TraceInformation("Start looking for next available IP");
+            foreach (var addr in ips.Keys)
+            {
+                if ((addr - ip) > 1)
+                {
+                    // it is a gap
+                    break;
+                }
+                else
+                {
+                    ip = addr;
+                }
+            }
+
+            // final IP found
+            ip = ip + 1;
+
+            string genIP = ip.ToString();
+            Trace.TraceInformation("Generated IP: {0}", genIP);
+
+            // store in cache
+            Trace.TraceInformation("Adding to sorted list");
+            ips.Add(ip, genIP);
+
+            Trace.TraceInformation("Leaving GenerateNextAvailablePrivateIP()");
+            return genIP;
+        }
+
+        private static SortedList<IPAddress, string> GetSortedNormalizedIPAddresses(List<PrivateIPAddress> ips, string subnetMask)
+        {
+            Trace.TraceInformation("Entering GetSortedNormalizedIPAddresses()");
+            Trace.TraceInformation("Param - subnetMask: {0}", subnetMask);
+
+            var mask = IPAddress.Parse(subnetMask);
+            SortedList<IPAddress, string> sortedIps = new SortedList<IPAddress, string>();
+            foreach (PrivateIPAddress ip in ips)
+            {
+                var addr = IPAddress.Parse(ip.IPAddress);
+                sortedIps.Add(addr, ip.IPAddress);
+
+                Trace.TraceInformation("Added {0} to sorted IPs list with key: {1} ", ip.IPAddress, addr.ToString());
+            }
+            Trace.TraceInformation("Leaving GetSortedNormalizedIPAddresses()");
+            return sortedIps;
+        }
+
+		private static string GetPrivateNetworkSubnetMask(string cidr, bool v6) {
+            if (v6)
+            {
+                return "/" + cidr;
+            }
+            else
+            {
+                return IPAddress.Parse("/" + cidr).ToV4MaskString();
+            }
+		}
+
+		private static string GetSubnetMaskCidr(string subnetMask) {
+			if (String.IsNullOrEmpty(subnetMask))
+				return subnetMask;
+			var ip = IPAddress.Parse(subnetMask);
+			if (ip.V4) {
+				int cidr = 32;
+				var mask = ip.Address;
+				while ((mask & 1) == 0 && cidr > 0) {
+					mask >>= 1;
+					cidr -= 1;
+				}
+				return cidr.ToString();
+			} else {
+				return ip.Cidr.ToString();
+			}
+		}
+		
+        private static bool CheckPrivateIPAddress(string subnetMask, string ipAddress)
+        {
+            var mask = IPAddress.Parse(subnetMask);
+            var ip = IPAddress.Parse(ipAddress);
+
+            //return ((mask & ip) == mask);
+            return true;
+        }
+        #endregion
+
+        #region Virtual Machine Permissions
+        public static List<VirtualMachinePermission> GetVirtualMachinePermissions(int itemId)
+        {
+            List<VirtualMachinePermission> result = new List<VirtualMachinePermission>();
+            return result;
+        }
+
+        public static int UpdateVirtualMachineUserPermissions(int itemId, VirtualMachinePermission[] permissions)
+        {
+            // VPS - UPDATE_PERMISSIONS
+            return 0;
+        }
+        #endregion
+
+        #region Virtual Switches
+        public static VirtualSwitch[] GetExternalSwitches(int serviceId, string computerName)
+        {
+            VirtualizationServer vs = new VirtualizationServer();
+            ServiceProviderProxy.Init(vs, serviceId);
+            return vs.GetExternalSwitches(computerName);
+        }
+        #endregion
+
+        #region Tools
+        public static ResultObject DeleteVirtualMachine(int itemId, bool saveFiles, bool exportVps, string exportPath)
+        {
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            // start task
+            res = TaskManager.StartResultTask<ResultObject>("VPS", "DELETE", vm.Id, vm.Name, vm.PackageId);
+
+            try
+            {
+                // get proxy
+                VirtualizationServer vs = GetVirtualizationProxy(vm.ServiceId);
+
+                // check VM state
+                VirtualMachine vps = vs.GetVirtualMachine(vm.VirtualMachineId);
+
+                JobResult result = null;
+
+                if (vps != null)
+                {
+                    #region turn off machine (if required)
+
+                    // stop virtual machine
+                    if (vps.State != VirtualMachineState.Off)
+                    {
+                        TaskManager.Write("VPS_DELETE_TURN_OFF");
+                        result = vs.ChangeVirtualMachineState(vm.VirtualMachineId, VirtualMachineRequestedState.TurnOff);
+                        // check result
+                        if (result.ReturnValue != ReturnCode.JobStarted)
+                        {
+                            LogReturnValueResult(res, result);
+                            TaskManager.CompleteResultTask(res);
+                            return res;
+                        }
+
+                        // wait for completion
+                        if (!JobCompleted(vs, result.Job))
+                        {
+                            LogJobResult(res, result.Job);
+                            TaskManager.CompleteResultTask(res);
+                            return res;
+                        }
+                    }
+                    #endregion
+
+                    #region export machine
+                    if (exportVps && !String.IsNullOrEmpty(exportPath))
+                    {
+                        TaskManager.Write("VPS_DELETE_EXPORT");
+                        result = vs.ExportVirtualMachine(vm.VirtualMachineId, exportPath);
+
+                        // check result
+                        if (result.ReturnValue != ReturnCode.JobStarted)
+                        {
+                            LogReturnValueResult(res, result);
+                            TaskManager.CompleteResultTask(res);
+                            return res;
+                        }
+
+                        // wait for completion
+                        if (!JobCompleted(vs, result.Job))
+                        {
+                            LogJobResult(res, result.Job);
+                            TaskManager.CompleteResultTask(res);
+                            return res;
+                        }
+                    }
+                    #endregion
+
+                    #region delete machine
+                    TaskManager.Write("VPS_DELETE_DELETE");
+                    result = vs.DeleteVirtualMachine(vm.VirtualMachineId);
+
+                    // check result
+                    if (result.ReturnValue != ReturnCode.JobStarted)
+                    {
+                        LogReturnValueResult(res, result);
+                        TaskManager.CompleteResultTask(res);
+                        return res;
+                    }
+
+                    // wait for completion
+                    if (!JobCompleted(vs, result.Job))
+                    {
+                        LogJobResult(res, result.Job);
+                        TaskManager.CompleteResultTask(res);
+                        return res;
+                    }
+                    #endregion
+                }
+
+                #region delete files
+                if (!saveFiles)
+                {
+                    TaskManager.Write("VPS_DELETE_FILES", vm.RootFolderPath);
+                    try
+                    {
+                        vs.DeleteRemoteFile(vm.RootFolderPath);
+                    }
+                    catch (Exception ex)
+                    {
+                        res.ErrorCodes.Add(VirtualizationErrorCodes.DELETE_VM_FILES_ERROR + ": " + ex.Message);
+                    }
+                }
+                #endregion
+
+                // delete meta item
+                PackageController.DeletePackageItem(itemId);
+            }
+            catch (Exception ex)
+            {
+                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.DELETE_ERROR, ex);
+                return res;
+            }
+
+            TaskManager.CompleteResultTask();
+            return res;
+        }
+
+        public static int ReinstallVirtualMachine(int itemId, string adminPassword, bool preserveVirtualDiskFiles,
+            bool saveVirtualDisk, bool exportVps, string exportPath)
+        {
+            // VPS - REINSTALL
+            return 0;
+        }
+        #endregion
+
+        #region Help
+        public static string GetVirtualMachineSummaryText(int itemId, bool emailMode, bool creation)
+        {
+            // load item
+            VirtualMachine vm = GetVirtualMachineByItemId(itemId);
+
+            // load user info
+            UserInfo user = PackageController.GetPackageOwner(vm.PackageId);
+
+            // get letter settings
+            UserSettings settings = UserController.GetUserSettings(user.UserId, UserSettings.VPS_SUMMARY_LETTER);
+
+            string settingName = user.HtmlMail ? "HtmlBody" : "TextBody";
+            string body = settings[settingName];
+            if (String.IsNullOrEmpty(body))
+                return null;
+
+            string result = EvaluateVirtualMachineTemplate(itemId, emailMode, creation, body);
+            return user.HtmlMail ? result : result.Replace("\n", "<br/>");
+        }
+
+        public static ResultObject SendVirtualMachineSummaryLetter(int itemId, string to, string bcc, bool creation)
+        {
+            ResultObject res = new ResultObject();
+
+            // load service item
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+            {
+                res.ErrorCodes.Add(VirtualizationErrorCodes.CANNOT_FIND_VIRTUAL_MACHINE_META_ITEM);
+                return res;
+            }
+
+            #region Check account and space statuses
+            // check account
+            if (!SecurityContext.CheckAccount(res, DemandAccount.NotDemo | DemandAccount.IsActive))
+                return res;
+
+            // check package
+            if (!SecurityContext.CheckPackage(res, vm.PackageId, DemandPackage.IsActive))
+                return res;
+            #endregion
+
+            // start task
+            res = TaskManager.StartResultTask<ResultObject>("VPS", "SEND_SUMMARY_LETTER", vm.Id, vm.Name, vm.PackageId);
+
+            try
+            {
+                // load user info
+                UserInfo user = PackageController.GetPackageOwner(vm.PackageId);
+
+                // get letter settings
+                UserSettings settings = UserController.GetUserSettings(user.UserId, UserSettings.VPS_SUMMARY_LETTER);
+
+                string from = settings["From"];
+                if (bcc == null)
+                    bcc = settings["CC"];
+                string subject = settings["Subject"];
+                string body = user.HtmlMail ? settings["HtmlBody"] : settings["TextBody"];
+                bool isHtml = user.HtmlMail;
+
+                MailPriority priority = MailPriority.Normal;
+                if (!String.IsNullOrEmpty(settings["Priority"]))
+                    priority = (MailPriority)Enum.Parse(typeof(MailPriority), settings["Priority"], true);
+
+                if (String.IsNullOrEmpty(body))
+                {
+                    TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.SUMMARY_TEMPLATE_IS_EMPTY);
+                    return res;
+                }
+
+                // load user info
+                if (to == null)
+                    to = user.Email;
+
+                subject = EvaluateVirtualMachineTemplate(itemId, true, creation, subject);
+                body = EvaluateVirtualMachineTemplate(itemId, true, creation, body);
+
+                // send message
+                int result = MailHelper.SendMessage(from, to, bcc, subject, body, priority, isHtml);
+
+                if (result != 0)
+                {
+                    TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.SEND_SUMMARY_LETTER_CODE + ":" + result);
+                    TaskManager.WriteWarning("VPS_SEND_SUMMARY_LETTER_ERROR_CODE", result.ToString());
+                    return res;
+                }
+            }
+            catch (Exception ex)
+            {
+                TaskManager.CompleteResultTask(res, VirtualizationErrorCodes.SEND_SUMMARY_LETTER, ex);
+                TaskManager.WriteWarning("VPS_SEND_SUMMARY_LETTER_ERROR", ex.Message);
+                return res;
+            }
+
+            TaskManager.CompleteResultTask();
+            return res;
+        }
+
+        public static string EvaluateVirtualMachineTemplate(int itemId, bool emailMode, bool creation, string template)
+        {
+            Hashtable items = new Hashtable();
+
+            // load machine details
+            VirtualMachine vm = GetVirtualMachineByItemId(itemId);
+            if (vm == null)
+                throw new Exception("VPS with the specified ID was not found.");
+
+            // space info
+            PackageInfo package = PackageController.GetPackage(vm.PackageId);
+            items["space"] = package;
+
+            // user info
+            items["user"] = PackageController.GetPackageOwner(vm.PackageId);
+
+            // VM item
+            items["vm"] = vm;
+
+            // load external NIC
+            items["external_nic"] = GetExternalNetworkAdapterDetails(itemId);
+
+            // load private NIC
+            items["private_nic"] = GetPrivateNetworkAdapterDetails(itemId);
+
+            // load private NIC
+            items["management_nic"] = GetManagementNetworkAdapterDetails(itemId);
+
+            // load service settings
+            StringDictionary settings = ServerController.GetServiceSettings(vm.ServiceId);
+
+            foreach (string key in settings.Keys)
+                items[key] = settings[key];
+
+            // service items
+            items["email"] = emailMode;
+            items["creation"] = creation;
+
+            // evaluate template
+            return PackageController.EvaluateTemplate(template, items);
+        }
+        #endregion
+
+        #region Helper methods
+        private static int GetServiceId(int packageId)
+        {
+            int serviceId = PackageController.GetPackageServiceId(packageId, ResourceGroups.VPS2012);
+            return serviceId;
+        }
+
+        private static VirtualizationServer GetVirtualizationProxyByPackageId(int packageId)
+        {
+            // get service
+            int serviceId = GetServiceId(packageId);
+
+            return GetVirtualizationProxy(serviceId);
+        }
+        
+        private static VirtualizationServer GetVirtualizationProxy(int serviceId)
+        {
+            VirtualizationServer ws = new VirtualizationServer();
+            ServiceProviderProxy.Init(ws, serviceId);
+            return ws;
+        }
+
+        public static VirtualMachine GetVirtualMachineByItemId(int itemId)
+        {
+            VirtualMachine vm = (VirtualMachine)PackageController.GetPackageItem(itemId);
+            if (vm == null)
+                return null;
+
+            // host name
+            int dotIdx = vm.Name.IndexOf(".");
+            if (dotIdx > -1)
+            {
+                vm.Hostname = vm.Name.Substring(0, dotIdx);
+                vm.Domain = vm.Name.Substring(dotIdx + 1);
+            }
+            else
+            {
+                vm.Hostname = vm.Name;
+                vm.Domain = "";
+            }
+
+            // check if task was aborted during provisioning
+            if (!String.IsNullOrEmpty(vm.CurrentTaskId)
+                && TaskManager.GetTask(vm.CurrentTaskId) == null)
+            {
+                // set to error
+                vm.CurrentTaskId = null;
+                vm.ProvisioningStatus = VirtualMachineProvisioningStatus.Error;
+                PackageController.UpdatePackageItem(vm);
+            }
+
+            vm.AdministratorPassword = CryptoUtils.Decrypt(vm.AdministratorPassword);
+            return vm;
+        }
+
+        private static void LogReturnValueResult(ResultObject res, JobResult job)
+        {
+            res.ErrorCodes.Add(VirtualizationErrorCodes.JOB_START_ERROR + ":" + job.ReturnValue);
+        }
+
+        private static void LogJobResult(ResultObject res, ConcreteJob job)
+        {
+            res.ErrorCodes.Add(VirtualizationErrorCodes.JOB_FAILED_ERROR + ":" + job.ErrorDescription);
+        }
+
+        private static bool JobCompleted(VirtualizationServer vs, ConcreteJob job)
+        {
+            TaskManager.IndicatorMaximum = 100;
+            bool jobCompleted = true;
+
+            while (job.JobState == ConcreteJobState.Starting ||
+                job.JobState == ConcreteJobState.Running)
+            {
+                System.Threading.Thread.Sleep(1000);
+                job = vs.GetJob(job.Id);
+                TaskManager.IndicatorCurrent = job.PercentComplete;
+            }
+
+            if (job.JobState != ConcreteJobState.Completed)
+            {
+                jobCompleted = false;
+            }
+
+            TaskManager.IndicatorCurrent = 0; // reset indicator
+
+            return jobCompleted;
+        }
+
+        private static string GenerateMacAddress()
+        {
+            return MS_MAC_PREFIX + Utils.GetRandomHexString(3);
+        }
+
+        #endregion
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebsitePanel.EnterpriseServer.Code.csproj b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebsitePanel.EnterpriseServer.Code.csproj
index 014a1d07..7cf712ca 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebsitePanel.EnterpriseServer.Code.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebsitePanel.EnterpriseServer.Code.csproj
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Bin\</OutputPath>
+    <OutputPath>..\WebsitePanel.EnterpriseServer\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Bin\</OutputPath>
+    <OutputPath>..\WebsitePanel.EnterpriseServer\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -165,6 +165,7 @@
     <Compile Include="Scheduling\SchedulerController.cs" />
     <Compile Include="Scheduling\SchedulerJob.cs" />
     <Compile Include="Servers\ServerController.cs" />
+    <Compile Include="SharePoint\HostedSharePointServerEntController.cs" />
     <Compile Include="SharePoint\HostedSharePointServerController.cs" />
     <Compile Include="SharePoint\SharePointServerController.cs" />
     <Compile Include="StatisticsServers\StatisticsServerController.cs" />
@@ -175,6 +176,8 @@
     <Compile Include="Tasks\TaskManager.cs" />
     <Compile Include="Users\UserAsyncWorker.cs" />
     <Compile Include="Users\UserController.cs" />
+    <Compile Include="Virtualization2012\CreateServerAsyncWorker2012.cs" />
+    <Compile Include="Virtualization2012\VirtualizationServerController2012.cs" />
     <Compile Include="VirtualizationForPrivateCloud\CreateAsyncVMfromVM.cs" />
     <Compile Include="VirtualizationForPrivateCloud\CreateServerAsyncWorkerForPrivateCloud.cs" />
     <Compile Include="VirtualizationForPrivateCloud\VirtualizationServerControllerForPrivateCloud.cs" />
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/WebsitePanel.EnterpriseServer.csproj b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/WebsitePanel.EnterpriseServer.csproj
index cbc87b11..fa46e2a4 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/WebsitePanel.EnterpriseServer.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/WebsitePanel.EnterpriseServer.csproj
@@ -68,25 +68,66 @@
     <Reference Include="System.EnterpriseServices" />
     <Reference Include="System.Web.Mobile" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="WebsitePanel.EnterpriseServer.Base">
+    <Reference Include="WebsitePanel.EnterpriseServer.Base, Version=2.1.0.1, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Bin\WebsitePanel.EnterpriseServer.Base.dll</HintPath>
     </Reference>
-    <Reference Include="WebsitePanel.EnterpriseServer.Code">
+    <Reference Include="WebsitePanel.EnterpriseServer.Code, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Bin\WebsitePanel.EnterpriseServer.Code.dll</HintPath>
     </Reference>
-    <Reference Include="WebsitePanel.Providers.Base">
+    <Reference Include="WebsitePanel.Providers.Base, Version=2.1.0.1, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Bin\WebsitePanel.Providers.Base.dll</HintPath>
     </Reference>
-    <Reference Include="WebsitePanel.Server.Client, Version=1.2.2.0, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
+    <Reference Include="WebsitePanel.Server.Client, Version=2.1.0.1, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Bin\WebsitePanel.Server.Client.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="bin\Ionic.Zip.Reduced.dll" />
+    <Content Include="bin\IPAddressRange.dll" />
+    <Content Include="bin\Microsoft.Web.Services3.dll" />
+    <Content Include="bin\WebsitePanel.Common.Utils.dll" />
+    <Content Include="bin\WebsitePanel.Common.Utils.pdb" />
+    <Content Include="bin\WebsitePanel.EnterpriseServer.Base.dll" />
+    <Content Include="bin\WebsitePanel.EnterpriseServer.Base.pdb" />
+    <Content Include="bin\WebsitePanel.EnterpriseServer.Code.dll" />
+    <Content Include="bin\WebsitePanel.EnterpriseServer.Code.pdb" />
+    <Content Include="bin\WebsitePanel.EnterpriseServer.dll" />
+    <Content Include="bin\WebsitePanel.EnterpriseServer.pdb" />
+    <Content Include="bin\WebsitePanel.Plugins.2Checkout.dll" />
+    <Content Include="bin\WebsitePanel.Plugins.2Checkout.pdb" />
+    <Content Include="bin\WebsitePanel.Plugins.AuthorizeNet.dll" />
+    <Content Include="bin\WebsitePanel.Plugins.AuthorizeNet.pdb" />
+    <Content Include="bin\WebsitePanel.Plugins.Enom.dll" />
+    <Content Include="bin\WebsitePanel.Plugins.Enom.pdb" />
+    <Content Include="bin\WebsitePanel.Plugins.OfflinePayment.dll" />
+    <Content Include="bin\WebsitePanel.Plugins.OfflinePayment.pdb" />
+    <Content Include="bin\WebsitePanel.Plugins.OfflineRegistrar.dll" />
+    <Content Include="bin\WebsitePanel.Plugins.OfflineRegistrar.pdb" />
+    <Content Include="bin\WebsitePanel.Plugins.PayPalPro.dll" />
+    <Content Include="bin\WebsitePanel.Plugins.PayPalPro.pdb" />
+    <Content Include="bin\WebsitePanel.Plugins.PayPalStandard.dll" />
+    <Content Include="bin\WebsitePanel.Plugins.PayPalStandard.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Base.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Base.pdb" />
+    <Content Include="bin\WebsitePanel.SchedulerService.exe" />
+    <Content Include="bin\WebsitePanel.SchedulerService.pdb" />
+    <Content Include="bin\WebsitePanel.Server.Client.dll" />
+    <Content Include="bin\WebsitePanel.Server.Client.pdb" />
+    <Content Include="bin\WebsitePanel.Templates.dll" />
+    <Content Include="bin\WebsitePanel.Templates.pdb" />
+    <Content Include="bin\WebsitePanel.Whois.dll" />
+    <Content Include="bin\WebsitePanel.Whois.pdb" />
+    <Content Include="bin\WhoisClient.dll" />
     <Content Include="esEnterpriseStorage.asmx" />
+    <Content Include="esHostedSharePointServersEnt.asmx" />
     <Content Include="esRemoteDesktopServices.asmx" />
     <Content Include="esHeliconZoo.asmx" />
     <Content Include="esLync.asmx" />
+    <Content Include="esVirtualizationServer2012.asmx" />
     <Content Include="esVirtualizationServerForPrivateCloud.asmx" />
     <Content Include="Default.aspx" />
     <Content Include="ecStorefront.asmx" />
@@ -116,9 +157,9 @@
     <Content Include="esUsers.asmx" />
     <Content Include="esWebServers.asmx" />
     <Content Include="Global.asax" />
-    <Content Include="Web.config">
+    <None Include="Web.config">
       <SubType>Designer</SubType>
-    </Content>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\VersionInfo.cs">
@@ -128,6 +169,10 @@
       <DependentUpon>esEnterpriseStorage.asmx</DependentUpon>
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="esHostedSharePointServersEnt.asmx.cs">
+      <DependentUpon>esHostedSharePointServersEnt.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="esRemoteDesktopServices.asmx.cs">
       <DependentUpon>esRemoteDesktopServices.asmx</DependentUpon>
       <SubType>Component</SubType>
@@ -140,6 +185,10 @@
       <DependentUpon>esLync.asmx</DependentUpon>
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="esVirtualizationServer2012.asmx.cs">
+      <DependentUpon>esVirtualizationServer2012.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="esVirtualizationServerForPrivateCloud.asmx.cs">
       <DependentUpon>esVirtualizationServerForPrivateCloud.asmx</DependentUpon>
       <SubType>Component</SubType>
@@ -288,6 +337,12 @@
     <Content Include="esWebApplicationGallery.asmx" />
     <EmbeddedResource Include="Images\logo.png" />
     <Content Include="SystemEventHandlers.config" />
+    <Content Include="bin\WebsitePanel.EnterpriseServer.dll.config" />
+    <Content Include="bin\WebsitePanel.SchedulerService.exe.config" />
+    <None Include="Properties\PublishProfiles\Default Settings %282%29.pubxml" />
+    <None Include="Properties\PublishProfiles\Default Settings %283%29.pubxml" />
+    <None Include="Properties\PublishProfiles\Default Settings.pubxml" />
+    <None Include="Properties\PublishProfiles\Enterprise Server.pubxml" />
     <None Include="TaskEventHandlers.config" />
     <None Include="WsePolicyCache.Config" />
   </ItemGroup>
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esEnterpriseStorage.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esEnterpriseStorage.asmx.cs
index f5ba338b..eab4e26b 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esEnterpriseStorage.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esEnterpriseStorage.asmx.cs
@@ -92,6 +92,12 @@ namespace WebsitePanel.EnterpriseServer
             return EnterpriseStorageController.GetFolders(itemId);
         }
 
+        [WebMethod]
+        public SystemFile[] GetUserRootFolders(int itemId, int accountId, string userName, string displayName)
+        {
+            return EnterpriseStorageController.GetUserRootFolders(itemId, accountId, userName, displayName);
+        }
+
         [WebMethod]
         public SystemFile GetEnterpriseFolder(int itemId, string folderName)
         {
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esHostedSharePointServers.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esHostedSharePointServers.asmx.cs
index c99bee6a..4aa4946f 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esHostedSharePointServers.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esHostedSharePointServers.asmx.cs
@@ -55,14 +55,13 @@ namespace WebsitePanel.EnterpriseServer
 		/// <param name="sortColumn">Sort column name.</param>
 		/// <param name="startRow">Row index to start from.</param>
 		/// <param name="maximumRows">Maximum number of rows to retrieve.</param>
-        /// <param name="groupName">Resource group name.</param>
 		/// <returns>Site collections in raw format.</returns>
 		[WebMethod]
 		public SharePointSiteCollectionListPaged GetSiteCollectionsPaged(int packageId, int organizationId,
-			string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, string groupName)
+			string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
 		{
 			return HostedSharePointServerController.GetSiteCollectionsPaged(packageId, organizationId, filterColumn, filterValue,
-				sortColumn, startRow, maximumRows, groupName);
+				sortColumn, startRow, maximumRows);
 		}
 
 		/// <summary>
@@ -80,12 +79,11 @@ namespace WebsitePanel.EnterpriseServer
 		/// </summary>
 		/// <param name="packageId">Package that owns site collections.</param>
 		/// <param name="recursive">A value which shows whether nested spaces must be searched as well.</param>
-        /// <param name="groupName">Resource group name.</param>
 		/// <returns>List of found site collections.</returns>
 		[WebMethod]
-		public List<SharePointSiteCollection> GetSiteCollections(int packageId, bool recursive, string groupName)
+		public List<SharePointSiteCollection> GetSiteCollections(int packageId, bool recursive)
 		{
-			return HostedSharePointServerController.GetSiteCollections(packageId, recursive, groupName);
+			return HostedSharePointServerController.GetSiteCollections(packageId, recursive);
 		}
 
         [WebMethod]
@@ -116,7 +114,7 @@ namespace WebsitePanel.EnterpriseServer
 		public SharePointSiteCollection GetSiteCollectionByDomain(int organizationId, string domain)
 		{
 			DomainInfo domainInfo = ServerController.GetDomain(domain);
-			SharePointSiteCollectionListPaged existentSiteCollections = this.GetSiteCollectionsPaged(domainInfo.PackageId, organizationId, "ItemName", String.Format("%{0}", domain), String.Empty, 0, Int32.MaxValue, null);
+			SharePointSiteCollectionListPaged existentSiteCollections = this.GetSiteCollectionsPaged(domainInfo.PackageId, organizationId, "ItemName", String.Format("%{0}", domain), String.Empty, 0, Int32.MaxValue);
 			foreach (SharePointSiteCollection existentSiteCollection in existentSiteCollections.SiteCollections)
 			{
 				Uri existentSiteCollectionUri = new Uri(existentSiteCollection.Name);
@@ -133,12 +131,11 @@ namespace WebsitePanel.EnterpriseServer
 		/// Adds SharePoint site collection.
 		/// </summary>
 		/// <param name="item">Site collection description.</param>
-        /// <param name="groupName">Resource group name.</param>
 		/// <returns>Created site collection id within metabase.</returns>
 		[WebMethod]
-		public int AddSiteCollection(SharePointSiteCollection item, string groupName)
+		public int AddSiteCollection(SharePointSiteCollection item)
 		{
-			return HostedSharePointServerController.AddSiteCollection(item, groupName);
+			return HostedSharePointServerController.AddSiteCollection(item);
 		}
 
 		/// <summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esHostedSharePointServersEnt.asmx b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esHostedSharePointServersEnt.asmx
new file mode 100644
index 00000000..c27229d3
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esHostedSharePointServersEnt.asmx
@@ -0,0 +1 @@
+<%@ WebService Language="C#" CodeBehind="esHostedSharePointServersEnt.asmx.cs" Class="WebsitePanel.EnterpriseServer.esHostedSharePointServersEnt" %>
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esHostedSharePointServersEnt.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esHostedSharePointServersEnt.asmx.cs
new file mode 100644
index 00000000..37c62963
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esHostedSharePointServersEnt.asmx.cs
@@ -0,0 +1,236 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Web.Services;
+using WebsitePanel.EnterpriseServer.Code.SharePoint;
+using WebsitePanel.Providers.SharePoint;
+using Microsoft.Web.Services3;
+
+namespace WebsitePanel.EnterpriseServer
+{
+	/// <summary>
+	/// Summary description for esHostedSharePointServers
+	/// </summary>
+	[WebService(Namespace = "http://smbsaas/websitepanel/enterpriseserver")]
+	[WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
+	[Policy("ServerPolicy")]
+	[ToolboxItem(false)]
+	public class esHostedSharePointServersEnt : WebService
+	{
+		/// <summary>
+		/// Gets site collections in raw form.
+		/// </summary>
+		/// <param name="packageId">Package to which desired site collections belong.</param>
+		/// <param name="organizationId">Organization to which desired site collections belong.</param>
+		/// <param name="filterColumn">Filter column name.</param>
+		/// <param name="filterValue">Filter value.</param>
+		/// <param name="sortColumn">Sort column name.</param>
+		/// <param name="startRow">Row index to start from.</param>
+		/// <param name="maximumRows">Maximum number of rows to retrieve.</param>
+        /// <param name="groupName">Resource group name.</param>
+		/// <returns>Site collections in raw format.</returns>
+		[WebMethod]
+		public SharePointEnterpriseSiteCollectionListPaged Enterprise_GetSiteCollectionsPaged(int packageId, int organizationId,
+			string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
+		{
+            return HostedSharePointServerEntController.GetSiteCollectionsPaged(packageId, organizationId, filterColumn, filterValue,
+				sortColumn, startRow, maximumRows);
+		}
+
+		/// <summary>
+		/// Gets list of supported languages by this installation of SharePoint.
+		/// </summary>
+		/// <returns>List of supported languages</returns>
+		[WebMethod]
+        public int[] Enterprise_GetSupportedLanguages(int packageId)
+		{
+            return HostedSharePointServerEntController.GetSupportedLanguages(packageId);            
+		}
+
+		/// <summary>
+		/// Gets list of SharePoint site collections that belong to the package.
+		/// </summary>
+		/// <param name="packageId">Package that owns site collections.</param>
+		/// <param name="recursive">A value which shows whether nested spaces must be searched as well.</param>
+        /// <param name="groupName">Resource group name.</param>
+		/// <returns>List of found site collections.</returns>
+		[WebMethod]
+        public List<SharePointEnterpriseSiteCollection> Enterprise_GetSiteCollections(int packageId, bool recursive)
+		{
+			return HostedSharePointServerEntController.GetSiteCollections(packageId, recursive);
+		}
+
+        [WebMethod]
+        public int Enterprise_SetStorageSettings(int itemId, int maxStorage, int warningStorage, bool applyToSiteCollections)
+        {
+            return HostedSharePointServerEntController.SetStorageSettings(itemId, maxStorage, warningStorage, applyToSiteCollections );
+        }
+
+		/// <summary>
+		/// Gets SharePoint site collection with given id.
+		/// </summary>
+		/// <param name="itemId">Site collection id within metabase.</param>
+		/// <returns>Site collection.</returns>
+		[WebMethod]
+        public SharePointEnterpriseSiteCollection Enterprise_GetSiteCollection(int itemId)
+		{
+			return HostedSharePointServerEntController.GetSiteCollection(itemId);
+		}
+
+		/// <summary>
+		/// Gets SharePoint site collection from package under organization with given domain.
+		/// </summary>
+		/// <param name="packageId">Package id.</param>
+		/// <param name="organizationId">Organization id.</param>
+		/// <param name="domain">Domain name.</param>
+		/// <returns>SharePoint site collection or null.</returns>
+		[WebMethod]
+        public SharePointEnterpriseSiteCollection Enterprise_GetSiteCollectionByDomain(int organizationId, string domain)
+		{
+			DomainInfo domainInfo = ServerController.GetDomain(domain);
+            SharePointEnterpriseSiteCollectionListPaged existentSiteCollections = this.Enterprise_GetSiteCollectionsPaged(domainInfo.PackageId, organizationId, "ItemName", String.Format("%{0}", domain), String.Empty, 0, Int32.MaxValue);
+			foreach (SharePointEnterpriseSiteCollection existentSiteCollection in existentSiteCollections.SiteCollections)
+			{
+				Uri existentSiteCollectionUri = new Uri(existentSiteCollection.Name);
+				if (existentSiteCollection.Name == String.Format("{0}://{1}", existentSiteCollectionUri.Scheme, domain))
+				{
+					return existentSiteCollection;
+				}
+			}
+
+			return null;
+		}
+
+		/// <summary>
+		/// Adds SharePoint site collection.
+		/// </summary>
+		/// <param name="item">Site collection description.</param>
+		/// <returns>Created site collection id within metabase.</returns>
+		[WebMethod]
+        public int Enterprise_AddSiteCollection(SharePointEnterpriseSiteCollection item)
+		{
+			return HostedSharePointServerEntController.AddSiteCollection(item);
+		}
+
+		/// <summary>
+		/// Deletes SharePoint site collection with given id.
+		/// </summary>
+		/// <param name="itemId">Site collection id within metabase.</param>
+		/// <returns>?</returns>
+		[WebMethod]
+        public int Enterprise_DeleteSiteCollection(int itemId)
+		{
+			return HostedSharePointServerEntController.DeleteSiteCollection(itemId);
+		}
+
+		/// <summary>
+		/// Deletes SharePoint site collections which belong to organization.
+		/// </summary>
+		/// <param name="organizationId">Site collection id within metabase.</param>
+		/// <returns>?</returns>
+		[WebMethod]
+        public int Enterprise_DeleteSiteCollections(int organizationId)
+		{
+			HostedSharePointServerEntController.DeleteSiteCollections(organizationId);
+			return 0;
+		}
+
+
+		/// <summary>
+		/// Backups SharePoint site collection.
+		/// </summary>
+		/// <param name="itemId">Site collection id within metabase.</param>
+		/// <param name="fileName">Backed up site collection file name.</param>
+		/// <param name="zipBackup">A value which shows whether back up must be archived.</param>
+		/// <param name="download">A value which shows whether created back up must be downloaded.</param>
+		/// <param name="folderName">Local folder to store downloaded backup.</param>
+		/// <returns>Created backup file name. </returns>
+		[WebMethod]
+        public string Enterprise_BackupSiteCollection(int itemId, string fileName, bool zipBackup, bool download, string folderName)
+		{
+			return HostedSharePointServerEntController.BackupSiteCollection(itemId, fileName, zipBackup, download, folderName);
+		}
+
+		/// <summary>
+		/// Restores SharePoint site collection.
+		/// </summary>
+		/// <param name="itemId">Site collection id within metabase.</param>
+		/// <param name="uploadedFile"></param>
+		/// <param name="packageFile"></param>
+		/// <returns></returns>
+		[WebMethod]
+        public int Enterprise_RestoreSiteCollection(int itemId, string uploadedFile, string packageFile)
+		{
+			return HostedSharePointServerEntController.RestoreSiteCollection(itemId, uploadedFile, packageFile);
+		}
+
+		/// <summary>
+		/// Gets binary data chunk of specified size from specified offset.
+		/// </summary>
+		/// <param name="itemId">Item id to obtain realted service id.</param>
+		/// <param name="path">Path to file to get bunary data chunk from.</param>
+		/// <param name="offset">Offset from which to start data reading.</param>
+		/// <param name="length">Binary data chunk length.</param>
+		/// <returns>Binary data chunk read from file.</returns>
+		[WebMethod]
+        public byte[] Enterprise_GetBackupBinaryChunk(int itemId, string path, int offset, int length)
+		{
+			return HostedSharePointServerEntController.GetBackupBinaryChunk(itemId, path, offset, length);
+		}
+
+		/// <summary>
+		/// Appends supplied binary data chunk to file.
+		/// </summary>
+		/// <param name="itemId">Item id to obtain realted service id.</param>
+		/// <param name="fileName">Non existent file name to append to.</param>
+		/// <param name="path">Full path to existent file to append to.</param>
+		/// <param name="chunk">Binary data chunk to append to.</param>
+		/// <returns>Path to file that was appended with chunk.</returns>
+		[WebMethod]
+        public string Enterprise_AppendBackupBinaryChunk(int itemId, string fileName, string path, byte[] chunk)
+		{
+			return HostedSharePointServerEntController.AppendBackupBinaryChunk(itemId, fileName, path, chunk);
+		}
+
+        [WebMethod]
+        public SharePointSiteDiskSpace[] Enterprise_CalculateSharePointSitesDiskSpace(int itemId, out int errorCode)
+        {
+            return HostedSharePointServerEntController.CalculateSharePointSitesDiskSpace(itemId, out  errorCode);
+        }
+
+
+        [WebMethod]
+        public void Enterprise_UpdateQuota(int itemId, int siteCollectionId, int maxSize, int warningSize)
+        {
+            HostedSharePointServerEntController.UpdateQuota(itemId, siteCollectionId, maxSize, warningSize);
+        }
+	}
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs
index 7b977052..b99ea321 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs
@@ -380,5 +380,11 @@ namespace WebsitePanel.EnterpriseServer
         {
             return RemoteDesktopServicesController.UpdateRdsServerSettings(serverId, settingsName, settings);
         }
+
+        [WebMethod]
+        public ResultObject ShadowSession(int itemId, string sessionId, bool control)
+        {
+            return RemoteDesktopServicesController.ShadowSession(itemId, sessionId, control);
+        }
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esVirtualizationServer2012.asmx b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esVirtualizationServer2012.asmx
new file mode 100644
index 00000000..328640b4
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esVirtualizationServer2012.asmx
@@ -0,0 +1 @@
+<%@ WebService Language="C#" CodeBehind="esVirtualizationServer2012.asmx.cs" Class="WebsitePanel.EnterpriseServer.esVirtualizationServer2012" %>
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esVirtualizationServer2012.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esVirtualizationServer2012.asmx.cs
new file mode 100644
index 00000000..79bfecbf
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esVirtualizationServer2012.asmx.cs
@@ -0,0 +1,476 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Data;
+using System.Web;
+using System.Collections;
+using System.Collections.Generic;
+using System.Web.Services;
+using System.Web.Services.Protocols;
+using System.ComponentModel;
+using WebsitePanel.Providers.Common;
+using WebsitePanel.Providers.ResultObjects;
+using Microsoft.Web.Services3;
+using WebsitePanel.Providers;
+using WebsitePanel.Providers.Common;
+using WebsitePanel.Providers.Virtualization;
+using WebsitePanel.Providers.ResultObjects; 
+using WebsitePanel.Providers.Virtualization;
+
+namespace WebsitePanel.EnterpriseServer
+{
+    /// <summary>
+    /// Summary description for esVirtualizationServer
+    /// </summary>
+    [WebService(Namespace = "http://smbsaas/websitepanel/enterpriseserver")]
+    [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
+    [Policy("ServerPolicy")]
+    [ToolboxItem(false)]
+    public class esVirtualizationServer2012 : System.Web.Services.WebService
+    {
+        #region Virtual Machines
+        [WebMethod]
+        public VirtualMachineMetaItemsPaged GetVirtualMachines(int packageId,
+            string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, bool recursive)
+        {
+            return VirtualizationServerController2012.GetVirtualMachines(packageId,
+                filterColumn, filterValue, sortColumn, startRow, maximumRows, recursive);
+        }
+
+        [WebMethod]
+        public VirtualMachine[] GetVirtualMachinesByServiceId(int serviceId)
+        {
+            return VirtualizationServerController2012.GetVirtualMachinesByServiceId(serviceId);
+        }
+
+        [WebMethod]
+        public VirtualMachine GetVirtualMachineItem(int itemId)
+        {
+            return VirtualizationServerController2012.GetVirtualMachineByItemId(itemId);
+        }
+
+        [WebMethod]
+        public string EvaluateVirtualMachineTemplate(int itemId, string template)
+        {
+            if (SecurityContext.CheckAccount(DemandAccount.IsActive | DemandAccount.IsAdmin | DemandAccount.NotDemo) != 0)
+                throw new Exception("This method could be called by serveradmin only.");
+
+            return VirtualizationServerController2012.EvaluateVirtualMachineTemplate(itemId, false, false, template);
+        }
+        #endregion
+
+        #region External Network
+        [WebMethod]
+        public NetworkAdapterDetails GetExternalNetworkDetails(int packageId)
+        {
+            return VirtualizationServerController2012.GetExternalNetworkDetails(packageId);
+        }
+        #endregion
+
+        #region Private Network
+        [WebMethod]
+        public PrivateIPAddressesPaged GetPackagePrivateIPAddressesPaged(int packageId,
+            string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
+        {
+            return VirtualizationServerController2012.GetPackagePrivateIPAddressesPaged(packageId,
+                filterColumn, filterValue, sortColumn, startRow, maximumRows);
+        }
+
+        [WebMethod]
+        public List<PrivateIPAddress> GetPackagePrivateIPAddresses(int packageId)
+        {
+            return VirtualizationServerController2012.GetPackagePrivateIPAddresses(packageId);
+        }
+
+        [WebMethod]
+        public NetworkAdapterDetails GetPrivateNetworkDetails(int packageId)
+        {
+            return VirtualizationServerController2012.GetPrivateNetworkDetails(packageId);
+        }
+        #endregion
+
+        #region User Permissions
+        [WebMethod]
+        public List<VirtualMachinePermission> GetSpaceUserPermissions(int packageId)
+        {
+            return VirtualizationServerController2012.GetSpaceUserPermissions(packageId);
+        }
+
+        [WebMethod]
+        public int UpdateSpaceUserPermissions(int packageId, VirtualMachinePermission[] permissions)
+        {
+            return VirtualizationServerController2012.UpdateSpaceUserPermissions(packageId, permissions);
+        }
+        #endregion
+
+        #region Audit Log
+        [WebMethod]
+        public List<LogRecord> GetSpaceAuditLog(int packageId, DateTime startPeriod, DateTime endPeriod,
+            int severity, string sortColumn, int startRow, int maximumRows)
+        {
+            return VirtualizationServerController2012.GetSpaceAuditLog(packageId, startPeriod, endPeriod,
+                severity, sortColumn, startRow, maximumRows);
+        }
+
+        [WebMethod]
+        public List<LogRecord> GetVirtualMachineAuditLog(int itemId, DateTime startPeriod, DateTime endPeriod,
+            int severity, string sortColumn, int startRow, int maximumRows)
+        {
+            return VirtualizationServerController2012.GetVirtualMachineAuditLog(itemId, startPeriod, endPeriod,
+                severity, sortColumn, startRow, maximumRows);
+        }
+        #endregion
+
+        #region VPS Create – Name & OS
+        [WebMethod]
+        public LibraryItem[] GetOperatingSystemTemplates(int packageId)
+        {
+            return VirtualizationServerController2012.GetOperatingSystemTemplates(packageId);
+        }
+
+        [WebMethod]
+        public LibraryItem[] GetOperatingSystemTemplatesByServiceId(int serviceId)
+        {
+            return VirtualizationServerController2012.GetOperatingSystemTemplatesByServiceId(serviceId);
+        }
+        #endregion
+
+        #region VPS Create - Configuration
+        [WebMethod]
+        public int GetMaximumCpuCoresNumber(int packageId)
+        {
+            return VirtualizationServerController2012.GetMaximumCpuCoresNumber(packageId);
+        }
+
+        [WebMethod]
+        public string GetDefaultExportPath(int itemId)
+        {
+            return VirtualizationServerController2012.GetDefaultExportPath(itemId);
+        }
+        #endregion
+
+        #region VPS Create
+        [WebMethod]
+        public IntResult CreateDefaultVirtualMachine(int packageId,
+            string hostname, string osTemplate, string password, string summaryLetterEmail)
+        {
+            return VirtualizationServerController2012.CreateDefaultVirtualMachine(packageId, hostname, osTemplate, password, summaryLetterEmail);
+        }
+
+        [WebMethod]
+        public IntResult CreateVirtualMachine(int packageId,
+                string hostname, string osTemplateFile, string password, string summaryLetterEmail,
+                int cpuCores, int ramMB, int hddGB, int snapshots, bool dvdInstalled, bool bootFromCD, bool numLock,
+                bool startShutdownAllowed, bool pauseResumeAllowed, bool rebootAllowed, bool resetAllowed, bool reinstallAllowed,
+                bool externalNetworkEnabled, int externalAddressesNumber, bool randomExternalAddresses, int[] externalAddresses,
+                bool privateNetworkEnabled, int privateAddressesNumber, bool randomPrivateAddresses, string[] privateAddresses, VirtualMachine otherSettings)
+        {
+            return VirtualizationServerController2012.CreateVirtualMachine(packageId,
+                hostname, osTemplateFile, password, summaryLetterEmail,
+                cpuCores, ramMB, hddGB, snapshots, dvdInstalled, bootFromCD, numLock,
+                startShutdownAllowed, pauseResumeAllowed, rebootAllowed, resetAllowed, reinstallAllowed,
+                externalNetworkEnabled, externalAddressesNumber, randomExternalAddresses, externalAddresses,
+                privateNetworkEnabled, privateAddressesNumber, randomPrivateAddresses, privateAddresses,  otherSettings);
+        }
+        #endregion
+
+        #region VPS - Import
+        [WebMethod]
+        public IntResult ImportVirtualMachine(int packageId,
+            int serviceId, string vmId,
+            string osTemplateFile, string adminPassword,
+            bool startShutdownAllowed, bool pauseResumeAllowed, bool rebootAllowed, bool resetAllowed, bool reinstallAllowed,
+            string externalNicMacAddress, int[] externalAddresses,
+            string managementNicMacAddress, int managementAddress)
+        {
+            return VirtualizationServerController2012.ImportVirtualMachine(packageId,
+                serviceId, vmId,
+                osTemplateFile, adminPassword,
+                startShutdownAllowed, pauseResumeAllowed, rebootAllowed, resetAllowed, reinstallAllowed,
+                externalNicMacAddress, externalAddresses,
+                managementNicMacAddress, managementAddress);
+        }
+        #endregion
+
+        #region VPS – General
+        [WebMethod]
+        public byte[] GetVirtualMachineThumbnail(int itemId, ThumbnailSize size)
+        {
+            return VirtualizationServerController2012.GetVirtualMachineThumbnail(itemId, size);
+        }
+
+        [WebMethod]
+        public VirtualMachine GetVirtualMachineGeneralDetails(int itemId)
+        {
+            return VirtualizationServerController2012.GetVirtualMachineGeneralDetails(itemId);
+        }
+
+        [WebMethod]
+        public VirtualMachine GetVirtualMachineExtendedInfo(int serviceId, string vmId)
+        {
+            return VirtualizationServerController2012.GetVirtualMachineExtendedInfo(serviceId, vmId);
+        }
+
+        [WebMethod]
+        public int CancelVirtualMachineJob(string jobId)
+        {
+            return VirtualizationServerController2012.CancelVirtualMachineJob(jobId);
+        }
+
+        [WebMethod]
+        public ResultObject UpdateVirtualMachineHostName(int itemId, string hostname, bool updateNetBIOS)
+        {
+            return VirtualizationServerController2012.UpdateVirtualMachineHostName(itemId, hostname, updateNetBIOS);
+        }
+
+        [WebMethod]
+        public ResultObject ChangeVirtualMachineState(int itemId, VirtualMachineRequestedState state)
+        {
+               return VirtualizationServerController2012.ChangeVirtualMachineStateExternal(itemId, state);    
+        }
+
+
+        [WebMethod]
+        public List<ConcreteJob> GetVirtualMachineJobs(int itemId)
+        {
+            return VirtualizationServerController2012.GetVirtualMachineJobs(itemId);
+
+        }
+        #endregion
+
+        #region VPS - Configuration
+        [WebMethod]
+        public ResultObject ChangeAdministratorPassword(int itemId, string password)
+        {
+            return VirtualizationServerController2012.ChangeAdministratorPassword(itemId, password);
+        }
+        #endregion
+
+        #region VPS – Edit Configuration
+        [WebMethod]
+        public ResultObject UpdateVirtualMachineConfiguration(int itemId, int cpuCores, int ramMB, int hddGB, int snapshots,
+                    bool dvdInstalled, bool bootFromCD, bool numLock,
+                    bool startShutdownAllowed, bool pauseResumeAllowed, bool rebootAllowed, bool resetAllowed, bool reinstallAllowed,
+                    bool externalNetworkEnabled,
+                    bool privateNetworkEnabled, VirtualMachine otherSettings)
+        {
+            return VirtualizationServerController2012.UpdateVirtualMachineConfiguration(
+                    itemId, cpuCores, ramMB, hddGB, snapshots,
+                    dvdInstalled, bootFromCD, numLock,
+                    startShutdownAllowed, pauseResumeAllowed, rebootAllowed, resetAllowed, reinstallAllowed,
+                    externalNetworkEnabled, privateNetworkEnabled,
+                    otherSettings);
+        }
+        #endregion
+
+        #region DVD
+        [WebMethod]
+        public LibraryItem GetInsertedDvdDisk(int itemId)
+        {
+            return VirtualizationServerController2012.GetInsertedDvdDisk(itemId);
+        }
+
+        [WebMethod]
+        public LibraryItem[] GetLibraryDisks(int itemId)
+        {
+            return VirtualizationServerController2012.GetLibraryDisks(itemId);
+        }
+
+        [WebMethod]
+        public ResultObject InsertDvdDisk(int itemId, string isoPath)
+        {
+            return VirtualizationServerController2012.InsertDvdDisk(itemId, isoPath);
+        }
+
+        [WebMethod]
+        public ResultObject EjectDvdDisk(int itemId)
+        {
+            return VirtualizationServerController2012.EjectDvdDisk(itemId);
+        }
+        #endregion
+
+        #region Snaphosts
+        [WebMethod]
+        public VirtualMachineSnapshot[] GetVirtualMachineSnapshots(int itemId)
+        {
+            return VirtualizationServerController2012.GetVirtualMachineSnapshots(itemId);
+        }
+
+        [WebMethod]
+        public VirtualMachineSnapshot GetSnapshot(int itemId, string snaphostId)
+        {
+            return VirtualizationServerController2012.GetSnapshot(itemId, snaphostId);
+        }
+
+        [WebMethod]
+        public ResultObject CreateSnapshot(int itemId)
+        {
+            return VirtualizationServerController2012.CreateSnapshot(itemId);
+        }
+
+        [WebMethod]
+        public ResultObject ApplySnapshot(int itemId, string snapshotId)
+        {
+            return VirtualizationServerController2012.ApplySnapshot(itemId, snapshotId);
+        }
+
+        [WebMethod]
+        public ResultObject RenameSnapshot(int itemId, string snapshotId, string newName)
+        {
+            return VirtualizationServerController2012.RenameSnapshot(itemId, snapshotId, newName);
+        }
+
+        [WebMethod]
+        public ResultObject DeleteSnapshot(int itemId, string snapshotId)
+        {
+            return VirtualizationServerController2012.DeleteSnapshot(itemId, snapshotId);
+        }
+
+        [WebMethod]
+        public ResultObject DeleteSnapshotSubtree(int itemId, string snapshotId)
+        {
+            return VirtualizationServerController2012.DeleteSnapshotSubtree(itemId, snapshotId);
+        }
+
+        [WebMethod]
+        public byte[] GetSnapshotThumbnail(int itemId, string snapshotId, ThumbnailSize size)
+        {
+            return VirtualizationServerController2012.GetSnapshotThumbnail(itemId, snapshotId, size);
+        }
+        #endregion
+
+        #region VPS - External Network
+        [WebMethod]
+        public NetworkAdapterDetails GetExternalNetworkAdapterDetails(int itemId)
+        {
+            return VirtualizationServerController2012.GetExternalNetworkAdapterDetails(itemId);
+        }
+
+        [WebMethod]
+        public ResultObject AddVirtualMachineExternalIPAddresses(int itemId, bool selectRandom,
+            int addressesNumber, int[] addressId)
+        {
+            return VirtualizationServerController2012.AddVirtualMachineExternalIPAddresses(itemId, selectRandom,
+                addressesNumber, addressId, true);
+        }
+
+        [WebMethod]
+        public ResultObject SetVirtualMachinePrimaryExternalIPAddress(int itemId, int addressId)
+        {
+            return VirtualizationServerController2012.SetVirtualMachinePrimaryExternalIPAddress(itemId, addressId, true);
+        }
+
+        [WebMethod]
+        public ResultObject DeleteVirtualMachineExternalIPAddresses(int itemId, int[] addressId)
+        {
+            return VirtualizationServerController2012.DeleteVirtualMachineExternalIPAddresses(itemId, addressId, true);
+        }
+        #endregion
+
+        #region VPS – Private Network
+        [WebMethod]
+        public NetworkAdapterDetails GetPrivateNetworkAdapterDetails(int itemId)
+        {
+            return VirtualizationServerController2012.GetPrivateNetworkAdapterDetails(itemId);
+        }
+
+        [WebMethod]
+        public ResultObject AddVirtualMachinePrivateIPAddresses(int itemId, bool selectRandom,
+            int addressesNumber, string[] addresses)
+        {
+            return VirtualizationServerController2012.AddVirtualMachinePrivateIPAddresses(itemId, selectRandom,
+                addressesNumber, addresses, true);
+        }
+
+        [WebMethod]
+        public ResultObject SetVirtualMachinePrimaryPrivateIPAddress(int itemId, int addressId)
+        {
+            return VirtualizationServerController2012.SetVirtualMachinePrimaryPrivateIPAddress(itemId, addressId, true);
+        }
+
+        [WebMethod]
+        public ResultObject DeleteVirtualMachinePrivateIPAddresses(int itemId, int[] addressId)
+        {
+            return VirtualizationServerController2012.DeleteVirtualMachinePrivateIPAddresses(itemId, addressId, true);
+        }
+        #endregion
+
+        #region Virtual Machine Permissions
+        [WebMethod]
+        public List<VirtualMachinePermission> GetVirtualMachinePermissions(int itemId)
+        {
+            return VirtualizationServerController2012.GetVirtualMachinePermissions(itemId);
+        }
+
+        [WebMethod]
+        public int UpdateVirtualMachineUserPermissions(int itemId, VirtualMachinePermission[] permissions)
+        {
+            return VirtualizationServerController2012.UpdateVirtualMachineUserPermissions(itemId, permissions);
+        }
+        #endregion
+
+        #region Virtual Switches
+        [WebMethod]
+        public VirtualSwitch[] GetExternalSwitches(int serviceId, string computerName)
+        {
+            return VirtualizationServerController2012.GetExternalSwitches(serviceId, computerName);
+        }
+        #endregion
+
+        #region Tools
+        [WebMethod]
+        public ResultObject DeleteVirtualMachine(int itemId, bool saveFiles, bool exportVps, string exportPath)
+        {
+            return VirtualizationServerController2012.DeleteVirtualMachine(itemId, saveFiles, exportVps, exportPath);
+        }
+
+        [WebMethod]
+        public int ReinstallVirtualMachine(int itemId, string adminPassword, bool preserveVirtualDiskFiles,
+            bool saveVirtualDisk, bool exportVps, string exportPath)
+        {
+            return VirtualizationServerController2012.ReinstallVirtualMachine(itemId, adminPassword, preserveVirtualDiskFiles,
+                saveVirtualDisk, exportVps, exportPath);
+        }
+        #endregion
+
+        #region Help
+        [WebMethod]
+        public string GetVirtualMachineSummaryText(int itemId)
+        {
+            return VirtualizationServerController2012.GetVirtualMachineSummaryText(itemId, false, false);
+        }
+
+        [WebMethod]
+        public ResultObject SendVirtualMachineSummaryLetter(int itemId, string to, string bcc)
+        {
+            return VirtualizationServerController2012.SendVirtualMachineSummaryLetter(itemId, to, bcc, false);
+        }
+        #endregion
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/Common/PersistentAttribute.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Common/PersistentAttribute.cs
index 1f3b7108..232b90bd 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/Common/PersistentAttribute.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Common/PersistentAttribute.cs
@@ -30,7 +30,7 @@ using System;
 
 namespace WebsitePanel.Providers
 {
-	[AttributeUsage(AttributeTargets.Property)]
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Class)]
 	public class PersistentAttribute : Attribute
 	{
 		public PersistentAttribute()
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/EnterpriseStorage/IEnterpriseStorage.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/EnterpriseStorage/IEnterpriseStorage.cs
index 892864a9..ae907208 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/EnterpriseStorage/IEnterpriseStorage.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/EnterpriseStorage/IEnterpriseStorage.cs
@@ -39,6 +39,7 @@ namespace WebsitePanel.Providers.EnterpriseStorage
     public interface IEnterpriseStorage
     {
         SystemFile[] GetFolders(string organizationId, WebDavSetting[] settings);
+        SystemFile[] GetFoldersWithoutFrsm(string organizationId, WebDavSetting[] settings);
         SystemFile GetFolder(string organizationId, string folderName, WebDavSetting setting);
         void CreateFolder(string organizationId, string folder, WebDavSetting setting);
         SystemFile RenameFolder(string organizationId, string originalFolder, string newFolder, WebDavSetting setting);
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/EnterpriseSolutionStatisticsReport.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/EnterpriseSolutionStatisticsReport.cs
index 77cccdae..d586e1a5 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/EnterpriseSolutionStatisticsReport.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/EnterpriseSolutionStatisticsReport.cs
@@ -32,6 +32,7 @@
     {
         public ExchangeStatisticsReport ExchangeReport { get; set; }
         public SharePointStatisticsReport SharePointReport { get; set; }
+        public SharePointEnterpriseStatisticsReport SharePointEnterpriseReport { get; set; }
         public CRMStatisticsReport CRMReport { get; set; }
         public OrganizationStatisticsReport OrganizationReport { get; set; }
         public LyncStatisticsReport LyncReport { get; set; }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/Organization.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/Organization.cs
index 69b3f2c7..23ea8636 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/Organization.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/Organization.cs
@@ -61,6 +61,9 @@ namespace WebsitePanel.Providers.HostedSolution
         private int maxSharePointStorage;
         private int warningSharePointStorage;
 
+        private int maxSharePointEnterpriseStorage;
+        private int warningSharePointEnterpriseStorage;
+
         #endregion
  
         [Persistent]
@@ -80,6 +83,20 @@ namespace WebsitePanel.Providers.HostedSolution
             set { warningSharePointStorage = value; }
         }
 
+        [Persistent]
+        public int MaxSharePointEnterpriseStorage
+        {
+            get { return maxSharePointEnterpriseStorage; }
+            set { maxSharePointEnterpriseStorage = value; }
+        }
+
+        [Persistent]
+        public int WarningSharePointEnterpriseStorage
+        {
+            get { return warningSharePointEnterpriseStorage; }
+            set { warningSharePointEnterpriseStorage = value; }
+        }
+
         [Persistent]
         public string CrmUrl
         {
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationStatistics.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationStatistics.cs
index 56923206..eddf97ed 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationStatistics.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationStatistics.cs
@@ -61,6 +61,9 @@ namespace WebsitePanel.Providers.HostedSolution
 		private int allocatedSharePointSiteCollections;
 		private int createdSharePointSiteCollections;
 
+        private int allocatedSharePointEnterpriseSiteCollections;
+        private int createdSharePointEnterpriseSiteCollections;
+
         private int createdCRMUsers;
         private int allocatedCRMUsers;
 
@@ -288,6 +291,18 @@ namespace WebsitePanel.Providers.HostedSolution
 			set { createdSharePointSiteCollections = value; }
 		}
 
+        public int AllocatedSharePointEnterpriseSiteCollections
+        {
+            get { return allocatedSharePointEnterpriseSiteCollections; }
+            set { allocatedSharePointEnterpriseSiteCollections = value; }
+        }
+
+        public int CreatedSharePointEnterpriseSiteCollections
+        {
+            get { return createdSharePointEnterpriseSiteCollections; }
+            set { createdSharePointEnterpriseSiteCollections = value; }
+        }
+
         public int CreatedBlackBerryUsers { get; set; }
         public int AllocatedBlackBerryUsers { get; set; }
 
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationStatisticsRepotItem.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationStatisticsRepotItem.cs
index 336a4afc..34d1a3e8 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationStatisticsRepotItem.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationStatisticsRepotItem.cs
@@ -60,6 +60,19 @@
             set;
         }
 
+        public int TotalSharePointEnterpriseSiteCollections
+        {
+            get;
+            set;
+        }
+
+        public long TotalSharePointEnterpriseSiteCollectionsSize
+        {
+            get;
+            set;
+        }
+
+
         public int TotalCRMUsers
         {
             get;
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/SharePointEnterpriseStatisticsReport.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/SharePointEnterpriseStatisticsReport.cs
new file mode 100644
index 00000000..d2be9b9f
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/SharePointEnterpriseStatisticsReport.cs
@@ -0,0 +1,71 @@
+// Copyright (c) 2015, 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.
+
+using System.Text;
+
+namespace WebsitePanel.Providers.HostedSolution
+{
+    public class SharePointEnterpriseStatisticsReport : BaseReport<SharePointEnterpriseStatistics>
+    {
+        public override string ToCSV()
+        {
+            StringBuilder mainBuilder = new StringBuilder();
+            
+            AddCSVHeader(mainBuilder);
+            foreach (SharePointEnterpriseStatistics item in Items)
+            {
+                StringBuilder sb = new StringBuilder();
+                sb.Append("\n");
+                sb.AppendFormat("{0},", ToCsvString(item.TopResellerName));
+                sb.AppendFormat("{0},", ToCsvString(item.ResellerName));
+                sb.AppendFormat("{0},", ToCsvString(item.CustomerName));
+                sb.AppendFormat("{0},", ToCsvString(item.CustomerCreated));
+                sb.AppendFormat("{0},", ToCsvString(item.HostingSpace));
+                sb.AppendFormat("{0},", ToCsvString(item.HostingSpaceCreated));
+                sb.AppendFormat("{0},", ToCsvString(item.OrganizationName));
+                sb.AppendFormat("{0},", ToCsvString(item.OrganizationCreated));
+                sb.AppendFormat("{0},", ToCsvString(item.OrganizationID));
+
+                sb.AppendFormat("{0},", ToCsvString(item.SiteCollectionUrl));
+                sb.AppendFormat("{0},", ToCsvString(item.SiteCollectionOwner));
+                sb.AppendFormat("{0},", ToCsvString(item.SiteCollectionCreated));
+                sb.AppendFormat("{0},", item.SiteCollectionQuota != 0 && item.SiteCollectionQuota != -1 ? ToCsvString(item.SiteCollectionQuota): "Unlimited");
+                sb.AppendFormat("{0}", ToCsvString(item.SiteCollectionSize / 1024.0 / 1024.0));
+                mainBuilder.Append(sb.ToString());
+                
+            }
+            return mainBuilder.ToString();
+            
+        }
+
+        private static void AddCSVHeader(StringBuilder sb)
+        {
+            sb.Append("Top Reseller,Reseller,Customer,Customer Created,Hosting Space,Hosting Space Created,Ogranization Name,Ogranization Created,Organization ID,Site Collection URL,Site collection owner,Site collection created,Site collection quota(Mb),Site collection size(Mb)");
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/SharePointEntetpriseStatistics.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/SharePointEntetpriseStatistics.cs
new file mode 100644
index 00000000..a1870725
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/SharePointEntetpriseStatistics.cs
@@ -0,0 +1,67 @@
+// Copyright (c) 2015, 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.
+
+using System;
+
+namespace WebsitePanel.Providers.HostedSolution
+{
+    public class SharePointEnterpriseStatistics : BaseStatistics
+    {
+        public string SiteCollectionUrl
+        {
+            get;
+            set;
+        }
+
+        public string SiteCollectionOwner
+        {
+            get;
+            set;
+        }
+
+        public DateTime SiteCollectionCreated
+        {
+            get;
+            set;
+        }
+
+        public long SiteCollectionQuota
+        {
+            get;
+            set;
+        }
+
+        public long SiteCollectionSize
+        {
+            get;
+            set;
+        }
+
+        
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/IRemoteDesktopServices.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/IRemoteDesktopServices.cs
index 1d5b04b4..2cfe5b06 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/IRemoteDesktopServices.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/IRemoteDesktopServices.cs
@@ -81,6 +81,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         void RemoveRdsServerFromTenantOU(string hostName, string organizationId);
         void InstallCertificate(byte[] certificate, string password, List<string> hostNames);
         void MoveSessionHostToRdsOU(string hostName);
-        void ApplyGPO(string collectionName, RdsServerSettings serverSettings);
+        void ApplyGPO(string organizationId, string collectionName, RdsServerSettings serverSettings);
+        void ShadowSession(string sessionId, bool control);
+        void MoveSessionHostsToCollectionOU(List<RdsServer> servers, string collectionName, string organizationId);
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsServerSettings.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsServerSettings.cs
index 1c347305..ad175a46 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsServerSettings.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsServerSettings.cs
@@ -39,6 +39,15 @@ namespace WebsitePanel.EnterpriseServer.Base.RDS
         public const string SCREEN_SAVER_DISABLED_ADMINISTRATORS = "ScreenSaverDisabledAdministrators";
         public const string SCREEN_SAVER_DISABLED_USERS = "ScreenSaverDisabledUsers";
         public const string DRIVE_SPACE_THRESHOLD_VALUE = "DriveSpaceThresholdValue";
+        public const string RDS_VIEW_WITHOUT_PERMISSION = "RDSViewWithoutPermission";
+        public const string RDS_VIEW_WITHOUT_PERMISSION_ADMINISTRATORS = "RDSViewWithoutPermissionAdministrators";
+        public const string RDS_VIEW_WITHOUT_PERMISSION_Users = "RDSViewWithoutPermissionUsers";
+        public const string RDS_CONTROL_WITHOUT_PERMISSION = "RDSControlWithoutPermission";
+        public const string RDS_CONTROL_WITHOUT_PERMISSION_ADMINISTRATORS = "RDSControlWithoutPermissionAdministrators";
+        public const string RDS_CONTROL_WITHOUT_PERMISSION_Users = "RDSControlWithoutPermissionUsers";
+        public const string DISABLE_CMD = "DisableCMD";
+        public const string DISABLE_CMD_ADMINISTRATORS = "DisableCMDAdministrators";
+        public const string DISABLE_CMD_USERS = "DisableCMDUsers";
 
         public string SettingsName { get; set; }
         public int ServerId { get; set; }
@@ -58,5 +67,21 @@ namespace WebsitePanel.EnterpriseServer.Base.RDS
                 settings = value;
             }
         }
+
+        public static List<KeyValuePair<string, string>> ScreenSaverTimeOuts
+        {
+            get
+            {
+                return new List<KeyValuePair<string, string>> {
+                    new KeyValuePair<string, string>("", "None"),
+                    new KeyValuePair<string, string>("10", "10"),
+                    new KeyValuePair<string, string>("20", "20"),
+                    new KeyValuePair<string, string>("30", "30"),
+                    new KeyValuePair<string, string>("40", "40"),
+                    new KeyValuePair<string, string>("50", "50"),
+                    new KeyValuePair<string, string>("60", "60")
+                };
+            }
+        }
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/SharePoint/IHostedSharePointServerEnt.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/SharePoint/IHostedSharePointServerEnt.cs
new file mode 100644
index 00000000..55b1d2e9
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/SharePoint/IHostedSharePointServerEnt.cs
@@ -0,0 +1,120 @@
+// Copyright (c) 2015, 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.
+
+using System;
+
+namespace WebsitePanel.Providers.SharePoint
+{
+    /// <summary>
+    /// Exposes functionality for share point server provider hosted in conjunction with organization management provider and 
+    /// exchange server.
+    /// </summary>
+    public interface IHostedSharePointServerEnt
+    {
+        /// <summary>
+        /// When implemented gets root web application uri.
+        /// </summary>
+        Uri Enterprise_RootWebApplicationUri
+        {
+            get;
+        }
+
+        /// <summary>
+        /// When implemented gets list of supported languages by this installation of SharePoint.
+        /// </summary>
+        /// <returns>List of supported languages</returns>
+        int[] Enterprise_GetSupportedLanguages();
+
+        /// <summary>
+        /// When implemented gets list of SharePoint collections within root web application.
+        /// </summary>
+        /// <returns>List of SharePoint collections within root web application.</returns>
+        SharePointEnterpriseSiteCollection[] Enterprise_GetSiteCollections();
+
+        /// <summary>
+        /// When implemented gets SharePoint collection within root web application with given name.
+        /// </summary>
+        /// <param name="url">Url that uniquely identifies site collection to be loaded.</param>
+        /// <returns>SharePoint collection within root web application with given name.</returns>
+        SharePointEnterpriseSiteCollection Enterprise_GetSiteCollection(string url);
+
+        /// <summary>
+        /// When implemented creates site collection within predefined root web application.
+        /// </summary>
+        /// <param name="siteCollection">Information about site coolection to be created.</param>
+        void Enterprise_CreateSiteCollection(SharePointEnterpriseSiteCollection siteCollection);
+
+        /// <summary>
+        /// When implemented deletes site collection under given url.
+        /// </summary>
+        /// <param name="url">Url that uniquely identifies site collection to be deleted.</param>
+        void Enterprise_DeleteSiteCollection(SharePointEnterpriseSiteCollection siteCollection);
+
+        /// <summary>
+        /// When implemeneted backups site collection under give url.
+        /// </summary>
+        /// <param name="url">Url that uniquely identifies site collection to be deleted.</param>
+        /// <param name="filename">Resulting backup file name.</param>
+        /// <param name="zip">A value which shows whether created backup must be archived.</param>
+        /// <returns>Created backup full path.</returns>
+        string Enterprise_BackupSiteCollection(string url, string filename, bool zip);
+
+        /// <summary>
+        /// When implemented restores site collection under given url from backup.
+        /// </summary>
+        /// <param name="siteCollection">Site collection to be restored.</param>
+        /// <param name="filename">Backup file name to restore from.</param>
+        void Enterprise_RestoreSiteCollection(SharePointEnterpriseSiteCollection siteCollection, string filename);
+
+        /// <summary>
+        /// When implemented gets binary data chunk of specified size from specified offset.
+        /// </summary>
+        /// <param name="path">Path to file to get bunary data chunk from.</param>
+        /// <param name="offset">Offset from which to start data reading.</param>
+        /// <param name="length">Binary data chunk length.</param>
+        /// <returns>Binary data chunk read from file.</returns>
+        byte[] Enterprise_GetTempFileBinaryChunk(string path, int offset, int length);
+
+        /// <summary>
+        /// When implemented appends supplied binary data chunk to file.
+        /// </summary>
+        /// <param name="fileName">Non existent file name to append to.</param>
+        /// <param name="path">Full path to existent file to append to.</param>
+        /// <param name="chunk">Binary data chunk to append to.</param>
+        /// <returns>Path to file that was appended with chunk.</returns>
+        string Enterprise_AppendTempFileBinaryChunk(string fileName, string path, byte[] chunk);
+
+        void Enterprise_UpdateQuotas(string url, long maxStorage, long warningStorage);
+
+        SharePointSiteDiskSpace[] Enterprise_CalculateSiteCollectionsDiskSpace(string[] urls);
+
+        long Enterprise_GetSiteCollectionSize(string url);
+
+        void Enterprise_SetPeoplePickerOu(string site, string ou);
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/SharePoint/SharePointEnterpriseSiteCollection.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/SharePoint/SharePointEnterpriseSiteCollection.cs
new file mode 100644
index 00000000..7230f123
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/SharePoint/SharePointEnterpriseSiteCollection.cs
@@ -0,0 +1,298 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebsitePanel.Providers.SharePoint
+{
+	/// <summary>
+	/// Represents SharePoint site collection information.
+	/// </summary>
+	[Serializable]
+	public class SharePointEnterpriseSiteCollection : ServiceProviderItem
+	{
+		private int organizationId;
+		private string url;
+		private string physicalAddress;
+		private string ownerLogin;
+		private string ownerName;
+		private string ownerEmail;
+		private int localeId;
+		private string title;
+		private string description;
+		private long bandwidth;
+		private long diskspace;
+	    private long maxSiteStorage;
+	    private long warningStorage;
+        private string rootWebApplicationInteralIpAddress;
+        private string rootWebApplicationFQDN;
+
+
+
+	    [Persistent]
+        public long MaxSiteStorage
+	    {
+	        get { return maxSiteStorage; }
+	        set { maxSiteStorage = value; }
+	    }
+
+        [Persistent]
+        public long WarningStorage
+	    {
+	        get { return warningStorage; }
+	        set { warningStorage = value; }
+	    }
+
+	    /// <summary>
+		/// Gets or sets service item name.
+		/// </summary>
+		public override string Name
+		{
+			get
+			{
+				return this.Url;
+			}
+			set
+			{
+				this.Url = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets id of organization which owns this site collection.
+		/// </summary>
+		[Persistent]
+		public int OrganizationId
+		{
+			get
+			{
+				return this.organizationId;
+			}
+			set
+			{
+				this.organizationId = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets url of the host named site collection to be created. It must not contain port number.
+		/// </summary>
+		[Persistent]
+		public string Url
+		{
+			get
+			{
+				return this.url;
+			}
+			set
+			{
+				this.url = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets physical address of the host named site collection. It contains scheme and port number.
+		/// </summary>
+		[Persistent]
+		public string PhysicalAddress
+		{
+			get
+			{
+				return this.physicalAddress;
+			}
+			set
+			{
+				this.physicalAddress = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets login name of the site collection's owner/primary site administrator.
+		/// </summary>
+		[Persistent]
+		public string OwnerLogin
+		{
+			get
+			{
+				return this.ownerLogin;
+			}
+			set
+			{
+				this.ownerLogin = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets display name of the site collection's owner/primary site administrator.
+		/// </summary>
+		[Persistent]
+		public string OwnerName
+		{
+			get
+			{
+				return this.ownerName;
+			}
+			set
+			{
+				this.ownerName = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets display email of the site collection's owner/primary site administrator.
+		/// </summary>
+		[Persistent]
+		public string OwnerEmail
+		{
+			get
+			{
+				return this.ownerEmail;
+			}
+			set
+			{
+				this.ownerEmail = value;
+			}
+		}
+
+        /// <summary>
+        /// Gets or sets the internal ip address
+        /// </summary>
+        [Persistent]
+        public string RootWebApplicationInteralIpAddress
+        {
+            get
+            {
+                return this.rootWebApplicationInteralIpAddress;
+            }
+            set
+            {
+                this.rootWebApplicationInteralIpAddress = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the internal ip address
+        /// </summary>
+        [Persistent]
+        public string RootWebApplicationFQDN
+        {
+            get
+            {
+                return this.rootWebApplicationFQDN;
+            }
+            set
+            {
+                this.rootWebApplicationFQDN = value;
+            }
+        }
+
+
+		/// <summary>
+		/// Gets or sets locale id of the site collection to be created.
+		/// </summary>
+		[Persistent]
+		public int LocaleId
+		{
+			get
+			{
+				return this.localeId;
+			}
+			set
+			{
+				this.localeId = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets title of the the site collection to be created.
+		/// </summary>
+		[Persistent]
+		public string Title
+		{
+			get
+			{
+				return this.title;
+			}
+			set
+			{
+				this.title = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets description of the the site collection to be created.
+		/// </summary>
+		[Persistent]
+		public string Description
+		{
+			get
+			{
+				return this.description;
+			}
+			set
+			{
+				this.description = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets bandwidth of the the site collection.
+		/// </summary>
+		[Persistent]
+		public long Bandwidth
+		{
+			get
+			{
+				return this.bandwidth;
+			}
+			set
+			{
+				this.bandwidth = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets diskspace of the the site collection.
+		/// </summary>
+		[Persistent]
+		public long Diskspace
+		{
+			get
+			{
+				return this.diskspace;
+			}
+			set
+			{
+				this.diskspace = value;
+			}
+		}
+	
+	}
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/SharePoint/SharePointEnterpriseSiteCollectionListPaged.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/SharePoint/SharePointEnterpriseSiteCollectionListPaged.cs
new file mode 100644
index 00000000..38ee5996
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/SharePoint/SharePointEnterpriseSiteCollectionListPaged.cs
@@ -0,0 +1,71 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebsitePanel.Providers.SharePoint
+{
+	[Serializable]
+	public class SharePointEnterpriseSiteCollectionListPaged
+	{
+		private int totalRowCount;
+		private List<SharePointEnterpriseSiteCollection> siteCollections;
+
+		/// <summary>
+		/// Gets or sets total row count in persistent storage.
+		/// </summary>
+		public int TotalRowCount
+		{
+			get
+			{
+				return this.totalRowCount;
+			}
+			set
+			{
+				this.totalRowCount = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets list of site collections on a single page.
+		/// </summary>
+		public List<SharePointEnterpriseSiteCollection> SiteCollections
+		{
+			get
+			{
+				return this.siteCollections;
+			}
+			set
+			{
+				this.siteCollections = value;
+			}
+		}
+	}
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/SharePoint/SharePointEnterpriseSiteDiskSpace.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/SharePoint/SharePointEnterpriseSiteDiskSpace.cs
new file mode 100644
index 00000000..a734327b
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/SharePoint/SharePointEnterpriseSiteDiskSpace.cs
@@ -0,0 +1,52 @@
+// Copyright (c) 2015, 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.
+
+using System;
+
+namespace WebsitePanel.Providers.SharePoint
+{
+    [Serializable]
+    public class SharePointEnterpriseSiteDiskSpace
+    {
+        private string url;
+        private long diskSpace;
+       
+        
+        public string Url
+        {
+            get { return url; }
+            set { url = value; }
+        }
+
+        public long DiskSpace
+        {
+            get { return diskSpace; }
+            set { diskSpace = value; }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/Virtualization/DynamicMemory.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Virtualization/DynamicMemory.cs
new file mode 100644
index 00000000..64b23a64
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Virtualization/DynamicMemory.cs
@@ -0,0 +1,52 @@
+// Copyright (c) 2015, 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.
+
+using System;
+
+
+namespace WebsitePanel.Providers.Virtualization
+{
+    [Persistent]
+    public class DynamicMemory
+    {
+        [Persistent]
+        public bool Enabled { get; set; }
+
+        [Persistent]
+        public int Minimum { get; set; }
+
+        [Persistent]
+        public int Maximum { get; set; }
+
+        [Persistent]
+        public int Buffer { get; set; }
+
+        [Persistent]
+        public int Priority { get; set; } // Weight
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/Virtualization/VirtualMachine.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Virtualization/VirtualMachine.cs
index aa659526..a4f1b809 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/Virtualization/VirtualMachine.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/Virtualization/VirtualMachine.cs
@@ -71,6 +71,10 @@ namespace WebsitePanel.Providers.Virtualization
         [Persistent]
         public int RamSize { get; set; }
         public int RamUsage { get; set; }
+
+        [Persistent]
+        public DynamicMemory DynamicMemory { get; set; }
+
         [Persistent]
         public int HddSize { get; set; }
         public LogicalDisk[] HddLogicalDisks { get; set; }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj
index ce9cc986..0f208c31 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj
@@ -126,6 +126,8 @@
     <Compile Include="HostedSolution\OrganizationDeletedUsersPaged.cs" />
     <Compile Include="HostedSolution\OrganizationSettings.cs" />
     <Compile Include="HostedSolution\OrganizationSettingsEntity.cs" />
+    <Compile Include="HostedSolution\SharePointEnterpriseStatisticsReport.cs" />
+    <Compile Include="HostedSolution\SharePointEntetpriseStatistics.cs" />
     <Compile Include="HostedSolution\TransactionAction.cs" />
     <Compile Include="OS\MappedDrivesPaged.cs" />
     <Compile Include="OS\MappedDrive.cs" />
@@ -284,11 +286,15 @@
     <Compile Include="ResultObjects\ValueResultObject.cs" />
     <Compile Include="ResultObjects\VirtualMachineResult.cs" />
     <Compile Include="ResultObjects\WebAppGallery.cs" />
+    <Compile Include="SharePoint\IHostedSharePointServerEnt.cs" />
     <Compile Include="SharePoint\IHostedSharePointServer.cs" />
     <Compile Include="SharePoint\ISharePointServer.cs" />
     <Compile Include="SharePoint\SharePointSite.cs" />
+    <Compile Include="SharePoint\SharePointEnterpriseSiteCollection.cs" />
     <Compile Include="SharePoint\SharePointSiteCollection.cs" />
+    <Compile Include="SharePoint\SharePointEnterpriseSiteCollectionListPaged.cs" />
     <Compile Include="SharePoint\SharePointSiteCollectionListPaged.cs" />
+    <Compile Include="SharePoint\SharePointEnterpriseSiteDiskSpace.cs" />
     <Compile Include="SharePoint\SharePointSiteDiskSpace.cs" />
     <Compile Include="Statistics\IStatisticsServer.cs" />
     <Compile Include="Statistics\StatsServer.cs" />
@@ -319,7 +325,6 @@
     <Compile Include="Virtualization\LibraryItem.cs" />
     <Compile Include="Virtualization\LogicalDisk.cs" />
     <Compile Include="Virtualization\DvdDriveInfo.cs" />
-    <Compile Include="Virtualization\MemoryInfo.cs" />
     <Compile Include="Virtualization\MonitoredObjectAlert.cs" />
     <Compile Include="Virtualization\MonitoredObjectEvent.cs" />
     <Compile Include="Virtualization\MountedDiskInfo.cs" />
@@ -337,6 +342,7 @@
     <Compile Include="Virtualization\VirtualHardDiskFormat.cs" />
     <Compile Include="Virtualization\VirtualHardDiskInfo.cs" />
     <Compile Include="Virtualization\VirtualHardDiskType.cs" />
+    <Compile Include="Virtualization\DynamicMemory.cs" />
     <Compile Include="Virtualization\VirtualMachine.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.DNS.MsDNS2012/WebsitePanel.Providers.DNS.MsDNS2012.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.DNS.MsDNS2012/WebsitePanel.Providers.DNS.MsDNS2012.csproj
index 3e204b0a..d958a02e 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.DNS.MsDNS2012/WebsitePanel.Providers.DNS.MsDNS2012.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.DNS.MsDNS2012/WebsitePanel.Providers.DNS.MsDNS2012.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WebsitePanel.Providers.DNS.MsDNS2012</RootNamespace>
     <AssemblyName>WebsitePanel.Providers.DNS.MsDNS2012</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Management.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/WebsitePanel.Providers.EnterpriseStorage.Windows2012.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/WebsitePanel.Providers.EnterpriseStorage.Windows2012.csproj
index 2ff4ba61..21db961a 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/WebsitePanel.Providers.EnterpriseStorage.Windows2012.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/WebsitePanel.Providers.EnterpriseStorage.Windows2012.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WebsitePanel.Providers.EnterpriseStorage.Windows2012</RootNamespace>
     <AssemblyName>WebsitePanel.Providers.EnterpriseStorage.Windows2012</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/Windows2012.cs b/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/Windows2012.cs
index f0a8caf3..67b2d1ff 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/Windows2012.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.EnterpriseStorage.Windows2012/Windows2012.cs
@@ -122,6 +122,49 @@ namespace WebsitePanel.Providers.EnterpriseStorage
             return (SystemFile[]) items.ToArray(typeof (SystemFile));
         }
 
+        public SystemFile[] GetFoldersWithoutFrsm(string organizationId, WebDavSetting[] settings)
+        {
+            ArrayList items = new ArrayList();
+
+            var webDavSettings = GetWebDavSettings(settings);
+
+            foreach (var setting in webDavSettings)
+            {
+                string rootPath = string.Format("{0}:\\{1}\\{2}", setting.LocationDrive, setting.HomeFolder,
+                    organizationId);
+
+                if (Directory.Exists(rootPath))
+                {
+                    DirectoryInfo root = new DirectoryInfo(rootPath);
+                    IWebDav webdav = new Web.WebDav(setting);
+
+                    // get directories
+                    DirectoryInfo[] dirs = root.GetDirectories();
+
+                    foreach (DirectoryInfo dir in dirs)
+                    {
+                        SystemFile folder = new SystemFile();
+
+                        folder.Name = dir.Name;
+                        folder.FullName = dir.FullName;
+                        folder.IsDirectory = true;
+
+                        if (folder.Size == -1)
+                        {
+                            folder.Size = FileUtils.BytesToMb(FileUtils.CalculateFolderSize(dir.FullName));
+                        }
+
+                        folder.Url = string.Format("https://{0}/{1}/{2}", setting.Domain, organizationId, dir.Name);
+                        folder.Rules = webdav.GetFolderWebDavRules(organizationId, dir.Name);
+
+                        items.Add(folder);
+                    }
+                }
+            }
+
+            return (SystemFile[])items.ToArray(typeof(SystemFile));
+        }
+
         public SystemFile GetFolder(string organizationId, string folderName, WebDavSetting setting)
         {
             var webDavSetting = GetWebDavSetting(setting);
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs
index 36a2f85f..02dead74 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/Exchange2013.cs
@@ -4995,12 +4995,18 @@ namespace WebsitePanel.Providers.HostedSolution
                 //general settings
                 Command cmd = new Command("Set-MailPublicFolder");
                 cmd.Parameters.Add("Identity", folder);
-                if (!folderName.Equals(newFolderName, StringComparison.OrdinalIgnoreCase))
-                {
-                    cmd.Parameters.Add("Name", newFolderName);
-                }
                 cmd.Parameters.Add("HiddenFromAddressListsEnabled", hideFromAddressBook);
                 ExecuteShellCommand(runSpace, cmd);
+
+                // rename
+                if (!folderName.Equals(newFolderName, StringComparison.OrdinalIgnoreCase))
+                {
+                    cmd = new Command("Set-PublicFolder");
+                    cmd.Parameters.Add("Identity", folder);
+                    cmd.Parameters.Add("Name", newFolderName);
+                    ExecuteShellCommand(runSpace, cmd);
+
+                }
             }
             finally
             {
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/WebsitePanel.Providers.HostedSolution.Exchange2013.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/WebsitePanel.Providers.HostedSolution.Exchange2013.csproj
index eb303e4c..dc984cec 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/WebsitePanel.Providers.HostedSolution.Exchange2013.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Exchange2013/WebsitePanel.Providers.HostedSolution.Exchange2013.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WebsitePanel.Providers.HostedSolution.Exchange2013</RootNamespace>
     <AssemblyName>WebsitePanel.Providers.HostedSolution.Exchange2013</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -22,6 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -30,6 +31,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Exchange.Common">
@@ -70,7 +72,6 @@
     <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Lib\References\Microsoft\Windows2012\System.Management.Automation.dll</HintPath>
-      <Private>False</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Lync2013HP/WebsitePanel.Providers.HostedSolution.Lync2013HP.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Lync2013HP/WebsitePanel.Providers.HostedSolution.Lync2013HP.csproj
index 4cd53e34..82943dc4 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Lync2013HP/WebsitePanel.Providers.HostedSolution.Lync2013HP.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.Lync2013HP/WebsitePanel.Providers.HostedSolution.Lync2013HP.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WebsitePanel.Providers.HostedSolution.Lync2013HP</RootNamespace>
     <AssemblyName>WebsitePanel.Providers.HostedSolution.Lync2013HP</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Rtc.Management.Core">
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent/HostedSharePointServer2013Ent.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent/HostedSharePointServer2013Ent.cs
new file mode 100644
index 00000000..1bc80759
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent/HostedSharePointServer2013Ent.cs
@@ -0,0 +1,352 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Xml;
+using Microsoft.Win32;
+using WebsitePanel.Providers.SharePoint;
+using WebsitePanel.Providers.Utils;
+using WebsitePanel.Server.Utils;
+
+namespace WebsitePanel.Providers.HostedSolution
+{
+    /// <summary>
+    /// Provides hosted SharePoint server functionality implementation.
+    /// </summary>
+    public class HostedSharePointServer2013Ent : HostingServiceProviderBase, IHostedSharePointServerEnt
+    {
+        #region Delegate
+
+        private delegate TReturn SharePointAction<TReturn>(HostedSharePointServer2013EntImpl impl);
+
+        #endregion
+
+        #region Fields
+
+        protected string LanguagePacksPath;
+        protected string Wss3Registry32Key;
+        protected string Wss3RegistryKey;
+
+        #endregion
+
+        #region Properties
+
+        public string BackupTemporaryFolder
+        {
+            get { return ProviderSettings["BackupTemporaryFolder"]; }
+        }
+
+        public Uri Enterprise_RootWebApplicationUri
+        {
+            get { return new Uri(ProviderSettings["RootWebApplicationUri"]); }
+        }
+
+        #endregion
+
+        #region Constructor
+
+        public HostedSharePointServer2013Ent()
+        {
+            Wss3RegistryKey = @"SOFTWARE\Microsoft\Shared Tools\Web Server Extensions\15.0";
+            Wss3Registry32Key = @"SOFTWARE\Wow6432Node\Microsoft\Shared Tools\Web Server Extensions\15.0";
+            LanguagePacksPath = @"%commonprogramfiles%\microsoft shared\Web Server Extensions\15\HCCab\";
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>Gets list of supported languages by this installation of SharePoint.</summary>
+        /// <returns>List of supported languages</returns>
+        public int[] Enterprise_GetSupportedLanguages()
+        {
+            var impl = new HostedSharePointServer2013EntImpl();
+            return impl.GetSupportedLanguages(Enterprise_RootWebApplicationUri);
+        }
+
+        /// <summary>Gets list of SharePoint collections within root web application.</summary>
+        /// <returns>List of SharePoint collections within root web application.</returns>
+        public SharePointEnterpriseSiteCollection[] Enterprise_GetSiteCollections()
+        {
+            return ExecuteSharePointAction(impl => impl.GetSiteCollections(Enterprise_RootWebApplicationUri));
+        }
+
+        /// <summary>Gets SharePoint collection within root web application with given name.</summary>
+        /// <param name="url">Url that uniquely identifies site collection to be loaded.</param>
+        /// <returns>SharePoint collection within root web application with given name.</returns>
+        public SharePointEnterpriseSiteCollection Enterprise_GetSiteCollection(string url)
+        {
+            return ExecuteSharePointAction(impl => impl.GetSiteCollection(Enterprise_RootWebApplicationUri, url));
+        }
+
+        /// <summary>Creates site collection within predefined root web application.</summary>
+        /// <param name="siteCollection">Information about site coolection to be created.</param>
+        public void Enterprise_CreateSiteCollection(SharePointEnterpriseSiteCollection siteCollection)
+        {
+            ExecuteSharePointAction<object>(delegate(HostedSharePointServer2013EntImpl impl)
+            {
+                impl.CreateSiteCollection(Enterprise_RootWebApplicationUri, siteCollection);
+                return null;
+            });
+        }
+
+        /// <summary>Deletes site collection under given url.</summary>
+        /// <param name="siteCollection">The site collection to be deleted.</param>
+        public void Enterprise_DeleteSiteCollection(SharePointEnterpriseSiteCollection siteCollection)
+        {
+            ExecuteSharePointAction<object>(delegate(HostedSharePointServer2013EntImpl impl)
+            {
+                impl.DeleteSiteCollection(Enterprise_RootWebApplicationUri, siteCollection);
+                return null;
+            });
+        }
+
+        /// <summary>Backups site collection under give url.</summary>
+        /// <param name="url">Url that uniquely identifies site collection to be deleted.</param>
+        /// <param name="filename">Resulting backup file name.</param>
+        /// <param name="zip">A value which shows whether created backup must be archived.</param>
+        /// <returns>Created backup full path.</returns>
+        public string Enterprise_BackupSiteCollection(string url, string filename, bool zip)
+        {
+            return ExecuteSharePointAction(impl => impl.BackupSiteCollection(Enterprise_RootWebApplicationUri, url, filename, zip, BackupTemporaryFolder));
+        }
+
+        /// <summary>Restores site collection under given url from backup.</summary>
+        /// <param name="siteCollection">Site collection to be restored.</param>
+        /// <param name="filename">Backup file name to restore from.</param>
+        public void Enterprise_RestoreSiteCollection(SharePointEnterpriseSiteCollection siteCollection, string filename)
+        {
+            ExecuteSharePointAction<object>(delegate(HostedSharePointServer2013EntImpl impl)
+            {
+                impl.RestoreSiteCollection(Enterprise_RootWebApplicationUri, siteCollection, filename);
+                return null;
+            });
+        }
+
+        /// <summary>Gets binary data chunk of specified size from specified offset.</summary>
+        /// <param name="path">Path to file to get bunary data chunk from.</param>
+        /// <param name="offset">Offset from which to start data reading.</param>
+        /// <param name="length">Binary data chunk length.</param>
+        /// <returns>Binary data chunk read from file.</returns>
+        public virtual byte[] Enterprise_GetTempFileBinaryChunk(string path, int offset, int length)
+        {
+            byte[] buffer = FileUtils.GetFileBinaryChunk(path, offset, length);
+
+            if (buffer.Length < length)
+            {
+                FileUtils.DeleteFile(path);
+            }
+
+            return buffer;
+        }
+
+        /// <summary>Appends supplied binary data chunk to file.</summary>
+        /// <param name="fileName">Non existent file name to append to.</param>
+        /// <param name="path">Full path to existent file to append to.</param>
+        /// <param name="chunk">Binary data chunk to append to.</param>
+        /// <returns>Path to file that was appended with chunk.</returns>
+        public virtual string Enterprise_AppendTempFileBinaryChunk(string fileName, string path, byte[] chunk)
+        {
+            if (path == null)
+            {
+                path = Path.Combine(Path.GetTempPath(), fileName);
+                if (FileUtils.FileExists(path))
+                {
+                    FileUtils.DeleteFile(path);
+                }
+            }
+
+            FileUtils.AppendFileBinaryContent(path, chunk);
+
+            return path;
+        }
+
+        public void Enterprise_UpdateQuotas(string url, long maxStorage, long warningStorage)
+        {
+            ExecuteSharePointAction<object>(delegate(HostedSharePointServer2013EntImpl impl)
+            {
+                impl.UpdateQuotas(Enterprise_RootWebApplicationUri, url, maxStorage, warningStorage);
+                return null;
+            });
+        }
+
+        public SharePointSiteDiskSpace[] Enterprise_CalculateSiteCollectionsDiskSpace(string[] urls)
+        {
+            return ExecuteSharePointAction(impl => impl.CalculateSiteCollectionDiskSpace(Enterprise_RootWebApplicationUri, urls));
+        }
+
+        public long Enterprise_GetSiteCollectionSize(string url)
+        {
+            return ExecuteSharePointAction(impl => impl.GetSiteCollectionSize(Enterprise_RootWebApplicationUri, url));
+        }
+
+        public void Enterprise_SetPeoplePickerOu(string site, string ou)
+        {
+            ExecuteSharePointAction<object>(delegate(HostedSharePointServer2013EntImpl impl)
+            {
+                impl.SetPeoplePickerOu(site, ou);
+                return null;
+            });
+        }
+
+
+        public override bool IsInstalled()
+        {
+            return IsSharePointInstalled();
+        }
+
+        /// <summary>Deletes service items that represent SharePoint site collection.</summary>
+        /// <param name="items">Items to be deleted.</param>
+        public override void DeleteServiceItems(ServiceProviderItem[] items)
+        {
+            foreach (ServiceProviderItem item in items)
+            {
+                var SharePointEnterpriseSiteCollection = item as SharePointEnterpriseSiteCollection;
+
+                if (SharePointEnterpriseSiteCollection != null)
+                {
+                    try
+                    {
+                        Enterprise_DeleteSiteCollection(SharePointEnterpriseSiteCollection);
+                    }
+                    catch (Exception ex)
+                    {
+                        Log.WriteError(String.Format("Error deleting '{0}' {1}", item.Name, item.GetType().Name), ex);
+                    }
+                }
+            }
+        }
+
+        /// <summary>Calculates diskspace used by supplied service items.</summary>
+        /// <param name="items">Service items to get diskspace usage for.</param>
+        /// <returns>Calculated disk space usage statistics.</returns>
+        public override ServiceProviderItemDiskSpace[] GetServiceItemsDiskSpace(ServiceProviderItem[] items)
+        {
+            var itemsDiskspace = new List<ServiceProviderItemDiskSpace>();
+
+            foreach (ServiceProviderItem item in items)
+            {
+                if (item is SharePointEnterpriseSiteCollection)
+                {
+                    try
+                    {
+                        Log.WriteStart(String.Format("Calculating '{0}' site logs size", item.Name));
+
+                        SharePointEnterpriseSiteCollection site = Enterprise_GetSiteCollection(item.Name);
+                        var diskspace = new ServiceProviderItemDiskSpace { ItemId = item.Id, DiskSpace = site.Diskspace };
+                        itemsDiskspace.Add(diskspace);
+
+                        Log.WriteEnd(String.Format("Calculating '{0}' site logs size", item.Name));
+                    }
+                    catch (Exception ex)
+                    {
+                        Log.WriteError(ex);
+                    }
+                }
+            }
+
+            return itemsDiskspace.ToArray();
+        }
+
+        /// <summary>Checks whether SharePoint 2013 is installed.</summary>
+        /// <returns>true - if it is installed; false - otherwise.</returns>
+        private bool IsSharePointInstalled()
+        {
+            RegistryKey spKey = Registry.LocalMachine.OpenSubKey(Wss3RegistryKey);
+            RegistryKey spKey32 = Registry.LocalMachine.OpenSubKey(Wss3Registry32Key);
+
+            if (spKey == null && spKey32 == null)
+            {
+                return false;
+            }
+
+            var spVal = (string)spKey.GetValue("SharePoint");
+
+            return (String.Compare(spVal, "installed", true) == 0);
+        }
+
+        /// <summary>Executes supplied action within separate application domain.</summary>
+        /// <param name="action">Action to be executed.</param>
+        /// <returns>Any object that results from action execution or null if nothing is supposed to be returned.</returns>
+        /// <exception cref="ArgumentNullException">Is thrown in case supplied action is null.</exception>
+        private static TReturn ExecuteSharePointAction<TReturn>(SharePointAction<TReturn> action)
+        {
+            if (action == null)
+            {
+                throw new ArgumentNullException("action");
+            }
+
+            AppDomain domain = null;
+
+            try
+            {
+                Type type = typeof(HostedSharePointServer2013EntImpl);
+                var info = new AppDomainSetup { ApplicationBase = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory), PrivateBinPath = GetPrivateBinPath() };
+                domain = AppDomain.CreateDomain("WSS30", null, info);
+                var impl = (HostedSharePointServer2013EntImpl)domain.CreateInstanceAndUnwrap(type.Assembly.FullName, type.FullName);
+
+                return action(impl);
+            }
+            finally
+            {
+                if (domain != null)
+                {
+                    AppDomain.Unload(domain);
+                }
+            }
+
+            throw new ArgumentNullException("action");
+        }
+
+        /// <summary> Getting PrivatePath from web.config. </summary>
+        /// <returns> The PrivateBinPath.</returns>
+        private static string GetPrivateBinPath()
+        {
+            var lines = new List<string> { "bin", "bin/debug" };
+            string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "web.config");
+
+            if (File.Exists(path))
+            {
+                using (var reader = new StreamReader(path))
+                {
+                    string content = reader.ReadToEnd();
+                    var pattern = new Regex(@"(?<=probing .*?privatePath\s*=\s*"")[^""]+(?="".*?>)");
+                    Match match = pattern.Match(content);
+                    lines.AddRange(match.Value.Split(';'));
+                }
+            }
+
+            return string.Join(Path.PathSeparator.ToString(), lines.ToArray());
+        }
+
+        #endregion
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent/HostedSharePointServer2013EntImpl.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent/HostedSharePointServer2013EntImpl.cs
new file mode 100644
index 00000000..04e39834
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent/HostedSharePointServer2013EntImpl.cs
@@ -0,0 +1,851 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Management.Automation;
+using System.Management.Automation.Runspaces;
+using System.Security.Principal;
+using Microsoft.SharePoint;
+using Microsoft.SharePoint.Administration;
+using WebsitePanel.Providers.SharePoint;
+using WebsitePanel.Providers.Utils;
+
+namespace WebsitePanel.Providers.HostedSolution
+{
+    public class HostedSharePointServer2013EntImpl : MarshalByRefObject
+    {
+        #region Fields
+
+        private static RunspaceConfiguration runspaceConfiguration;
+
+        #endregion
+
+        #region Properties
+
+        private string SharepointSnapInName
+        {
+            get { return "Microsoft.SharePoint.Powershell"; }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>Gets list of SharePoint collections within root web application.</summary>
+        /// <param name="rootWebApplicationUri"> The root web application Uri. </param>
+        /// <returns>List of SharePoint collections within root web application.</returns>
+        public SharePointEnterpriseSiteCollection[] GetSiteCollections(Uri rootWebApplicationUri)
+        {
+            return GetSPSiteCollections(rootWebApplicationUri).Select(pair => NewSiteCollection(pair.Value)).ToArray();
+        }
+
+        /// <summary>Gets list of supported languages by this installation of SharePoint.</summary>
+        /// <param name="rootWebApplicationUri"> The root web application Uri. </param>
+        /// <returns>List of supported languages</returns>
+        public int[] GetSupportedLanguages(Uri rootWebApplicationUri)
+        {
+            var languages = new List<int>();
+
+            try
+            {
+                WindowsImpersonationContext wic = WindowsIdentity.GetCurrent().Impersonate();
+
+                try
+                {
+                    languages.AddRange(from SPLanguage lang in SPRegionalSettings.GlobalInstalledLanguages select lang.LCID);                    
+                }
+                finally
+                {
+                    wic.Undo();
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException("Failed to create site collection.", ex);
+            }
+
+            return languages.ToArray();
+        }
+
+        /// <summary>Gets site collection size in bytes.</summary>
+        /// <param name="rootWebApplicationUri">The root web application uri.</param>
+        /// <param name="url">The site collection url.</param>
+        /// <returns>Size in bytes.</returns>
+        public long GetSiteCollectionSize(Uri rootWebApplicationUri, string url)
+        {
+            Dictionary<string, long> sizes = GetSitesCollectionSize(rootWebApplicationUri, new[] {url});
+
+            if (sizes.Count() == 1)
+            {
+                return sizes.First().Value;
+            }
+
+            throw new ApplicationException(string.Format("SiteCollection {0} does not exist", url));
+        }
+
+        /// <summary>Gets sites disk space.</summary>
+        /// <param name="rootWebApplicationUri">The root web application uri.</param>
+        /// <param name="urls">The sites urls.</param>
+        /// <returns>The disk space.</returns>
+        public SharePointSiteDiskSpace[] CalculateSiteCollectionDiskSpace(Uri rootWebApplicationUri, string[] urls)
+        {
+            return GetSitesCollectionSize(rootWebApplicationUri, urls).Select(pair => new SharePointSiteDiskSpace {Url = pair.Key, DiskSpace = (long) Math.Round(pair.Value/1024.0/1024.0)}).ToArray();
+        }
+
+        /// <summary>Calculates size of the required seti collections.</summary>
+        /// <param name="rootWebApplicationUri">The root web application uri.</param>
+        /// <param name="urls">The sites urls.</param>
+        /// <returns>Calculated sizes.</returns>
+        private Dictionary<string, long> GetSitesCollectionSize(Uri rootWebApplicationUri, IEnumerable<string> urls)
+        {
+            Runspace runspace = null;
+            var result = new Dictionary<string, long>();
+
+            try
+            {
+                runspace = OpenRunspace();
+
+                foreach (string url in urls)
+                {
+                    string siteCollectionUrl = String.Format("{0}:{1}", url, rootWebApplicationUri.Port);
+                    var scripts = new List<string> {string.Format("$site=Get-SPSite -Identity \"{0}\"", siteCollectionUrl), "$site.RecalculateStorageUsed()", "$site.Usage.Storage"};
+                    Collection<PSObject> scriptResult = ExecuteShellCommand(runspace, scripts);
+
+                    if (scriptResult != null && scriptResult.Any())
+                    {
+                        result.Add(url, Convert.ToInt64(scriptResult.First().BaseObject));
+                    }
+                }
+            }
+            finally
+            {
+                CloseRunspace(runspace);
+            }
+
+            return result;
+        }
+
+        /// <summary>Sets people picker OU.</summary>
+        /// <param name="site">The site.</param>
+        /// <param name="ou">OU.</param>
+        public void SetPeoplePickerOu(string site, string ou)
+        {
+            HostedSolutionLog.LogStart("SetPeoplePickerOu");
+            HostedSolutionLog.LogInfo("  Site: {0}", site);
+            HostedSolutionLog.LogInfo("  OU: {0}", ou);
+
+            Runspace runspace = null;
+
+            try
+            {
+                runspace = OpenRunspace();
+                var cmd = new Command("Set-SPSite");
+                cmd.Parameters.Add("Identity", site);
+                cmd.Parameters.Add("UserAccountDirectoryPath", ou);
+                ExecuteShellCommand(runspace, cmd);
+            }
+            finally
+            {
+                CloseRunspace(runspace);
+            }
+
+            HostedSolutionLog.LogEnd("SetPeoplePickerOu");
+        }
+
+        /// <summary>Gets SharePoint collection within root web application with given name.</summary>
+        /// <param name="rootWebApplicationUri">Root web application uri.</param>
+        /// <param name="url">Url that uniquely identifies site collection to be loaded.</param>
+        /// <returns>SharePoint collection within root web application with given name.</returns>
+        public SharePointEnterpriseSiteCollection GetSiteCollection(Uri rootWebApplicationUri, string url)
+        {
+            return NewSiteCollection(GetSPSiteCollection(rootWebApplicationUri, url));
+        }
+
+        /// <summary>Deletes quota.</summary>
+        /// <param name="name">The quota name.</param>
+        private static void DeleteQuotaTemplate(string name)
+        {
+            SPFarm farm = SPFarm.Local;
+
+            var webService = farm.Services.GetValue<SPWebService>("");
+            SPQuotaTemplateCollection quotaColl = webService.QuotaTemplates;
+            quotaColl.Delete(name);
+        }
+
+        /// <summary>Updates site collection quota.</summary>
+        /// <param name="root">The root uri.</param>
+        /// <param name="url">The site collection url.</param>
+        /// <param name="maxStorage">The max storage.</param>
+        /// <param name="warningStorage">The warning storage value.</param>
+        public void UpdateQuotas(Uri root, string url, long maxStorage, long warningStorage)
+        {
+            if (maxStorage != -1)
+            {
+                maxStorage = maxStorage*1024*1024;
+            }
+            else
+            {
+                maxStorage = 0;
+            }
+
+            if (warningStorage != -1 && maxStorage != -1)
+            {
+                warningStorage = Math.Min(warningStorage, maxStorage)*1024*1024;
+            }
+            else
+            {
+                warningStorage = 0;
+            }
+
+            Runspace runspace = null;
+
+            try
+            {
+                runspace = OpenRunspace();
+                GrantAccess(runspace, root);
+                string siteCollectionUrl = String.Format("{0}:{1}", url, root.Port);
+                var command = new Command("Set-SPSite");
+                command.Parameters.Add("Identity", siteCollectionUrl);
+                command.Parameters.Add("MaxSize", maxStorage);
+                command.Parameters.Add("WarningSize", warningStorage);
+                ExecuteShellCommand(runspace, command);
+            }
+            finally
+            {
+                CloseRunspace(runspace);
+            }
+        }
+
+        /// <summary>Grants acces to current user.</summary>
+        /// <param name="runspace">The runspace.</param>
+        /// <param name="rootWebApplicationUri">The root web application uri.</param>
+        private void GrantAccess(Runspace runspace, Uri rootWebApplicationUri)
+        {
+            ExecuteShellCommand(runspace, new List<string> {string.Format("$webApp=Get-SPWebApplication {0}", rootWebApplicationUri.AbsoluteUri), string.Format("$webApp.GrantAccessToProcessIdentity(\"{0}\")", WindowsIdentity.GetCurrent().Name)});
+        }
+
+        /// <summary>Deletes site collection.</summary>
+        /// <param name="runspace">The runspace.</param>
+        /// <param name="url">The site collection url.</param>
+        /// <param name="deleteADAccounts">True - if active directory accounts should be deleted.</param>
+        private void DeleteSiteCollection(Runspace runspace, string url, bool deleteADAccounts)
+        {
+            var command = new Command("Remove-SPSite");
+            command.Parameters.Add("Identity", url);
+            command.Parameters.Add("DeleteADAccounts", deleteADAccounts);
+            ExecuteShellCommand(runspace, command);
+        }
+
+        /// <summary> Creates site collection within predefined root web application.</summary>
+        /// <param name="rootWebApplicationUri">Root web application uri.</param>
+        /// <param name="siteCollection">Information about site coolection to be created.</param>
+        /// <exception cref="InvalidOperationException">Is thrown in case requested operation fails for any reason.</exception>
+        public void CreateSiteCollection(Uri rootWebApplicationUri, SharePointEnterpriseSiteCollection siteCollection)
+        {
+            HostedSolutionLog.LogStart("CreateSiteCollection");
+            WindowsImpersonationContext wic = null;
+            Runspace runspace = null;
+
+            try
+            {
+                wic = WindowsIdentity.GetCurrent().Impersonate();
+                runspace = OpenRunspace();
+                CreateCollection(runspace, rootWebApplicationUri, siteCollection);
+            }
+            finally
+            {
+                CloseRunspace(runspace);
+                HostedSolutionLog.LogEnd("CreateSiteCollection");
+
+                if (wic != null)
+                {
+                    wic.Undo();
+                }
+            }
+        }
+
+        /// <summary> Creates site collection within predefined root web application.</summary>
+        /// <param name="runspace"> The runspace.</param>
+        /// <param name="rootWebApplicationUri">Root web application uri.</param>
+        /// <param name="siteCollection">Information about site coolection to be created.</param>
+        /// <exception cref="InvalidOperationException">Is thrown in case requested operation fails for any reason.</exception>
+        private void CreateCollection(Runspace runspace, Uri rootWebApplicationUri, SharePointEnterpriseSiteCollection siteCollection)
+        {
+            string siteCollectionUrl = String.Format("{0}:{1}", siteCollection.Url, rootWebApplicationUri.Port);
+            HostedSolutionLog.DebugInfo("siteCollectionUrl: {0}", siteCollectionUrl);
+
+            try
+            {
+                SPWebApplication rootWebApplication = SPWebApplication.Lookup(rootWebApplicationUri);
+                rootWebApplication.Sites.Add(siteCollectionUrl, siteCollection.Title, siteCollection.Description, (uint) siteCollection.LocaleId, String.Empty, siteCollection.OwnerLogin, siteCollection.OwnerName, siteCollection.OwnerEmail, null, null, null, true);
+                rootWebApplication.Update();
+            }
+            catch (Exception)
+            {
+                DeleteSiteCollection(runspace, siteCollectionUrl, true);
+                throw;
+            }
+
+            try
+            {
+                GrantAccess(runspace, rootWebApplicationUri);
+                var command = new Command("Set-SPSite");
+                command.Parameters.Add("Identity", siteCollectionUrl);
+
+                if (siteCollection.MaxSiteStorage != -1)
+                {
+                    command.Parameters.Add("MaxSize", siteCollection.MaxSiteStorage*1024*1024);
+                }
+
+                if (siteCollection.WarningStorage != -1 && siteCollection.MaxSiteStorage != -1)
+                {
+                    command.Parameters.Add("WarningSize", Math.Min(siteCollection.WarningStorage, siteCollection.MaxSiteStorage)*1024*1024);
+                }
+
+                ExecuteShellCommand(runspace, command);
+            }
+            catch (Exception)
+            {
+                DeleteQuotaTemplate(siteCollection.Title);
+                DeleteSiteCollection(runspace, siteCollectionUrl, true);
+                throw;
+            }
+
+            AddHostsRecord(siteCollection);
+        }
+
+        /// <summary>Deletes site collection under given url.</summary>
+        /// <param name="rootWebApplicationUri">Root web application uri.</param>
+        /// <param name="siteCollection">The site collection to be deleted.</param>
+        /// <exception cref="InvalidOperationException">Is thrown in case requested operation fails for any reason.</exception>
+        public void DeleteSiteCollection(Uri rootWebApplicationUri, SharePointEnterpriseSiteCollection siteCollection)
+        {
+            HostedSolutionLog.LogStart("DeleteSiteCollection");
+            Runspace runspace = null;
+
+            try
+            {
+                string siteCollectionUrl = String.Format("{0}:{1}", siteCollection.Url, rootWebApplicationUri.Port);
+                HostedSolutionLog.DebugInfo("siteCollectionUrl: {0}", siteCollectionUrl);
+                runspace = OpenRunspace();
+                DeleteSiteCollection(runspace, siteCollectionUrl, false);
+                RemoveHostsRecord(siteCollection);
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException("Failed to delete site collection.", ex);
+            }
+            finally
+            {
+                CloseRunspace(runspace);
+                HostedSolutionLog.LogEnd("DeleteSiteCollection");
+            }
+        }
+
+        /// <summary> Backups site collection under give url.</summary>
+        /// <param name="rootWebApplicationUri">Root web application uri.</param>
+        /// <param name="url">Url that uniquely identifies site collection to be deleted.</param>
+        /// <param name="filename">Resulting backup file name.</param>
+        /// <param name="zip">A value which shows whether created backup must be archived.</param>
+        /// <param name="tempPath">Custom temp path for backup</param>
+        /// <returns>Full path to created backup.</returns>
+        /// <exception cref="InvalidOperationException">Is thrown in case requested operation fails for any reason.</exception>
+        public string BackupSiteCollection(Uri rootWebApplicationUri, string url, string filename, bool zip, string tempPath)
+        {
+            try
+            {
+                string siteCollectionUrl = String.Format("{0}:{1}", url, rootWebApplicationUri.Port);
+                HostedSolutionLog.LogStart("BackupSiteCollection");
+                HostedSolutionLog.DebugInfo("siteCollectionUrl: {0}", siteCollectionUrl);
+
+                if (String.IsNullOrEmpty(tempPath))
+                {
+                    tempPath = Path.GetTempPath();
+                }
+
+                string backupFileName = Path.Combine(tempPath, (zip ? StringUtils.CleanIdentifier(siteCollectionUrl) + ".bsh" : StringUtils.CleanIdentifier(filename)));
+                HostedSolutionLog.DebugInfo("backupFilePath: {0}", backupFileName);
+                Runspace runspace = null;
+
+                try
+                {
+                    runspace = OpenRunspace();
+                    var command = new Command("Backup-SPSite");
+                    command.Parameters.Add("Identity", siteCollectionUrl);
+                    command.Parameters.Add("Path", backupFileName);
+                    ExecuteShellCommand(runspace, command);
+
+                    if (zip)
+                    {
+                        string zipFile = Path.Combine(tempPath, filename);
+                        string zipRoot = Path.GetDirectoryName(backupFileName);
+
+                        FileUtils.ZipFiles(zipFile, zipRoot, new[] {Path.GetFileName(backupFileName)});
+                        FileUtils.DeleteFile(backupFileName);
+
+                        backupFileName = zipFile;
+                    }
+
+                    return backupFileName;
+                }
+                finally
+                {
+                    CloseRunspace(runspace);
+                    HostedSolutionLog.LogEnd("BackupSiteCollection");
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException("Failed to backup site collection.", ex);
+            }
+        }
+
+        /// <summary>Restores site collection under given url from backup.</summary>
+        /// <param name="rootWebApplicationUri">Root web application uri.</param>
+        /// <param name="siteCollection">Site collection to be restored.</param>
+        /// <param name="filename">Backup file name to restore from.</param>
+        /// <exception cref="InvalidOperationException">Is thrown in case requested operation fails for any reason.</exception>
+        public void RestoreSiteCollection(Uri rootWebApplicationUri, SharePointEnterpriseSiteCollection siteCollection, string filename)
+        {
+            string url = siteCollection.Url;
+
+            try
+            {
+                string siteCollectionUrl = String.Format("{0}:{1}", url, rootWebApplicationUri.Port);
+                HostedSolutionLog.LogStart("RestoreSiteCollection");
+                HostedSolutionLog.DebugInfo("siteCollectionUrl: {0}", siteCollectionUrl);
+
+                HostedSolutionLog.DebugInfo("backupFilePath: {0}", filename);
+                Runspace runspace = null;
+
+                try
+                {
+                    string tempPath = Path.GetTempPath();
+                    string expandedFile = filename;
+
+                    if (Path.GetExtension(filename).ToLower() == ".zip")
+                    {
+                        expandedFile = FileUtils.UnzipFiles(filename, tempPath)[0];
+
+                        // Delete zip archive.
+                        FileUtils.DeleteFile(filename);
+                    }
+
+                    runspace = OpenRunspace();
+                    DeleteSiteCollection(runspace, siteCollectionUrl, false);
+                    var command = new Command("Restore-SPSite");
+                    command.Parameters.Add("Identity", siteCollectionUrl);
+                    command.Parameters.Add("Path", filename);
+                    ExecuteShellCommand(runspace, command);
+
+                    command = new Command("Set-SPSite");
+                    command.Parameters.Add("Identity", siteCollectionUrl);
+                    command.Parameters.Add("OwnerAlias", siteCollection.OwnerLogin);
+                    ExecuteShellCommand(runspace, command);
+
+                    command = new Command("Set-SPUser");
+                    command.Parameters.Add("Identity", siteCollection.OwnerLogin);
+                    command.Parameters.Add("Email", siteCollection.OwnerEmail);
+                    command.Parameters.Add("DisplayName", siteCollection.Name);
+                    ExecuteShellCommand(runspace, command);
+
+                    FileUtils.DeleteFile(expandedFile);
+                }
+                finally
+                {
+                    CloseRunspace(runspace);
+                    HostedSolutionLog.LogEnd("RestoreSiteCollection");
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException("Failed to restore site collection.", ex);
+            }
+        }
+
+        /// <summary>Creates new site collection with information from administration object.</summary>
+        /// <param name="site">Administration object.</param>
+        private static SharePointEnterpriseSiteCollection NewSiteCollection(SPSite site)
+        {
+            var siteUri = new Uri(site.Url);
+            string url = (siteUri.Port > 0) ? site.Url.Replace(String.Format(":{0}", siteUri.Port), String.Empty) : site.Url;
+
+            return new SharePointEnterpriseSiteCollection {Url = url, OwnerLogin = site.Owner.LoginName, OwnerName = site.Owner.Name, OwnerEmail = site.Owner.Email, LocaleId = site.RootWeb.Locale.LCID, Title = site.RootWeb.Title, Description = site.RootWeb.Description, Bandwidth = site.Usage.Bandwidth, Diskspace = site.Usage.Storage, MaxSiteStorage = site.Quota.StorageMaximumLevel, WarningStorage = site.Quota.StorageWarningLevel};
+        }
+
+        /// <summary>Gets SharePoint sites collection.</summary>
+        /// <param name="rootWebApplicationUri">The root web application uri.</param>
+        /// <returns>The SharePoint sites.</returns>
+        private Dictionary<string, SPSite> GetSPSiteCollections(Uri rootWebApplicationUri)
+        {
+            Runspace runspace = null;
+            var collections = new Dictionary<string, SPSite>();
+
+            try
+            {
+                runspace = OpenRunspace();
+                var cmd = new Command("Get-SPSite");
+                cmd.Parameters.Add("WebApplication", rootWebApplicationUri.AbsoluteUri);
+                Collection<PSObject> result = ExecuteShellCommand(runspace, cmd);
+
+                if (result != null)
+                {
+                    foreach (PSObject psObject in result)
+                    {
+                        var spSite = psObject.BaseObject as SPSite;
+
+                        if (spSite != null)
+                        {
+                            collections.Add(spSite.Url, spSite);
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                CloseRunspace(runspace);
+            }
+
+            return collections;
+        }
+
+        /// <summary>Gets SharePoint site collection.</summary>
+        /// <param name="rootWebApplicationUri">The root web application uri.</param>
+        /// <param name="url">The required site url.</param>
+        /// <returns>The SharePoint sites.</returns>
+        private SPSite GetSPSiteCollection(Uri rootWebApplicationUri, string url)
+        {
+            Runspace runspace = null;
+
+            try
+            {
+                string siteCollectionUrl = String.Format("{0}:{1}", url, rootWebApplicationUri.Port);
+                runspace = OpenRunspace();
+                var cmd = new Command("Get-SPSite");
+                cmd.Parameters.Add("Identity", siteCollectionUrl);
+                Collection<PSObject> result = ExecuteShellCommand(runspace, cmd);
+
+                if (result != null && result.Count() == 1)
+                {
+                    var spSite = result.First().BaseObject as SPSite;
+
+                    if (spSite == null)
+                    {
+                        throw new ApplicationException(string.Format("SiteCollection {0} does not exist", url));
+                    }
+
+                    return result.First().BaseObject as SPSite;
+                }
+                else
+                {
+                    throw new ApplicationException(string.Format("SiteCollection {0} does not exist", url));
+                }
+            }
+            catch (Exception ex)
+            {
+                HostedSolutionLog.LogError(ex);
+                throw;
+            }
+            finally
+            {
+                CloseRunspace(runspace);
+            }
+        }
+
+        /// <summary>Opens PowerShell runspace.</summary>
+        /// <returns>The runspace.</returns>
+        private Runspace OpenRunspace()
+        {
+            HostedSolutionLog.LogStart("OpenRunspace");
+
+            if (runspaceConfiguration == null)
+            {
+                runspaceConfiguration = RunspaceConfiguration.Create();
+                PSSnapInException exception;
+                runspaceConfiguration.AddPSSnapIn(SharepointSnapInName, out exception);
+                HostedSolutionLog.LogInfo("Sharepoint snapin loaded");
+
+                if (exception != null)
+                {
+                    HostedSolutionLog.LogWarning("SnapIn error", exception);
+                }
+            }
+
+            Runspace runspace = RunspaceFactory.CreateRunspace(runspaceConfiguration);
+            runspace.Open();
+            runspace.SessionStateProxy.SetVariable("ConfirmPreference", "none");
+            HostedSolutionLog.LogEnd("OpenRunspace");
+
+            return runspace;
+        }
+
+        /// <summary>Closes runspace.</summary>
+        /// <param name="runspace">The runspace.</param>
+        private void CloseRunspace(Runspace runspace)
+        {
+            try
+            {
+                if (runspace != null && runspace.RunspaceStateInfo.State == RunspaceState.Opened)
+                {
+                    runspace.Close();
+                }
+            }
+            catch (Exception ex)
+            {
+                HostedSolutionLog.LogError("Runspace error", ex);
+            }
+        }
+
+        /// <summary>Executes shell command.</summary>
+        /// <param name="runspace">The runspace.</param>
+        /// <param name="cmd">The command to be executed.</param>        
+        /// <returns>PSobjecs collection.</returns>
+        private Collection<PSObject> ExecuteShellCommand(Runspace runspace, object cmd)
+        {
+            object[] errors;
+            var command = cmd as Command;
+
+            if (command != null)
+            {
+                return ExecuteShellCommand(runspace, command, out errors);
+            }
+
+            return ExecuteShellCommand(runspace, cmd as List<string>, out errors);
+        }
+
+        /// <summary>Executes shell command.</summary>
+        /// <param name="runspace">The runspace.</param>
+        /// <param name="cmd">The command to be executed.</param>
+        /// <param name="errors">The errors.</param>
+        /// <returns>PSobjecs collection.</returns>
+        private Collection<PSObject> ExecuteShellCommand(Runspace runspace, Command cmd, out object[] errors)
+        {
+            HostedSolutionLog.LogStart("ExecuteShellCommand");
+            var errorList = new List<object>();
+            Collection<PSObject> results;
+
+            using (Pipeline pipeLine = runspace.CreatePipeline())
+            {
+                pipeLine.Commands.Add(cmd);
+                results = pipeLine.Invoke();
+
+                if (pipeLine.Error != null && pipeLine.Error.Count > 0)
+                {
+                    foreach (object item in pipeLine.Error.ReadToEnd())
+                    {
+                        errorList.Add(item);
+                        string errorMessage = string.Format("Invoke error: {0}", item);
+                        HostedSolutionLog.LogWarning(errorMessage);
+                    }
+                }
+            }
+
+            errors = errorList.ToArray();
+            HostedSolutionLog.LogEnd("ExecuteShellCommand");
+
+            return results;
+        }
+
+        /// <summary>Executes shell command.</summary>
+        /// <param name="runspace">The runspace.</param>
+        /// <param name="scripts">The scripts to be executed.</param>
+        /// <param name="errors">The errors.</param>
+        /// <returns>PSobjecs collection.</returns>
+        private Collection<PSObject> ExecuteShellCommand(Runspace runspace, List<string> scripts, out object[] errors)
+        {
+            HostedSolutionLog.LogStart("ExecuteShellCommand");
+            var errorList = new List<object>();
+            Collection<PSObject> results;
+
+            using (Pipeline pipeLine = runspace.CreatePipeline())
+            {
+                foreach (string script in scripts)
+                {
+                    pipeLine.Commands.AddScript(script);
+                }
+
+                results = pipeLine.Invoke();
+
+                if (pipeLine.Error != null && pipeLine.Error.Count > 0)
+                {
+                    foreach (object item in pipeLine.Error.ReadToEnd())
+                    {
+                        errorList.Add(item);
+                        string errorMessage = string.Format("Invoke error: {0}", item);
+                        HostedSolutionLog.LogWarning(errorMessage);
+
+                        throw new ArgumentException(scripts.First());
+                    }
+                }
+            }
+
+            errors = errorList.ToArray();
+            HostedSolutionLog.LogEnd("ExecuteShellCommand");
+
+            return results;
+        }
+
+        /// <summary>Adds record to hosts file.</summary>
+        /// <param name="siteCollection">The site collection object.</param>
+        public void AddHostsRecord(SharePointEnterpriseSiteCollection siteCollection)
+        {
+            try
+            {
+                if (siteCollection.RootWebApplicationInteralIpAddress != string.Empty)
+                {
+                    string dirPath = FileUtils.EvaluateSystemVariables(@"%windir%\system32\drivers\etc");
+                    string path = dirPath + "\\hosts";
+
+                    if (FileUtils.FileExists(path))
+                    {
+                        string content = FileUtils.GetFileTextContent(path);
+                        content = content.Replace("\r\n", "\n").Replace("\n\r", "\n");
+                        string[] contentArr = content.Split(new[] {'\n'});
+                        bool bRecordExist = false;
+
+                        foreach (string s in contentArr)
+                        {
+                            if (s != string.Empty)
+                            {
+                                string hostName = string.Empty;
+
+                                if (s[0] != '#')
+                                {
+                                    bool bSeperator = false;
+
+                                    foreach (char c in s)
+                                    {
+                                        if ((c != ' ') & (c != '\t'))
+                                        {
+                                            if (bSeperator)
+                                            {
+                                                hostName += c;
+                                            }
+                                        }
+                                        else
+                                        {
+                                            bSeperator = true;
+                                        }
+                                    }
+
+                                    if (hostName.ToLower() == siteCollection.RootWebApplicationFQDN.ToLower())
+                                    {
+                                        bRecordExist = true;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+
+                        if (!bRecordExist)
+                        {
+                            string outPut = contentArr.Where(o => o != string.Empty).Aggregate(string.Empty, (current, o) => current + (o + "\r\n"));
+                            outPut += siteCollection.RootWebApplicationInteralIpAddress + '\t' + siteCollection.RootWebApplicationFQDN + "\r\n";
+                            FileUtils.UpdateFileTextContent(path, outPut);
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                HostedSolutionLog.LogError(ex);
+            }
+        }
+
+        /// <summary>Removes record from hosts file.</summary>
+        /// <param name="siteCollection">The site collection object.</param>
+        private void RemoveHostsRecord(SharePointEnterpriseSiteCollection siteCollection)
+        {
+            try
+            {
+                if (siteCollection.RootWebApplicationInteralIpAddress != string.Empty)
+                {
+                    string dirPath = FileUtils.EvaluateSystemVariables(@"%windir%\system32\drivers\etc");
+                    string path = dirPath + "\\hosts";
+
+                    if (FileUtils.FileExists(path))
+                    {
+                        string content = FileUtils.GetFileTextContent(path);
+                        content = content.Replace("\r\n", "\n").Replace("\n\r", "\n");
+                        string[] contentArr = content.Split(new[] {'\n'});
+                        string outPut = string.Empty;
+
+                        foreach (string s in contentArr)
+                        {
+                            if (s != string.Empty)
+                            {
+                                string hostName = string.Empty;
+
+                                if (s[0] != '#')
+                                {
+                                    bool bSeperator = false;
+
+                                    foreach (char c in s)
+                                    {
+                                        if ((c != ' ') & (c != '\t'))
+                                        {
+                                            if (bSeperator)
+                                            {
+                                                hostName += c;
+                                            }
+                                        }
+                                        else
+                                        {
+                                            bSeperator = true;
+                                        }
+                                    }
+
+                                    if (hostName.ToLower() != siteCollection.RootWebApplicationFQDN.ToLower())
+                                    {
+                                        outPut += s + "\r\n";
+                                    }
+                                }
+                                else
+                                {
+                                    outPut += s + "\r\n";
+                                }
+                            }
+                        }
+
+                        FileUtils.UpdateFileTextContent(path, outPut);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                HostedSolutionLog.LogError(ex);
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent/Properties/AssemblyInfo.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..e25dee60
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("WebsitePanel.Providers.HostedSolution.SharePoint2013Ent")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("WebsitePanel.Providers.HostedSolution.SharePoint2013Ent")]
+[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("fd1db47e-461e-41ac-88cf-fb2925f48d52")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent.csproj
new file mode 100644
index 00000000..88440ff3
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent/WebsitePanel.Providers.HostedSolution.SharePoint2013Ent.csproj
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{0CF0C19E-7BFE-4A61-AF00-7B7CE7264252}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>WebsitePanel.Providers.HostedSolution.SharePoint2013Ent</RootNamespace>
+    <AssemblyName>WebsitePanel.Providers.HostedSolution.SharePoint2013Ent</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\WebsitePanel.Server\bin\Sharepoint2013\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\WebsitePanel.Server\bin\Sharepoint2013\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.SharePoint">
+      <HintPath>..\..\Lib\References\Microsoft\Microsoft.SharePoint.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\Windows\assembly\GAC_MSIL\System.Management.Automation\1.0.0.0__31bf3856ad364e35\System.Management.Automation.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <ProjectReference Include="..\WebsitePanel.Providers.Base\WebsitePanel.Providers.Base.csproj">
+      <Project>{684C932A-6C75-46AC-A327-F3689D89EB42}</Project>
+      <Name>WebsitePanel.Providers.Base</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\WebsitePanel.Providers.HostedSolution\WebsitePanel.Providers.HostedSolution.csproj">
+      <Project>{A06DE5E4-4331-47E1-8F46-7B846146B559}</Project>
+      <Name>WebsitePanel.Providers.HostedSolution</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\WebsitePanel.Server.Utils\WebsitePanel.Server.Utils.csproj">
+      <Project>{E91E52F3-9555-4D00-B577-2B1DBDD87CA7}</Project>
+      <Name>WebsitePanel.Server.Utils</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="HostedSharePointServer2013Ent.cs" />
+    <Compile Include="HostedSharePointServer2013EntImpl.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/OrganizationProvider.cs b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/OrganizationProvider.cs
index 310e2626..e7102461 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/OrganizationProvider.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/OrganizationProvider.cs
@@ -2133,7 +2133,7 @@ namespace WebsitePanel.Providers.HostedSolution
             uidAttr.Value = Guid.NewGuid().ToString("B");
             bypassErrorsAttr.Value = (1).ToString();
 
-            actionPropAttr.Value = "R";
+            actionPropAttr.Value = "C";
             thisDrivePropAttr.Value = "NOCHANGE";
             allDrivesPropAttr.Value = "NOCHANGE";
             userNamePropAttr.Value = string.Empty;
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs
index caafd49c..43c2c9a4 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.IceWarp/IceWarp.cs
@@ -31,23 +31,23 @@ using System.IO;
 using System.Net.Mail;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using Microsoft.Win32;
-using WebsitePanel.Providers.Utils;
 using WebsitePanel.Server.Utils;
 
 namespace WebsitePanel.Providers.Mail
 {
-    public class IceWarp : HostingServiceProviderBase, IMailServer
+    public class IceWarp : HostingServiceProviderBase, IMailServer, IDisposable
     {
         protected const string API_PROGID = "IceWarpServer.APIObject";
         protected const string DOMAIN_PROGID = "IceWarpServer.DomainObject";
         protected const string ACCOUNT_PROGID = "IceWarpServer.AccountObject";
-        
+
         private dynamic _currentApiObject = null;
 
-        #region IceWarp Enums
+        #region Protected Enums
 
         protected enum IceWarpErrorCode
         {
@@ -110,8 +110,8 @@ namespace WebsitePanel.Providers.Mail
             get
             {
                 var apiObject = GetApiObject();
-                var adresses = ((object) apiObject.GetProperty("C_System_Services_BindIPAddress"));
-                return adresses == null ? "" : adresses.ToString().Split(new[] {';'}, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
+                var adresses = ((object)apiObject.GetProperty("C_System_Services_BindIPAddress"));
+                return adresses == null ? "" : adresses.ToString().Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault();
             }
         }
 
@@ -120,7 +120,7 @@ namespace WebsitePanel.Providers.Mail
             get
             {
                 var apiObject = GetApiObject();
-                return Convert.ToBoolean((object) apiObject.GetProperty("C_Accounts_Global_Domains_UseDiskQuota"));
+                return Convert.ToBoolean((object)apiObject.GetProperty("C_Accounts_Global_Domains_UseDiskQuota"));
             }
         }
 
@@ -129,7 +129,7 @@ namespace WebsitePanel.Providers.Mail
             get
             {
                 var apiObject = GetApiObject();
-                return Convert.ToBoolean((object) apiObject.GetProperty("C_Accounts_Global_Domains_UseDomainLimits"));
+                return Convert.ToBoolean((object)apiObject.GetProperty("C_Accounts_Global_Domains_UseDomainLimits"));
             }
         }
 
@@ -138,7 +138,7 @@ namespace WebsitePanel.Providers.Mail
             get
             {
                 var apiObject = GetApiObject();
-                return Convert.ToBoolean((object) apiObject.GetProperty("C_Accounts_Global_Domains_UseUserLimits"));
+                return Convert.ToBoolean((object)apiObject.GetProperty("C_Accounts_Global_Domains_UseUserLimits"));
             }
         }
 
@@ -147,7 +147,7 @@ namespace WebsitePanel.Providers.Mail
             get
             {
                 var apiObject = GetApiObject();
-                return Convert.ToBoolean((object) apiObject.GetProperty("C_Accounts_Global_Domains_OverrideGlobal"));
+                return Convert.ToBoolean((object)apiObject.GetProperty("C_Accounts_Global_Domains_OverrideGlobal"));
             }
         }
 
@@ -156,16 +156,16 @@ namespace WebsitePanel.Providers.Mail
             get
             {
                 var apiObject = GetApiObject();
-                return Convert.ToInt32((object) apiObject.GetProperty("C_Mail_SMTP_Delivery_MaxMsgSize"))/1024/1024;
+                return Convert.ToInt32((object)apiObject.GetProperty("C_Mail_SMTP_Delivery_MaxMsgSize")) / 1024 / 1024;
             }
         }
-                
+
         protected int WarnMailboxUsage
         {
             get
             {
                 var apiObject = GetApiObject();
-                return Convert.ToInt32((object)apiObject.GetProperty("C_Accounts_Global_Domains_WarnMailboxUsage"));                
+                return Convert.ToInt32((object)apiObject.GetProperty("C_Accounts_Global_Domains_WarnMailboxUsage"));
             }
         }
 
@@ -177,13 +177,15 @@ namespace WebsitePanel.Providers.Mail
                 return Convert.ToInt32((object)apiObject.GetProperty("C_Accounts_Global_Domains_WarnDomainSize"));
             }
         }
-        
+
 
         private void SaveApiSetting(dynamic apiObject)
         {
             if (!apiObject.Save())
             {
-                throw new Exception("Cannot save Api Object: " + GetErrorMessage(apiObject.LastErr));
+                var ex = new Exception("Cannot save Api Object: " + GetErrorMessage(apiObject.LastErr));
+                Log.WriteError(ex);
+                throw ex;
             }
         }
 
@@ -193,7 +195,7 @@ namespace WebsitePanel.Providers.Mail
 
         protected static string GetErrorMessage(int errorCode)
         {
-            switch ((IceWarpErrorCode) errorCode)
+            switch ((IceWarpErrorCode)errorCode)
             {
                 case IceWarpErrorCode.S_OK:
                     return "OK";
@@ -247,6 +249,11 @@ namespace WebsitePanel.Providers.Mail
             }
         }
 
+        protected void DisposeObject(object obj)
+        {
+            Marshal.FinalReleaseComObject(obj);
+        }
+
         protected dynamic GetApiObject()
         {
             if (_currentApiObject != null) return _currentApiObject;
@@ -298,7 +305,7 @@ namespace WebsitePanel.Providers.Mail
             var obj = GetAccountObject();
             if (!obj.Open(accountName))
             {
-                throw new Exception("Cannot open account " + accountName + ": " + GetErrorMessage(obj.LastErr));
+                Log.WriteWarning(string.Format("Cannot open account {0}: {1}", accountName, GetErrorMessage(obj.LastErr)));
             }
 
             return obj;
@@ -308,7 +315,9 @@ namespace WebsitePanel.Providers.Mail
         {
             if (!domain.Save())
             {
-                throw new ArgumentException("Could not save domain:" + GetErrorMessage(domain.LastErr));
+                var ex = new Exception("Could not save domain:" + GetErrorMessage(domain.LastErr));
+                Log.WriteError(ex);
+                throw ex;
             }
         }
 
@@ -316,11 +325,12 @@ namespace WebsitePanel.Providers.Mail
         {
             if (!account.Save())
             {
-                throw new ArgumentException("Could not save " + accountTypeName + ":" + GetErrorMessage(account.LastErr));
+                var ex = new Exception(string.Format("Could not save {0}: {1}", accountTypeName, GetErrorMessage(account.LastErr)));
+                Log.WriteError(ex);
+                throw ex;
             }
         }
 
-
         protected string GetEmailUser(string email)
         {
             if (string.IsNullOrWhiteSpace(email))
@@ -382,6 +392,8 @@ namespace WebsitePanel.Providers.Mail
                 }
             }
 
+            DisposeObject(accountObject);
+
             return mailAccounts.ToArray();
         }
 
@@ -395,7 +407,7 @@ namespace WebsitePanel.Providers.Mail
             apiObject.SetProperty("C_Accounts_Global_Domains_WarnMailboxUsage", ProviderSettings["WarnMailboxUsage"]);
             apiObject.SetProperty("C_Accounts_Global_Domains_WarnDomainSize", ProviderSettings["WarnDomainSize"]);
 
-            apiObject.SetProperty("C_Mail_SMTP_Delivery_MaxMsgSize", Convert.ToInt32(ProviderSettings["MaxMessageSize"])*1024*1024);
+            apiObject.SetProperty("C_Mail_SMTP_Delivery_MaxMsgSize", Convert.ToInt32(ProviderSettings["MaxMessageSize"]) * 1024 * 1024);
             apiObject.SetProperty("C_Mail_SMTP_Delivery_LimitMsgSize", Convert.ToInt32(ProviderSettings["MaxMessageSize"]) > 0);
 
             SaveApiSetting(apiObject);
@@ -403,11 +415,11 @@ namespace WebsitePanel.Providers.Mail
 
         #endregion
 
- 		#region IHostingServiceProvier methods
+        #region IHostingServiceProvier methods
 
-		public override SettingPair[] GetProviderDefaultSettings()
-		{
-            var settings = new []
+        public override SettingPair[] GetProviderDefaultSettings()
+        {
+            var settings = new[]
             {
                 new SettingPair("UseDomainDiskQuota", UseDomainDiskQuota.ToString()), 
                 new SettingPair("UseDomainLimits", UseDomainLimits.ToString()), 
@@ -419,8 +431,8 @@ namespace WebsitePanel.Providers.Mail
                 new SettingPair("ServerIpAddress", BindIpAddress)
             };
 
-			return settings;
-		}
+            return settings;
+        }
 
         public override string[] Install()
         {
@@ -429,25 +441,25 @@ namespace WebsitePanel.Providers.Mail
         }
 
         public override void ChangeServiceItemsState(ServiceProviderItem[] items, bool enabled)
-		{
-		    foreach (var item in items.OfType<MailDomain>())
-		    {
-		        try
-		        {
-		            // enable/disable mail domain
-		            if (DomainExists(item.Name))
-		            {
-		                var mailDomain = GetDomain(item.Name);
-		                mailDomain.Enabled = enabled;
-		                UpdateDomain(mailDomain);
-		            }
-		        }
-		        catch (Exception ex)
-		        {
-		            Log.WriteError(String.Format("Error switching '{0}' IceWarp domain", item.Name), ex);
-		        }
-		    }
-		}
+        {
+            foreach (var item in items.OfType<MailDomain>())
+            {
+                try
+                {
+                    // enable/disable mail domain
+                    if (DomainExists(item.Name))
+                    {
+                        var mailDomain = GetDomain(item.Name);
+                        mailDomain.Enabled = enabled;
+                        UpdateDomain(mailDomain);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Log.WriteError(String.Format("Error switching '{0}' IceWarp domain", item.Name), ex);
+                }
+            }
+        }
 
         public override void DeleteServiceItems(ServiceProviderItem[] items)
         {
@@ -466,64 +478,69 @@ namespace WebsitePanel.Providers.Mail
         }
 
         public override ServiceProviderItemDiskSpace[] GetServiceItemsDiskSpace(ServiceProviderItem[] items)
-		{
-			var itemsDiskspace = new List<ServiceProviderItemDiskSpace>();
+        {
+            var itemsDiskspace = new List<ServiceProviderItemDiskSpace>();
+            
+            var accountObject = GetAccountObject();
 
-			// update items with diskspace
-			foreach (var item in items.OfType<MailAccount>())
-			{
-			    try
-			    {
-			        Log.WriteStart(String.Format("Calculating mail account '{0}' size", item.Name));
-			        // calculate disk space
-			        var accountObject = GetAccountObject(item.Name);
-			        var size = Convert.ToInt64((object)accountObject.GetProperty("U_MailboxSize")) * 1024;
+            // update items with diskspace
+            foreach (var item in items.OfType<MailAccount>())
+            {
+                try
+                {
+                    Log.WriteStart(String.Format("Calculating mail account '{0}' size", item.Name));
+                    // calculate disk space
+                    accountObject.Open(item.Name);
+                    var size = Convert.ToInt64((object)accountObject.GetProperty("U_MailboxSize")) * 1024;
 
-                    var diskspace = new ServiceProviderItemDiskSpace {ItemId = item.Id, DiskSpace = size};
-			        itemsDiskspace.Add(diskspace);
-			        Log.WriteEnd(String.Format("Calculating mail account '{0}' size", item.Name));
-			    }
-			    catch (Exception ex)
-			    {
-			        Log.WriteError(ex);
-			    }
-			}
-			return itemsDiskspace.ToArray();
-		}
+                    var diskspace = new ServiceProviderItemDiskSpace { ItemId = item.Id, DiskSpace = size };
+                    itemsDiskspace.Add(diskspace);
 
-		public override ServiceProviderItemBandwidth[] GetServiceItemsBandwidth(ServiceProviderItem[] items, DateTime since)
-		{
-			var itemsBandwidth = new ServiceProviderItemBandwidth[items.Length];
+                    Log.WriteEnd(String.Format("Calculating mail account '{0}' size", item.Name));
+                }
+                catch (Exception ex)
+                {
+                    Log.WriteError(ex);
+                }
+            }
 
-			// update items with diskspace
-			for (int i = 0; i < items.Length; i++)
-			{
-				ServiceProviderItem item = items[i];
+            DisposeObject(accountObject);
 
-				// create new bandwidth object
-				itemsBandwidth[i] = new ServiceProviderItemBandwidth
-				{
-				    ItemId = item.Id, 
+            return itemsDiskspace.ToArray();
+        }
+
+        public override ServiceProviderItemBandwidth[] GetServiceItemsBandwidth(ServiceProviderItem[] items, DateTime since)
+        {
+            var itemsBandwidth = new ServiceProviderItemBandwidth[items.Length];
+
+            // update items with bandwidth
+            for (var i = 0; i < items.Length; i++)
+            {
+                var item = items[i];
+
+                // create new bandwidth object
+                itemsBandwidth[i] = new ServiceProviderItemBandwidth
+                {
+                    ItemId = item.Id,
                     Days = new DailyStatistics[0]
-				};
+                };
 
-			    if (item is MailDomain)
-				{
-					try
-					{
-						// get daily statistics
-						itemsBandwidth[i].Days = GetDailyStatistics(since, item.Name);
-					}
-					catch (Exception ex)
-					{
-						Log.WriteError(ex);
-						System.Diagnostics.Debug.WriteLine(ex);
-					}
-				}
-			}
+                if (!(item is MailDomain)) continue;
 
-			return itemsBandwidth;
-		}
+                try
+                {
+                    // get daily statistics
+                    itemsBandwidth[i].Days = GetDailyStatistics(since, item.Name);
+                }
+                catch (Exception ex)
+                {
+                    Log.WriteError(ex);
+                    System.Diagnostics.Debug.WriteLine(ex);
+                }
+            }
+
+            return itemsBandwidth;
+        }
 
         public DailyStatistics[] GetDailyStatistics(DateTime since, string maildomainName)
         {
@@ -544,7 +561,7 @@ namespace WebsitePanel.Providers.Mail
 
                     var ms = new MemoryStream(statsBuffer);
                     var reader = new StreamReader(ms);
-                    while (reader.Peek() != -1)
+                    while (reader.Peek() > -1)
                     {
                         var line = reader.ReadLine();
                         var fields = line.Split(',');
@@ -561,11 +578,11 @@ namespace WebsitePanel.Providers.Mail
                             case '*':
                                 var dailyStats = new DailyStatistics
                                 {
-                                    Year = date.Year, 
-                                    Month = date.Month, 
-                                    Day = date.Day, 
-                                    BytesSent = Convert.ToInt64(fields[mailSentField])*1024, 
-                                    BytesReceived = Convert.ToInt64(fields[mailReceivedField])*1024
+                                    Year = date.Year,
+                                    Month = date.Month,
+                                    Day = date.Day,
+                                    BytesSent = Convert.ToInt64(fields[mailSentField]) * 1024,
+                                    BytesReceived = Convert.ToInt64(fields[mailReceivedField]) * 1024
                                 };
                                 days.Add(dailyStats);
                                 continue;
@@ -614,7 +631,7 @@ namespace WebsitePanel.Providers.Mail
 
             // Checking for version 10.4.0 (released 2012-03-21) or newer
             // This version introduced L_ListFile_Contents, G_ListFile_Contents and M_ListFileContents that is the latest API variable used by this provider
-            var split = version.Split(new[] {'.'});
+            var split = version.Split(new[] { '.' });
             var majorVersion = Convert.ToInt32(split[0]);
             var minVersion = Convert.ToInt32(split[1]);
 
@@ -632,32 +649,34 @@ namespace WebsitePanel.Providers.Mail
         public string[] GetDomains()
         {
             var api = GetApiObject();
-            return api.GetDomainList().Split(new[] {';'}, StringSplitOptions.RemoveEmptyEntries);
+            return api.GetDomainList().Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
         }
 
         public MailDomain GetDomain(string domainName)
         {
-            var domain = GetDomainObject(domainName);
+            var domainObject = GetDomainObject(domainName);
 
             var mailDomain = new MailDomain
             {
-                Name = domain.Name,
-                PostmasterAccount = domain.GetProperty("D_AdminEmail"),
-                CatchAllAccount = domain.GetProperty("D_UnknownForwardTo"),
-                Enabled = Convert.ToBoolean((object) domain.GetProperty("D_DisableLogin")),
-                MaxDomainSizeInMB = Convert.ToInt32((object) domain.GetProperty("D_DiskQuota"))/1024,
-                MaxDomainUsers = Convert.ToInt32((object) domain.GetProperty("D_AccountNumber")),
-                MegaByteSendLimit = Convert.ToInt32((object) domain.GetProperty("D_VolumeLimit"))/1024,
-                NumberSendLimit = Convert.ToInt32((object) domain.GetProperty("D_NumberLimit")),
-                DefaultUserQuotaInMB = Convert.ToInt32((object) domain.GetProperty("D_UserMailbox"))/1024,
-                DefaultUserMaxMessageSizeMegaByte = Convert.ToInt32((object) domain.GetProperty("D_UserMsg"))/1024,
-                DefaultUserMegaByteSendLimit = Convert.ToInt32((object) domain.GetProperty("D_UserMB")),
-                DefaultUserNumberSendLimit = Convert.ToInt32((object) domain.GetProperty("D_UserNumber")),
+                Name = domainObject.Name,
+                PostmasterAccount = domainObject.GetProperty("D_AdminEmail"),
+                CatchAllAccount = domainObject.GetProperty("D_UnknownForwardTo"),
+                Enabled = Convert.ToBoolean((object)domainObject.GetProperty("D_DisableLogin")),
+                MaxDomainSizeInMB = Convert.ToInt32((object)domainObject.GetProperty("D_DiskQuota")) / 1024,
+                MaxDomainUsers = Convert.ToInt32((object)domainObject.GetProperty("D_AccountNumber")),
+                MegaByteSendLimit = Convert.ToInt32((object)domainObject.GetProperty("D_VolumeLimit")) / 1024,
+                NumberSendLimit = Convert.ToInt32((object)domainObject.GetProperty("D_NumberLimit")),
+                DefaultUserQuotaInMB = Convert.ToInt32((object)domainObject.GetProperty("D_UserMailbox")) / 1024,
+                DefaultUserMaxMessageSizeMegaByte = Convert.ToInt32((object)domainObject.GetProperty("D_UserMsg")) / 1024,
+                DefaultUserMegaByteSendLimit = Convert.ToInt32((object)domainObject.GetProperty("D_UserMB")),
+                DefaultUserNumberSendLimit = Convert.ToInt32((object)domainObject.GetProperty("D_UserNumber")),
                 UseDomainDiskQuota = Convert.ToBoolean(ProviderSettings["UseDomainDiskQuota"]),
                 UseDomainLimits = Convert.ToBoolean(ProviderSettings["UseDomainLimits"]),
                 UseUserLimits = Convert.ToBoolean(ProviderSettings["UseUserLimits"])
             };
 
+            DisposeObject(domainObject);
+
             return mailDomain;
         }
 
@@ -665,18 +684,24 @@ namespace WebsitePanel.Providers.Mail
         {
             if (string.IsNullOrWhiteSpace(domain.Name))
             {
-                throw new ArgumentNullException("domain.Name");
+                var ex = new Exception("Cannot create domain with empty domain name", new ArgumentNullException("domain.Name"));
+                Log.WriteError(ex);
+                throw ex;
             }
 
             var domainObject = GetDomainObject();
 
             if (!domainObject.New(domain.Name))
             {
-                throw new ApplicationException("Failed to create domain: " + GetErrorMessage(domainObject.LastErr));
+                var ex = new Exception("Failed to create domain: " + GetErrorMessage(domainObject.LastErr));
+                Log.WriteError(ex);
+                throw ex;
             }
 
             SaveDomain(domainObject);
 
+            DisposeObject(domainObject);
+
             UpdateDomain(domain);
         }
 
@@ -698,32 +723,41 @@ namespace WebsitePanel.Providers.Mail
             }
 
             domainObject.SetProperty("D_DisableLogin", !domain.Enabled);
-            domainObject.SetProperty("D_DiskQuota", domain.MaxDomainSizeInMB*1024);
+            domainObject.SetProperty("D_DiskQuota", domain.MaxDomainSizeInMB * 1024);
             domainObject.SetProperty("D_AccountNumber", domain.MaxDomainUsers);
-            domainObject.SetProperty("D_VolumeLimit", domain.MegaByteSendLimit*1024);
+            domainObject.SetProperty("D_VolumeLimit", domain.MegaByteSendLimit * 1024);
             domainObject.SetProperty("D_NumberLimit", domain.NumberSendLimit);
 
-            domainObject.SetProperty("D_UserMailbox", domain.DefaultUserQuotaInMB*1024);
-            domainObject.SetProperty("D_UserMsg", domain.DefaultUserMaxMessageSizeMegaByte*1024);
+            domainObject.SetProperty("D_UserMailbox", domain.DefaultUserQuotaInMB * 1024);
+            domainObject.SetProperty("D_UserMsg", domain.DefaultUserMaxMessageSizeMegaByte * 1024);
             domainObject.SetProperty("D_UserMB", domain.DefaultUserMegaByteSendLimit);
             domainObject.SetProperty("D_UserNumber", domain.DefaultUserNumberSendLimit);
 
             SaveDomain(domainObject);
+
+            DisposeObject(domainObject);
         }
 
         public void DeleteDomain(string domainName)
         {
+            if (!DomainExists(domainName))
+            {
+                return;
+            }
+
             var domainObject = GetDomainObject(domainName);
 
-            if (domainObject.Delete())
+            if (!domainObject.Delete())
             {
-                throw new Exception("Could not delete domain");
+                Log.WriteError("Could not delete domain" + GetErrorMessage(domainObject.LastErr), null);
             }
+
+            DisposeObject(domainObject);
         }
 
         #endregion
 
-        #region Domain alieses
+        #region Domain aliases
 
         public bool DomainAliasExists(string domainName, string aliasName)
         {
@@ -734,7 +768,11 @@ namespace WebsitePanel.Providers.Mail
 
             var domainObject = GetDomainObject(aliasName);
 
-            return Convert.ToInt32((object) domainObject.GetProperty("D_Type")) == 2 && string.Compare(domainObject.GetProperty("D_DomainValue").ToString(), domainName, true) == 0;
+            var result = Convert.ToInt32((object)domainObject.GetProperty("D_Type")) == 2 && string.Compare(domainObject.GetProperty("D_DomainValue").ToString(), domainName, true) == 0;
+
+            DisposeObject(domainObject);
+
+            return result;
         }
 
         public string[] GetDomainAliases(string domainName)
@@ -759,13 +797,15 @@ namespace WebsitePanel.Providers.Mail
 
         public void AddDomainAlias(string domainName, string aliasName)
         {
-            var mailDomain = new MailDomain {Name = aliasName};
+            var mailDomain = new MailDomain { Name = aliasName };
             CreateDomain(mailDomain);
             var domainObject = GetDomainObject(aliasName);
 
             domainObject.SetProperty("D_Type", 2);
             domainObject.SetProperty("D_DomainValue", domainName);
             SaveDomain(domainObject);
+
+            DisposeObject(domainObject);
         }
 
         public void DeleteDomainAlias(string domainName, string aliasName)
@@ -781,7 +821,11 @@ namespace WebsitePanel.Providers.Mail
         {
             var accountObject = GetAccountObject();
 
-            return accountObject.Open(mailboxName) && Convert.ToInt32((object) accountObject.GetProperty("U_Type")) == (int) IceWarpAccountType.User;
+            var result = accountObject.Open(mailboxName) && Convert.ToInt32((object)accountObject.GetProperty("U_Type")) == (int)IceWarpAccountType.User;
+
+            DisposeObject(accountObject);
+
+            return result;
         }
 
         protected class IceWarpResponderContent
@@ -827,35 +871,35 @@ namespace WebsitePanel.Providers.Mail
             return result;
         }
 
-        protected static MailAccount CreateMailAccountFromAccountObject(dynamic accountObject)
+        protected MailAccount CreateMailAccountFromAccountObject(dynamic accountObject)
         {
             var mailAccount = new MailAccount
             {
                 Name = accountObject.EmailAddress,
                 FullName = accountObject.GetProperty("U_Name"),
-                Enabled = Convert.ToInt32((object) accountObject.GetProperty("U_AccountDisabled")) == 0,
-                ForwardingEnabled = !string.IsNullOrWhiteSpace(accountObject.GetProperty("U_ForwardTo")) || string.IsNullOrWhiteSpace(accountObject.GetProperty("U_RemoteAddress")) && Convert.ToBoolean((object) accountObject.GetProperty("U_UseRemoteAddress")),
-                IsDomainAdmin = Convert.ToBoolean((object) accountObject.GetProperty("U_DomainAdmin")),
-                MaxMailboxSize = Convert.ToBoolean((object) accountObject.GetProperty("U_MaxBox")) ? Convert.ToInt32((object) accountObject.GetProperty("U_MaxBoxSize"))/1024 : 0,
+                Enabled = Convert.ToInt32((object)accountObject.GetProperty("U_AccountDisabled")) == 0,
+                ForwardingEnabled = !string.IsNullOrWhiteSpace(accountObject.GetProperty("U_ForwardTo")) || string.IsNullOrWhiteSpace(accountObject.GetProperty("U_RemoteAddress")) && Convert.ToBoolean((object)accountObject.GetProperty("U_UseRemoteAddress")),
+                IsDomainAdmin = Convert.ToBoolean((object)accountObject.GetProperty("U_DomainAdmin")),
+                MaxMailboxSize = Convert.ToBoolean((object)accountObject.GetProperty("U_MaxBox")) ? Convert.ToInt32((object)accountObject.GetProperty("U_MaxBoxSize")) / 1024 : 0,
                 Password = accountObject.GetProperty("U_Password"),
-                ResponderEnabled = Convert.ToInt32((object) accountObject.GetProperty("U_Respond")) > 0,
-                QuotaUsed = Convert.ToInt64((object) accountObject.GetProperty("U_MailBoxSize")),
-                MaxMessageSizeMegaByte = Convert.ToInt32((object) accountObject.GetProperty("U_MaxMessageSize"))/1024,
-                MegaByteSendLimit = Convert.ToInt32((object) accountObject.GetProperty("U_MegabyteSendLimit")),
-                NumberSendLimit = Convert.ToInt32((object) accountObject.GetProperty("U_NumberSendLimit")),
-                DeleteOlder = Convert.ToBoolean((object) accountObject.GetProperty("U_DeleteOlder")),
-                DeleteOlderDays = Convert.ToInt32((object) accountObject.GetProperty("U_DeleteOlderDays")),
-                ForwardOlder = Convert.ToBoolean((object) accountObject.GetProperty("U_ForwardOlder")),
-                ForwardOlderDays = Convert.ToInt32((object) accountObject.GetProperty("U_ForwardOlderDays")),
+                ResponderEnabled = Convert.ToInt32((object)accountObject.GetProperty("U_Respond")) > 0,
+                QuotaUsed = Convert.ToInt64((object)accountObject.GetProperty("U_MailBoxSize")),
+                MaxMessageSizeMegaByte = Convert.ToInt32((object)accountObject.GetProperty("U_MaxMessageSize")) / 1024,
+                MegaByteSendLimit = Convert.ToInt32((object)accountObject.GetProperty("U_MegabyteSendLimit")),
+                NumberSendLimit = Convert.ToInt32((object)accountObject.GetProperty("U_NumberSendLimit")),
+                DeleteOlder = Convert.ToBoolean((object)accountObject.GetProperty("U_DeleteOlder")),
+                DeleteOlderDays = Convert.ToInt32((object)accountObject.GetProperty("U_DeleteOlderDays")),
+                ForwardOlder = Convert.ToBoolean((object)accountObject.GetProperty("U_ForwardOlder")),
+                ForwardOlderDays = Convert.ToInt32((object)accountObject.GetProperty("U_ForwardOlderDays")),
                 ForwardOlderTo = accountObject.GetProperty("U_ForwardOlderTo"),
-                IceWarpAccountState = Convert.ToInt32((object) accountObject.GetProperty("U_AccountDisabled")),
-                IceWarpAccountType = Convert.ToInt32((object) accountObject.GetProperty("U_AccountType")),
-                IceWarpRespondType = Convert.ToInt32((object) accountObject.GetProperty("U_Respond"))
+                IceWarpAccountState = Convert.ToInt32((object)accountObject.GetProperty("U_AccountDisabled")),
+                IceWarpAccountType = Convert.ToInt32((object)accountObject.GetProperty("U_AccountType")),
+                IceWarpRespondType = Convert.ToInt32((object)accountObject.GetProperty("U_Respond"))
             };
 
             if (mailAccount.ForwardingEnabled)
             {
-                mailAccount.ForwardingAddresses = new string[] {accountObject.GetProperty("U_ForwardTo") + accountObject.GetProperty("U_RemoteAddress")};
+                mailAccount.ForwardingAddresses = new string[] { accountObject.GetProperty("U_ForwardTo") + accountObject.GetProperty("U_RemoteAddress") };
                 mailAccount.DeleteOnForward = Convert.ToInt32(accountObject.GetProperty("U_UseRemoteAddress")) == 1;
                 mailAccount.RetainLocalCopy = !mailAccount.DeleteOnForward;
             }
@@ -876,7 +920,7 @@ namespace WebsitePanel.Providers.Mail
                     mailAccount.RespondTo = respondTo;
                 }
 
-                mailAccount.RespondPeriodInDays = Convert.ToInt32((object) accountObject.GetProperty("U_RespondPeriod"));
+                mailAccount.RespondPeriodInDays = Convert.ToInt32((object)accountObject.GetProperty("U_RespondPeriod"));
                 var responderContent = ParseResponderContent(accountObject.GetProperty("U_ResponderContent"));
                 mailAccount.ResponderMessage = responderContent.Content;
                 mailAccount.ResponderSubject = responderContent.Subject;
@@ -894,7 +938,11 @@ namespace WebsitePanel.Providers.Mail
         public MailAccount GetAccount(string mailboxName)
         {
             var accountObject = GetAccountObject(mailboxName);
-            return CreateMailAccountFromAccountObject(accountObject);
+            var account = CreateMailAccountFromAccountObject(accountObject);
+
+            DisposeObject(accountObject);
+
+            return account;
         }
 
         public void CreateAccount(MailAccount mailbox)
@@ -904,15 +952,19 @@ namespace WebsitePanel.Providers.Mail
             var emailParts = new MailAddress(mailbox.Name);
             if (!accountObject.CanCreateMailbox(emailParts.User, emailParts.User, mailbox.Password, emailParts.Host))
             {
-                throw new Exception("Cannot create account: " + GetErrorMessage(accountObject.LastErr));
+                var ex = new Exception("Cannot create account because of password policy in IceWarp server, invalid username, alias or domain. Check if the password policy is different in IceWarp and WSP. Also perhaps your IceWarp diallows username in password?");
+                Log.WriteError(ex);
+                throw ex;
             }
 
             if (accountObject.New(mailbox.Name))
             {
+                accountObject.SetProperty("U_Password", mailbox.Password);
                 accountObject.Save();
+                UpdateAccount(mailbox);
             }
 
-            UpdateAccount(mailbox);
+            DisposeObject(accountObject);
         }
 
         public void UpdateAccount(MailAccount mailbox)
@@ -922,10 +974,15 @@ namespace WebsitePanel.Providers.Mail
             accountObject.SetProperty("U_Name", mailbox.FullName);
             accountObject.SetProperty("U_AccountDisabled", mailbox.IceWarpAccountState);
             accountObject.SetProperty("U_DomainAdmin", mailbox.IsDomainAdmin);
-            accountObject.SetProperty("U_Password", mailbox.Password);
-            accountObject.SetProperty("U_MaxBoxSize", mailbox.MaxMailboxSize*1024);
+
+            if (mailbox.ChangePassword)
+            {
+                accountObject.SetProperty("U_Password", mailbox.Password);
+            }
+
+            accountObject.SetProperty("U_MaxBoxSize", mailbox.MaxMailboxSize * 1024);
             accountObject.SetProperty("U_MaxBox", mailbox.MaxMailboxSize > 0 ? "1" : "0");
-            accountObject.SetProperty("U_MaxMessageSize", mailbox.MaxMessageSizeMegaByte*1024);
+            accountObject.SetProperty("U_MaxMessageSize", mailbox.MaxMessageSizeMegaByte * 1024);
             accountObject.SetProperty("U_MegabyteSendLimit", mailbox.MegaByteSendLimit);
             accountObject.SetProperty("U_NumberSendLimit", mailbox.NumberSendLimit);
             accountObject.SetProperty("U_AccountType", mailbox.IceWarpAccountType);
@@ -985,15 +1042,24 @@ namespace WebsitePanel.Providers.Mail
             }
 
             SaveAccount(accountObject);
+
+            DisposeObject(accountObject);
         }
 
         public void DeleteAccount(string mailboxName)
         {
+            if (!AccountExists(mailboxName))
+            {
+                return;
+            }
+
             var accountObject = GetAccountObject(mailboxName);
             if (!accountObject.Delete())
             {
-                throw new Exception("Cannot delete account: " + GetErrorMessage(accountObject.LastErr));
+                Log.WriteError("Cannot delete account: " + GetErrorMessage(accountObject.LastErr), null);
             }
+
+            DisposeObject(accountObject);
         }
 
         #endregion
@@ -1004,7 +1070,11 @@ namespace WebsitePanel.Providers.Mail
         {
             var accountObject = GetAccountObject();
 
-            return accountObject.Open(mailAliasName);
+            var result = accountObject.Open(mailAliasName);
+
+            DisposeObject(accountObject);
+
+            return result;
         }
 
         protected IEnumerable<string> GetAliasListFromAccountObject(dynamic accountObject)
@@ -1036,12 +1106,14 @@ namespace WebsitePanel.Providers.Mail
                 {
                     var forwardTo = GetForwardToAddressFromAccountObject(accountObject);
                     var aliases = GetAliasListFromAccountObject(accountObject) as IEnumerable<string>;
-                    aliasList.AddRange(aliases.Where(a => a + "@" + domainName != forwardTo).Select(alias => new MailAlias {Name = alias + "@" + domainName, ForwardTo = forwardTo}));
+                    aliasList.AddRange(aliases.Where(a => a + "@" + domainName != forwardTo).Select(alias => new MailAlias { Name = alias + "@" + domainName, ForwardTo = forwardTo }));
                 }
 
                 accountObject.FindDone();
             }
 
+            DisposeObject(accountObject);
+
             return aliasList.ToArray();
         }
 
@@ -1051,7 +1123,11 @@ namespace WebsitePanel.Providers.Mail
 
             var forwardTo = GetForwardToAddressFromAccountObject(accountObject);
 
-            return new MailAlias {ForwardTo = forwardTo, Name = mailAliasName};
+            var result = new MailAlias { ForwardTo = forwardTo, Name = mailAliasName };
+
+            DisposeObject(accountObject);
+
+            return result;
         }
 
         public void CreateMailAlias(MailAlias mailAlias)
@@ -1061,23 +1137,25 @@ namespace WebsitePanel.Providers.Mail
             {
                 mailAlias.ForwardingEnabled = true;
                 mailAlias.DeleteOnForward = true;
-                mailAlias.ForwardingAddresses = new[] {mailAlias.ForwardTo};
+                mailAlias.ForwardingAddresses = new[] { mailAlias.ForwardTo };
                 mailAlias.Password = GetRandomPassword();
                 CreateAccount(mailAlias);
             }
-                // else open account and add alias to list
+            // else open account and add alias to list
             else
             {
-                var accountOject = GetAccountObject(mailAlias.ForwardTo);
-                var aliases = GetAliasListFromAccountObject(accountOject).ToList();
+                var accountObject = GetAccountObject(mailAlias.ForwardTo);
+                var aliases = ((IEnumerable<string>)GetAliasListFromAccountObject(accountObject)).ToList();
                 aliases.Add(GetEmailUser(mailAlias.Name));
-                accountOject.SetProperty("U_EmailAlias", string.Join(";", aliases));
+                accountObject.SetProperty("U_EmailAlias", string.Join(";", aliases));
 
-                SaveAccount(accountOject, "account when creating mail alias");
+                SaveAccount(accountObject, "account when creating mail alias");
+
+                DisposeObject(accountObject);
             }
         }
 
-        private string GetRandowChars(string chars, int length)
+        private static string GetRandowChars(string chars, int length)
         {
             var random = new Random();
             return new string(Enumerable.Repeat(chars, length).Select(s => s[random.Next(s.Length)]).ToArray());
@@ -1091,8 +1169,8 @@ namespace WebsitePanel.Providers.Mail
             var nonAlphaNum = apiObject.GetProperty("C_Accounts_Policies_Pass_NonAlphaNum");
             var alpha = apiObject.GetProperty("C_Accounts_Policies_Pass_Alpha");
 
-            return System.Web.Security.Membership.GeneratePassword(minLength, nonAlphaNum) + 
-                GetRandowChars("0123456789", digits)+
+            return System.Web.Security.Membership.GeneratePassword(minLength, nonAlphaNum) +
+                GetRandowChars("0123456789", digits) +
                 GetRandowChars("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", alpha);
         }
 
@@ -1117,11 +1195,13 @@ namespace WebsitePanel.Providers.Mail
                 accountObject.SetProperty("U_EmailAlias", string.Join(";", otherAliases));
                 SaveAccount(accountObject, "account during alias delete");
             }
-                // If no other aliases, this should be an account with a remote address and then we should delete the account
+            // If no other aliases, this should be an account with a remote address and then we should delete the account
             else
             {
                 DeleteAccount(mailAliasName);
             }
+
+            DisposeObject(accountObject);
         }
 
         #endregion
@@ -1132,7 +1212,11 @@ namespace WebsitePanel.Providers.Mail
         {
             var accountObject = GetAccountObject();
 
-            return accountObject.Open(groupName) && Convert.ToInt32(accountObject.GetProperty("U_Type")) == 7;
+            var result = accountObject.Open(groupName) && (IceWarpAccountType)Enum.Parse(typeof(IceWarpAccountType), ((object)accountObject.GetProperty("U_Type")).ToString()) == IceWarpAccountType.UserGroup;
+
+            DisposeObject(accountObject);
+
+            return result;
         }
 
         public MailGroup[] GetGroups(string domainName)
@@ -1145,7 +1229,7 @@ namespace WebsitePanel.Providers.Mail
             var mailGroup = new MailGroup
             {
                 Name = accountObject.EmailAddress,
-                Enabled = Convert.ToInt32((object) accountObject.GetProperty("U_AccountDisabled")) == 0,
+                Enabled = Convert.ToInt32((object)accountObject.GetProperty("U_AccountDisabled")) == 0,
                 GroupName = accountObject.GetProperty("G_Name"),
                 Members = ((IEnumerable<string>)SplitFileContents(accountObject, "G_ListFile_Contents")).ToArray()
             };
@@ -1156,7 +1240,11 @@ namespace WebsitePanel.Providers.Mail
         public MailGroup GetGroup(string groupName)
         {
             var accountObject = GetAccountObject(groupName);
-            return CreateMailGroupFromAccountObject(accountObject);
+            var result = CreateMailGroupFromAccountObject(accountObject);
+
+            DisposeObject(accountObject);
+
+            return result;
         }
 
         public void CreateGroup(MailGroup @group)
@@ -1165,16 +1253,18 @@ namespace WebsitePanel.Providers.Mail
 
             if (accountObject.New(group.Name))
             {
-                accountObject.SetProperty("U_Type", 7);
+                accountObject.SetProperty("U_Type", IceWarpAccountType.UserGroup);
                 accountObject.SetProperty("G_GroupwareMailDelivery", false);
                 SaveAccount(accountObject, "group account");
             }
             else
             {
-                throw new ApplicationException("Failed to create group: " + GetErrorMessage(accountObject.LastErr));
+                Log.WriteError("Failed to create group: " + GetErrorMessage(accountObject.LastErr), null);
             }
 
             UpdateGroup(group);
+
+            DisposeObject(accountObject);
         }
 
         public void UpdateGroup(MailGroup @group)
@@ -1186,15 +1276,24 @@ namespace WebsitePanel.Providers.Mail
             accountObject.SetProperty("G_ListFile_Contents", string.Join("\n", group.Members));
 
             SaveAccount(accountObject, "group");
+
+            DisposeObject(accountObject);
         }
 
         public void DeleteGroup(string groupName)
         {
+            if (!GroupExists(groupName))
+            {
+                return;
+            }
+
             var accountObject = GetAccountObject(groupName);
             if (!accountObject.Delete())
             {
-                throw new Exception("Cannot delete group: " + GetErrorMessage(accountObject.LastErr));
+                Log.WriteError("Cannot delete group: " + GetErrorMessage(accountObject.LastErr), null);
             }
+
+            DisposeObject(accountObject);
         }
 
         #endregion
@@ -1205,7 +1304,11 @@ namespace WebsitePanel.Providers.Mail
         {
             var accountObject = GetAccountObject();
 
-            return accountObject.Open(maillistName) && (IceWarpAccountType) Enum.Parse(typeof (IceWarpAccountType), ((object) accountObject.GetProperty("U_Type")).ToString()) == IceWarpAccountType.MailingList;
+            var result = accountObject.Open(maillistName) && (IceWarpAccountType)Enum.Parse(typeof(IceWarpAccountType), ((object)accountObject.GetProperty("U_Type")).ToString()) == IceWarpAccountType.MailingList;
+
+            DisposeObject(accountObject);
+
+            return result;
         }
 
         public MailList[] GetLists(string domainName)
@@ -1215,8 +1318,8 @@ namespace WebsitePanel.Providers.Mail
 
         protected IEnumerable<string> SplitStringProperty(dynamic accountObject, string propertyName, char separator)
         {
-            var value = (object) accountObject.GetProperty(propertyName);
-            return value == null ? new String[] {} : value.ToString().Split(new[] {separator}, StringSplitOptions.RemoveEmptyEntries);
+            var value = (object)accountObject.GetProperty(propertyName);
+            return value == null ? new String[] { } : value.ToString().Split(new[] { separator }, StringSplitOptions.RemoveEmptyEntries);
         }
 
         protected IEnumerable<string> SplitFileContents(dynamic accountObject, string propertyName)
@@ -1237,43 +1340,43 @@ namespace WebsitePanel.Providers.Mail
                 Name = accountObject.EmailAddress,
                 Description = accountObject.GetProperty("M_Name"),
                 ModeratorAddress = accountObject.GetProperty("M_OwnerAddress"),
-                MembersSource = (IceWarpListMembersSource) Enum.Parse(typeof (IceWarpListMembersSource), ((object) accountObject.GetProperty("M_SendAllLists")).ToString()),
-                Members = ((IEnumerable<string>)SplitFileContents(accountObject, "M_ListFile_Contents")).Select(m => m.TrimEnd(new[] {';', '0', '1', '2'})).ToArray(),
-                SetReceipientsToToHeader = Convert.ToBoolean((object) accountObject.GetProperty("M_SeparateTo")),
+                MembersSource = (IceWarpListMembersSource)Enum.Parse(typeof(IceWarpListMembersSource), ((object)accountObject.GetProperty("M_SendAllLists")).ToString()),
+                Members = ((IEnumerable<string>)SplitFileContents(accountObject, "M_ListFile_Contents")).Select(m => m.TrimEnd(new[] { ';', '0', '1', '2' })).ToArray(),
+                SetReceipientsToToHeader = Convert.ToBoolean((object)accountObject.GetProperty("M_SeparateTo")),
                 SubjectPrefix = accountObject.GetProperty("M_AddToSubject"),
-                Originator = (IceWarpListOriginator) Enum.Parse(typeof (IceWarpListOriginator), ((object) accountObject.GetProperty("M_ListSender")).ToString()),
-                PostingMode = Convert.ToBoolean((object) accountObject.GetProperty("M_MembersOnly")) ? PostingMode.MembersCanPost : PostingMode.AnyoneCanPost,
-                PasswordProtection = (PasswordProtection) Enum.Parse(typeof (PasswordProtection), ((object) accountObject.GetProperty("M_Moderated")).ToString()),
+                Originator = (IceWarpListOriginator)Enum.Parse(typeof(IceWarpListOriginator), ((object)accountObject.GetProperty("M_ListSender")).ToString()),
+                PostingMode = Convert.ToBoolean((object)accountObject.GetProperty("M_MembersOnly")) ? PostingMode.MembersCanPost : PostingMode.AnyoneCanPost,
+                PasswordProtection = (PasswordProtection)Enum.Parse(typeof(PasswordProtection), ((object)accountObject.GetProperty("M_Moderated")).ToString()),
                 Password = accountObject.GetProperty("M_ModeratedPassword"),
-                DefaultRights = (IceWarpListDefaultRights) Enum.Parse(typeof (IceWarpListDefaultRights), ((object) accountObject.GetProperty("M_DefaultRights")).ToString()),
-                MaxMessageSizeEnabled = Convert.ToBoolean((object) accountObject.GetProperty("M_MaxList")),
-                MaxMessageSize = Convert.ToInt32((object) accountObject.GetProperty("M_MaxListSize")),
-                MaxMembers = Convert.ToInt32((object) accountObject.GetProperty("M_MaxMembers")),
-                SendToSender = Convert.ToBoolean((object) accountObject.GetProperty("M_SendToSender")),
-                DigestMode = Convert.ToBoolean((object) accountObject.GetProperty("M_DigestConfirmed")),
-                MaxMessagesPerMinute = Convert.ToInt32((object) accountObject.GetProperty("M_ListBatch")),
-                SendSubscribe = Convert.ToBoolean((object) accountObject.GetProperty("M_NotifyJoin")),
-                SendUnsubscribe = Convert.ToBoolean((object) accountObject.GetProperty("M_NotifyLeave")),
+                DefaultRights = (IceWarpListDefaultRights)Enum.Parse(typeof(IceWarpListDefaultRights), ((object)accountObject.GetProperty("M_DefaultRights")).ToString()),
+                MaxMessageSizeEnabled = Convert.ToBoolean((object)accountObject.GetProperty("M_MaxList")),
+                MaxMessageSize = Convert.ToInt32((object)accountObject.GetProperty("M_MaxListSize")),
+                MaxMembers = Convert.ToInt32((object)accountObject.GetProperty("M_MaxMembers")),
+                SendToSender = Convert.ToBoolean((object)accountObject.GetProperty("M_SendToSender")),
+                DigestMode = Convert.ToBoolean((object)accountObject.GetProperty("M_DigestConfirmed")),
+                MaxMessagesPerMinute = Convert.ToInt32((object)accountObject.GetProperty("M_ListBatch")),
+                SendSubscribe = Convert.ToBoolean((object)accountObject.GetProperty("M_NotifyJoin")),
+                SendUnsubscribe = Convert.ToBoolean((object)accountObject.GetProperty("M_NotifyLeave")),
 
                 // From list server account
-                ConfirmSubscription = (IceWarpListConfirmSubscription) Enum.Parse(typeof (IceWarpListConfirmSubscription), ((object) listServerAccountObject.GetProperty("L_DigestConfirmed")).ToString()),
-                CommandsInSubject = Convert.ToBoolean((object) listServerAccountObject.GetProperty("L_ListSubject")),
-                DisableSubscribecommand = !Convert.ToBoolean((object) listServerAccountObject.GetProperty("M_JoinR")),
-                AllowUnsubscribe = Convert.ToBoolean((object) listServerAccountObject.GetProperty("M_LeaveR")),
-                DisableListcommand = !Convert.ToBoolean((object) listServerAccountObject.GetProperty("M_ListsR")),
-                DisableWhichCommand = !Convert.ToBoolean((object) listServerAccountObject.GetProperty("M_WhichR")),
-                DisableReviewCommand = !Convert.ToBoolean((object) listServerAccountObject.GetProperty("M_ReviewR")),
-                DisableVacationCommand = !Convert.ToBoolean((object) listServerAccountObject.GetProperty("M_VacationR")),
-                Moderated = Convert.ToBoolean((object) listServerAccountObject.GetProperty("L_Moderated")),
+                ConfirmSubscription = (IceWarpListConfirmSubscription)Enum.Parse(typeof(IceWarpListConfirmSubscription), ((object)listServerAccountObject.GetProperty("L_DigestConfirmed")).ToString()),
+                CommandsInSubject = Convert.ToBoolean((object)listServerAccountObject.GetProperty("L_ListSubject")),
+                DisableSubscribecommand = !Convert.ToBoolean((object)listServerAccountObject.GetProperty("M_JoinR")),
+                AllowUnsubscribe = Convert.ToBoolean((object)listServerAccountObject.GetProperty("M_LeaveR")),
+                DisableListcommand = !Convert.ToBoolean((object)listServerAccountObject.GetProperty("M_ListsR")),
+                DisableWhichCommand = !Convert.ToBoolean((object)listServerAccountObject.GetProperty("M_WhichR")),
+                DisableReviewCommand = !Convert.ToBoolean((object)listServerAccountObject.GetProperty("M_ReviewR")),
+                DisableVacationCommand = !Convert.ToBoolean((object)listServerAccountObject.GetProperty("M_VacationR")),
+                Moderated = Convert.ToBoolean((object)listServerAccountObject.GetProperty("L_Moderated")),
                 CommandPassword = listServerAccountObject.GetProperty("L_ModeratedPassword"),
-                SuppressCommandResponses = Convert.ToBoolean((object) listServerAccountObject.GetProperty("L_MaxList"))
+                SuppressCommandResponses = Convert.ToBoolean((object)listServerAccountObject.GetProperty("L_MaxList"))
             };
 
 
             // This is how I get values for from and replyto header values. TODO: There must be a better way, but I don't see the pattern right now...
-            var ss = Convert.ToInt32((object) accountObject.GetProperty("M_SetSender"));
-            var sv = Convert.ToInt32((object) accountObject.GetProperty("M_SetValue"));
-            var vm = Convert.ToBoolean((object) accountObject.GetProperty("M_ValueMode"));
+            var ss = Convert.ToInt32((object)accountObject.GetProperty("M_SetSender"));
+            var sv = Convert.ToInt32((object)accountObject.GetProperty("M_SetValue"));
+            var vm = Convert.ToBoolean((object)accountObject.GetProperty("M_ValueMode"));
             var value = accountObject.GetProperty("M_HeaderValue");
 
             switch (ss)
@@ -1338,27 +1441,37 @@ namespace WebsitePanel.Providers.Mail
                     break;
             }
 
+            DisposeObject(listServerAccountObject);
+
             return mailList;
         }
 
         public MailList GetList(string maillistName)
         {
             var accountObject = GetAccountObject(maillistName);
-            return CreateMailListFromAccountObject(accountObject);
+            var result = CreateMailListFromAccountObject(accountObject);
+
+            DisposeObject(accountObject);
+
+            return result;
         }
 
         public void CreateList(MailList maillist)
         {
             if (string.IsNullOrWhiteSpace(maillist.Name))
             {
-                throw new ArgumentNullException("maillist.Name");
+                var ex = new ArgumentNullException("maillist.Name", "Cannot create list with empty name");
+                Log.WriteError(ex);
+                throw ex;
             }
 
             var accountObject = GetAccountObject();
 
             if (!accountObject.New(maillist.Name))
             {
-                throw new ApplicationException("Failed to create mailing list: " + GetErrorMessage(accountObject.LastErr));
+                var ex = new Exception("Failed to create mailing list: " + GetErrorMessage(accountObject.LastErr));
+                Log.WriteError(ex);
+                throw ex;
             }
 
             accountObject.SetProperty("U_Type", IceWarpAccountType.MailingList);
@@ -1366,6 +1479,8 @@ namespace WebsitePanel.Providers.Mail
             SaveAccount(accountObject, "mailing list");
 
             UpdateList(maillist);
+
+            DisposeObject(accountObject);
         }
 
         protected dynamic FindMatchingListServerAccount(string mailingListName, bool createListServerAccountIfNeeded)
@@ -1401,7 +1516,9 @@ namespace WebsitePanel.Providers.Mail
                 // Create list server account    
                 if (!listServerAccountObject.New("srv" + mailingListName))
                 {
-                    throw new Exception("Cannot create listserver account to associate with mailing list." + GetErrorMessage(listServerAccountObject.LastErr));
+                    var ex = new Exception("Cannot create listserver account to associate with mailing list." + GetErrorMessage(listServerAccountObject.LastErr));
+                    Log.WriteError(ex);
+                    throw ex;
                 }
 
                 listServerAccountObject.SetProperty("U_Type", IceWarpAccountType.ListServer);
@@ -1524,11 +1641,16 @@ namespace WebsitePanel.Providers.Mail
             listServerAccountObject.SetProperty("L_ListSender", maillist.Originator);
             listServerAccountObject.SetProperty("L_MaxList", maillist.SuppressCommandResponses);
 
-            SaveAccount(accountObject, "listserver account associated with mailing list");
+            SaveAccount(listServerAccountObject, "listserver account associated with mailing list");
         }
 
         public void DeleteList(string maillistName)
         {
+            if (!ListExists(maillistName))
+            {
+                return;
+            }
+
             var accountObject = GetAccountObject(maillistName);
             var listServerAccountObject = FindMatchingListServerAccount(maillistName, false);
 
@@ -1546,7 +1668,9 @@ namespace WebsitePanel.Providers.Mail
                 {
                     if (!listServerAccountObject.Delete())
                     {
-                        throw new Exception("Deleted mail list, but list server account remains: " + GetErrorMessage(listServerAccountObject.LastErr));
+                        var ex = new Exception("Deleted mail list, but list server account remains: " + GetErrorMessage(listServerAccountObject.LastErr));
+                        Log.WriteError(ex);
+                        throw ex;
                     }
                 }
                 else
@@ -1554,16 +1678,26 @@ namespace WebsitePanel.Providers.Mail
                     listServerAccountObject.SetProperty("L_ListFile_Contents", string.Join("\n", lists.Remove(maillistName)));
                     if (!listServerAccountObject.Save())
                     {
-                        throw new Exception("Deleted mail list, but associated list server account could not be updated: " + GetErrorMessage(listServerAccountObject.LastErr));
+                        var ex = new Exception("Deleted mail list, but associated list server account could not be updated: " + GetErrorMessage(listServerAccountObject.LastErr));
+                        Log.WriteError(ex);
+                        throw ex;
                     }
                 }
             }
             else
             {
-                throw new Exception("Cannot delete mail list: " + GetErrorMessage(accountObject.LastErr));
+                Log.WriteError("Cannot delete mail list: " + GetErrorMessage(accountObject.LastErr), null);
             }
+
+            DisposeObject(accountObject);
+            DisposeObject(listServerAccountObject);
         }
 
         #endregion
+
+        public void Dispose()
+        {
+            Marshal.FinalReleaseComObject(_currentApiObject);
+        }
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.MailEnable/MailEnable.vb b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.MailEnable/MailEnable.vb
index 9439198a..c067d2d8 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Mail.MailEnable/MailEnable.vb
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Mail.MailEnable/MailEnable.vb
@@ -2034,8 +2034,9 @@ Public Class MailEnable
         End If
 
         If [String].IsNullOrEmpty(version) = False Then
-            Dim split As String() = version.Split(New [Char]() {"."c})
-            Return split(0).Equals("1") Or split(0).Equals("2") Or split(0).Equals("3") Or split(0).Equals("4") Or split(0).Equals("5") Or split(0).Equals("6") Or split(0).Equals("7")
+            'all versions of MailEnable will be compatible with this, so we are just checking to see if there is a version number
+            'future versions aim to retain compatibility
+            Return True
         Else
             Return False
         End If
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
index 58bc5ab0..233fe6a2 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.TerminalServices.Windows2012/Windows2012.cs
@@ -93,6 +93,13 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
         private const string DisableTaskManagerGpoValueName = "DisableTaskMgr";
         private const string HideCDriveGpoKey = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\Explorer";
         private const string HideCDriveGpoValueName = "NoDrives";
+        private const string RDSSessionGpoKey = @"HKCU\Software\Policies\Microsoft\Windows NT\Terminal Services";
+        private const string RDSSessionGpoValueName = "Shadow";
+        private const string DisableCmdGpoKey = @"HKCU\Software\Policies\Microsoft\Windows\System";
+        private const string DisableCmdGpoValueName = "DisableCMD";
+        private const string DisallowRunParentKey = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\Explorer";
+        private const string DisallowRunKey = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\Explorer\DisallowRun";
+        private const string DisallowRunValueName = "DisallowRun";
 
         #endregion
 
@@ -369,8 +376,12 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
                     AddComputerToCollectionAdComputerGroup(organizationId, collection.Name, rdsServer);
                 }
 
-                CreatePolicy(runSpace, organizationId, string.Format("{0}-administrators", collection.Name), new DirectoryEntry(GetGroupPath(organizationId, collection.Name, GetLocalAdminsGroupName(collection.Name))), collection.Name);
-                CreatePolicy(runSpace, organizationId, string.Format("{0}-users", collection.Name), new DirectoryEntry(GetUsersGroupPath(organizationId, collection.Name)), collection.Name);
+                string collectionComputersPath = GetComputerGroupPath(organizationId, collection.Name);
+                CreatePolicy(runSpace, organizationId, string.Format("{0}-administrators", collection.Name),
+                    new DirectoryEntry(GetGroupPath(organizationId, collection.Name, GetLocalAdminsGroupName(collection.Name))), new DirectoryEntry(collectionComputersPath), collection.Name);
+                CreatePolicy(runSpace, organizationId, string.Format("{0}-users", collection.Name), new DirectoryEntry(GetUsersGroupPath(organizationId, collection.Name))
+                    , new DirectoryEntry(collectionComputersPath), collection.Name);
+                CreateHelpDeskPolicy(runSpace, new DirectoryEntry(GetHelpDeskGroupPath(RDSHelpDeskGroup)), new DirectoryEntry(collectionComputersPath), organizationId, collection.Name);
             }                   
             finally
             {
@@ -516,6 +527,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
                 DeleteGpo(runSpace, string.Format("{0}-administrators", collectionName));
                 DeleteGpo(runSpace, string.Format("{0}-users", collectionName));
+                DeleteHelpDeskPolicy(runSpace, collectionName);
                 var capPolicyName = GetPolicyName(organizationId, collectionName, RdsPolicyTypes.RdCap);
                 var rapPolicyName = GetPolicyName(organizationId, collectionName, RdsPolicyTypes.RdRap);
 
@@ -628,6 +640,14 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             }
         }
 
+        public void MoveSessionHostsToCollectionOU(List<RdsServer> servers, string collectionName, string organizationId)
+        {
+            foreach(var server in servers)
+            {
+                MoveSessionHostToCollectionOU(server.Name, collectionName, organizationId);
+            }
+        }
+
         public void RemoveSessionHostServerFromCollection(string organizationId, string collectionName, RdsServer server)
         {
             Runspace runSpace = null;
@@ -1116,7 +1136,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
         #region GPO   
      
-        public void ApplyGPO(string collectionName, RdsServerSettings serverSettings)
+        public void ApplyGPO(string organizationId, string collectionName, RdsServerSettings serverSettings)
         {
             string administratorsGpo = string.Format("{0}-administrators", collectionName);
             string usersGpo = string.Format("{0}-users", collectionName);
@@ -1124,43 +1144,135 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
             try
             {
-                runspace = OpenRunspace();
+                runspace = OpenRunspace();                
+                string collectionComputersPath = GetComputerGroupPath(organizationId, collectionName);
 
+                CreatePolicy(runspace, organizationId, string.Format("{0}-administrators", collectionName),
+                    new DirectoryEntry(GetGroupPath(organizationId, collectionName, GetLocalAdminsGroupName(collectionName))), new DirectoryEntry(collectionComputersPath), collectionName);
+                CreatePolicy(runspace, organizationId, string.Format("{0}-users", collectionName),
+                    new DirectoryEntry(GetUsersGroupPath(organizationId, collectionName)), new DirectoryEntry(collectionComputersPath), collectionName);
+                CreateHelpDeskPolicy(runspace, new DirectoryEntry(GetHelpDeskGroupPath(RDSHelpDeskGroup)), new DirectoryEntry(collectionComputersPath), organizationId, collectionName);                
                 RemoveRegistryValue(runspace, ScreenSaverGpoKey, administratorsGpo);
                 RemoveRegistryValue(runspace, ScreenSaverGpoKey, usersGpo);                
                 RemoveRegistryValue(runspace, RemoveRestartGpoKey, administratorsGpo);
                 RemoveRegistryValue(runspace, RemoveRestartGpoKey, usersGpo);
                 RemoveRegistryValue(runspace, DisableTaskManagerGpoKey, administratorsGpo);
-                RemoveRegistryValue(runspace, DisableTaskManagerGpoKey, usersGpo);                
+                RemoveRegistryValue(runspace, DisableTaskManagerGpoKey, usersGpo);
+                RemoveRegistryValue(runspace, DisableCmdGpoKey, usersGpo);
+                RemoveRegistryValue(runspace, DisableCmdGpoKey, administratorsGpo);
+                RemoveRegistryValue(runspace, DisallowRunKey, usersGpo);
+                RemoveRegistryValue(runspace, DisallowRunParentKey, usersGpo);
+                RemoveRegistryValue(runspace, DisallowRunKey, administratorsGpo);
+                RemoveRegistryValue(runspace, DisallowRunParentKey, administratorsGpo);
 
-                var setting = serverSettings.Settings.First(s => s.PropertyName.Equals(RdsServerSettings.SCREEN_SAVER_DISABLED));
-                SetRegistryValue(setting, runspace, ScreenSaverGpoKey, administratorsGpo, usersGpo, ScreenSaverValueName, "0", "string");                
+                var setting = serverSettings.Settings.FirstOrDefault(s => s.PropertyName.Equals(RdsServerSettings.SCREEN_SAVER_DISABLED));
+                SetRegistryValue(setting, runspace, ScreenSaverGpoKey, administratorsGpo, usersGpo, ScreenSaverValueName, "0", "string");
 
-                setting = serverSettings.Settings.First(s => s.PropertyName.Equals(RdsServerSettings.REMOVE_SHUTDOWN_RESTART));
-                SetRegistryValue(setting, runspace, RemoveRestartGpoKey, administratorsGpo, usersGpo, RemoveRestartGpoValueName, "1", "DWord");                                
+                setting = serverSettings.Settings.FirstOrDefault(s => s.PropertyName.Equals(RdsServerSettings.REMOVE_SHUTDOWN_RESTART));
+                SetRegistryValue(setting, runspace, RemoveRestartGpoKey, administratorsGpo, usersGpo, RemoveRestartGpoValueName, "1", "DWord");
 
-                setting = serverSettings.Settings.First(s => s.PropertyName.Equals(RdsServerSettings.REMOVE_RUN_COMMAND));
+                setting = serverSettings.Settings.FirstOrDefault(s => s.PropertyName.Equals(RdsServerSettings.REMOVE_RUN_COMMAND));
                 SetRegistryValue(setting, runspace, RemoveRunGpoKey, administratorsGpo, usersGpo, RemoveRunGpoValueName, "1", "DWord");
 
-                setting = serverSettings.Settings.First(s => s.PropertyName.Equals(RdsServerSettings.DISABLE_TASK_MANAGER));
+                setting = serverSettings.Settings.FirstOrDefault(s => s.PropertyName.Equals(RdsServerSettings.DISABLE_TASK_MANAGER));
                 SetRegistryValue(setting, runspace, DisableTaskManagerGpoKey, administratorsGpo, usersGpo, DisableTaskManagerGpoValueName, "1", "DWord");
 
-                setting = serverSettings.Settings.First(s => s.PropertyName.Equals(RdsServerSettings.HIDE_C_DRIVE));
-                SetRegistryValue(setting, runspace, HideCDriveGpoKey, administratorsGpo, usersGpo, HideCDriveGpoValueName, "4", "DWord");                
-                
-                setting = serverSettings.Settings.First(s => s.PropertyName.Equals(RdsServerSettings.LOCK_SCREEN_TIMEOUT));
+                setting = serverSettings.Settings.FirstOrDefault(s => s.PropertyName.Equals(RdsServerSettings.HIDE_C_DRIVE));
+                SetRegistryValue(setting, runspace, HideCDriveGpoKey, administratorsGpo, usersGpo, HideCDriveGpoValueName, "4", "DWord");
+
+                setting = serverSettings.Settings.FirstOrDefault(s => s.PropertyName.Equals(RdsServerSettings.DISABLE_CMD));
+                SetRegistryValue(setting, runspace, DisableCmdGpoKey, administratorsGpo, usersGpo, DisableCmdGpoValueName, "1", "DWord");
+
+                setting = serverSettings.Settings.FirstOrDefault(s => s.PropertyName.Equals(RdsServerSettings.LOCK_SCREEN_TIMEOUT));
                 double result;
 
-                if (!string.IsNullOrEmpty(setting.PropertyValue) && double.TryParse(setting.PropertyValue, out result))
+                if (setting != null && !string.IsNullOrEmpty(setting.PropertyValue) && double.TryParse(setting.PropertyValue, out result))
                 {                    
                     SetRegistryValue(setting, runspace, ScreenSaverTimeoutGpoKey, administratorsGpo, usersGpo, ScreenSaverTimeoutValueName, setting.PropertyValue, "string");                                    
                 }
+
+                SetRdsSessionHostPermissions(runspace, serverSettings, usersGpo, administratorsGpo);
+                SetPowershellPermissions(runspace, serverSettings.Settings.FirstOrDefault(s => s.PropertyName.Equals(RdsServerSettings.REMOVE_POWERSHELL_COMMAND)), usersGpo, administratorsGpo);
             }
             finally
             {
                 CloseRunspace(runspace);
             }
-        }     
+        }
+
+        private void CheckPolicySecurityFiltering(Runspace runspace, string gpoName, DirectoryEntry collectionComputersEntry)
+        {
+            var scripts = new List<string>{
+                string.Format("Get-GPPermissions -Name {0} -TargetName {1} -TargetType group", gpoName, string.Format("'{0}'", ActiveDirectoryUtils.GetADObjectProperty(collectionComputersEntry, "sAMAccountName").ToString()))
+            };
+
+            object[] errors = null;
+            ExecuteRemoteShellCommand(runspace, PrimaryDomainController, scripts, out errors);
+
+            if (errors != null && errors.Any())
+            {
+                scripts = new List<string>{
+                    string.Format("Set-GPPermissions -Name {0} -PermissionLevel gpoapply -TargetName {1} -TargetType group", gpoName, string.Format("'{0}'", ActiveDirectoryUtils.GetADObjectProperty(collectionComputersEntry, "sAMAccountName").ToString()))
+                };
+            }
+
+            ExecuteRemoteShellCommand(runspace, PrimaryDomainController, scripts, out errors);
+        }
+
+        private void SetPowershellPermissions(Runspace runspace, RdsServerSetting setting, string usersGpo, string administratorsGpo)
+        {
+            if (setting != null)
+            {
+                SetRegistryValue(setting, runspace, DisallowRunParentKey, administratorsGpo, usersGpo, DisallowRunValueName, "1", "Dword");
+
+                if (setting.ApplyAdministrators)
+                {
+                    SetRegistryValue(runspace, DisallowRunKey, administratorsGpo, "powershell.exe", "string");
+                }
+
+                if (setting.ApplyUsers)
+                {
+                    SetRegistryValue(runspace, DisallowRunKey, usersGpo, "powershell.exe", "string");
+                }
+            }
+        }
+
+        private void SetRdsSessionHostPermissions(Runspace runspace, RdsServerSettings settings, string usersGpo, string administratorsGpo)
+        {
+            var viewSetting = settings.Settings.FirstOrDefault(s => s.PropertyName.Equals(RdsServerSettings.RDS_VIEW_WITHOUT_PERMISSION));
+            var controlSetting = settings.Settings.FirstOrDefault(s => s.PropertyName.Equals(RdsServerSettings.RDS_CONTROL_WITHOUT_PERMISSION));
+
+            if (viewSetting == null || controlSetting == null)
+            {
+                return;
+            }
+
+            if (controlSetting.ApplyUsers)
+            {
+                SetRegistryValue(runspace, RDSSessionGpoKey, usersGpo, "2", RDSSessionGpoValueName, "DWord");
+            }
+            else if (viewSetting.ApplyUsers)
+            {
+                SetRegistryValue(runspace, RDSSessionGpoKey, usersGpo, "4", RDSSessionGpoValueName, "DWord");
+            }
+            else
+            {
+                SetRegistryValue(runspace, RDSSessionGpoKey, usersGpo, "3", RDSSessionGpoValueName, "DWord");
+            }
+
+            if (controlSetting.ApplyAdministrators)
+            {
+                SetRegistryValue(runspace, RDSSessionGpoKey, administratorsGpo, "2", RDSSessionGpoValueName, "DWord");
+            }
+            else if (viewSetting.ApplyAdministrators)
+            {
+                SetRegistryValue(runspace, RDSSessionGpoKey, administratorsGpo, "4", RDSSessionGpoValueName, "DWord");
+            }
+            else
+            {
+                SetRegistryValue(runspace, RDSSessionGpoKey, administratorsGpo, "3", RDSSessionGpoValueName, "DWord");
+            }
+        }
    
         private void RemoveRegistryValue(Runspace runspace, string key, string gpoName)
         {
@@ -1173,6 +1285,11 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
         private void SetRegistryValue(RdsServerSetting setting, Runspace runspace, string key, string administratorsGpo, string usersGpo, string valueName, string value, string type)
         {
+            if (setting == null)
+            {
+                return;
+            }
+
             if (setting.ApplyAdministrators)
             {
                 SetRegistryValue(runspace, key, administratorsGpo, value, valueName, type);
@@ -1184,6 +1301,17 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             }
         }
 
+        private void SetRegistryValue(Runspace runspace, string key, string gpoName, string value, string type)
+        {
+            Command cmd = new Command("Set-GPRegistryValue");
+            cmd.Parameters.Add("Name", gpoName);
+            cmd.Parameters.Add("Key", string.Format("\"{0}\"", key));
+            cmd.Parameters.Add("Value", value);            
+            cmd.Parameters.Add("Type", type);
+
+            Collection<PSObject> result = ExecuteRemoteShellCommand(runspace, PrimaryDomainController, cmd);
+        }
+
         private void SetRegistryValue(Runspace runspace, string key, string gpoName, string value, string valueName, string type)
         {
             Command cmd = new Command("Set-GPRegistryValue");
@@ -1196,19 +1324,46 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             Collection<PSObject> result = ExecuteRemoteShellCommand(runspace, PrimaryDomainController, cmd);
         }
 
-        private string CreatePolicy(Runspace runspace, string organizationId, string gpoName, DirectoryEntry entry, string collectionName)
+        private void CreateHelpDeskPolicy(Runspace runspace, DirectoryEntry entry, DirectoryEntry collectionComputersEntry, string organizationId, string collectionName)
+        {
+            string gpoName = string.Format("{0}-HelpDesk", collectionName);
+            string gpoId = GetPolicyId(runspace, gpoName);
+
+            if (string.IsNullOrEmpty(gpoId))
+            {
+                gpoId = CreateAndLinkPolicy(runspace, gpoName, organizationId, collectionName);
+                SetPolicyPermissions(runspace, gpoName, entry, collectionComputersEntry);
+                SetRegistryValue(runspace, RDSSessionGpoKey, gpoName, "2", RDSSessionGpoValueName, "DWord");
+            }
+            else
+            {
+                CheckPolicySecurityFiltering(runspace, gpoName, collectionComputersEntry);
+            }
+        }
+
+        private string CreatePolicy(Runspace runspace, string organizationId, string gpoName, DirectoryEntry entry, DirectoryEntry collectionComputersEntry, string collectionName)
         {
             string gpoId = GetPolicyId(runspace, gpoName);
 
             if (string.IsNullOrEmpty(gpoId))
             {
                 gpoId = CreateAndLinkPolicy(runspace, gpoName, organizationId, collectionName);
-                SetPolicyPermissions(runspace, gpoName, entry);
+                SetPolicyPermissions(runspace, gpoName, entry, collectionComputersEntry);
+            }
+            else
+            {
+                CheckPolicySecurityFiltering(runspace, gpoName, collectionComputersEntry);
             }
 
             return gpoId;
         }
 
+        private void DeleteHelpDeskPolicy(Runspace runspace, string collectionName)
+        {
+            string gpoName = string.Format("{0}-HelpDesk", collectionName);
+            DeleteGpo(runspace, gpoName);
+        }
+
         private void DeleteGpo(Runspace runspace, string gpoName)
         {
             Command cmd = new Command("Remove-GPO");
@@ -1217,12 +1372,13 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
             Collection<PSObject> result = ExecuteRemoteShellCommand(runspace, PrimaryDomainController, cmd);
         }
 
-        private void SetPolicyPermissions(Runspace runspace, string gpoName, DirectoryEntry entry)
+        private void SetPolicyPermissions(Runspace runspace, string gpoName, DirectoryEntry entry, DirectoryEntry collectionComputersEntry)
         {
             var scripts = new List<string>
             {
                 string.Format("Set-GPPermissions -Name {0} -Replace -PermissionLevel None -TargetName 'Authenticated Users' -TargetType group", gpoName),
-                string.Format("Set-GPPermissions -Name {0} -PermissionLevel gpoapply -TargetName {1} -TargetType group", gpoName, string.Format("'{0}'", ActiveDirectoryUtils.GetADObjectProperty(entry, "sAMAccountName").ToString()))
+                string.Format("Set-GPPermissions -Name {0} -PermissionLevel gpoapply -TargetName {1} -TargetType group", gpoName, string.Format("'{0}'", ActiveDirectoryUtils.GetADObjectProperty(entry, "sAMAccountName").ToString())),
+                string.Format("Set-GPPermissions -Name {0} -PermissionLevel gpoapply -TargetName {1} -TargetType group", gpoName, string.Format("'{0}'", ActiveDirectoryUtils.GetADObjectProperty(collectionComputersEntry, "sAMAccountName").ToString()))
             };
 
             object[] errors = null;
@@ -1235,7 +1391,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
             try
             {
-                var entry = new DirectoryEntry(GetCollectionOUPath(organizationId, string.Format("{0}-OU", collectionName)));
+                var entry = new DirectoryEntry(GetOrganizationPath(organizationId));
                 var distinguishedName = string.Format("\"{0}\"", ActiveDirectoryUtils.GetADObjectProperty(entry, "DistinguishedName"));
 
                 Command cmd = new Command("New-GPO");
@@ -1294,6 +1450,32 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
 
         #endregion
 
+        #region Shadow Session
+
+        public void ShadowSession(string sessionId, bool control)
+        {
+            Runspace runspace = null;
+
+            try
+            {
+                runspace = OpenRunspace();
+
+                var scripts = new List<string>
+                {
+                    string.Format("mstsc /Shadow:{0}{1}", sessionId, control ? " /Control" : "")
+                };
+
+                object[] errors = null;
+                ExecuteShellCommand(runspace, scripts, out errors);
+            }
+            finally
+            {
+                CloseRunspace(runspace);
+            }
+        }
+
+        #endregion
+
         #region RDS Help Desk
 
         private string GetHelpDeskGroupPath(string groupName)
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Constants.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Constants.cs
index b487d4cf..acdcf69c 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Constants.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Constants.cs
@@ -20,5 +20,8 @@ namespace WebsitePanel.Providers.Virtualization
 
         public const Int64 Size1G = 0x40000000;
         public const Int64 Size1M = 0x100000;
+
+        public const string KVP_RAM_SUMMARY_KEY = "VM-RAM-Summary";
+        public const string KVP_HDD_SUMMARY_KEY = "VM-HDD-Summary";
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Extensions/PSObjectExtension.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Extensions/PSObjectExtension.cs
index 33426fe2..ba8df901 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Extensions/PSObjectExtension.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Extensions/PSObjectExtension.cs
@@ -36,6 +36,10 @@ namespace WebsitePanel.Providers.Virtualization
         {
             return obj.Members[name].Value == null ? "" : obj.Members[name].Value.ToString();
         }
+        public static bool GetBool(this PSObject obj, string name)
+        {
+            return Convert.ToBoolean(obj.Members[name].Value);
+        }
         
         #endregion
 
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Helpers/MemoryHelper.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Helpers/MemoryHelper.cs
new file mode 100644
index 00000000..035da473
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Helpers/MemoryHelper.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Management.Automation;
+using System.Management.Automation.Runspaces;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WebsitePanel.Providers.Virtualization
+{
+    public static class MemoryHelper
+    {
+        public static DynamicMemory GetDynamicMemory(PowerShellManager powerShell, string vmName)
+        {
+            DynamicMemory info = null;
+
+            Command cmd = new Command("Get-VMMemory");
+            cmd.Parameters.Add("VMName", vmName);
+            Collection<PSObject> result = powerShell.Execute(cmd);
+
+            if (result != null && result.Count > 0)
+            {
+                info = new DynamicMemory();
+                info.Enabled = result[0].GetBool("DynamicMemoryEnabled");
+                info.Minimum = Convert.ToInt32(result[0].GetLong("Minimum") / Constants.Size1M);
+                info.Maximum = Convert.ToInt32(result[0].GetLong("Maximum") / Constants.Size1M);
+                info.Buffer = Convert.ToInt32(result[0].GetInt("Buffer"));
+                info.Priority = Convert.ToInt32(result[0].GetInt("Priority"));
+            }
+
+            return info;
+        }
+
+        public static void Update(PowerShellManager powerShell, VirtualMachine vm, int ramMb, DynamicMemory dynamicMemory)
+        {
+            Command cmd = new Command("Set-VMMemory");
+
+            cmd.Parameters.Add("VMName", vm.Name);
+            cmd.Parameters.Add("StartupBytes", ramMb * Constants.Size1M);
+
+            if (dynamicMemory != null && dynamicMemory.Enabled)
+            {
+                cmd.Parameters.Add("DynamicMemoryEnabled", true);
+                cmd.Parameters.Add("MinimumBytes", dynamicMemory.Minimum * Constants.Size1M);
+                cmd.Parameters.Add("MaximumBytes", dynamicMemory.Maximum * Constants.Size1M);
+                cmd.Parameters.Add("Buffer", dynamicMemory.Buffer);
+                cmd.Parameters.Add("Priority", dynamicMemory.Priority);
+            }
+            else
+            {
+                cmd.Parameters.Add("DynamicMemoryEnabled", false);
+            }
+
+            powerShell.Execute(cmd, true);
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Helpers/VirtualMachineHelper.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Helpers/VirtualMachineHelper.cs
index 30aad925..68cd50ac 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Helpers/VirtualMachineHelper.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Helpers/VirtualMachineHelper.cs
@@ -34,7 +34,6 @@ namespace WebsitePanel.Providers.Virtualization
 
         public static int GetVMProcessors(PowerShellManager powerShell, string name)
         {
-
             int procs = 0;
 
             Command cmd = new Command("Get-VMProcessor");
@@ -50,48 +49,17 @@ namespace WebsitePanel.Providers.Virtualization
             return procs;
         }
 
-        public static MemoryInfo GetVMMemory(PowerShellManager powerShell, string name)
-        {
-            MemoryInfo info = new MemoryInfo();
-
-            Command cmd = new Command("Get-VMMemory");
-
-            cmd.Parameters.Add("VMName", name);
-
-            Collection<PSObject> result = powerShell.Execute(cmd, true);
-            if (result != null && result.Count > 0)
-            {
-                info.DynamicMemoryEnabled = Convert.ToBoolean(result[0].GetProperty("DynamicMemoryEnabled"));
-                info.Startup = Convert.ToInt32(Convert.ToInt64(result[0].GetProperty("Startup")) / Constants.Size1M);
-                info.Minimum = Convert.ToInt32(Convert.ToInt64(result[0].GetProperty("Minimum")) / Constants.Size1M);
-                info.Maximum = Convert.ToInt32(Convert.ToInt64(result[0].GetProperty("Maximum")) / Constants.Size1M);
-                info.Buffer = Convert.ToInt32(result[0].GetProperty("Buffer"));
-                info.Priority = Convert.ToInt32(result[0].GetProperty("Priority"));
-            }
-            return info;
-        }
-
         public static void UpdateProcessors(PowerShellManager powerShell, VirtualMachine vm, int cpuCores, int cpuLimitSettings, int cpuReserveSettings, int cpuWeightSettings)
         {
             Command cmd = new Command("Set-VMProcessor");
 
             cmd.Parameters.Add("VMName", vm.Name);
             cmd.Parameters.Add("Count", cpuCores);
-            cmd.Parameters.Add("Maximum", Convert.ToInt64(cpuLimitSettings * 1000));
-            cmd.Parameters.Add("Reserve", Convert.ToInt64(cpuReserveSettings * 1000));
+            cmd.Parameters.Add("Maximum", cpuLimitSettings);
+            cmd.Parameters.Add("Reserve", cpuReserveSettings);
             cmd.Parameters.Add("RelativeWeight", cpuWeightSettings);
 
             powerShell.Execute(cmd, true);
         }
-
-        public static void UpdateMemory(PowerShellManager powerShell, VirtualMachine vm, long ramMB)
-        {
-            Command cmd = new Command("Set-VMMemory");
-
-            cmd.Parameters.Add("VMName", vm.Name);
-            cmd.Parameters.Add("StartupBytes", ramMB * Constants.Size1M);
-
-            powerShell.Execute(cmd, true);
-        }
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/HyperV2012R2.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/HyperV2012R2.cs
index cb14f1d2..9cfaba40 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/HyperV2012R2.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/HyperV2012R2.cs
@@ -143,34 +143,31 @@ namespace WebsitePanel.Providers.Virtualization
             try
             {
                 Command cmd = new Command("Get-VM");
-
                 cmd.Parameters.Add("Id", vmId);
-
                 Collection<PSObject> result = PowerShell.Execute(cmd, true);
+
                 if (result != null && result.Count > 0)
                 {
-                    vm.Name = result[0].GetProperty("Name").ToString();
+                    vm.Name = result[0].GetString("Name");
                     vm.State = result[0].GetEnum<VirtualMachineState>("State");
                     vm.CpuUsage = ConvertNullableToInt32(result[0].GetProperty("CpuUsage"));
+                    // This does not truly give the RAM usage, only the memory assigned to the VPS
+                    // Lets handle detection of total memory and usage else where. SetUsagesFromKVP method have been made for it.
                     vm.RamUsage = Convert.ToInt32(ConvertNullableToInt64(result[0].GetProperty("MemoryAssigned")) / Constants.Size1M);
+                    vm.RamSize = Convert.ToInt32(ConvertNullableToInt64(result[0].GetProperty("MemoryStartup")) / Constants.Size1M);
                     vm.Uptime = Convert.ToInt64(result[0].GetProperty<TimeSpan>("UpTime").TotalMilliseconds);
                     vm.Status = result[0].GetProperty("Status").ToString();
                     vm.ReplicationState = result[0].GetProperty("ReplicationState").ToString();
                     vm.Generation = result[0].GetInt("Generation");
                     vm.ProcessorCount = result[0].GetInt("ProcessorCount");
                     vm.ParentSnapshotId = result[0].GetString("ParentSnapshotId");
-
                     vm.Heartbeat = VirtualMachineHelper.GetVMHeartBeatStatus(PowerShell, vm.Name);
-
                     vm.CreatedDate = DateTime.Now;
 
                     if (extendedInfo)
                     {
                         vm.CpuCores = VirtualMachineHelper.GetVMProcessors(PowerShell, vm.Name);
 
-                        MemoryInfo memoryInfo = VirtualMachineHelper.GetVMMemory(PowerShell, vm.Name);
-                        vm.RamSize = memoryInfo.Startup;
-
                         // BIOS 
                         BiosInfo biosInfo = BiosHelper.Get(PowerShell, vm.Name, vm.Generation);
                         vm.NumLockEnabled = biosInfo.NumLockEnabled;
@@ -192,6 +189,11 @@ namespace WebsitePanel.Providers.Virtualization
                         // network adapters
                         vm.Adapters = NetworkAdapterHelper.Get(PowerShell, vm.Name);
                     }
+
+                    vm.DynamicMemory = MemoryHelper.GetDynamicMemory(PowerShell, vm.Name);
+
+                    // If it is possible get usage ram and usage hdd data from KVP
+                    SetUsagesFromKVP(ref vm);
                 }
             }
             catch (Exception ex)
@@ -365,7 +367,7 @@ namespace WebsitePanel.Providers.Virtualization
                 DvdDriveHelper.Update(PowerShell, realVm, vm.DvdDriveInstalled); // Dvd should be before bios because bios sets boot order
                 BiosHelper.Update(PowerShell, realVm, vm.BootFromCD, vm.NumLockEnabled);
                 VirtualMachineHelper.UpdateProcessors(PowerShell, realVm, vm.CpuCores, CpuLimitSettings, CpuReserveSettings, CpuWeightSettings);
-                VirtualMachineHelper.UpdateMemory(PowerShell, realVm, vm.RamSize);
+                MemoryHelper.Update(PowerShell, realVm, vm.RamSize, vm.DynamicMemory);
                 NetworkAdapterHelper.Update(PowerShell, vm);
             }
             catch (Exception ex)
@@ -504,19 +506,21 @@ namespace WebsitePanel.Providers.Virtualization
             if (vm.State != VirtualMachineState.Saved && vm.State != VirtualMachineState.Off)
                 throw new Exception("The virtual computer system must be in the powered off or saved state prior to calling Destroy method.");
 
-            // Delete network adapters and network switchesw
+            // Delete network adapters and network switches
             foreach (var networkAdapter in vm.Adapters)
             {
                 NetworkAdapterHelper.Delete(PowerShell, vm.Name, networkAdapter);
 
-                if (!string.IsNullOrEmpty(networkAdapter.SwitchName))
-                    DeleteSwitch(networkAdapter.SwitchName);
+                // If more than 1 VM are assigned to the same switch, deleting the virtual machine also deletes the switch which takes other VM instances off line
+                // There may be a reason for this that I am not aware of?
+                //if (!string.IsNullOrEmpty(networkAdapter.SwitchName))
+                    //DeleteSwitch(networkAdapter.SwitchName);
             }
 
             Command cmdSet = new Command("Remove-VM");
             cmdSet.Parameters.Add("Name", vm.Name);
             cmdSet.Parameters.Add("Force");
-            PowerShell.Execute(cmdSet, false, true);
+            PowerShell.Execute(cmdSet, true, true);
 
             return JobHelper.CreateSuccessResult(ReturnCode.JobStarted);
         }
@@ -782,10 +786,11 @@ namespace WebsitePanel.Providers.Virtualization
                 
                 Command cmd = new Command("Get-VMSwitch");
 
-                if (!string.IsNullOrEmpty(computerName)) cmd.Parameters.Add("ComputerName", computerName);
+                // Not needed as the PowerShellManager adds the computer name
+                //if (!string.IsNullOrEmpty(computerName)) cmd.Parameters.Add("ComputerName", computerName);
                 if (!string.IsNullOrEmpty(type)) cmd.Parameters.Add("SwitchType", type);
 
-                Collection<PSObject> result = PowerShell.Execute(cmd, false, true);
+                Collection<PSObject> result = PowerShell.Execute(cmd, true, true);
 
                 foreach (PSObject current in result)
                 {
@@ -1797,6 +1802,40 @@ namespace WebsitePanel.Providers.Virtualization
 
             return jobCompleted;
         }
+        private void SetUsagesFromKVP(ref VirtualMachine vm)
+        {
+            // Use the WebsitePanel VMConfig Windows service to get the RAM usage as well as the HDD usage / sizes
+            List<KvpExchangeDataItem> vmKvps = GetKVPItems(vm.VirtualMachineId);
+            foreach (KvpExchangeDataItem vmKvp in vmKvps)
+            {
+                // RAM
+                if (vmKvp.Name == Constants.KVP_RAM_SUMMARY_KEY)
+                {
+                    string[] ram = vmKvp.Data.Split(':');
+                    int freeRam = Int32.Parse(ram[0]);
+                    int availRam = Int32.Parse(ram[1]);
+
+                    vm.RamUsage = availRam - freeRam;
+                }
+
+                // HDD
+                if (vmKvp.Name == Constants.KVP_HDD_SUMMARY_KEY)
+                {
+                    string[] disksArray = vmKvp.Data.Split(';');
+                    vm.HddLogicalDisks = new LogicalDisk[disksArray.Length];
+                    for (int i = 0; i < disksArray.Length; i++)
+                    {
+                        string[] disk = disksArray[i].Split(':');
+                        vm.HddLogicalDisks[i] = new LogicalDisk
+                        {
+                            DriveLetter = disk[0],
+                            FreeSpace = Int32.Parse(disk[1]),
+                            Size = Int32.Parse(disk[2])
+                        };
+                    }
+                }
+            }
+        }
         #endregion
 
         #region Remote File Methods
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/PowerShellManager.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/PowerShellManager.cs
index 1f63b104..e55191f3 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/PowerShellManager.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/PowerShellManager.cs
@@ -4,8 +4,6 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Management.Automation;
 using System.Management.Automation.Runspaces;
-using System.Text;
-using System.Threading.Tasks;
 using WebsitePanel.Providers.HostedSolution;
 
 namespace WebsitePanel.Providers.Virtualization
@@ -65,7 +63,6 @@ namespace WebsitePanel.Providers.Virtualization
 
         public Collection<PSObject> Execute(Command cmd, bool addComputerNameParameter)
         {
-            object[] errors;
             return Execute(cmd, addComputerNameParameter, false);
         }
 
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/WebsitePanel.Providers.Virtualization.HyperV2012R2.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/WebsitePanel.Providers.Virtualization.HyperV2012R2.csproj
index aa20c15c..814d9693 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/WebsitePanel.Providers.Virtualization.HyperV2012R2.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/WebsitePanel.Providers.Virtualization.HyperV2012R2.csproj
@@ -57,6 +57,7 @@
     <Compile Include="Extensions\PSObjectExtension.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
     <Compile Include="Helpers\BiosHelper.cs" />
+    <Compile Include="Helpers\MemoryHelper.cs" />
     <Compile Include="Helpers\VdsHelper.cs" />
     <Compile Include="Helpers\HardDriveHelper.cs" />
     <Compile Include="Helpers\NetworkAdapterHelper.cs" />
diff --git a/WebsitePanel/Sources/WebsitePanel.Server.Client/EnterpriseStorageProxy.cs b/WebsitePanel/Sources/WebsitePanel.Server.Client/EnterpriseStorageProxy.cs
index f43357e6..2fd82337 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server.Client/EnterpriseStorageProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server.Client/EnterpriseStorageProxy.cs
@@ -11,10 +11,6 @@
 // 
 // This source code was auto-generated by wsdl, Version=2.0.50727.3038.
 // 
-
-using WebsitePanel.Providers.OS;
-using WebsitePanel.Providers.Web;
-
 namespace WebsitePanel.Providers.EnterpriseStorage {
     using System.Xml.Serialization;
     using System.Web.Services;
@@ -22,6 +18,8 @@ namespace WebsitePanel.Providers.EnterpriseStorage {
     using System.Web.Services.Protocols;
     using System;
     using System.Diagnostics;
+    using WebsitePanel.Providers.OS;
+    using WebsitePanel.Providers.Web;
     
     
     /// <remarks/>
@@ -36,6 +34,8 @@ namespace WebsitePanel.Providers.EnterpriseStorage {
         
         private System.Threading.SendOrPostCallback GetFoldersOperationCompleted;
         
+        private System.Threading.SendOrPostCallback GetFoldersWithoutFrsmOperationCompleted;
+        
         private System.Threading.SendOrPostCallback GetFolderOperationCompleted;
         
         private System.Threading.SendOrPostCallback CreateFolderOperationCompleted;
@@ -60,6 +60,9 @@ namespace WebsitePanel.Providers.EnterpriseStorage {
         /// <remarks/>
         public event GetFoldersCompletedEventHandler GetFoldersCompleted;
         
+        /// <remarks/>
+        public event GetFoldersWithoutFrsmCompletedEventHandler GetFoldersWithoutFrsmCompleted;
+        
         /// <remarks/>
         public event GetFolderCompletedEventHandler GetFolderCompleted;
         
@@ -129,6 +132,51 @@ namespace WebsitePanel.Providers.EnterpriseStorage {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/GetFoldersWithoutFrsm", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public SystemFile[] GetFoldersWithoutFrsm(string organizationId, WebDavSetting[] settings) {
+            object[] results = this.Invoke("GetFoldersWithoutFrsm", new object[] {
+                        organizationId,
+                        settings});
+            return ((SystemFile[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginGetFoldersWithoutFrsm(string organizationId, WebDavSetting[] settings, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("GetFoldersWithoutFrsm", new object[] {
+                        organizationId,
+                        settings}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public SystemFile[] EndGetFoldersWithoutFrsm(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((SystemFile[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void GetFoldersWithoutFrsmAsync(string organizationId, WebDavSetting[] settings) {
+            this.GetFoldersWithoutFrsmAsync(organizationId, settings, null);
+        }
+        
+        /// <remarks/>
+        public void GetFoldersWithoutFrsmAsync(string organizationId, WebDavSetting[] settings, object userState) {
+            if ((this.GetFoldersWithoutFrsmOperationCompleted == null)) {
+                this.GetFoldersWithoutFrsmOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetFoldersWithoutFrsmOperationCompleted);
+            }
+            this.InvokeAsync("GetFoldersWithoutFrsm", new object[] {
+                        organizationId,
+                        settings}, this.GetFoldersWithoutFrsmOperationCompleted, userState);
+        }
+        
+        private void OnGetFoldersWithoutFrsmOperationCompleted(object arg) {
+            if ((this.GetFoldersWithoutFrsmCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.GetFoldersWithoutFrsmCompleted(this, new GetFoldersWithoutFrsmCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/GetFolder", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
@@ -544,6 +592,32 @@ namespace WebsitePanel.Providers.EnterpriseStorage {
         }
     }
     
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void GetFoldersWithoutFrsmCompletedEventHandler(object sender, GetFoldersWithoutFrsmCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class GetFoldersWithoutFrsmCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal GetFoldersWithoutFrsmCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public SystemFile[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((SystemFile[])(this.results[0]));
+            }
+        }
+    }
+    
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void GetFolderCompletedEventHandler(object sender, GetFolderCompletedEventArgs e);
diff --git a/WebsitePanel/Sources/WebsitePanel.Server.Client/HostedSharePointServerEntProxy.cs b/WebsitePanel/Sources/WebsitePanel.Server.Client/HostedSharePointServerEntProxy.cs
new file mode 100644
index 00000000..3b465943
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Server.Client/HostedSharePointServerEntProxy.cs
@@ -0,0 +1,926 @@
+// Copyright (c) 2015, 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.
+//     Runtime Version:2.0.50727.8657
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+// 
+// This source code was auto-generated by wsdl, Version=2.0.50727.3038.
+// 
+namespace WebsitePanel.Providers.HostedSolution {
+    using System.Xml.Serialization;
+    using System.Web.Services;
+    using System.ComponentModel;
+    using System.Web.Services.Protocols;
+    using System;
+    using System.Diagnostics;
+    using WebsitePanel.Providers.SharePoint;
+    
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Web.Services.WebServiceBindingAttribute(Name="HostedSharePointServerEntSoap", Namespace="http://smbsaas/websitepanel/server/")]
+    [System.Xml.Serialization.XmlIncludeAttribute(typeof(ServiceProviderItem))]
+    public partial class HostedSharePointServerEnt : Microsoft.Web.Services3.WebServicesClientProtocol {
+        
+        public ServiceProviderSettingsSoapHeader ServiceProviderSettingsSoapHeaderValue;
+        
+        private System.Threading.SendOrPostCallback Enterprise_GetSupportedLanguagesOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_GetSiteCollectionsOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_GetSiteCollectionOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_CreateSiteCollectionOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_UpdateQuotasOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_CalculateSiteCollectionsDiskSpaceOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_DeleteSiteCollectionOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_BackupSiteCollectionOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_RestoreSiteCollectionOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_GetTempFileBinaryChunkOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_AppendTempFileBinaryChunkOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_GetSiteCollectionSizeOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback Enterprise_SetPeoplePickerOuOperationCompleted;
+        
+        /// <remarks/>
+        public HostedSharePointServerEnt() {
+            this.Url = "http://localhost:9003/HostedSharePointServerEnt.asmx";
+        }
+        
+        /// <remarks/>
+        public event Enterprise_GetSupportedLanguagesCompletedEventHandler Enterprise_GetSupportedLanguagesCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_GetSiteCollectionsCompletedEventHandler Enterprise_GetSiteCollectionsCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_GetSiteCollectionCompletedEventHandler Enterprise_GetSiteCollectionCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_CreateSiteCollectionCompletedEventHandler Enterprise_CreateSiteCollectionCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_UpdateQuotasCompletedEventHandler Enterprise_UpdateQuotasCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_CalculateSiteCollectionsDiskSpaceCompletedEventHandler Enterprise_CalculateSiteCollectionsDiskSpaceCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_DeleteSiteCollectionCompletedEventHandler Enterprise_DeleteSiteCollectionCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_BackupSiteCollectionCompletedEventHandler Enterprise_BackupSiteCollectionCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_RestoreSiteCollectionCompletedEventHandler Enterprise_RestoreSiteCollectionCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_GetTempFileBinaryChunkCompletedEventHandler Enterprise_GetTempFileBinaryChunkCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_AppendTempFileBinaryChunkCompletedEventHandler Enterprise_AppendTempFileBinaryChunkCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_GetSiteCollectionSizeCompletedEventHandler Enterprise_GetSiteCollectionSizeCompleted;
+        
+        /// <remarks/>
+        public event Enterprise_SetPeoplePickerOuCompletedEventHandler Enterprise_SetPeoplePickerOuCompleted;
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/Enterprise_GetSupportedLanguages", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public int[] Enterprise_GetSupportedLanguages() {
+            object[] results = this.Invoke("Enterprise_GetSupportedLanguages", new object[0]);
+            return ((int[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_GetSupportedLanguages(System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_GetSupportedLanguages", new object[0], callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public int[] EndEnterprise_GetSupportedLanguages(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((int[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetSupportedLanguagesAsync() {
+            this.Enterprise_GetSupportedLanguagesAsync(null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetSupportedLanguagesAsync(object userState) {
+            if ((this.Enterprise_GetSupportedLanguagesOperationCompleted == null)) {
+                this.Enterprise_GetSupportedLanguagesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_GetSupportedLanguagesOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_GetSupportedLanguages", new object[0], this.Enterprise_GetSupportedLanguagesOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_GetSupportedLanguagesOperationCompleted(object arg) {
+            if ((this.Enterprise_GetSupportedLanguagesCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_GetSupportedLanguagesCompleted(this, new Enterprise_GetSupportedLanguagesCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/Enterprise_GetSiteCollections", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public SharePointEnterpriseSiteCollection[] Enterprise_GetSiteCollections() {
+            object[] results = this.Invoke("Enterprise_GetSiteCollections", new object[0]);
+            return ((SharePointEnterpriseSiteCollection[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_GetSiteCollections(System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_GetSiteCollections", new object[0], callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public SharePointEnterpriseSiteCollection[] EndEnterprise_GetSiteCollections(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((SharePointEnterpriseSiteCollection[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetSiteCollectionsAsync() {
+            this.Enterprise_GetSiteCollectionsAsync(null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetSiteCollectionsAsync(object userState) {
+            if ((this.Enterprise_GetSiteCollectionsOperationCompleted == null)) {
+                this.Enterprise_GetSiteCollectionsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_GetSiteCollectionsOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_GetSiteCollections", new object[0], this.Enterprise_GetSiteCollectionsOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_GetSiteCollectionsOperationCompleted(object arg) {
+            if ((this.Enterprise_GetSiteCollectionsCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_GetSiteCollectionsCompleted(this, new Enterprise_GetSiteCollectionsCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/Enterprise_GetSiteCollection", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public SharePointEnterpriseSiteCollection Enterprise_GetSiteCollection(string url) {
+            object[] results = this.Invoke("Enterprise_GetSiteCollection", new object[] {
+                        url});
+            return ((SharePointEnterpriseSiteCollection)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_GetSiteCollection(string url, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_GetSiteCollection", new object[] {
+                        url}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public SharePointEnterpriseSiteCollection EndEnterprise_GetSiteCollection(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((SharePointEnterpriseSiteCollection)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetSiteCollectionAsync(string url) {
+            this.Enterprise_GetSiteCollectionAsync(url, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetSiteCollectionAsync(string url, object userState) {
+            if ((this.Enterprise_GetSiteCollectionOperationCompleted == null)) {
+                this.Enterprise_GetSiteCollectionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_GetSiteCollectionOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_GetSiteCollection", new object[] {
+                        url}, this.Enterprise_GetSiteCollectionOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_GetSiteCollectionOperationCompleted(object arg) {
+            if ((this.Enterprise_GetSiteCollectionCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_GetSiteCollectionCompleted(this, new Enterprise_GetSiteCollectionCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/Enterprise_CreateSiteCollection", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void Enterprise_CreateSiteCollection(SharePointEnterpriseSiteCollection siteCollection) {
+            this.Invoke("Enterprise_CreateSiteCollection", new object[] {
+                        siteCollection});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_CreateSiteCollection(SharePointEnterpriseSiteCollection siteCollection, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_CreateSiteCollection", new object[] {
+                        siteCollection}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndEnterprise_CreateSiteCollection(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_CreateSiteCollectionAsync(SharePointEnterpriseSiteCollection siteCollection) {
+            this.Enterprise_CreateSiteCollectionAsync(siteCollection, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_CreateSiteCollectionAsync(SharePointEnterpriseSiteCollection siteCollection, object userState) {
+            if ((this.Enterprise_CreateSiteCollectionOperationCompleted == null)) {
+                this.Enterprise_CreateSiteCollectionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_CreateSiteCollectionOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_CreateSiteCollection", new object[] {
+                        siteCollection}, this.Enterprise_CreateSiteCollectionOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_CreateSiteCollectionOperationCompleted(object arg) {
+            if ((this.Enterprise_CreateSiteCollectionCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_CreateSiteCollectionCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/Enterprise_UpdateQuotas", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void Enterprise_UpdateQuotas(string url, long maxSize, long warningSize) {
+            this.Invoke("Enterprise_UpdateQuotas", new object[] {
+                        url,
+                        maxSize,
+                        warningSize});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_UpdateQuotas(string url, long maxSize, long warningSize, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_UpdateQuotas", new object[] {
+                        url,
+                        maxSize,
+                        warningSize}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndEnterprise_UpdateQuotas(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_UpdateQuotasAsync(string url, long maxSize, long warningSize) {
+            this.Enterprise_UpdateQuotasAsync(url, maxSize, warningSize, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_UpdateQuotasAsync(string url, long maxSize, long warningSize, object userState) {
+            if ((this.Enterprise_UpdateQuotasOperationCompleted == null)) {
+                this.Enterprise_UpdateQuotasOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_UpdateQuotasOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_UpdateQuotas", new object[] {
+                        url,
+                        maxSize,
+                        warningSize}, this.Enterprise_UpdateQuotasOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_UpdateQuotasOperationCompleted(object arg) {
+            if ((this.Enterprise_UpdateQuotasCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_UpdateQuotasCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/Enterprise_CalculateSiteCollectionsDiskSpace", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public SharePointSiteDiskSpace[] Enterprise_CalculateSiteCollectionsDiskSpace(string[] urls) {
+            object[] results = this.Invoke("Enterprise_CalculateSiteCollectionsDiskSpace", new object[] {
+                        urls});
+            return ((SharePointSiteDiskSpace[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_CalculateSiteCollectionsDiskSpace(string[] urls, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_CalculateSiteCollectionsDiskSpace", new object[] {
+                        urls}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public SharePointSiteDiskSpace[] EndEnterprise_CalculateSiteCollectionsDiskSpace(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((SharePointSiteDiskSpace[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_CalculateSiteCollectionsDiskSpaceAsync(string[] urls) {
+            this.Enterprise_CalculateSiteCollectionsDiskSpaceAsync(urls, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_CalculateSiteCollectionsDiskSpaceAsync(string[] urls, object userState) {
+            if ((this.Enterprise_CalculateSiteCollectionsDiskSpaceOperationCompleted == null)) {
+                this.Enterprise_CalculateSiteCollectionsDiskSpaceOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_CalculateSiteCollectionsDiskSpaceOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_CalculateSiteCollectionsDiskSpace", new object[] {
+                        urls}, this.Enterprise_CalculateSiteCollectionsDiskSpaceOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_CalculateSiteCollectionsDiskSpaceOperationCompleted(object arg) {
+            if ((this.Enterprise_CalculateSiteCollectionsDiskSpaceCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_CalculateSiteCollectionsDiskSpaceCompleted(this, new Enterprise_CalculateSiteCollectionsDiskSpaceCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/Enterprise_DeleteSiteCollection", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void Enterprise_DeleteSiteCollection(SharePointEnterpriseSiteCollection siteCollection) {
+            this.Invoke("Enterprise_DeleteSiteCollection", new object[] {
+                        siteCollection});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_DeleteSiteCollection(SharePointEnterpriseSiteCollection siteCollection, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_DeleteSiteCollection", new object[] {
+                        siteCollection}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndEnterprise_DeleteSiteCollection(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_DeleteSiteCollectionAsync(SharePointEnterpriseSiteCollection siteCollection) {
+            this.Enterprise_DeleteSiteCollectionAsync(siteCollection, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_DeleteSiteCollectionAsync(SharePointEnterpriseSiteCollection siteCollection, object userState) {
+            if ((this.Enterprise_DeleteSiteCollectionOperationCompleted == null)) {
+                this.Enterprise_DeleteSiteCollectionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_DeleteSiteCollectionOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_DeleteSiteCollection", new object[] {
+                        siteCollection}, this.Enterprise_DeleteSiteCollectionOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_DeleteSiteCollectionOperationCompleted(object arg) {
+            if ((this.Enterprise_DeleteSiteCollectionCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_DeleteSiteCollectionCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/Enterprise_BackupSiteCollection", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public string Enterprise_BackupSiteCollection(string url, string filename, bool zip) {
+            object[] results = this.Invoke("Enterprise_BackupSiteCollection", new object[] {
+                        url,
+                        filename,
+                        zip});
+            return ((string)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_BackupSiteCollection(string url, string filename, bool zip, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_BackupSiteCollection", new object[] {
+                        url,
+                        filename,
+                        zip}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public string EndEnterprise_BackupSiteCollection(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((string)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_BackupSiteCollectionAsync(string url, string filename, bool zip) {
+            this.Enterprise_BackupSiteCollectionAsync(url, filename, zip, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_BackupSiteCollectionAsync(string url, string filename, bool zip, object userState) {
+            if ((this.Enterprise_BackupSiteCollectionOperationCompleted == null)) {
+                this.Enterprise_BackupSiteCollectionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_BackupSiteCollectionOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_BackupSiteCollection", new object[] {
+                        url,
+                        filename,
+                        zip}, this.Enterprise_BackupSiteCollectionOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_BackupSiteCollectionOperationCompleted(object arg) {
+            if ((this.Enterprise_BackupSiteCollectionCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_BackupSiteCollectionCompleted(this, new Enterprise_BackupSiteCollectionCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/Enterprise_RestoreSiteCollection", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void Enterprise_RestoreSiteCollection(SharePointEnterpriseSiteCollection siteCollection, string filename) {
+            this.Invoke("Enterprise_RestoreSiteCollection", new object[] {
+                        siteCollection,
+                        filename});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_RestoreSiteCollection(SharePointEnterpriseSiteCollection siteCollection, string filename, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_RestoreSiteCollection", new object[] {
+                        siteCollection,
+                        filename}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndEnterprise_RestoreSiteCollection(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_RestoreSiteCollectionAsync(SharePointEnterpriseSiteCollection siteCollection, string filename) {
+            this.Enterprise_RestoreSiteCollectionAsync(siteCollection, filename, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_RestoreSiteCollectionAsync(SharePointEnterpriseSiteCollection siteCollection, string filename, object userState) {
+            if ((this.Enterprise_RestoreSiteCollectionOperationCompleted == null)) {
+                this.Enterprise_RestoreSiteCollectionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_RestoreSiteCollectionOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_RestoreSiteCollection", new object[] {
+                        siteCollection,
+                        filename}, this.Enterprise_RestoreSiteCollectionOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_RestoreSiteCollectionOperationCompleted(object arg) {
+            if ((this.Enterprise_RestoreSiteCollectionCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_RestoreSiteCollectionCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/Enterprise_GetTempFileBinaryChunk", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        [return: System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")]
+        public byte[] Enterprise_GetTempFileBinaryChunk(string path, int offset, int length) {
+            object[] results = this.Invoke("Enterprise_GetTempFileBinaryChunk", new object[] {
+                        path,
+                        offset,
+                        length});
+            return ((byte[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_GetTempFileBinaryChunk(string path, int offset, int length, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_GetTempFileBinaryChunk", new object[] {
+                        path,
+                        offset,
+                        length}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public byte[] EndEnterprise_GetTempFileBinaryChunk(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((byte[])(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetTempFileBinaryChunkAsync(string path, int offset, int length) {
+            this.Enterprise_GetTempFileBinaryChunkAsync(path, offset, length, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetTempFileBinaryChunkAsync(string path, int offset, int length, object userState) {
+            if ((this.Enterprise_GetTempFileBinaryChunkOperationCompleted == null)) {
+                this.Enterprise_GetTempFileBinaryChunkOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_GetTempFileBinaryChunkOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_GetTempFileBinaryChunk", new object[] {
+                        path,
+                        offset,
+                        length}, this.Enterprise_GetTempFileBinaryChunkOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_GetTempFileBinaryChunkOperationCompleted(object arg) {
+            if ((this.Enterprise_GetTempFileBinaryChunkCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_GetTempFileBinaryChunkCompleted(this, new Enterprise_GetTempFileBinaryChunkCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/Enterprise_AppendTempFileBinaryChunk", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public string Enterprise_AppendTempFileBinaryChunk(string fileName, string path, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] byte[] chunk) {
+            object[] results = this.Invoke("Enterprise_AppendTempFileBinaryChunk", new object[] {
+                        fileName,
+                        path,
+                        chunk});
+            return ((string)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_AppendTempFileBinaryChunk(string fileName, string path, byte[] chunk, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_AppendTempFileBinaryChunk", new object[] {
+                        fileName,
+                        path,
+                        chunk}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public string EndEnterprise_AppendTempFileBinaryChunk(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((string)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_AppendTempFileBinaryChunkAsync(string fileName, string path, byte[] chunk) {
+            this.Enterprise_AppendTempFileBinaryChunkAsync(fileName, path, chunk, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_AppendTempFileBinaryChunkAsync(string fileName, string path, byte[] chunk, object userState) {
+            if ((this.Enterprise_AppendTempFileBinaryChunkOperationCompleted == null)) {
+                this.Enterprise_AppendTempFileBinaryChunkOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_AppendTempFileBinaryChunkOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_AppendTempFileBinaryChunk", new object[] {
+                        fileName,
+                        path,
+                        chunk}, this.Enterprise_AppendTempFileBinaryChunkOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_AppendTempFileBinaryChunkOperationCompleted(object arg) {
+            if ((this.Enterprise_AppendTempFileBinaryChunkCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_AppendTempFileBinaryChunkCompleted(this, new Enterprise_AppendTempFileBinaryChunkCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/Enterprise_GetSiteCollectionSize", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public long Enterprise_GetSiteCollectionSize(string url) {
+            object[] results = this.Invoke("Enterprise_GetSiteCollectionSize", new object[] {
+                        url});
+            return ((long)(results[0]));
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_GetSiteCollectionSize(string url, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_GetSiteCollectionSize", new object[] {
+                        url}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public long EndEnterprise_GetSiteCollectionSize(System.IAsyncResult asyncResult) {
+            object[] results = this.EndInvoke(asyncResult);
+            return ((long)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetSiteCollectionSizeAsync(string url) {
+            this.Enterprise_GetSiteCollectionSizeAsync(url, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_GetSiteCollectionSizeAsync(string url, object userState) {
+            if ((this.Enterprise_GetSiteCollectionSizeOperationCompleted == null)) {
+                this.Enterprise_GetSiteCollectionSizeOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_GetSiteCollectionSizeOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_GetSiteCollectionSize", new object[] {
+                        url}, this.Enterprise_GetSiteCollectionSizeOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_GetSiteCollectionSizeOperationCompleted(object arg) {
+            if ((this.Enterprise_GetSiteCollectionSizeCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_GetSiteCollectionSizeCompleted(this, new Enterprise_GetSiteCollectionSizeCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/Enterprise_SetPeoplePickerOu", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void Enterprise_SetPeoplePickerOu(string site, string ou) {
+            this.Invoke("Enterprise_SetPeoplePickerOu", new object[] {
+                        site,
+                        ou});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginEnterprise_SetPeoplePickerOu(string site, string ou, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("Enterprise_SetPeoplePickerOu", new object[] {
+                        site,
+                        ou}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndEnterprise_SetPeoplePickerOu(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_SetPeoplePickerOuAsync(string site, string ou) {
+            this.Enterprise_SetPeoplePickerOuAsync(site, ou, null);
+        }
+        
+        /// <remarks/>
+        public void Enterprise_SetPeoplePickerOuAsync(string site, string ou, object userState) {
+            if ((this.Enterprise_SetPeoplePickerOuOperationCompleted == null)) {
+                this.Enterprise_SetPeoplePickerOuOperationCompleted = new System.Threading.SendOrPostCallback(this.OnEnterprise_SetPeoplePickerOuOperationCompleted);
+            }
+            this.InvokeAsync("Enterprise_SetPeoplePickerOu", new object[] {
+                        site,
+                        ou}, this.Enterprise_SetPeoplePickerOuOperationCompleted, userState);
+        }
+        
+        private void OnEnterprise_SetPeoplePickerOuOperationCompleted(object arg) {
+            if ((this.Enterprise_SetPeoplePickerOuCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.Enterprise_SetPeoplePickerOuCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        public new void CancelAsync(object userState) {
+            base.CancelAsync(userState);
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_GetSupportedLanguagesCompletedEventHandler(object sender, Enterprise_GetSupportedLanguagesCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_GetSupportedLanguagesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_GetSupportedLanguagesCompletedEventArgs(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.3038")]
+    public delegate void Enterprise_GetSiteCollectionsCompletedEventHandler(object sender, Enterprise_GetSiteCollectionsCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_GetSiteCollectionsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_GetSiteCollectionsCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public SharePointEnterpriseSiteCollection[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((SharePointEnterpriseSiteCollection[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_GetSiteCollectionCompletedEventHandler(object sender, Enterprise_GetSiteCollectionCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_GetSiteCollectionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_GetSiteCollectionCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public SharePointEnterpriseSiteCollection Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((SharePointEnterpriseSiteCollection)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_CreateSiteCollectionCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_UpdateQuotasCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_CalculateSiteCollectionsDiskSpaceCompletedEventHandler(object sender, Enterprise_CalculateSiteCollectionsDiskSpaceCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_CalculateSiteCollectionsDiskSpaceCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_CalculateSiteCollectionsDiskSpaceCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public SharePointSiteDiskSpace[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((SharePointSiteDiskSpace[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_DeleteSiteCollectionCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_BackupSiteCollectionCompletedEventHandler(object sender, Enterprise_BackupSiteCollectionCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_BackupSiteCollectionCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_BackupSiteCollectionCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public string Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((string)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_RestoreSiteCollectionCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_GetTempFileBinaryChunkCompletedEventHandler(object sender, Enterprise_GetTempFileBinaryChunkCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_GetTempFileBinaryChunkCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_GetTempFileBinaryChunkCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public byte[] Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((byte[])(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_AppendTempFileBinaryChunkCompletedEventHandler(object sender, Enterprise_AppendTempFileBinaryChunkCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_AppendTempFileBinaryChunkCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_AppendTempFileBinaryChunkCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public string Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((string)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_GetSiteCollectionSizeCompletedEventHandler(object sender, Enterprise_GetSiteCollectionSizeCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class Enterprise_GetSiteCollectionSizeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal Enterprise_GetSiteCollectionSizeCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public long Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((long)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void Enterprise_SetPeoplePickerOuCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Server.Client/RemoteDesktopServicesProxy.cs b/WebsitePanel/Sources/WebsitePanel.Server.Client/RemoteDesktopServicesProxy.cs
index fbb586a2..bbd90595 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server.Client/RemoteDesktopServicesProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server.Client/RemoteDesktopServicesProxy.cs
@@ -104,6 +104,10 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         
         private System.Threading.SendOrPostCallback ApplyGPOOperationCompleted;
         
+        private System.Threading.SendOrPostCallback ShadowSessionOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback MoveSessionHostsToCollectionOUOperationCompleted;
+        
         /// <remarks/>
         public RemoteDesktopServices() {
             this.Url = "http://localhost:9003/RemoteDesktopServices.asmx";
@@ -220,6 +224,12 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         /// <remarks/>
         public event ApplyGPOCompletedEventHandler ApplyGPOCompleted;
         
+        /// <remarks/>
+        public event ShadowSessionCompletedEventHandler ShadowSessionCompleted;
+        
+        /// <remarks/>
+        public event MoveSessionHostsToCollectionOUCompletedEventHandler MoveSessionHostsToCollectionOUCompleted;
+        
         /// <remarks/>
         [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/CreateCollection", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
@@ -1791,15 +1801,17 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         /// <remarks/>
         [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/ApplyGPO", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public void ApplyGPO(string collectionName, RdsServerSettings serverSettings) {
+        public void ApplyGPO(string organizationId, string collectionName, RdsServerSettings serverSettings) {
             this.Invoke("ApplyGPO", new object[] {
+                        organizationId,
                         collectionName,
                         serverSettings});
         }
         
         /// <remarks/>
-        public System.IAsyncResult BeginApplyGPO(string collectionName, RdsServerSettings serverSettings, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginApplyGPO(string organizationId, string collectionName, RdsServerSettings serverSettings, System.AsyncCallback callback, object asyncState) {
             return this.BeginInvoke("ApplyGPO", new object[] {
+                        organizationId,
                         collectionName,
                         serverSettings}, callback, asyncState);
         }
@@ -1810,16 +1822,17 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
         }
         
         /// <remarks/>
-        public void ApplyGPOAsync(string collectionName, RdsServerSettings serverSettings) {
-            this.ApplyGPOAsync(collectionName, serverSettings, null);
+        public void ApplyGPOAsync(string organizationId, string collectionName, RdsServerSettings serverSettings) {
+            this.ApplyGPOAsync(organizationId, collectionName, serverSettings, null);
         }
         
         /// <remarks/>
-        public void ApplyGPOAsync(string collectionName, RdsServerSettings serverSettings, object userState) {
+        public void ApplyGPOAsync(string organizationId, string collectionName, RdsServerSettings serverSettings, object userState) {
             if ((this.ApplyGPOOperationCompleted == null)) {
                 this.ApplyGPOOperationCompleted = new System.Threading.SendOrPostCallback(this.OnApplyGPOOperationCompleted);
             }
             this.InvokeAsync("ApplyGPO", new object[] {
+                        organizationId,
                         collectionName,
                         serverSettings}, this.ApplyGPOOperationCompleted, userState);
         }
@@ -1831,6 +1844,95 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
             }
         }
         
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/ShadowSession", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void ShadowSession(string sessionId, bool control) {
+            this.Invoke("ShadowSession", new object[] {
+                        sessionId,
+                        control});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginShadowSession(string sessionId, bool control, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("ShadowSession", new object[] {
+                        sessionId,
+                        control}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndShadowSession(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void ShadowSessionAsync(string sessionId, bool control) {
+            this.ShadowSessionAsync(sessionId, control, null);
+        }
+        
+        /// <remarks/>
+        public void ShadowSessionAsync(string sessionId, bool control, object userState) {
+            if ((this.ShadowSessionOperationCompleted == null)) {
+                this.ShadowSessionOperationCompleted = new System.Threading.SendOrPostCallback(this.OnShadowSessionOperationCompleted);
+            }
+            this.InvokeAsync("ShadowSession", new object[] {
+                        sessionId,
+                        control}, this.ShadowSessionOperationCompleted, userState);
+        }
+        
+        private void OnShadowSessionOperationCompleted(object arg) {
+            if ((this.ShadowSessionCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.ShadowSessionCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapHeaderAttribute("ServiceProviderSettingsSoapHeaderValue")]
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/server/MoveSessionHostsToCollectionOU", RequestNamespace="http://smbsaas/websitepanel/server/", ResponseNamespace="http://smbsaas/websitepanel/server/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public void MoveSessionHostsToCollectionOU(RdsServer[] servers, string collectionName, string organizationId) {
+            this.Invoke("MoveSessionHostsToCollectionOU", new object[] {
+                        servers,
+                        collectionName,
+                        organizationId});
+        }
+        
+        /// <remarks/>
+        public System.IAsyncResult BeginMoveSessionHostsToCollectionOU(RdsServer[] servers, string collectionName, string organizationId, System.AsyncCallback callback, object asyncState) {
+            return this.BeginInvoke("MoveSessionHostsToCollectionOU", new object[] {
+                        servers,
+                        collectionName,
+                        organizationId}, callback, asyncState);
+        }
+        
+        /// <remarks/>
+        public void EndMoveSessionHostsToCollectionOU(System.IAsyncResult asyncResult) {
+            this.EndInvoke(asyncResult);
+        }
+        
+        /// <remarks/>
+        public void MoveSessionHostsToCollectionOUAsync(RdsServer[] servers, string collectionName, string organizationId) {
+            this.MoveSessionHostsToCollectionOUAsync(servers, collectionName, organizationId, null);
+        }
+        
+        /// <remarks/>
+        public void MoveSessionHostsToCollectionOUAsync(RdsServer[] servers, string collectionName, string organizationId, object userState) {
+            if ((this.MoveSessionHostsToCollectionOUOperationCompleted == null)) {
+                this.MoveSessionHostsToCollectionOUOperationCompleted = new System.Threading.SendOrPostCallback(this.OnMoveSessionHostsToCollectionOUOperationCompleted);
+            }
+            this.InvokeAsync("MoveSessionHostsToCollectionOU", new object[] {
+                        servers,
+                        collectionName,
+                        organizationId}, this.MoveSessionHostsToCollectionOUOperationCompleted, userState);
+        }
+        
+        private void OnMoveSessionHostsToCollectionOUOperationCompleted(object arg) {
+            if ((this.MoveSessionHostsToCollectionOUCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.MoveSessionHostsToCollectionOUCompleted(this, new System.ComponentModel.AsyncCompletedEventArgs(invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
         /// <remarks/>
         public new void CancelAsync(object userState) {
             base.CancelAsync(userState);
@@ -2468,4 +2570,12 @@ namespace WebsitePanel.Providers.RemoteDesktopServices {
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
     public delegate void ApplyGPOCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void ShadowSessionCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("wsdl", "2.0.50727.3038")]
+    public delegate void MoveSessionHostsToCollectionOUCompletedEventHandler(object sender, System.ComponentModel.AsyncCompletedEventArgs e);
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Server.Client/WebsitePanel.Server.Client.csproj b/WebsitePanel/Sources/WebsitePanel.Server.Client/WebsitePanel.Server.Client.csproj
index 751a8fe5..c68a63eb 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server.Client/WebsitePanel.Server.Client.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Server.Client/WebsitePanel.Server.Client.csproj
@@ -82,6 +82,7 @@
     <Compile Include="ExchangeServerProxy.cs" />
     <Compile Include="FtpServerProxy.cs" />
     <Compile Include="HeliconZooProxy.cs" />
+    <Compile Include="HostedSharePointServerEntProxy.cs" />
     <Compile Include="HostedSharePointServerProxy.cs" />
     <Compile Include="LyncServerProxy.cs" />
     <Compile Include="OCSEdgeServerProxy.cs" />
diff --git a/WebsitePanel/Sources/WebsitePanel.Server.Utils/Log.cs b/WebsitePanel/Sources/WebsitePanel.Server.Utils/Log.cs
index b0d975f2..e3c1a823 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server.Utils/Log.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server.Utils/Log.cs
@@ -29,6 +29,7 @@
 using System;
 using System.Diagnostics;
 
+
 namespace WebsitePanel.Server.Utils
 {
     /// <summary>
@@ -151,5 +152,7 @@ namespace WebsitePanel.Server.Utils
             //
             return String.Concat(String.Format("[{0:G}] {1}: ", DateTime.Now, tag), message);
         }
+
+
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Server.sln b/WebsitePanel/Sources/WebsitePanel.Server.sln
index c5af78c6..b06fa4e6 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server.sln
+++ b/WebsitePanel/Sources/WebsitePanel.Server.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Caching Application Block", "Caching Application Block", "{C8E6F2E4-A5B8-486A-A56E-92D864524682}"
 	ProjectSection(SolutionItems) = preProject
@@ -152,6 +152,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsitePanel.Providers.Mail
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsitePanel.Providers.Virtualization.HyperV2012R2", "WebsitePanel.Providers.Virtualization.HyperV-2012R2\WebsitePanel.Providers.Virtualization.HyperV2012R2.csproj", "{EE40516B-93DF-4CAB-80C4-64DCE0B751CC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsitePanel.Providers.HostedSolution.SharePoint2013Ent", "WebsitePanel.Providers.HostedSolution.SharePoint2013Ent\WebsitePanel.Providers.HostedSolution.SharePoint2013Ent.csproj", "{0CF0C19E-7BFE-4A61-AF00-7B7CE7264252}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -762,6 +764,16 @@ Global
 		{EE40516B-93DF-4CAB-80C4-64DCE0B751CC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EE40516B-93DF-4CAB-80C4-64DCE0B751CC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{EE40516B-93DF-4CAB-80C4-64DCE0B751CC}.Release|x86.ActiveCfg = Release|Any CPU
+		{0CF0C19E-7BFE-4A61-AF00-7B7CE7264252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CF0C19E-7BFE-4A61-AF00-7B7CE7264252}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CF0C19E-7BFE-4A61-AF00-7B7CE7264252}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0CF0C19E-7BFE-4A61-AF00-7B7CE7264252}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0CF0C19E-7BFE-4A61-AF00-7B7CE7264252}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0CF0C19E-7BFE-4A61-AF00-7B7CE7264252}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0CF0C19E-7BFE-4A61-AF00-7B7CE7264252}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0CF0C19E-7BFE-4A61-AF00-7B7CE7264252}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0CF0C19E-7BFE-4A61-AF00-7B7CE7264252}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0CF0C19E-7BFE-4A61-AF00-7B7CE7264252}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/EnterpriseStorage.asmx.cs b/WebsitePanel/Sources/WebsitePanel.Server/EnterpriseStorage.asmx.cs
index ecd4878c..6a27c78a 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/EnterpriseStorage.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server/EnterpriseStorage.asmx.cs
@@ -75,6 +75,23 @@ namespace WebsitePanel.Server
             }
         }
 
+        [WebMethod, SoapHeader("settings")]
+        public SystemFile[] GetFoldersWithoutFrsm(string organizationId, WebDavSetting[] settings)
+        {
+            try
+            {
+                Log.WriteStart("'{0}' GetFolders", ProviderSettings.ProviderName);
+                SystemFile[] result = EnterpriseStorageProvider.GetFoldersWithoutFrsm(organizationId, settings);
+                Log.WriteEnd("'{0}' GetFolders", ProviderSettings.ProviderName);
+                return result;
+            }
+            catch (Exception ex)
+            {
+                Log.WriteError(String.Format("'{0}' GetFolders", ProviderSettings.ProviderName), ex);
+                throw;
+            }
+        }
+
         [WebMethod, SoapHeader("settings")]
         public SystemFile GetFolder(string organizationId, string folder, WebDavSetting setting)
         {
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/HostedSharePointServerEnt.asmx b/WebsitePanel/Sources/WebsitePanel.Server/HostedSharePointServerEnt.asmx
new file mode 100644
index 00000000..6eb0df72
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Server/HostedSharePointServerEnt.asmx
@@ -0,0 +1 @@
+<%@ WebService Language="C#" CodeBehind="HostedSharePointServerEnt.asmx.cs" Class="WebsitePanel.Server.HostedSharePointServerEnt" %>
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/HostedSharePointServerEnt.asmx.cs b/WebsitePanel/Sources/WebsitePanel.Server/HostedSharePointServerEnt.asmx.cs
new file mode 100644
index 00000000..732ddf55
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.Server/HostedSharePointServerEnt.asmx.cs
@@ -0,0 +1,274 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.ComponentModel;
+using System.Web.Services;
+using System.Web.Services.Protocols;
+using WebsitePanel.Providers;
+using WebsitePanel.Providers.HostedSolution;
+using WebsitePanel.Providers.SharePoint;
+using WebsitePanel.Server.Utils;
+using Microsoft.Web.Services3;
+
+namespace WebsitePanel.Server
+{
+    /// <summary>
+    /// Summary description for HostedSharePointServerEnt
+    /// </summary>
+    [WebService(Namespace = "http://smbsaas/websitepanel/server/")]
+    [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
+    [Policy("ServerPolicy")]
+    [ToolboxItem(false)]
+    public class HostedSharePointServerEnt : HostingServiceProviderWebService
+    {
+        private delegate TReturn Action<TReturn>();
+
+        /// <summary>
+        /// Gets hosted SharePoint provider instance.
+        /// </summary>
+        private IHostedSharePointServerEnt HostedSharePointServerEntProvider
+        {
+            get { return (IHostedSharePointServerEnt)Provider; }
+        }
+
+        /// <summary>
+        /// Gets list of supported languages by this installation of SharePoint.
+        /// </summary>
+        /// <returns>List of supported languages</returns>
+        [WebMethod, SoapHeader("settings")]
+        public int[] Enterprise_GetSupportedLanguages()
+        {
+            return ExecuteAction<int[]>(delegate
+            {
+                return HostedSharePointServerEntProvider.Enterprise_GetSupportedLanguages();
+            }, "GetSupportedLanguages");
+        }
+
+
+        /// <summary>
+        /// Gets list of SharePoint collections within root web application.
+        /// </summary>
+        /// <returns>List of SharePoint collections within root web application.</returns>
+        [WebMethod, SoapHeader("settings")]
+        public SharePointEnterpriseSiteCollection[] Enterprise_GetSiteCollections()
+        {
+            return ExecuteAction<SharePointEnterpriseSiteCollection[]>(delegate
+            {
+                return HostedSharePointServerEntProvider.Enterprise_GetSiteCollections();
+            }, "GetSiteCollections");
+        }
+
+        /// <summary>
+        /// Gets SharePoint collection within root web application with given name.
+        /// </summary>
+        /// <param name="url">Url that uniquely identifies site collection to be loaded.</param>
+        /// <returns>SharePoint collection within root web application with given name.</returns>
+        [WebMethod, SoapHeader("settings")]
+        public SharePointEnterpriseSiteCollection Enterprise_GetSiteCollection(string url)
+        {
+            return ExecuteAction<SharePointEnterpriseSiteCollection>(delegate
+            {
+                return HostedSharePointServerEntProvider.Enterprise_GetSiteCollection(url);
+            }, "GetSiteCollection");
+        }
+
+        /// <summary>
+        /// Creates site collection within predefined root web application.
+        /// </summary>
+        /// <param name="siteCollection">Information about site coolection to be created.</param>
+        [WebMethod, SoapHeader("settings")]
+        public void Enterprise_CreateSiteCollection(SharePointEnterpriseSiteCollection siteCollection)
+        {
+            siteCollection.OwnerLogin = AttachNetbiosDomainName(siteCollection.OwnerLogin);
+            ExecuteAction<object>(delegate
+            {
+                HostedSharePointServerEntProvider.Enterprise_CreateSiteCollection(siteCollection);
+                return new object();
+            }, "CreateSiteCollection");
+        }
+
+
+        [WebMethod, SoapHeader("settings")]
+        public void Enterprise_UpdateQuotas(string url, long maxSize, long warningSize)
+        {
+            ExecuteAction<object>(delegate
+            {
+                HostedSharePointServerEntProvider.Enterprise_UpdateQuotas(url, maxSize, warningSize);
+                return new object();
+            }, "UpdateQuotas");
+
+
+
+        }
+
+        [WebMethod, SoapHeader("settings")]
+        public SharePointSiteDiskSpace[] Enterprise_CalculateSiteCollectionsDiskSpace(string[] urls)
+        {
+            SharePointSiteDiskSpace[] ret = null;
+            ret = ExecuteAction<SharePointSiteDiskSpace[]>(delegate
+            {
+                return HostedSharePointServerEntProvider.Enterprise_CalculateSiteCollectionsDiskSpace(urls);
+            }, "CalculateSiteCollectionDiskSpace");
+            return ret;
+
+        }
+        /// <summary>
+        /// Deletes site collection under given url.
+        /// </summary>
+        /// <param name="url">Url that uniquely identifies site collection to be deleted.</param>
+        [WebMethod, SoapHeader("settings")]
+        public void Enterprise_DeleteSiteCollection(SharePointEnterpriseSiteCollection siteCollection)
+        {
+            ExecuteAction<object>(delegate
+            {
+                HostedSharePointServerEntProvider.Enterprise_DeleteSiteCollection(siteCollection);
+                return new object();
+            }, "DeleteSiteCollection");
+        }
+        /// <summary>
+        /// Backups site collection under give url.
+        /// </summary>
+        /// <param name="url">Url that uniquely identifies site collection to be deleted.</param>
+        /// <param name="filename">Resulting backup file name.</param>
+        /// <param name="zip">A value which shows whether created backup must be archived.</param>
+        /// <returns>Created backup full path.</returns>
+        [WebMethod, SoapHeader("settings")]
+        public string Enterprise_BackupSiteCollection(string url, string filename, bool zip)
+        {
+            return ExecuteAction<string>(delegate
+            {
+                return
+                    HostedSharePointServerEntProvider.Enterprise_BackupSiteCollection(url, filename, zip);
+            }, "BackupSiteCollection");
+        }
+
+        /// <summary>
+        /// Restores site collection under given url from backup.
+        /// </summary>
+        /// <param name="siteCollection">Site collection to be restored.</param>
+        /// <param name="filename">Backup file name to restore from.</param>
+        [WebMethod, SoapHeader("settings")]
+        public void Enterprise_RestoreSiteCollection(SharePointEnterpriseSiteCollection siteCollection, string filename)
+        {
+            siteCollection.OwnerLogin = AttachNetbiosDomainName(siteCollection.OwnerLogin);
+            ExecuteAction<object>(delegate
+            {
+                HostedSharePointServerEntProvider.Enterprise_RestoreSiteCollection(siteCollection, filename);
+                return new object();
+            }, "RestoreSiteCollection");
+        }
+
+        /// <summary>
+        /// Gets binary data chunk of specified size from specified offset.
+        /// </summary>
+        /// <param name="path">Path to file to get bunary data chunk from.</param>
+        /// <param name="offset">Offset from which to start data reading.</param>
+        /// <param name="length">Binary data chunk length.</param>
+        /// <returns>Binary data chunk read from file.</returns>
+        [WebMethod, SoapHeader("settings")]
+        public byte[] Enterprise_GetTempFileBinaryChunk(string path, int offset, int length)
+        {
+            return ExecuteAction<byte[]>(delegate
+            {
+                return
+                    HostedSharePointServerEntProvider.Enterprise_GetTempFileBinaryChunk(path, offset, length);
+            }, "GetTempFileBinaryChunk");
+        }
+
+        /// <summary>
+        /// Appends supplied binary data chunk to file.
+        /// </summary>
+        /// <param name="fileName">Non existent file name to append to.</param>
+        /// <param name="path">Full path to existent file to append to.</param>
+        /// <param name="chunk">Binary data chunk to append to.</param>
+        /// <returns>Path to file that was appended with chunk.</returns>
+        [WebMethod, SoapHeader("settings")]
+        public virtual string Enterprise_AppendTempFileBinaryChunk(string fileName, string path, byte[] chunk)
+        {
+            return ExecuteAction<string>(delegate
+            {
+                return
+                    HostedSharePointServerEntProvider.Enterprise_AppendTempFileBinaryChunk(fileName, path, chunk);
+            }, "AppendTempFileBinaryChunk");
+        }
+
+
+        [WebMethod, SoapHeader("settings")]
+        public long Enterprise_GetSiteCollectionSize(string url)
+        {
+            return ExecuteAction<long>(delegate
+            {
+                return
+                    HostedSharePointServerEntProvider.Enterprise_GetSiteCollectionSize(url);
+            }, "GetSiteCollectionSize");
+        }
+
+
+        [WebMethod, SoapHeader("settings")]
+        public void Enterprise_SetPeoplePickerOu(string site, string ou)
+        {
+            HostedSharePointServerEntProvider.Enterprise_SetPeoplePickerOu(site, ou);
+        }
+
+
+        /// <summary>
+        /// Executes supplied action and performs logging.
+        /// </summary>
+        /// <typeparam name="TReturn">Type of action's return value.</typeparam>
+        /// <param name="action">Action to be executed.</param>
+        /// <param name="actionName">Action name for logging purposes.</param>
+        /// <returns>Action execution result.</returns>
+        private TReturn ExecuteAction<TReturn>(Action<TReturn> action, string actionName)
+        {
+            try
+            {
+                Log.WriteStart("'{0}' {1}", ProviderSettings.ProviderName, actionName);
+                TReturn result = action();
+                Log.WriteEnd("'{0}' {1}", ProviderSettings.ProviderName, actionName);
+                return result;
+            }
+            catch (Exception ex)
+            {
+                Log.WriteError(String.Format("Can't {1} '{0}' provider", ProviderSettings.ProviderName, actionName), ex);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Returns fully qualified netbios account name.
+        /// </summary>
+        /// <param name="accountName">Account name.</param>
+        /// <returns>Fully qualified netbios account name.</returns>
+        private string AttachNetbiosDomainName(string accountName)
+        {
+            string domainNetbiosName = String.Format("{0}\\", ActiveDirectoryUtils.GetNETBIOSDomainName(ServerSettings.ADRootDomain));
+            return String.Format("{0}{1}", domainNetbiosName, accountName.Replace(domainNetbiosName, String.Empty));
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/RemoteDesktopServices.asmx.cs b/WebsitePanel/Sources/WebsitePanel.Server/RemoteDesktopServices.asmx.cs
index ff949699..e28846eb 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/RemoteDesktopServices.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server/RemoteDesktopServices.asmx.cs
@@ -665,12 +665,12 @@ namespace WebsitePanel.Server
         }
 
         [WebMethod, SoapHeader("settings")]
-        public void ApplyGPO(string collectionName, RdsServerSettings serverSettings)
+        public void ApplyGPO(string organizationId, string collectionName, RdsServerSettings serverSettings)
         {
             try
             {
                 Log.WriteStart("'{0}' ApplyGPO", ProviderSettings.ProviderName);
-                RDSProvider.ApplyGPO(collectionName, serverSettings);
+                RDSProvider.ApplyGPO(organizationId, collectionName, serverSettings);
                 Log.WriteEnd("'{0}' ApplyGPO", ProviderSettings.ProviderName);
             }
             catch (Exception ex)
@@ -679,5 +679,37 @@ namespace WebsitePanel.Server
                 throw;
             }
         }
+
+        [WebMethod, SoapHeader("settings")]
+        public void ShadowSession(string sessionId, bool control)
+        {
+            try
+            {
+                Log.WriteStart("'{0}' ShadowSession", ProviderSettings.ProviderName);
+                RDSProvider.ShadowSession(sessionId, control);
+                Log.WriteEnd("'{0}' ShadowSession", ProviderSettings.ProviderName);
+            }
+            catch (Exception ex)
+            {
+                Log.WriteError(String.Format("'{0}' ShadowSession", ProviderSettings.ProviderName), ex);
+                throw;
+            }
+        }
+
+        [WebMethod, SoapHeader("settings")]
+        public void MoveSessionHostsToCollectionOU(List<RdsServer> servers, string collectionName, string organizationId)
+        {
+            try
+            {
+                Log.WriteStart("'{0}' MoveSessionHostsToCollectionOU", ProviderSettings.ProviderName);
+                RDSProvider.MoveSessionHostsToCollectionOU(servers, collectionName, organizationId);
+                Log.WriteEnd("'{0}' MoveSessionHostsToCollectionOU", ProviderSettings.ProviderName);
+            }
+            catch (Exception ex)
+            {
+                Log.WriteError(String.Format("'{0}' MoveSessionHostsToCollectionOU", ProviderSettings.ProviderName), ex);
+                throw;
+            }
+        }
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj b/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj
index 8b1d2bb6..029e25a2 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj
@@ -35,6 +35,7 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <WarningsAsErrors>618</WarningsAsErrors>
+    <FilesToIncludeForPublish>OnlyFilesToRunTheApp</FilesToIncludeForPublish>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -91,9 +92,187 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="AutoDiscovery.asmx" />
+    <Content Include="bin\Crm2011\microsoft.crm.sdk.proxy.dll" />
+    <Content Include="bin\Crm2011\microsoft.xrm.client.codegeneration.dll" />
+    <Content Include="bin\Crm2011\microsoft.xrm.client.dll" />
+    <Content Include="bin\Crm2011\microsoft.xrm.portal.dll" />
+    <Content Include="bin\Crm2011\microsoft.xrm.portal.files.dll" />
+    <Content Include="bin\Crm2011\microsoft.xrm.sdk.deployment.dll" />
+    <Content Include="bin\Crm2011\microsoft.xrm.sdk.dll" />
+    <Content Include="bin\Crm2011\microsoft.xrm.sdk.workflow.dll" />
+    <Content Include="bin\Crm2011\WebsitePanel.Providers.HostedSolution.Crm2011.dll" />
+    <Content Include="bin\Crm2011\WebsitePanel.Providers.HostedSolution.Crm2011.pdb" />
+    <Content Include="bin\Crm2013\Microsoft.Crm.Sdk.Proxy.dll" />
+    <Content Include="bin\Crm2013\Microsoft.Xrm.Client.CodeGeneration.dll" />
+    <Content Include="bin\Crm2013\Microsoft.Xrm.Client.dll" />
+    <Content Include="bin\Crm2013\Microsoft.Xrm.Portal.dll" />
+    <Content Include="bin\Crm2013\Microsoft.Xrm.Portal.Files.dll" />
+    <Content Include="bin\Crm2013\Microsoft.Xrm.Sdk.Deployment.dll" />
+    <Content Include="bin\Crm2013\Microsoft.Xrm.Sdk.dll" />
+    <Content Include="bin\Crm2013\Microsoft.Xrm.Sdk.Workflow.dll" />
+    <Content Include="bin\Crm2013\System.Management.Automation.dll" />
+    <Content Include="bin\Crm2013\WebsitePanel.Providers.HostedSolution.Crm2013.dll" />
+    <Content Include="bin\Crm2013\WebsitePanel.Providers.HostedSolution.Crm2013.pdb" />
+    <Content Include="bin\Dns2012\Ionic.Zip.Reduced.dll" />
+    <Content Include="bin\Dns2012\Microsoft.Management.Infrastructure.dll" />
+    <Content Include="bin\Dns2012\System.Management.Automation.dll" />
+    <Content Include="bin\Dns2012\WebsitePanel.Providers.Base.dll" />
+    <Content Include="bin\Dns2012\WebsitePanel.Providers.Base.pdb" />
+    <Content Include="bin\Dns2012\WebsitePanel.Providers.DNS.MsDNS2012.dll" />
+    <Content Include="bin\Dns2012\WebsitePanel.Providers.DNS.MsDNS2012.pdb" />
+    <Content Include="bin\Dns2012\WebsitePanel.Server.Utils.dll" />
+    <Content Include="bin\Dns2012\WebsitePanel.Server.Utils.pdb" />
+    <Content Include="bin\Exchange2013\WebsitePanel.Providers.HostedSolution.Exchange2013.dll" />
+    <Content Include="bin\Exchange2013\WebsitePanel.Providers.HostedSolution.Exchange2013.pdb" />
+    <Content Include="bin\HyperV2012R2\Ionic.Zip.Reduced.dll" />
+    <Content Include="bin\HyperV2012R2\Microsoft.SharePoint.dll" />
+    <Content Include="bin\HyperV2012R2\Microsoft.Storage.Vds.dll" />
+    <Content Include="bin\HyperV2012R2\WebsitePanel.Providers.Base.dll" />
+    <Content Include="bin\HyperV2012R2\WebsitePanel.Providers.Base.pdb" />
+    <Content Include="bin\HyperV2012R2\WebsitePanel.Providers.HostedSolution.dll" />
+    <Content Include="bin\HyperV2012R2\WebsitePanel.Providers.HostedSolution.pdb" />
+    <Content Include="bin\HyperV2012R2\WebsitePanel.Providers.Virtualization.HyperV2012R2.dll" />
+    <Content Include="bin\HyperV2012R2\WebsitePanel.Providers.Virtualization.HyperV2012R2.pdb" />
+    <Content Include="bin\HyperV2012R2\WebsitePanel.Server.Utils.dll" />
+    <Content Include="bin\HyperV2012R2\WebsitePanel.Server.Utils.pdb" />
+    <Content Include="bin\IceWarp\WebsitePanel.Providers.Mail.IceWarp.dll" />
+    <Content Include="bin\IceWarp\WebsitePanel.Providers.Mail.IceWarp.pdb" />
+    <Content Include="bin\IIs80\WebsitePanel.Providers.Web.IIs80.dll" />
+    <Content Include="bin\IIs80\WebsitePanel.Providers.Web.IIs80.pdb" />
+    <Content Include="bin\Ionic.Zip.Reduced.dll" />
+    <Content Include="bin\Lync2013\WebsitePanel.Providers.Base.dll" />
+    <Content Include="bin\Lync2013\WebsitePanel.Providers.Base.pdb" />
+    <Content Include="bin\Lync2013\WebsitePanel.Providers.HostedSolution.Lync2013.dll" />
+    <Content Include="bin\Lync2013\WebsitePanel.Providers.HostedSolution.Lync2013.pdb" />
+    <Content Include="bin\Lync2013\WebsitePanel.Providers.HostedSolution.Lync2013HP.dll" />
+    <Content Include="bin\Lync2013\WebsitePanel.Providers.HostedSolution.Lync2013HP.pdb" />
+    <Content Include="bin\Lync2013\WebsitePanel.Server.Utils.dll" />
+    <Content Include="bin\Lync2013\WebsitePanel.Server.Utils.pdb" />
+    <Content Include="bin\Microsoft.Practices.EnterpriseLibrary.Caching.dll" />
+    <Content Include="bin\Microsoft.Practices.EnterpriseLibrary.Common.dll" />
+    <Content Include="bin\Microsoft.Practices.ObjectBuilder.dll" />
+    <Content Include="bin\Microsoft.SharePoint.dll" />
+    <Content Include="bin\Microsoft.Storage.Vds.dll" />
+    <Content Include="bin\Microsoft.Web.Deployment.dll" />
+    <Content Include="bin\Microsoft.Web.Management.dll" />
+    <Content Include="bin\Microsoft.Web.PlatformInstaller.dll" />
+    <Content Include="bin\Microsoft.Web.Services3.dll" />
+    <Content Include="bin\Sharepoint2013\WebsitePanel.Providers.HostedSolution.SharePoint2013.dll" />
+    <Content Include="bin\Sharepoint2013\WebsitePanel.Providers.HostedSolution.SharePoint2013.pdb" />
+    <Content Include="bin\Sharepoint2013\WebsitePanel.Providers.HostedSolution.SharePoint2013Ent.dll" />
+    <Content Include="bin\Sharepoint2013\WebsitePanel.Providers.HostedSolution.SharePoint2013Ent.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Base.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Base.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Database.MySQL.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Database.MySQL.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Database.SqlServer.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Database.SqlServer.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.DNS.Bind.dll" />
+    <Content Include="bin\WebsitePanel.Providers.DNS.Bind.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.DNS.MsDNS.dll" />
+    <Content Include="bin\WebsitePanel.Providers.DNS.MsDNS.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.DNS.Nettica.dll" />
+    <Content Include="bin\WebsitePanel.Providers.DNS.Nettica.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.DNS.PowerDNS.dll" />
+    <Content Include="bin\WebsitePanel.Providers.DNS.PowerDNS.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.DNS.SimpleDNS.dll" />
+    <Content Include="bin\WebsitePanel.Providers.DNS.SimpleDNS.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.DNS.SimpleDNS50.dll" />
+    <Content Include="bin\WebsitePanel.Providers.DNS.SimpleDNS50.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.EnterpriseStorage.Windows2012.dll" />
+    <Content Include="bin\WebsitePanel.Providers.EnterpriseStorage.Windows2012.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.FTP.FileZilla.dll" />
+    <Content Include="bin\WebsitePanel.Providers.FTP.FileZilla.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.FTP.Gene6.dll" />
+    <Content Include="bin\WebsitePanel.Providers.FTP.Gene6.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.FTP.IIs60.dll" />
+    <Content Include="bin\WebsitePanel.Providers.FTP.IIs60.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.FTP.IIs70.dll" />
+    <Content Include="bin\WebsitePanel.Providers.FTP.IIs70.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.FTP.IIs80.dll" />
+    <Content Include="bin\WebsitePanel.Providers.FTP.IIs80.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.FTP.ServU.dll" />
+    <Content Include="bin\WebsitePanel.Providers.FTP.ServU.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.HostedSolution.dll" />
+    <Content Include="bin\WebsitePanel.Providers.HostedSolution.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.AbilityMailServer.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.AbilityMailServer.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.ArgoMail.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.ArgoMail.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.hMailServer.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.hMailServer.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.hMailServer43.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.hMailServer43.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.hMailServer5.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.hMailServer5.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.MailEnable.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.MailEnable.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.MDaemon.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.MDaemon.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.Merak.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.Merak.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.Merak10.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.Merak10.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.SmarterMail10.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.SmarterMail10.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.SmarterMail2.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.SmarterMail2.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.SmarterMail3.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.SmarterMail3.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.SmarterMail5.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.SmarterMail5.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.SmarterMail6.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.SmarterMail6.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.SmarterMail7.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.SmarterMail7.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.SmarterMail9.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Mail.SmarterMail9.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.OS.Windows2003.dll" />
+    <Content Include="bin\WebsitePanel.Providers.OS.Windows2003.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.OS.Windows2008.dll" />
+    <Content Include="bin\WebsitePanel.Providers.OS.Windows2008.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.OS.Windows2012.dll" />
+    <Content Include="bin\WebsitePanel.Providers.OS.Windows2012.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.RemoteDesktopServices.Windows2012.dll" />
+    <Content Include="bin\WebsitePanel.Providers.RemoteDesktopServices.Windows2012.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.SharePoint.Sps20.dll" />
+    <Content Include="bin\WebsitePanel.Providers.SharePoint.Sps20.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.SharePoint.Sps30.dll" />
+    <Content Include="bin\WebsitePanel.Providers.SharePoint.Sps30.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Statistics.AWStats.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Statistics.AWStats.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Statistics.SmarterStats.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Statistics.SmarterStats.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Virtualization.HyperV.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Virtualization.HyperV.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Virtualization.HyperV2012R2.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Virtualization.HyperV2012R2.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.VirtualizationForPC.HyperVForPC.dll" />
+    <Content Include="bin\WebsitePanel.Providers.VirtualizationForPC.HyperVForPC.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Web.HeliconZoo.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Web.HeliconZoo.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Web.IIs60.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Web.IIs60.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Web.IIs70.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Web.IIs70.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Web.IIs80.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Web.IIs80.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Web.WebDav.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Web.WebDav.pdb" />
+    <Content Include="bin\WebsitePanel.Server.Client.dll" />
+    <Content Include="bin\WebsitePanel.Server.Client.pdb" />
+    <Content Include="bin\WebsitePanel.Server.dll" />
+    <Content Include="bin\WebsitePanel.Server.pdb" />
+    <Content Include="bin\WebsitePanel.Server.Utils.dll" />
+    <Content Include="bin\WebsitePanel.Server.Utils.pdb" />
+    <Content Include="bin\WebsitePanel.Server.WPIService.exe" />
+    <Content Include="bin\WebsitePanel.Server.WPIService.pdb" />
+    <Content Include="bin\WpiServiceContract.dll" />
+    <Content Include="bin\WpiServiceContract.pdb" />
     <Content Include="BlackBerry.asmx" />
     <EmbeddedResource Include="Images\logo.png" />
     <Content Include="EnterpriseStorage.asmx" />
+    <Content Include="HostedSharePointServerEnt.asmx" />
     <Content Include="RemoteDesktopServices.asmx" />
     <Content Include="HeliconZoo.asmx" />
     <Content Include="LyncServer.asmx" />
@@ -115,9 +294,11 @@
     <Content Include="StatisticsServer.asmx" />
     <Content Include="VirtualizationServer.asmx" />
     <Content Include="VirtualizationServerForPrivateCloud.asmx" />
-    <Content Include="Web.config">
+    <Content Include="bin\WebsitePanel.Server.dll.config" />
+    <Content Include="bin\WebsitePanel.Server.WPIService.exe.config" />
+    <None Include="Web.config">
       <SubType>Designer</SubType>
-    </Content>
+    </None>
     <Content Include="WebServer.asmx" />
     <Content Include="WindowsServer.asmx" />
   </ItemGroup>
@@ -141,6 +322,10 @@
       <DependentUpon>EnterpriseStorage.asmx</DependentUpon>
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="HostedSharePointServerEnt.asmx.cs">
+      <DependentUpon>HostedSharePointServerEnt.asmx</DependentUpon>
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="RemoteDesktopServices.asmx.cs">
       <DependentUpon>RemoteDesktopServices.asmx</DependentUpon>
       <SubType>Component</SubType>
@@ -243,6 +428,10 @@
       <Project>{684C932A-6C75-46AC-A327-F3689D89EB42}</Project>
       <Name>WebsitePanel.Providers.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\WebsitePanel.Server.Client\WebsitePanel.Server.Client.csproj">
+      <Project>{990c4a2a-34a5-4be0-9546-e10abdfffd0e}</Project>
+      <Name>WebsitePanel.Server.Client</Name>
+    </ProjectReference>
     <ProjectReference Include="..\WebsitePanel.Server.Utils\WebsitePanel.Server.Utils.csproj">
       <Project>{E91E52F3-9555-4D00-B577-2B1DBDD87CA7}</Project>
       <Name>WebsitePanel.Server.Utils</Name>
@@ -253,7 +442,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="WsePolicyCache.Config" />
+    <None Include="Properties\PublishProfiles\WebsitePanel Server.pubxml" />
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Containers/Default/VPS2012.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Containers/Default/VPS2012.ascx
new file mode 100644
index 00000000..89c6426c
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Containers/Default/VPS2012.ascx
@@ -0,0 +1,10 @@
+<%@ Control Language="C#" AutoEventWireup="false" %>
+<div class="VpsFooter">
+	<div class="VpsHeader">
+		<div class="VpsBottom">
+			<div class="Vps2012Body">
+    	        <asp:PlaceHolder ID="ContentPane" runat="server"></asp:PlaceHolder>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ESModule_ControlsHierarchy.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ESModule_ControlsHierarchy.config
index f79eefba..7933d0cc 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ESModule_ControlsHierarchy.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ESModule_ControlsHierarchy.config
@@ -99,11 +99,22 @@
 	<Control key="sharepoint_edit_sitecollection" general_key="sharepoint_sitecollections" />
 	<Control key="sharepoint_backup_sitecollection" general_key="sharepoint_sitecollections" />
 	<Control key="sharepoint_restore_sitecollection" general_key="sharepoint_sitecollections" />
-  
+ 
 	<Control key="sharepoint_storage_settings" />
   
 	<Control key="sharepoint_storage_usage" />
 
+  <!--SharePoint Enterprise-->
+  <Control key="sharepoint_enterprise_sitecollections" />
+  <Control key="sharepoint_enterprise_edit_sitecollection" general_key="sharepoint_enterprise_sitecollections" />
+  <Control key="sharepoint_enterprise_backup_sitecollection" general_key="sharepoint_enterprise_sitecollections" />
+  <Control key="sharepoint_enterprise_restore_sitecollection" general_key="sharepoint_enterprise_sitecollections" />
+
+  <Control key="sharepoint_enterprise_storage_settings" />
+
+  <Control key="sharepoint_enterprise_storage_usage" />
+
+
 
   <!--BlackBerry-->
 	<Control key="blackberry_users" />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config
index 54627906..6a632d9b 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config
@@ -69,6 +69,7 @@
 			</MenuItems>
 		</MenuItem>
 		<MenuItem pageID="SpaceVPS" resourceGroup="VPS"/>
+		<MenuItem pageID="SpaceVPS2012" resourceGroup="VPS2012"/>
 		<MenuItem pageID="SpaceVPSForPC" resourceGroup="VPSForPC"/>
 		<MenuItem pageID="SpaceExchangeServer" resourceGroup="Hosted Organizations"/>
 		<MenuItem pageID="SpaceSharedSSL" resourceGroup="OS" quota="Web.SharedSSL"/>
@@ -123,6 +124,7 @@
     </Group>
     <Group pageID="SpaceHome" titleresourcekey="VPS" disabled="True">
       <Icon pageID="SpaceVPS" resourceGroup="VPS" imageUrl="icons/vps_48.png" />
+      <Icon pageID="SpaceVPS2012" resourceGroup="VPS2012" imageUrl="icons/vps_48.png" />
       <Icon pageID="SpaceVPSForPC" resourceGroup="VPSForPC" imageUrl="icons/vpsforpc_48.png" />
     </Group>
     <!-- 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config
index 8e94ffca..34fd75f5 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Modules.config
@@ -252,6 +252,16 @@
 	</ModuleDefinition>
 
 
+  <ModuleDefinition id="HostedSharePointEnterpriseSiteCollections">
+    <Controls>
+      <Control key="" src="WebsitePanel/HostedSharePointEnterpriseSiteCollections.ascx" title="HostedSharePointEnterpriseSiteCollections" type="View"  icon="colors_48.png"/>
+      <Control key="edit_item" src="WebsitePanel/HostedSharePointEnterpriseEditSiteCollection.ascx" title="HostedSharePointEnterpriseSiteCollection" type="View" icon="colors_48.png" />
+      <Control key="backup" src="WebsitePanel/HostedSharePointEnterpriseBackupSiteCollection.ascx" title="HostedSharePointEnterpriseBackupSiteCollection" type="View"/>
+      <Control key="restore" src="WebsitePanel/HostedSharePointEnterpriseRestoreSiteCollection.ascx" title="HostedSharePointEnterpriseRestoreSiteCollection" type="View"/>
+    </Controls>
+  </ModuleDefinition>
+
+
 	<ModuleDefinition id="FileManager">
 		<Controls>
 			<Control key="" src="WebsitePanel/FileManager.ascx" title="HostingSpaceFiles" type="View" />
@@ -535,14 +545,21 @@
       <Control key="crm_storage_settings" src="WebsitePanel/CRM/CRMStorageSettings.ascx" title="CRMRestoreSiteCollection" type="View"/>
 
 
-      <Control key="sharepoint_sitecollections" src="WebsitePanel/HostedSharePointSiteCollections.ascx" title="HostedSharePointSiteCollections" type="View"  icon="colors_48.png"/>
-			<Control key="sharepoint_edit_sitecollection" src="WebsitePanel/HostedSharePointEditSiteCollection.ascx" title="HostedSharePointSiteCollection" type="View" icon="colors_48.png" />
-			<Control key="sharepoint_backup_sitecollection" src="WebsitePanel/HostedSharePointBackupSiteCollection.ascx" title="HostedSharePointBackupSiteCollection" type="View"/>
-			<Control key="sharepoint_restore_sitecollection" src="WebsitePanel/HostedSharePointRestoreSiteCollection.ascx" title="HostedSharePointRestoreSiteCollection" type="View"/>
-			<Control key="sharepoint_storage_settings" src="WebsitePanel/HostedSharePointStorageSettings.ascx" title="HostedSharePointRestoreSiteCollection" type="View"/>
-			<Control key="sharepoint_storage_usage" src="WebsitePanel/HostedSharePointStorageUsage.ascx" title="HostedSharePointRestoreSiteCollection" type="View"/>
+      <Control key="sharepoint_sitecollections" src="WebsitePanel/HostedSharePoint/HostedSharePointSiteCollections.ascx" title="HostedSharePointSiteCollections" type="View"  icon="colors_48.png"/>
+			<Control key="sharepoint_edit_sitecollection" src="WebsitePanel/HostedSharePoint/HostedSharePointEditSiteCollection.ascx" title="HostedSharePointSiteCollection" type="View" icon="colors_48.png" />
+			<Control key="sharepoint_backup_sitecollection" src="WebsitePanel/HostedSharePoint/HostedSharePointBackupSiteCollection.ascx" title="HostedSharePointBackupSiteCollection" type="View"/>
+			<Control key="sharepoint_restore_sitecollection" src="WebsitePanel/HostedSharePoint/HostedSharePointRestoreSiteCollection.ascx" title="HostedSharePointRestoreSiteCollection" type="View"/>
+			<Control key="sharepoint_storage_settings" src="WebsitePanel/HostedSharePoint/HostedSharePointStorageSettings.ascx" title="HostedSharePointRestoreSiteCollection" type="View"/>
+			<Control key="sharepoint_storage_usage" src="WebsitePanel/HostedSharePoint/HostedSharePointStorageUsage.ascx" title="HostedSharePointRestoreSiteCollection" type="View"/>
 
 
+      <Control key="sharepoint_enterprise_sitecollections" src="WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseSiteCollections.ascx" title="HostedSharePointEnterpriseSiteCollections" type="View"  icon="colors_48.png"/>
+      <Control key="sharepoint_enterprise_edit_sitecollection" src="WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseEditSiteCollection.ascx" title="HostedSharePointEnterpriseSiteCollection" type="View" icon="colors_48.png" />
+      <Control key="sharepoint_enterprise_backup_sitecollection" src="WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseBackupSiteCollection.ascx" title="HostedSharePointEnterpriseBackupSiteCollection" type="View"/>
+      <Control key="sharepoint_enterprise_restore_sitecollection" src="WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseRestoreSiteCollection.ascx" title="HostedSharePointEnterpriseRestoreSiteCollection" type="View"/>
+      <Control key="sharepoint_enterprise_storage_settings" src="WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageSettings.ascx" title="HostedSharePointEnterpriseRestoreSiteCollection" type="View"/>
+      <Control key="sharepoint_enterprise_storage_usage" src="WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageUsage.ascx" title="HostedSharePointEnterpriseRestoreSiteCollection" type="View"/>
+
 			<Control key="blackberry_users" src="WebsitePanel/BlackBerry/BlackBerryUsers.ascx" title="BlackBerry Users" type="View" />
 			<Control key="create_new_blackberry_user" src="WebsitePanel/BlackBerry/CreateNewBlackBerryUser.ascx" title="Create New BlackBerry User" type="View" />
 			<Control key="edit_blackberry_user" src="WebsitePanel/BlackBerry/EditBlackBerryUser.ascx" title="Edit BlackBerry User" type="View" />
@@ -626,6 +643,37 @@
 		</Controls>
 	</ModuleDefinition>
 
+	<ModuleDefinition id="VPS2012">
+		<Controls>
+			<Control key="" src="WebsitePanel/VPS2012/VdcHome.ascx" title="VdcHome" type="View" />
+			<Control key="vdc_create_server" src="WebsitePanel/VPS2012/VdcCreateServer.ascx" title="VdcCreateServer" type="View" />
+      <Control key="vdc_import_server" src="WebsitePanel/VPS2012/VdcImportServer.ascx" title="VdcImportServer" type="View" />
+			<Control key="vdc_external_network" src="WebsitePanel/VPS2012/VdcExternalNetwork.ascx" title="VdcExternalNetwork" type="View" />
+			<Control key="vdc_management_network" src="WebsitePanel/VPS2012/VdcManagementNetwork.ascx" title="VdcManagementNetwork" type="View" />
+			<Control key="vdc_allocate_external_ip" src="WebsitePanel/VPS2012/VdcAddExternalAddress.ascx" title="VdcAddExternalAddress" type="View" />
+			<Control key="vdc_private_network" src="WebsitePanel/VPS2012/VdcPrivateNetwork.ascx" title="VdcPrivateNetwork" type="View" />
+			<Control key="vdc_permissions" src="WebsitePanel/VPS2012/VdcPermissions.ascx" title="VdcPermissions" type="View" />
+			<Control key="vdc_audit_log" src="WebsitePanel/VPS2012/VdcAuditLog.ascx" title="VdcAuditLog" type="View" />
+
+			<Control key="vps_general" src="WebsitePanel/VPS2012/VpsDetailsGeneral.ascx" title="VpsDetailsGeneral" type="View" />
+			<Control key="vps_config" src="WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx" title="VpsDetailsConfiguration" type="View" />
+			<Control key="vps_edit_config" src="WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx" title="VpsDetailsEditConfiguration" type="View" />
+			<Control key="vps_dvd" src="WebsitePanel/VPS2012/VpsDetailsDvd.ascx" title="VpsDetailsDvd" type="View" />
+			<Control key="vps_insert_dvd" src="WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx" title="VpsDetailsInsertDvd" type="View" />
+			<Control key="vps_snapshots" src="WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx" title="VpsDetailsSnapshots" type="View" />
+			<Control key="vps_network" src="WebsitePanel/VPS2012/VpsDetailsNetwork.ascx" title="VpsDetailsNetwork" type="View" />
+			<Control key="vps_add_external_ip" src="WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx" title="VpsDetailsAddExternalAddress" type="View" />
+			<Control key="vps_add_private_ip" src="WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx" title="VpsDetailsAddPrivateAddress" type="View" />
+			<Control key="vps_permissions" src="WebsitePanel/VPS2012/VpsDetailsPermissions.ascx" title="VpsDetailsNetworking" type="View" />
+			<Control key="vps_tools" src="WebsitePanel/VPS2012/VpsDetailsTools.ascx" title="VpsDetailsTools" type="View" />
+			<Control key="vps_audit_log" src="WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx" title="VpsDetailsAuditLog" type="View" />
+			<Control key="vps_help" src="WebsitePanel/VPS2012/VpsDetailsHelp.ascx" title="VpsDetailsHelp" type="View" />
+			<Control key="vps_tools_delete" src="WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx" title="VpsToolsDeleteServer" type="View" />
+      <Control key="vps_tools_move" src="WebsitePanel/VPS2012/VpsMoveServer.ascx" title="VpsMoveServer" type="View" />
+			<Control key="vps_tools_reinstall" src="WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx" title="VpsToolsReinstallServer" type="View" />
+		</Controls>
+	</ModuleDefinition>
+
   <ModuleDefinition id="VPSForPC">
     <Controls>
       <Control key="" src="WebsitePanel/VPSForPC/VdcHome.ascx" title="VdcHome" type="View" />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Pages.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Pages.config
index e10593c1..23692e45 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Pages.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Pages.config
@@ -175,6 +175,17 @@
     </Content>
   </Page>
 
+  <Page name="SpaceOrganizationHostedSharePointEnterprise" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
+    <Content id="LeftPane">
+      <Module moduleDefinitionID="HostedSolutionMenu" title="HostedSolutionMenu" container="Clear.ascx">
+        <ModuleData ref="HostedSolutionMenu"/>
+      </Module>
+    </Content>
+    <Content id="ContentPane">
+      <Module moduleDefinitionID="HostedSharePointEnterpriseSiteCollections" title="HostedSharePointEnterpriseSiteCollections" icon="colors_48.png" />
+    </Content>
+  </Page>
+
   <Page name="SpaceDomains" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
     <Content id="LeftPane">
       <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
@@ -641,6 +652,20 @@
     </Content>
   </Page>
 
+  <Page name="SpaceVPS2012" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="VPS.ascx" adminskin="VPS.ascx">
+    <Content id="LeftPane">
+      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
+        <ModuleData ref="UserMenu"/>
+      </Module>
+      <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
+        <ModuleData ref="SpaceMenu"/>
+      </Module>
+    </Content>
+    <Content id="ContentPane">
+      <Module moduleDefinitionID="VPS2012" title="VirtualPrivateServers2012" icon="" container="VPS2012.ascx" admincontainer="VPS2012.ascx" readOnlyRoles="PlatformCSR,ResellerCSR"/>
+    </Content>
+  </Page>
+
   <Page name="SpaceVPSForPC" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="VPS.ascx" adminskin="VPS.ascx">
     <Content id="LeftPane">
       <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Modules.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Modules.ascx.resx
index 33515c24..08aa99a4 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Modules.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Modules.ascx.resx
@@ -732,6 +732,21 @@
   <data name="ModuleTitle.HostedSharePointRestoreSiteCollection" xml:space="preserve">
     <value>Restore Site Collection</value>
   </data>
+
+
+  <data name="ModuleTitle.HostedSharePointEnterpriseSiteCollection" xml:space="preserve">
+    <value>SharePoint Enterprise Site Collection</value>
+  </data>
+  <data name="ModuleTitle.HostedSharePointEnterpriseSiteCollections" xml:space="preserve">
+    <value>Hosted SharePoint Enterprise Site Collections</value>
+  </data>
+  <data name="ModuleTitle.HostedSharePointEnterpriseBackupSiteCollection" xml:space="preserve">
+    <value>Backup Site Collection</value>
+  </data>
+  <data name="ModuleTitle.HostedSharePointEnterpriseRestoreSiteCollection" xml:space="preserve">
+    <value>Restore Site Collection</value>
+  </data>
+
   <data name="ModuleTitle.WebSiteIPAddresses" xml:space="preserve">
     <value>Web Site IP Addresses</value>
   </data>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Pages.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Pages.ascx.resx
index dace43a8..d5ee58d7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Pages.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_Pages.ascx.resx
@@ -444,6 +444,12 @@
   <data name="PageTitle.SpaceVPS" xml:space="preserve">
     <value>{user} - {space} - Virtual Private Servers</value>
   </data>
+  <data name="PageName.SpaceVPS2012" xml:space="preserve">
+    <value>Virtual Private Servers 2012</value>
+  </data>
+  <data name="PageTitle.SpaceVPS2012" xml:space="preserve">
+    <value>{user} - {space} - Virtual Private Servers 2012</value>
+  </data>
   <data name="PageName.SpaceWebIPAddresses" xml:space="preserve">
     <value>IP Addresses</value>
   </data>
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 b9b15589..37177986 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
@@ -3370,15 +3370,15 @@
   <data name="Quota.HostedSolution.DeletedUsersBackupStorageSpace" xml:space="preserve">
     <value>Deleted Users Backup Storage Space per Organization, Mb</value>
   </data>
-  <data name="ResourceGroup.Hosted SharePoint" xml:space="preserve">
-    <value>Hosted SharePoint</value>
-  </data>
   <data name="ResourceGroup.SharePoint Foundation Server" xml:space="preserve">
     <value>SharePoint Foundation Server</value>
   </data>
   <data name="ResourceGroup.SharePoint Server" xml:space="preserve">
     <value>SharePoint Server</value>
   </data>
+  <data name="ResourceGroup.SharePoint Enterprise Server" xml:space="preserve">
+    <value>SharePoint Enterprise Server</value>
+  </data>
   <data name="ResourceGroup.OCS" xml:space="preserve">
     <value>Office Communications Server</value>
   </data>
@@ -3397,6 +3397,12 @@
   <data name="Quota.HostedSharePointServer.MaxStorage" xml:space="preserve">
     <value>Max site storage, MB</value>
   </data>
+  <data name="Quota.HostedSharePointEnterprise.Sites" xml:space="preserve">
+    <value>SharePoint Enterprise Site Collections per Organization</value>
+  </data>
+  <data name="Quota.HostedSharePointEnterprise.MaxStorage" xml:space="preserve">
+    <value>Max site storage, MB</value>
+  </data>
   <data name="Quota.HostedCRM.Users" xml:space="preserve">
     <value>Full licenses per organization</value>
   </data>
@@ -4261,6 +4267,9 @@
   <data name="VPS.VPS_QUOTA_WRONG_RAM" xml:space="preserve">
     <value>RAM size must be a positive number and greater than zero</value>
   </data>
+  <data name="VPS.VPS_QUOTA_NOT_IN_DYNAMIC_RAM" xml:space="preserve">
+    <value>RAM size must be between the minimum and maximum of the dynamic memory</value>
+  </data>
   <data name="VPS.VPS_QUOTA_WRONG_SNAPSHOTS" xml:space="preserve">
     <value>Snapshots must be a positive number and greater than zero</value>
   </data>
@@ -5122,6 +5131,74 @@
   <data name="Quota.VPSForPC.StartShutdownAllowed" xml:space="preserve">
     <value>Allow user to Start, Turn off VPS</value>
   </data>
+
+  <data name="ResourceGroup.VPS2012" xml:space="preserve">
+    <value>Virtual Private Servers 2012</value>
+  </data>
+  <data name="AuditLogSource.VPS2012" xml:space="preserve">
+    <value>Virtual Private Servers 2012</value>
+  </data>
+  <data name="Quota.VPS2012.Bandwidth" xml:space="preserve">
+    <value>Monthly bandwidth, GB</value>
+  </data>
+  <data name="Quota.VPS2012.BootCdAllowed" xml:space="preserve">
+    <value>Boot from CD allowed</value>
+  </data>
+  <data name="Quota.VPS2012.BootCdEnabled" xml:space="preserve">
+    <value>Boot from CD</value>
+  </data>
+  <data name="Quota.VPS2012.CpuNumber" xml:space="preserve">
+    <value>Number of CPU cores</value>
+  </data>
+  <data name="Quota.VPS2012.DvdEnabled" xml:space="preserve">
+    <value>DVD drive</value>
+  </data>
+  <data name="Quota.VPS2012.ExternalIPAddressesNumber" xml:space="preserve">
+    <value>Number of External IP addresses</value>
+  </data>
+  <data name="Quota.VPS2012.ExternalNetworkEnabled" xml:space="preserve">
+    <value>External Network</value>
+  </data>
+  <data name="Quota.VPS2012.Hdd" xml:space="preserve">
+    <value>Hard Drive size, GB</value>
+  </data>
+  <data name="Quota.VPS2012.ManagingAllowed" xml:space="preserve">
+    <value>Allow user to create, delete VPS</value>
+  </data>
+  <data name="Quota.VPS2012.NumLockEnabled" xml:space="preserve">
+    <value>"Num Lock" by default</value>
+  </data>
+  <data name="Quota.VPS2012.PauseResumeAllowed" xml:space="preserve">
+    <value>Allow user to Pause, Resume VPS</value>
+  </data>
+  <data name="Quota.VPS2012.PrivateIPAddressesNumber" xml:space="preserve">
+    <value>Number of Private IP addresses per VPS</value>
+  </data>
+  <data name="Quota.VPS2012.PrivateNetworkEnabled" xml:space="preserve">
+    <value>Private Network</value>
+  </data>
+  <data name="Quota.VPS2012.Ram" xml:space="preserve">
+    <value>RAM size, MB</value>
+  </data>
+  <data name="Quota.VPS2012.RebootAllowed" xml:space="preserve">
+    <value>Allow user to Reboot VPS</value>
+  </data>
+  <data name="Quota.VPS2012.ReinstallAllowed" xml:space="preserve">
+    <value>Allow user to Re-install VPS</value>
+  </data>
+  <data name="Quota.VPS2012.ResetAlowed" xml:space="preserve">
+    <value>Allow user to Reset VPS</value>
+  </data>
+  <data name="Quota.VPS2012.ServersNumber" xml:space="preserve">
+    <value>Number of VPS</value>
+  </data>
+  <data name="Quota.VPS2012.SnapshotsNumber" xml:space="preserve">
+    <value>Number of Snaphots</value>
+  </data>
+  <data name="Quota.VPS2012.StartShutdownAllowed" xml:space="preserve">
+    <value>Allow user to Start, Turn off VPS</value>
+  </data>
+  
   <data name="Error.CreateCheckPointError" xml:space="preserve">
     <value>Error creating CheckPoint</value>
   </data>
@@ -5173,6 +5250,9 @@
   <data name="Quota.HostedSharePoint.UseSharedSSL" xml:space="preserve">
     <value>Use shared SSL Root</value>
   </data>
+  <data name="Quota.HostedSharePointEnterprise.UseSharedSSL" xml:space="preserve">
+    <value>Use shared SSL Root</value>
+  </data>
   <data name="Quota.HostedSharePointServer.UseSharedSSL" xml:space="preserve">
     <value>Use shared SSL Root</value>
   </data>
@@ -5701,6 +5781,12 @@
   <data name="ERROR.REMOTE_DESKTOP_SERVICES_LOG_OFF_USER" xml:space="preserve">
     <value>RDS User logging off error</value>
   </data>
+  <data name="ERROR.REMOTE_DESKTOP_SERVICES_VIEW_SESSION" xml:space="preserve">
+    <value>View session error</value>
+  </data>
+    <data name="ERROR.REMOTE_DESKTOP_SERVICES_CONTROL_SESSION" xml:space="preserve">
+    <value>Control session error</value>
+  </data>
   <data name="ERROR.REMOTE_DESKTOP_SERVICES_USER_SESSIONS" xml:space="preserve">
     <value>Getting RDS User sessions error</value>
   </data>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/Ecommerce/WebsitePanel.Portal.Ecommerce.Modules.csproj b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/Ecommerce/WebsitePanel.Portal.Ecommerce.Modules.csproj
index 8fda74b1..5593d561 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/Ecommerce/WebsitePanel.Portal.Ecommerce.Modules.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/Ecommerce/WebsitePanel.Portal.Ecommerce.Modules.csproj
@@ -1168,6 +1168,9 @@
   <ItemGroup>
     <Content Include="Web.config" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\PublishProfiles\Default Settings.pubxml" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx
index f6644414..5631492c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/OrganizationMenu.ascx.resx
@@ -204,7 +204,7 @@
   <data name="Text.SharePointFoundationServerGroup" xml:space="preserve">
     <value>SharePoint Foundation</value>
   </data>
-  <data name="Text.SharePointServerGroup" xml:space="preserve">
+  <data name="Text.SharePointEnterpriseServerGroup" xml:space="preserve">
     <value>SharePoint Server</value>
   </data>
   <data name="Text.SiteCollections" xml:space="preserve">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SettingsRdsPolicy.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SettingsRdsPolicy.ascx.resx
index 91b50033..4e783a67 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SettingsRdsPolicy.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SettingsRdsPolicy.ascx.resx
@@ -123,6 +123,15 @@
   <data name="cbUsers.Text" xml:space="preserve">
     <value>Users</value>
   </data>
+  <data name="secChangeDesktop.Text" xml:space="preserve">
+    <value>Changing Desktop Disabled</value>
+  </data>
+  <data name="secControlSession.Text" xml:space="preserve">
+    <value>Control RDS Session without Users's Permission</value>
+  </data>
+  <data name="secDisableCmd.Text" xml:space="preserve">
+    <value>Disable Command Prompt</value>
+  </data>
   <data name="secDriveSpace.Text" xml:space="preserve">
     <value>Drive Space Threshold</value>
   </data>
@@ -145,9 +154,9 @@
     <value>Disable Task Manager</value>
   </data>
   <data name="secTimeout.Text" xml:space="preserve">
-    <value>Lock Screen Timeout</value>
+    <value>Lock Screen Timeout (sec.)</value>
   </data>
-  <data name="sekChangeDesktop.Text" xml:space="preserve">
-    <value>Changing Desktop Disabled</value>
+  <data name="secViewSession.Text" xml:space="preserve">
+    <value>View RDS Session without Users's Permission</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceQuotas.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceQuotas.ascx.resx
index fc627511..da260eaf 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceQuotas.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceQuotas.ascx.resx
@@ -180,8 +180,8 @@
   <data name="lblOCSUsers.Text" xml:space="preserve">
     <value>OCS Users:</value>
   </data>
-  <data name="lblSharepointSites" xml:space="preserve">
-    <value>Sharepoint Sites:</value>
+  <data name="lblSharepointSites.Text" xml:space="preserve">
+    <value>SharePoint Foundation Sites:</value>
   </data>
   <data name="lblUserAccounts.Text" xml:space="preserve">
     <value>User Accounts:</value>
@@ -210,4 +210,7 @@
   <data name="lblDeletedUsers.Text" xml:space="preserve">
     <value>Deleted Users:</value>
   </data>
+  <data name="lblSharepointEnterpriseSites.Text" xml:space="preserve">
+    <value>SharePoint Server Sites:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceSettings.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceSettings.ascx.resx
index 9bb30cb6..1c39f562 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceSettings.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SpaceSettings.ascx.resx
@@ -141,6 +141,9 @@
   <data name="lnkVps.Text" xml:space="preserve">
     <value>Virtual Private Servers</value>
   </data>
+  <data name="lnkVps2012.Text" xml:space="preserve">
+    <value>Virtual Private Servers 2012</value>
+  </data>
   <data name="lnkVpsForPC.Text" xml:space="preserve">
     <value>Virtual Private Servers for Private Cloud</value>
   </data>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
index 135dc55a..1d9cf5da 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserOrganization.ascx.resx
@@ -237,9 +237,9 @@
   <data name="Text.SharePointFoundationServerGroup" xml:space="preserve">
     <value>Hosted Organization - SharePoint Foundation Server</value>
   </data>
-  <data name="Text.SharePointServerGroup" xml:space="preserve">
+  <data name="Text.SharePointEnterpriseServerGroup" xml:space="preserve">
     <value>Hosted Organization - SharePoint Server</value>
-  </data>  
+  </data>
   <data name="Text.SiteCollections" xml:space="preserve">
     <value>Sharepoint Sites</value>
   </data>
@@ -250,7 +250,7 @@
     <value>Storage Usage</value>
   </data>
   <data name="Text.Users" xml:space="preserve">
-    <value>Users</value>
+    <value>Users (User Organization)</value>
   </data>
   <data name="Text.CreateOrganization" xml:space="preserve">
     <value>Create Organization</value>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Framework/ES.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Framework/ES.cs
index 90d1df09..ec67a269 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Framework/ES.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Framework/ES.cs
@@ -68,6 +68,11 @@ namespace WebsitePanel.Portal
             get { return GetCachedProxy<esVirtualizationServer>(); }
         }
 
+        public esVirtualizationServer2012 VPS2012
+        {
+            get { return GetCachedProxy<esVirtualizationServer2012>(); }
+        }
+
         public esVirtualizationServerForPrivateCloud VPSPC
         {
             get { return GetCachedProxy<esVirtualizationServerForPrivateCloud>(); }
@@ -198,6 +203,11 @@ namespace WebsitePanel.Portal
 			get { return GetCachedProxy<esHostedSharePointServers>(); }
 		}
 
+        public esHostedSharePointServersEnt HostedSharePointServersEnt
+        {
+            get { return GetCachedProxy<esHostedSharePointServersEnt>(); }
+        }
+
         public esImport Import
         {
             get { return GetCachedProxy<esImport>(); }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Framework/Utils.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Framework/Utils.cs
index fccbcbb2..8e745c8f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Framework/Utils.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Framework/Utils.cs
@@ -337,7 +337,7 @@ namespace WebsitePanel.Portal
             {
                 if (((CheckBox)gvr.FindControl(checkboxName)).Checked)
                 {
-                    string userId = gridView.DataKeys[gvr.DataItemIndex].Value.ToString();
+                    string userId = gridView.DataKeys[gvr.DataItemIndex % gridView.PageSize].Value.ToString();
                     userIds.Add((T)Convert.ChangeType(userId, typeof(T)));
                 }
             }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/HostedSharePointEnterpriseSiteCollectionsHelper.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/HostedSharePointEnterpriseSiteCollectionsHelper.cs
new file mode 100644
index 00000000..5ed1105a
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/HostedSharePointEnterpriseSiteCollectionsHelper.cs
@@ -0,0 +1,67 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Data;
+using System.Configuration;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using WebsitePanel.Providers.SharePoint;
+using System.Collections.Generic;
+
+namespace WebsitePanel.Portal
+{
+	public class HostedSharePointEnterpriseSiteCollectionsHelper
+	{
+		SharePointEnterpriseSiteCollectionListPaged result;
+
+		public int GetSharePointEnterpriseSiteCollectionPagedCount(int packageId, int organizationId, string filterColumn, string filterValue)
+		{
+			return result.TotalRowCount;
+		}
+
+
+
+        public List<SharePointEnterpriseSiteCollection> GetSharePointEnterpriseSiteCollectionPaged(int packageId, int organizationId, string filterColumn, string filterValue, int maximumRows, int startRowIndex, string sortColumn)
+		{
+			if (!String.IsNullOrEmpty(filterValue))
+			{
+				filterValue = filterValue + "%";
+			}
+
+			result = ES.Services.HostedSharePointServersEnt.Enterprise_GetSiteCollectionsPaged(packageId, organizationId, filterColumn, filterValue, sortColumn, startRowIndex, maximumRows);
+
+			return result.SiteCollections;            
+		}
+
+	}
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/HostedSharePointSiteCollectionsHelper.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/HostedSharePointSiteCollectionsHelper.cs
index 50a0078e..6f0dd712 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/HostedSharePointSiteCollectionsHelper.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/HostedSharePointSiteCollectionsHelper.cs
@@ -37,7 +37,6 @@ using System.Web.UI.WebControls.WebParts;
 using System.Web.UI.HtmlControls;
 using WebsitePanel.Providers.SharePoint;
 using System.Collections.Generic;
-using WebsitePanel.EnterpriseServer;
 
 namespace WebsitePanel.Portal
 {
@@ -45,28 +44,19 @@ namespace WebsitePanel.Portal
 	{
 		SharePointSiteCollectionListPaged result;
 
-		public int GetSharePointSiteCollectionPagedCount(int packageId, int organizationId, string groupName, string filterColumn, string filterValue)
+		public int GetSharePointSiteCollectionPagedCount(int packageId, int organizationId, string filterColumn, string filterValue)
 		{
 			return result.TotalRowCount;
 		}
 
-		public List<SharePointSiteCollection> GetSharePointSiteCollectionPaged(int packageId, int organizationId, string groupName, string filterColumn, string filterValue, int maximumRows, int startRowIndex, string sortColumn)
+		public List<SharePointSiteCollection> GetSharePointSiteCollectionPaged(int packageId, int organizationId, string filterColumn, string filterValue, int maximumRows, int startRowIndex, string sortColumn)
 		{
 			if (!String.IsNullOrEmpty(filterValue))
 			{
 				filterValue = filterValue + "%";
 			}
 
-            if (ResourceGroups.SharepointFoundationServer.Replace(" ", "").Equals(groupName))
-            {
-                groupName = ResourceGroups.SharepointFoundationServer;
-            }
-            else if (ResourceGroups.SharepointServer.Replace(" ", "").Equals(groupName))
-            {
-                groupName = ResourceGroups.SharepointServer;
-            }
-
-			result = ES.Services.HostedSharePointServers.GetSiteCollectionsPaged(packageId, organizationId, filterColumn, filterValue, sortColumn, startRowIndex, maximumRows, groupName);
+			result = ES.Services.HostedSharePointServers.GetSiteCollectionsPaged(packageId, organizationId, filterColumn, filterValue, sortColumn, startRowIndex, maximumRows);
 
 			return result.SiteCollections;            
 		}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/VirtualMachineSettingExtensions.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/VirtualMachineSettingExtensions.cs
new file mode 100644
index 00000000..ec313c46
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/VirtualMachineSettingExtensions.cs
@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Web.UI;
+using WebsitePanel.Providers.Virtualization;
+
+namespace WebsitePanel.Portal.Code.Helpers
+{
+
+    public static class VirtualMachineSettingExtensions
+    {
+        public static void BindSettingsControls(this Control page, VirtualMachine vm)
+        {
+            page.GetSettingsControls().ForEach(s => s.BindItem(vm));
+        }
+
+        public static void SaveSettingsControls(this Control page, ref VirtualMachine vm)
+        {
+            foreach (var s in page.GetSettingsControls()) s.SaveItem(ref vm);
+        }
+
+        public static List<IVirtualMachineSettingsControl> GetSettingsControls(this Control parent)
+        {
+            var result = new List<IVirtualMachineSettingsControl>();
+            foreach (Control control in parent.Controls)
+            {
+                if (control is IVirtualMachineSettingsControl)
+                    result.Add((IVirtualMachineSettingsControl)control);
+
+                if (control.HasControls())
+                    result.AddRange(control.GetSettingsControls());
+            }
+            return result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/VirtualMachines2012Helper.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/VirtualMachines2012Helper.cs
new file mode 100644
index 00000000..0ad705fd
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/VirtualMachines2012Helper.cs
@@ -0,0 +1,129 @@
+// Copyright (c) 2015, 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.
+
+using WebsitePanel.EnterpriseServer;
+using WebsitePanel.Providers.Virtualization;
+using System.Web;
+using System;
+
+namespace WebsitePanel.Portal
+{
+    public class VirtualMachines2012Helper
+    {
+        public static bool IsVirtualMachineManagementAllowed(int packageId)
+        {
+            bool manageAllowed = false;
+            PackageContext cntx = PackagesHelper.GetCachedPackageContext(packageId);
+            if (cntx.Quotas.ContainsKey(Quotas.VPS2012_MANAGING_ALLOWED))
+                manageAllowed = !cntx.Quotas[Quotas.VPS2012_MANAGING_ALLOWED].QuotaExhausted;
+
+            if (PanelSecurity.EffectiveUser.Role == UserRole.Administrator)
+                manageAllowed = true;
+            else if (PanelSecurity.EffectiveUser.Role == UserRole.Reseller)
+            {
+                // check if the reseller is allowed to manage on its parent level
+                PackageInfo package = ES.Services.Packages.GetPackage(PanelSecurity.PackageId);
+                if (package.UserId != PanelSecurity.EffectiveUserId)
+                {
+                    cntx = PackagesHelper.GetCachedPackageContext(package.ParentPackageId);
+                    if (cntx != null && cntx.Quotas.ContainsKey(Quotas.VPS2012_MANAGING_ALLOWED))
+                        manageAllowed = !cntx.Quotas[Quotas.VPS2012_MANAGING_ALLOWED].QuotaExhausted;
+                }
+            }
+            return manageAllowed;
+        }
+
+        // TODO: Move this method to the corresponding extension later.
+        public static VirtualMachine GetCachedVirtualMachine(int itemId)
+        {
+            return VirtualMachinesExtensions.GetCachedVirtualMachine<VirtualMachine>(
+                itemId, () => ES.Services.VPS2012.GetVirtualMachineItem(itemId));
+        }
+
+        #region Virtual Machines
+        VirtualMachineMetaItemsPaged vms;
+        public VirtualMachineMetaItem[] GetVirtualMachines(int packageId, string filterColumn, string filterValue,
+            string sortColumn, int maximumRows, int startRowIndex)
+        {
+            vms = ES.Services.VPS2012.GetVirtualMachines(packageId, filterColumn, filterValue,
+                    sortColumn, startRowIndex, maximumRows, true);
+            return vms.Items;
+        }
+
+        public int GetVirtualMachinesCount(int packageId, string filterColumn, string filterValue)
+        {
+            return vms.Count;
+        }
+        #endregion
+
+        #region Package IP Addresses
+        PackageIPAddressesPaged packageAddresses;
+        public PackageIPAddress[] GetPackageIPAddresses(int packageId, IPAddressPool pool, string filterColumn, string filterValue,
+            string sortColumn, int maximumRows, int startRowIndex)
+        {
+            packageAddresses = ES.Services.Servers.GetPackageIPAddresses(packageId, 0, pool,
+                filterColumn, filterValue, sortColumn, startRowIndex, maximumRows, true);
+            return packageAddresses.Items;
+        }
+
+        public int GetPackageIPAddressesCount(int packageId, IPAddressPool pool, string filterColumn, string filterValue)
+        {
+            return packageAddresses.Count;
+        }
+
+        public PackageIPAddress[] GetPackageIPAddresses(int packageId, int orgId, IPAddressPool pool, string filterColumn, string filterValue,
+            string sortColumn, int maximumRows, int startRowIndex)
+        {
+            packageAddresses = ES.Services.Servers.GetPackageIPAddresses(packageId, orgId, pool,
+                filterColumn, filterValue, sortColumn, startRowIndex, maximumRows, true);
+            return packageAddresses.Items;
+        }
+
+        public int GetPackageIPAddressesCount(int packageId, int orgId, IPAddressPool pool, string filterColumn, string filterValue)
+        {
+            return packageAddresses.Count;
+        }
+        #endregion
+
+        #region Package Private IP Addresses
+        PrivateIPAddressesPaged privateAddresses;
+        public PrivateIPAddress[] GetPackagePrivateIPAddresses(int packageId, string filterColumn, string filterValue,
+            string sortColumn, int maximumRows, int startRowIndex)
+        {
+            privateAddresses = ES.Services.VPS2012.GetPackagePrivateIPAddressesPaged(packageId, filterColumn, filterValue,
+                sortColumn, startRowIndex, maximumRows);
+            return privateAddresses.Items;
+        }
+
+        public int GetPackagePrivateIPAddressesCount(int packageId, string filterColumn, string filterValue)
+        {
+            return privateAddresses.Count;
+        }
+        #endregion
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/ProviderControls/IVirtualMachineCreateControl.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/ProviderControls/IVirtualMachineSettingsControl.cs
similarity index 78%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/ProviderControls/IVirtualMachineCreateControl.cs
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/ProviderControls/IVirtualMachineSettingsControl.cs
index 7ffcba0b..c35799ea 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/ProviderControls/IVirtualMachineCreateControl.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/ProviderControls/IVirtualMachineSettingsControl.cs
@@ -26,27 +26,24 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-using System;
-using System.Data;
-using System.Configuration;
-using System.Web;
-using System.Web.Security;
+using System.Collections.Generic;
 using System.Web.UI;
-using System.Web.UI.WebControls;
-using System.Web.UI.WebControls.WebParts;
-using System.Web.UI.HtmlControls;
-
-using WebsitePanel.Providers.Mail;
 using WebsitePanel.Providers.Virtualization;
 
 namespace WebsitePanel.Portal
 {
-    /// <summary>
-    /// Summary description for IVirtualMachineCreateControl
-    /// </summary>
-    public interface IVirtualMachineCreateControl
+    public enum VirtualMachineSettingsMode
     {
-        void BindItem(VirtualMachine item);
-        void SaveItem(VirtualMachine item);
+        Display,
+        Edit,
+        Summary,
     }
+
+    public interface IVirtualMachineSettingsControl
+    {
+        VirtualMachineSettingsMode Mode { get; set; }
+        void BindItem(VirtualMachine item);
+        void SaveItem(ref VirtualMachine item);
+    }
+
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationHome.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationHome.ascx.resx
index d3d1e91f..3fb7dd1f 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationHome.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationHome.ascx.resx
@@ -196,7 +196,7 @@
     <value>OCS</value>
   </data>
   <data name="locSharePoint.Text" xml:space="preserve">
-    <value>SharePoint</value>
+    <value>SharePoint Foundation</value>
   </data>
   <data name="locTitle.Text" xml:space="preserve">
     <value>Home</value>
@@ -237,6 +237,9 @@
   <data name="lnkRdsUsers.Text" xml:space="preserve">
     <value>RDS Users</value>
   </data>
+  <data name="locSharePointEnterprise.Text" xml:space="preserve">
+    <value>SharePoint Server</value>
+  </data>
   <data name="lnkEditOrganizationSettings.Text" xml:space="preserve">
     <value>Edit</value>
   </data>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationHome.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationHome.ascx
index b1510caa..1d794907 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationHome.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationHome.ascx
@@ -226,6 +226,25 @@
                         </tr>
                         </asp:Panel>
 
+                        <asp:Panel runat="server" ID="sharePointEnterpriseStatsPanel">
+                        <tr class="OrgStatsRow">
+                            <td class="OrgStatsGroup" width="100%" colspan="2">
+                                <asp:Localize ID="locSharePointEnterprise" runat="server" meta:resourcekey="locSharePointEnterprise"
+                                    Text="Organization Statistics"></asp:Localize>
+                            </td>
+                        </tr>
+                        <tr class="OrgStatsRow">
+                            <td class="OrgStatsQuota" nowrap> 
+                                <asp:HyperLink ID="lnkEnterpriseSiteCollections" runat="server" meta:resourcekey="lnkSiteCollections"></asp:HyperLink>
+                            </td>
+                            <td>
+                                <wsp:QuotaViewer ID="enterpriseSiteCollectionsStats" QuotaTypeId="2" runat="server" DisplayGauge="true" />
+                            </td>
+                        </tr>
+                        </asp:Panel>
+
+
+
                         <asp:Panel runat="server" ID="ocsStatsPanel">
                         <tr>
                             <td class="OrgStatsGroup" width="100%" colspan="2">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationHome.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationHome.ascx.cs
index de167b9a..0631c701 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationHome.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationHome.ascx.cs
@@ -252,6 +252,21 @@ namespace WebsitePanel.Portal.ExchangeServer
             else
                 sharePointStatsPanel.Visible = false;
 
+            //Show SharePoint statistics
+            if (cntx.Groups.ContainsKey(ResourceGroups.SharepointEnterpriseServer))
+            {
+                sharePointEnterpriseStatsPanel.Visible = true;
+
+                lnkEnterpriseSiteCollections.NavigateUrl = EditUrl("ItemID", PanelRequest.ItemID.ToString(), "sharepoint_enterprise_sitecollections",
+                "SpaceID=" + PanelSecurity.PackageId);
+                enterpriseSiteCollectionsStats.QuotaUsedValue = orgStats.CreatedSharePointEnterpriseSiteCollections;
+                enterpriseSiteCollectionsStats.QuotaValue = orgStats.AllocatedSharePointEnterpriseSiteCollections;
+                if (orgStats.AllocatedSharePointEnterpriseSiteCollections != -1) enterpriseSiteCollectionsStats.QuotaAvailable = tenantStats.AllocatedSharePointEnterpriseSiteCollections - tenantStats.CreatedSharePointEnterpriseSiteCollections;
+            }
+            else
+                sharePointEnterpriseStatsPanel.Visible = false;
+
+
             if (cntx.Groups.ContainsKey(ResourceGroups.OCS))
             {
                 ocsStatsPanel.Visible = true;
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationHome.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationHome.ascx.designer.cs
index f0f7aab1..3e45260d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationHome.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationHome.ascx.designer.cs
@@ -543,6 +543,42 @@ namespace WebsitePanel.Portal.ExchangeServer {
         /// </remarks>
         protected global::WebsitePanel.Portal.QuotaViewer siteCollectionsStats;
         
+        /// <summary>
+        /// sharePointEnterpriseStatsPanel 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 sharePointEnterpriseStatsPanel;
+        
+        /// <summary>
+        /// locSharePointEnterprise 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 locSharePointEnterprise;
+        
+        /// <summary>
+        /// lnkEnterpriseSiteCollections 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.HyperLink lnkEnterpriseSiteCollections;
+        
+        /// <summary>
+        /// enterpriseSiteCollectionsStats control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.QuotaViewer enterpriseSiteCollectionsStats;
+        
         /// <summary>
         /// ocsStatsPanel control.
         /// </summary>
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 6563c74a..cd6d756e 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
@@ -168,8 +168,8 @@
   <data name="Text.SharePointFoundationServerGroup" xml:space="preserve">
     <value>SharePoint Foundation</value>
   </data>
-  <data name="Text.SharePointServerGroup" xml:space="preserve">
-    <value>SharePoint Server</value>
+  <data name="Text.SharePointEnterpriseServerGroup" xml:space="preserve">
+    <value>SharePoint Enterprise</value>
   </data>
   <data name="Text.OCSGroup" xml:space="preserve">
     <value>OCS</value>
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 45d1f8c5..359e8091 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
@@ -251,6 +251,20 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
             groups.Add(sharepointGroup);
 
 
+        }
+
+
+        private void PrepareSharePointEnterpriseMenu(PackageContext cntx, List<MenuGroup> groups, string imagePath, string menuItemText)
+        {
+            MenuGroup sharepointGroup =
+                    new MenuGroup(menuItemText, imagePath + "sharepoint24.png");
+            sharepointGroup.MenuItems.Add(CreateMenuItem("SiteCollections", "sharepoint_enterprise_sitecollections"));
+            sharepointGroup.MenuItems.Add(CreateMenuItem("StorageUsage", "sharepoint_enterprise_storage_usage"));
+            sharepointGroup.MenuItems.Add(CreateMenuItem("StorageLimits", "sharepoint_enterprise_storage_settings"));
+
+            groups.Add(sharepointGroup);
+
+
         }
 
         private void PrepareOCSMenu(PackageContext cntx, List<MenuGroup> groups, string imagePath)
@@ -319,9 +333,9 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
                 PrepareSharePointMenu(cntx, groups, imagePath, GetLocalizedString("Text.SharePointFoundationServerGroup"));
             }
 
-            if (cntx.Groups.ContainsKey(ResourceGroups.SharepointServer))
+            if (cntx.Groups.ContainsKey(ResourceGroups.SharepointEnterpriseServer))
             {
-                PrepareSharePointMenu(cntx, groups, imagePath, GetLocalizedString("Text.SharePointServerGroup"));
+                PrepareSharePointEnterpriseMenu(cntx, groups, imagePath, GetLocalizedString("Text.SharePointEnterpriseServerGroup"));
             }
 
             //CRM Menu
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/HostedSharePointBackupSiteCollection.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointBackupSiteCollection.ascx.resx
similarity index 100%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/HostedSharePointBackupSiteCollection.ascx.resx
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointBackupSiteCollection.ascx.resx
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/HostedSharePointEditSiteCollection.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointEditSiteCollection.ascx.resx
similarity index 100%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/HostedSharePointEditSiteCollection.ascx.resx
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointEditSiteCollection.ascx.resx
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointEnterpriseBackupSiteCollection.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointEnterpriseBackupSiteCollection.ascx.resx
new file mode 100644
index 00000000..c931ca06
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointEnterpriseBackupSiteCollection.ascx.resx
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnBackup.Text" xml:space="preserve">
+    <value>Backup</value>
+  </data>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="chkZipBackup.Text" xml:space="preserve">
+    <value>ZIP Backup</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;The backup file that you create includes list or library content, security settings, user information, navigation, customizations, and personalizations (such as views, site templates, and content types). The backup file does not include workflows, alerts, and properties stored at the site collection level.&lt;/p&gt;</value>
+  </data>
+  <data name="lblBackupDestination.Text" xml:space="preserve">
+    <value>Backup Destination:</value>
+  </data>
+  <data name="lblBackupFileName.Text" xml:space="preserve">
+    <value>Backup File Name:</value>
+  </data>
+  <data name="lblBackupOptions.Text" xml:space="preserve">
+    <value>Backup Options:</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Backup SharePoint Site Collection</value>
+  </data>
+  <data name="rbCopy.Text" xml:space="preserve">
+    <value>Copy to Folder</value>
+  </data>
+  <data name="rbDownload.Text" xml:space="preserve">
+    <value>Download via HTTP</value>
+  </data>
+  <data name="Text.PageName" xml:space="preserve">
+    <value>Backup SharePoint Site Collection</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointEnterpriseEditSiteCollection.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointEnterpriseEditSiteCollection.ascx.resx
new file mode 100644
index 00000000..856828c3
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointEnterpriseEditSiteCollection.ascx.resx
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnBackup.Text" xml:space="preserve">
+    <value>Backup Site Collection</value>
+  </data>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="btnDelete.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Deleting SharePoint site collection...');</value>
+  </data>
+  <data name="btnDelete.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="btnRestore.Text" xml:space="preserve">
+    <value>Restore Site Collection</value>
+  </data>
+  <data name="btnUpdate.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Updating SharePoint site collection...');</value>
+  </data>
+  <data name="btnUpdate.Text" xml:space="preserve">
+    <value>Update</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;Here you can create new SharePoint site collection. Choose URL from the list of domains you already own. Site URL like team.yourcompany.com should be added as domain in “Domain names” organization’s menu before SharePoint site collection creation.&lt;/p&gt;
+
+&lt;p&gt;&lt;b&gt;Site owner&lt;/b&gt; is member of your organization who will be responsible for this SharePoint site collection administration: choosing site templates, adding other users, creating sub-sites.&lt;/p&gt;
+
+&lt;p&gt;&lt;b&gt;Locale ID&lt;/b&gt; defines your site language and can not be changed after site creation. However child sub sites can use another Locale IDs.&lt;/p&gt;
+
+&lt;p&gt;Title will be visible in site header.&lt;/p&gt;
+
+&lt;p&gt;&lt;b&gt;Description&lt;/b&gt; will be visible when you open site on the top of the main site page.&lt;/p&gt;
+
+&lt;p&gt;After you create this site open it using owner login, and do at least 2 main steps:
+1.	Choose site template
+2.	Define who will be able to access this site. To add user from your hosted organization to SharePoint site, please copy/paste his or her e-mail from user's properties in WebsitePanel to SharePoint site collection’s Users/Groups field.&lt;/p&gt;</value>
+  </data>
+  <data name="gvUserEmail.HeaderText" xml:space="preserve">
+    <value>Email</value>
+  </data>
+  <data name="gvUserName.HeaderText" xml:space="preserve">
+    <value>User Name</value>
+  </data>
+  <data name="lblDescription.Text" xml:space="preserve">
+    <value>Description:</value>
+  </data>
+  <data name="lblSiteCollectionLocaleID.Text" xml:space="preserve">
+    <value>Locale ID:</value>
+  </data>
+  <data name="lblSiteCollectionOwner.Text" xml:space="preserve">
+    <value>Owner:</value>
+  </data>
+  <data name="lblSiteCollectionUrl.Text" xml:space="preserve">
+    <value>Url:</value>
+  </data>
+  <data name="lblTitle.Text" xml:space="preserve">
+    <value>Title:</value>
+  </data>
+  <data name="lblWarningStorage.Text" xml:space="preserve">
+    <value>Send warning E-mail when site storage reaches (MB):</value>
+  </data>
+  <data name="localesList.Text" xml:space="preserve">
+    <value>Full list of locales</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>SharePoint Site Collection</value>
+  </data>
+  <data name="secMainTools.Text" xml:space="preserve">
+    <value>SharePoint Site Collection Tools</value>
+  </data>
+  <data name="Text.Add" xml:space="preserve">
+    <value>Add Site Collection</value>
+  </data>
+  <data name="Text.PageName" xml:space="preserve">
+    <value>Edit SharePoint Site Collection</value>
+  </data>
+  <data name="Text.Update" xml:space="preserve">
+    <value>Update</value>
+  </data>
+  <data name="lblMaxStorage.Text" xml:space="preserve">
+    <value>Maximum site storage size (MB):</value>
+  </data>
+  <data name="WarningUnlimitedValue" xml:space="preserve">
+    <value>Do not send</value>
+  </data>
+  <data name="btnCreate.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Creating SharePoint site collection...');</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/HostedSharePointRestoreSiteCollection.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointEnterpriseRestoreSiteCollection.ascx.resx
similarity index 100%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/HostedSharePointRestoreSiteCollection.ascx.resx
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointEnterpriseRestoreSiteCollection.ascx.resx
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointEnterpriseSiteCollections.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointEnterpriseSiteCollections.ascx.resx
new file mode 100644
index 00000000..224fd542
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointEnterpriseSiteCollections.ascx.resx
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnAddItem.Text" xml:space="preserve">
+    <value>Add SharePoint Enterprise Site Collection</value>
+  </data>
+  <data name="btnCreateSiteCollection.Text" xml:space="preserve">
+    <value>Create New Site Collection</value>
+  </data>
+  <data name="cmdDelete.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="ddlSearchColumnUrl.Text" xml:space="preserve">
+    <value>Url</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;&lt;b&gt;SharePoint site collection&lt;/b&gt; is a group of sites built on Microsoft Windows SharePoint Services that all exist under a top-level site. To make managing the sites and their content more convenient, you can assign users to be site collection administrators or site collection owners. These are permission levels to give to users who you want to have full administrative rights to all sites and content within a site collection.&lt;/p&gt;</value>
+  </data>
+  <data name="gvOwnerDisplayName.HeaderText" xml:space="preserve">
+    <value>Owner</value>
+  </data>
+  <data name="gvSiteCollection.Empty" xml:space="preserve">
+    <value>No SharePoint site collections have been created. To create a SharePoint site collection click "Create New Site Collection" button.</value>
+  </data>
+  <data name="gvSiteCollectionUrl.HeaderText" xml:space="preserve">
+    <value>Site Collection Url</value>
+  </data>
+  <data name="locQuota.Text" xml:space="preserve">
+    <value>Total Site Collections Created:</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>SharePoint Enterprise Site Collections</value>
+  </data>
+  <data name="Text.PageName" xml:space="preserve">
+    <value>SharePoint Enterprise Site Collections</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/HostedSharePointStorageSettings.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointEnterpriseStorageSettings.ascx.resx
similarity index 100%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/HostedSharePointStorageSettings.ascx.resx
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointEnterpriseStorageSettings.ascx.resx
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/HostedSharePointStorageUsage.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointEnterpriseStorageUsage.ascx.resx
similarity index 100%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/HostedSharePointStorageUsage.ascx.resx
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointEnterpriseStorageUsage.ascx.resx
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointRestoreSiteCollection.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointRestoreSiteCollection.ascx.resx
new file mode 100644
index 00000000..06164c47
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointRestoreSiteCollection.ascx.resx
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="btnRestore.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Restoring SharePoint site collection...');</value>
+  </data>
+  <data name="btnRestore.Text" xml:space="preserve">
+    <value>Restore</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;After site collection is restored it will have primary administrator assigned to it as it was before restoration (primary administrator record from backup is ignored).&lt;/p&gt;</value>
+  </data>
+  <data name="lblAllowedFiles.Text" xml:space="preserve">
+    <value>.ZIP, .BAK files are allowed</value>
+  </data>
+  <data name="lblRestoreFrom.Text" xml:space="preserve">
+    <value>Restore From:</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Restore SharePoint Site Collection</value>
+  </data>
+  <data name="radioFile.Text" xml:space="preserve">
+    <value>Hosting Space File</value>
+  </data>
+  <data name="radioUpload.Text" xml:space="preserve">
+    <value>Uploaded File</value>
+  </data>
+  <data name="Text.PageName" xml:space="preserve">
+    <value>Restore SharePoint Site Collection</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/HostedSharePointSiteCollections.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointSiteCollections.ascx.resx
similarity index 100%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/HostedSharePointSiteCollections.ascx.resx
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointSiteCollections.ascx.resx
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointStorageSettings.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointStorageSettings.ascx.resx
new file mode 100644
index 00000000..062e04df
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointStorageSettings.ascx.resx
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnSave.Text" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="btnSaveApply.Text" xml:space="preserve">
+    <value>Save and Apply to All Site Collections</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;Storage settings are used to limit the amount of storage available on a SharePoint site collection, and they are used to send e-mail alerts to the site administrator when a specified value of space is used.&lt;/p&gt;
+
+&lt;p&gt;These settings will be applied to the new site collections only. By clicking "Save and Apply to All Site Collections" button you can override these settings for all existing site collections.&lt;/p&gt;
+
+&lt;p&gt;Please note, that you cannot specify storage settings higher than defined in the space hosting plan.&lt;/p&gt;</value>
+  </data>
+  <data name="locMaxStorage.Text" xml:space="preserve">
+    <value>Maximum site storage size (MB):</value>
+  </data>
+  <data name="locWarningStorage.Text" xml:space="preserve">
+    <value>Send warning E-mail when site storage reaches (MB):</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Storage Settings</value>
+  </data>
+  <data name="Text.PageName" xml:space="preserve">
+    <value>Storage Settings</value>
+  </data>
+  <data name="secStorageLimits.Text" xml:space="preserve">
+    <value>Storage Settings</value>
+  </data>
+  <data name="chkQuotaUnlimited.Text" xml:space="preserve">
+    <value>Don't use</value>
+  </data>
+  <data name="WarningUnlimitedValue" xml:space="preserve">
+    <value>Do not send</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointStorageUsage.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointStorageUsage.ascx.resx
new file mode 100644
index 00000000..b945ab03
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/App_LocalResources/HostedSharePointStorageUsage.ascx.resx
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnRecalculateDiscSpace.Text" xml:space="preserve">
+    <value>Recalculate Disk Space</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;SharePoint disk space usage is calculated on timely basis (usually once a day). You can recalculate it right now by clicking "Recalculate Disk Space" button.&lt;/p&gt;</value>
+  </data>
+  <data name="gvSiteCollectionName.HeaderText" xml:space="preserve">
+    <value>Site Collection</value>
+  </data>
+  <data name="gvSiteCollectionSize.HeaderText" xml:space="preserve">
+    <value>Total Size, MB</value>
+  </data>
+  <data name="gvStorageUsage.EmptyDataText" xml:space="preserve">
+    <value>There are no site collections</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Storage Usage</value>
+  </data>
+  <data name="secSiteCollectionsReport.Text" xml:space="preserve">
+    <value>Site Collections</value>
+  </data>
+  <data name="Text.PageName" xml:space="preserve">
+    <value>Storage Usage</value>
+  </data>
+  <data name="locTotalMailboxesSize.Text" xml:space="preserve">
+    <value>Total Size (MB):</value>
+  </data>
+  <data name="locTotalMailboxItems.Text" xml:space="preserve">
+    <value>Total Items:</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointBackupSiteCollection.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointBackupSiteCollection.ascx
similarity index 87%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointBackupSiteCollection.ascx
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointBackupSiteCollection.ascx
index 932d7aa8..743a1ec4 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointBackupSiteCollection.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointBackupSiteCollection.ascx
@@ -1,10 +1,11 @@
 <%@ Control Language="C#" AutoEventWireup="true" Codebehind="HostedSharePointBackupSiteCollection.ascx.cs"
 	Inherits="WebsitePanel.Portal.HostedSharePointBackupSiteCollection" %>
-<%@ Register Src="UserControls/FileLookup.ascx" TagName="FileLookup" TagPrefix="uc1" %>
-<%@ Register Src="UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox"
+<%@ Register Src="../UserControls/FileLookup.ascx" TagName="FileLookup" TagPrefix="uc1" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox"
 	TagPrefix="wsp" %>
-	
-<%@ Register Src="UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport"
+
+<%@ Register Src="../ExchangeServer/UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %> 	
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport"
 	TagPrefix="wsp" %>
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server" />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointBackupSiteCollection.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointBackupSiteCollection.ascx.cs
similarity index 90%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointBackupSiteCollection.ascx.cs
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointBackupSiteCollection.ascx.cs
index 4171ea68..5e1afb37 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointBackupSiteCollection.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointBackupSiteCollection.ascx.cs
@@ -61,11 +61,6 @@ namespace WebsitePanel.Portal
 			}
 		}
 
-        public static string GroupName
-        {
-            get { return HttpContext.Current.Request["GroupName"]; }
-        }
-
 		protected void Page_Load(object sender, EventArgs e)
 		{
 			if (!IsPostBack)
@@ -165,10 +160,10 @@ namespace WebsitePanel.Portal
 			RedirectBack();
 		}
 
-		private void RedirectBack()
-		{
-			HttpContext.Current.Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_edit_sitecollection", "SiteCollectionID=" + this.SiteCollectionId, "ItemID=" + PanelRequest.ItemID.ToString(), "GroupName=" + GroupName));
-		}
+        private void RedirectBack()
+        {
+            HttpContext.Current.Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_edit_sitecollection", "SiteCollectionID=" + this.SiteCollectionId, "ItemID=" + PanelRequest.ItemID.ToString()));
+        }
 
 		protected void chkZipBackup_CheckedChanged(object sender, EventArgs e)
 		{
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointBackupSiteCollection.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointBackupSiteCollection.ascx.designer.cs
similarity index 75%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointBackupSiteCollection.ascx.designer.cs
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointBackupSiteCollection.ascx.designer.cs
index fd9c426c..6bd4aa9e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointBackupSiteCollection.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointBackupSiteCollection.ascx.designer.cs
@@ -1,31 +1,3 @@
-// Copyright (c) 2015, 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.
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointEditSiteCollection.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEditSiteCollection.ascx
similarity index 87%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointEditSiteCollection.ascx
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEditSiteCollection.ascx
index d80139d7..ad030d8c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointEditSiteCollection.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEditSiteCollection.ascx
@@ -1,13 +1,14 @@
 <%@ Control Language="C#" AutoEventWireup="true" Codebehind="HostedSharePointEditSiteCollection.ascx.cs" Inherits="WebsitePanel.Portal.HostedSharePointEditSiteCollection" %>
-<%@ Register Src="ExchangeServer/UserControls/SizeBox.ascx" TagName="SizeBox" TagPrefix="wsp" %>
-<%@ Register Src="UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
-<%@ Register Src="UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
-<%@ Register Src="UserControls/PopupHeader.ascx" TagName="PopupHeader" TagPrefix="wsp" %>
-<%@ Register Src="UserControls/AllocatePackageIPAddresses.ascx" TagName="SiteUrlBuilder" TagPrefix="wsp" %>	
-<%@ Register Src="ExchangeServer/UserControls/UserSelector.ascx" TagName="UserSelector" TagPrefix="wsp" %>	
-<%@ Register Src="UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
-<%@ Register src="UserControls/QuotaEditor.ascx" tagname="QuotaEditor" tagprefix="uc1" %>
-<%@ Register Src="DomainsSelectDomainControl.ascx" TagName="DomainsSelectDomainControl" TagPrefix="uc1" %>
+<%@ Register Src="../ExchangeServer/UserControls/SizeBox.ascx" TagName="SizeBox" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/PopupHeader.ascx" TagName="PopupHeader" TagPrefix="wsp" %>
+<%@ Register Src="../ExchangeServer/UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/AllocatePackageIPAddresses.ascx" TagName="SiteUrlBuilder" TagPrefix="wsp" %>	
+<%@ Register Src="../ExchangeServer/UserControls/UserSelector.ascx" TagName="UserSelector" TagPrefix="wsp" %>	
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+<%@ Register src="../UserControls/QuotaEditor.ascx" tagname="QuotaEditor" tagprefix="uc1" %>
+<%@ Register Src="../DomainsSelectDomainControl.ascx" TagName="DomainsSelectDomainControl" TagPrefix="uc1" %>
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server" />
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointEditSiteCollection.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEditSiteCollection.ascx.cs
similarity index 92%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointEditSiteCollection.ascx.cs
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEditSiteCollection.ascx.cs
index 0a35bcfc..1c150ca9 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointEditSiteCollection.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEditSiteCollection.ascx.cs
@@ -44,11 +44,6 @@ namespace WebsitePanel.Portal
     {
         SharePointSiteCollection item = null;
 
-        public static string GroupName
-        {
-            get { return HttpContext.Current.Request["GroupName"]; }
-        }
-
         private int OrganizationId
         {
             get
@@ -230,7 +225,7 @@ namespace WebsitePanel.Portal
         /// <returns> Reserved disk space vallue.</returns>
         private int GetReservedDiskStorageSpace()
         {
-            var existingCollections = ES.Services.HostedSharePointServers.GetSiteCollections(PanelSecurity.PackageId, false, GroupName);
+            var existingCollections = ES.Services.HostedSharePointServers.GetSiteCollections(PanelSecurity.PackageId, false);
 
             return (int)existingCollections.Sum(siteCollection => siteCollection.MaxSiteStorage);
         }
@@ -257,20 +252,9 @@ namespace WebsitePanel.Portal
                 {
                     item = new SharePointSiteCollection();
 
-                    string groupName = GroupName;
-
-                    if (ResourceGroups.SharepointFoundationServer.Replace(" ", "").Equals(groupName))
-                    {
-                        groupName = ResourceGroups.SharepointFoundationServer;
-                    }
-                    else if (ResourceGroups.SharepointServer.Replace(" ", "").Equals(groupName))
-                    {
-                        groupName = ResourceGroups.SharepointServer;
-                    }
-
-                    if (!UseSharedSLL(PanelSecurity.PackageId))
+                       if (!UseSharedSLL(PanelSecurity.PackageId))
                     {                        
-                        SharePointSiteCollectionListPaged existentSiteCollections = ES.Services.HostedSharePointServers.GetSiteCollectionsPaged(PanelSecurity.PackageId, this.OrganizationId, "ItemName", String.Format("%{0}", this.domain.DomainName), String.Empty, 0, Int32.MaxValue, groupName);
+                        SharePointSiteCollectionListPaged existentSiteCollections = ES.Services.HostedSharePointServers.GetSiteCollectionsPaged(PanelSecurity.PackageId, this.OrganizationId, "ItemName", String.Format("%{0}", this.domain.DomainName), String.Empty, 0, Int32.MaxValue);
                         foreach (SharePointSiteCollection existentSiteCollection in existentSiteCollections.SiteCollections)
                         {
                             Uri existentSiteCollectionUri = new Uri(existentSiteCollection.Name);
@@ -303,7 +287,7 @@ namespace WebsitePanel.Portal
                     item.MaxSiteStorage = maxStorage.QuotaValue;
                     item.WarningStorage = warningStorage.QuotaValue;                    
 
-                    int result = ES.Services.HostedSharePointServers.AddSiteCollection(item, groupName);
+                    int result = ES.Services.HostedSharePointServers.AddSiteCollection(item);
                     if (result < 0)
                     {
                         localMessageBox.ShowResultMessage(result);
@@ -390,19 +374,19 @@ namespace WebsitePanel.Portal
 
         protected void btnBackup_Click(object sender, EventArgs e)
         {
-            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_backup_sitecollection", "SiteCollectionID=" + this.SiteCollectionId, "ItemID=" + PanelRequest.ItemID.ToString(), "GroupName=" + GroupName));
+            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_backup_sitecollection", "SiteCollectionID=" + this.SiteCollectionId, "ItemID=" + PanelRequest.ItemID.ToString()));
         }
 
         protected void btnRestore_Click(object sender, EventArgs e)
         {
-            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_restore_sitecollection", "SiteCollectionID=" + this.SiteCollectionId, "ItemID=" + PanelRequest.ItemID.ToString(), "GroupName=" + GroupName));
+            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_restore_sitecollection", "SiteCollectionID=" + this.SiteCollectionId, "ItemID=" + PanelRequest.ItemID.ToString()));
         }
 
 
 
         private void RedirectToSiteCollectionsList()
         {
-            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_sitecollections", "ItemID=" + PanelRequest.ItemID.ToString(), "GroupName=" + GroupName));
+            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_sitecollections", "ItemID=" + PanelRequest.ItemID.ToString()));
         }
 
         private bool UseSharedSLL(int packageID)
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointEditSiteCollection.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEditSiteCollection.ascx.designer.cs
similarity index 88%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointEditSiteCollection.ascx.designer.cs
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEditSiteCollection.ascx.designer.cs
index b82a5dd1..6801e4b1 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointEditSiteCollection.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEditSiteCollection.ascx.designer.cs
@@ -1,31 +1,3 @@
-// Copyright (c) 2015, 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.
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseBackupSiteCollection.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseBackupSiteCollection.ascx
new file mode 100644
index 00000000..f680ba4a
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseBackupSiteCollection.ascx
@@ -0,0 +1,80 @@
+<%@ Control Language="C#" AutoEventWireup="true" Codebehind="HostedSharePointEnterpriseBackupSiteCollection.ascx.cs"
+	Inherits="WebsitePanel.Portal.HostedSharePointEnterpriseBackupSiteCollection" %>
+<%@ Register Src="../UserControls/FileLookup.ascx" TagName="FileLookup" TagPrefix="uc1" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox"
+	TagPrefix="wsp" %>
+
+<%@ Register Src="../ExchangeServer/UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %> 	
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport"
+	TagPrefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server" />
+
+	
+<div id="ExchangeContainer">
+	<div class="Module">
+		<div class="Left">
+		</div>
+		<div class="Content">
+			<div class="Center">
+				<div class="Title">
+					<asp:Image ID="Image1" SkinID="SharePointSiteCollection48" runat="server" />
+					<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="SharePoint Site Collections"></asp:Localize>
+				</div>
+				<div class="FormBody">
+					<wsp:SimpleMessageBox id="messageBox" runat="server" />
+					<table cellspacing="0" cellpadding="5" width="100%">
+						<tr>
+							<td class="Huge" colspan="2">
+								<asp:Literal ID="litSiteCollectionName" runat="server"></asp:Literal></td>
+						</tr>
+						<tr>
+							<td>
+								&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="SubHead" valign="top">
+								<asp:Label ID="lblBackupFileName" runat="server" meta:resourcekey="lblBackupFileName"
+									Text="Backup File Name:"></asp:Label></td>
+							<td class="normal">
+								<asp:TextBox ID="txtBackupName" runat="server" CssClass="NormalTextBox" Width="200"></asp:TextBox><asp:RequiredFieldValidator
+									ID="validatorUserName" runat="server" ControlToValidate="txtBackupName" CssClass="NormalBold"
+									Display="Dynamic" ErrorMessage="*"></asp:RequiredFieldValidator></td>
+						</tr>
+						<tr>
+							<td class="SubHead" valign="top">
+								<asp:Label ID="lblBackupOptions" runat="server" meta:resourcekey="lblBackupOptions"
+									Text="Backup Options:"></asp:Label></td>
+							<td class="normal">
+								<asp:CheckBox ID="chkZipBackup" runat="server" meta:resourcekey="chkZipBackup" Checked="True"
+									Text="ZIP Backup" AutoPostBack="True" OnCheckedChanged="chkZipBackup_CheckedChanged">
+								</asp:CheckBox><br />
+								<br />
+							</td>
+						</tr>
+						<tr>
+							<td class="SubHead" valign="top">
+								<asp:Label ID="lblBackupDestination" runat="server" meta:resourcekey="lblBackupDestination"
+									Text="Backup Destination:"></asp:Label></td>
+							<td class="normal">
+								<asp:RadioButton ID="rbDownload" runat="server" meta:resourcekey="rbDownload" Checked="True"
+									Text="Download via HTTP" GroupName="action" AutoPostBack="True" OnCheckedChanged="rbDownload_CheckedChanged">
+								</asp:RadioButton><br />
+								<asp:RadioButton ID="rbCopy" runat="server" meta:resourcekey="rbCopy" Text="Copy to Folder"
+									GroupName="action" AutoPostBack="True" OnCheckedChanged="rbDownload_CheckedChanged">
+								</asp:RadioButton><br />
+								&nbsp;&nbsp;&nbsp;&nbsp;<uc1:FileLookup ID="fileLookup" runat="server" Width="300" />
+							</td>
+						</tr>
+					</table>
+					<div class="FormFooterClean">
+						<asp:Button ID="btnBackup" runat="server" meta:resourcekey="btnBackup" CssClass="Button1"
+							Text="Backup" OnClick="btnBackup_Click"/>
+						<asp:Button ID="btnCancel" runat="server" meta:resourcekey="btnCancel" CssClass="Button1"
+							CausesValidation="false" Text="Cancel" OnClick="btnCancel_Click" />
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseBackupSiteCollection.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseBackupSiteCollection.ascx.cs
new file mode 100644
index 00000000..6a74ea65
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseBackupSiteCollection.ascx.cs
@@ -0,0 +1,189 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.IO;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using WebsitePanel.Providers.SharePoint;
+
+namespace WebsitePanel.Portal
+{
+	public partial class HostedSharePointEnterpriseBackupSiteCollection : WebsitePanelModuleBase
+	{
+		private const string BACKUP_EXTENSION = ".bsh";
+
+		private int OrganizationId
+		{
+			get
+			{
+				return PanelRequest.GetInt("ItemID");
+			}
+		}
+
+		private int SiteCollectionId
+		{
+			get
+			{
+				return PanelRequest.GetInt("SiteCollectionID");
+			}
+		}
+
+		protected void Page_Load(object sender, EventArgs e)
+		{
+			if (!IsPostBack)
+			{
+				BindSite();
+			}
+		}
+
+		private void BindSite()
+		{
+			try
+			{
+				SharePointEnterpriseSiteCollection siteCollection = ES.Services.HostedSharePointServersEnt.Enterprise_GetSiteCollection(this.SiteCollectionId);
+				litSiteCollectionName.Text = siteCollection.PhysicalAddress;
+				txtBackupName.Text = siteCollection.Url + BACKUP_EXTENSION;
+				fileLookup.SelectedFile = "\\";
+				fileLookup.PackageId = siteCollection.PackageId;
+
+				BindBackupName();
+				ToggleControls();
+			}
+			catch (Exception ex)
+			{
+				ShowErrorMessage("SHAREPOINT_GET_SITE", ex);
+				return;
+			}
+		}
+
+		private void BindBackupName()
+		{
+			string backupName = Path.GetFileNameWithoutExtension(txtBackupName.Text);
+			txtBackupName.Text = backupName + (chkZipBackup.Checked ? ".zip" : BACKUP_EXTENSION);
+		}
+
+		private void ToggleControls()
+		{
+			fileLookup.Visible = rbCopy.Checked;
+		}
+
+		private void BackupSiteCollection()
+		{
+			try
+			{
+                string bakFile = ES.Services.HostedSharePointServersEnt.Enterprise_BackupSiteCollection(this.SiteCollectionId,
+					txtBackupName.Text, chkZipBackup.Checked, rbDownload.Checked, fileLookup.SelectedFile);
+
+				if (rbDownload.Checked && !String.IsNullOrEmpty(bakFile))
+				{
+
+                    string fileName = bakFile;
+                    
+					//Response.Clear();
+					Response.AddHeader("Content-Disposition", "attachment; filename=" + Path.GetFileName(fileName));
+					Response.ContentType = "application/octet-stream";
+
+					int FILE_BUFFER_LENGTH = 5000000;
+					byte[] buffer = null;
+					int offset = 0;
+					do
+					{
+						// Read remote content.
+						buffer = ES.Services.HostedSharePointServersEnt.Enterprise_GetBackupBinaryChunk(this.SiteCollectionId, fileName, offset, FILE_BUFFER_LENGTH);
+
+						// Write to stream.
+						//Response.BinaryWrite(buffer);
+                        Response.OutputStream.Write(buffer, 0, buffer.Length);
+						offset += FILE_BUFFER_LENGTH;
+					}
+					while (buffer.Length == FILE_BUFFER_LENGTH);
+
+                    Response.Flush();
+                    Response.End();
+                    //Response.Close();
+                    //HttpContext.Current.ApplicationInstance.CompleteRequest();
+                    //Response.End();
+                    
+                }
+			}
+			catch (Exception ex)
+			{
+				ShowErrorMessage("SHAREPOINT_BACKUP_SITE", ex);
+                return;
+			}
+            //Response.ClearContent();
+		    Context.Response.Clear();
+            if (!rbDownload.Checked)
+                RedirectBack();
+            
+		}
+
+		protected void btnBackup_Click(object sender, EventArgs e)
+		{
+            BackupSiteCollection();
+		}
+		protected void btnCancel_Click(object sender, EventArgs e)
+		{
+			RedirectBack();
+		}
+
+        private void RedirectBack()
+        {
+            HttpContext.Current.Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_enterprise_edit_sitecollection", "SiteCollectionID=" + this.SiteCollectionId, "ItemID=" + PanelRequest.ItemID.ToString()));
+        }
+
+		protected void chkZipBackup_CheckedChanged(object sender, EventArgs e)
+		{
+			BindBackupName();
+		}
+
+		protected void rbDownload_CheckedChanged(object sender, EventArgs e)
+		{
+			ToggleControls();
+		}
+
+        protected override void OnPreRender(EventArgs e)
+        {
+            string str = string.Format("var rb = document.getElementById('{0}'); if (!rb.checked) ShowProgressDialog('Backing up site collection...');", rbDownload.ClientID);
+            
+                
+                
+            btnBackup.Attributes.Add("onclick", str);
+            base.OnPreRender(e);
+        }
+
+	}
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseBackupSiteCollection.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseBackupSiteCollection.ascx.designer.cs
new file mode 100644
index 00000000..b74025b4
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseBackupSiteCollection.ascx.designer.cs
@@ -0,0 +1,159 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal {
+    
+    
+    public partial class HostedSharePointEnterpriseBackupSiteCollection {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// Image1 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.Image Image1;
+        
+        /// <summary>
+        /// locTitle 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 locTitle;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// litSiteCollectionName 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.Literal litSiteCollectionName;
+        
+        /// <summary>
+        /// lblBackupFileName 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.Label lblBackupFileName;
+        
+        /// <summary>
+        /// txtBackupName 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 txtBackupName;
+        
+        /// <summary>
+        /// validatorUserName 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.RequiredFieldValidator validatorUserName;
+        
+        /// <summary>
+        /// lblBackupOptions 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.Label lblBackupOptions;
+        
+        /// <summary>
+        /// chkZipBackup 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 chkZipBackup;
+        
+        /// <summary>
+        /// lblBackupDestination 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.Label lblBackupDestination;
+        
+        /// <summary>
+        /// rbDownload 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.RadioButton rbDownload;
+        
+        /// <summary>
+        /// rbCopy 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.RadioButton rbCopy;
+        
+        /// <summary>
+        /// fileLookup control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.FileLookup fileLookup;
+        
+        /// <summary>
+        /// btnBackup 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.Button btnBackup;
+        
+        /// <summary>
+        /// btnCancel 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.Button btnCancel;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseEditSiteCollection.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseEditSiteCollection.ascx
new file mode 100644
index 00000000..5a4b5917
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseEditSiteCollection.ascx
@@ -0,0 +1,209 @@
+<%@ Control Language="C#" AutoEventWireup="true" Codebehind="HostedSharePointEnterpriseEditSiteCollection.ascx.cs" Inherits="WebsitePanel.Portal.HostedSharePointEnterpriseEditSiteCollection" %>
+<%@ Register Src="../ExchangeServer/UserControls/SizeBox.ascx" TagName="SizeBox" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/PopupHeader.ascx" TagName="PopupHeader" TagPrefix="wsp" %>
+<%@ Register Src="../ExchangeServer/UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/AllocatePackageIPAddresses.ascx" TagName="SiteUrlBuilder" TagPrefix="wsp" %>	
+<%@ Register Src="../ExchangeServer/UserControls/UserSelector.ascx" TagName="UserSelector" TagPrefix="wsp" %>	
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+<%@ Register src="../UserControls/QuotaEditor.ascx" tagname="QuotaEditor" tagprefix="uc1" %>
+<%@ Register Src="../DomainsSelectDomainControl.ascx" TagName="DomainsSelectDomainControl" TagPrefix="uc1" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server" />
+
+<div id="ExchangeContainer">
+	<div class="Module">
+		<div class="Left">
+		</div>
+		<div class="Content">
+			<div class="Center">
+				<div class="Title"> 
+					<asp:Image ID="Image1" SkinID="SharePointSiteCollection48" runat="server" />
+					<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="SharePoint Site Collection"></asp:Localize>
+                    </div>
+				<div class="FormBody">
+					<wsp:SimpleMessageBox id="localMessageBox" runat="server">
+                    </wsp:SimpleMessageBox>					
+					<table id="tblEditItem" runat="server" cellspacing="0" cellpadding="5" width="100%">
+						<tr id="rowUrl">
+							<td class="SubHead" nowrap width="200">
+								<asp:Label ID="lblSiteCollectionUrl" runat="server" meta:resourcekey="lblSiteCollectionUrl"
+									Text="Url:"></asp:Label>
+							</td>
+							<td width="100%" class="NormalBold">
+			                    <asp:TextBox ID="txtHostName" runat="server" CssClass="TextBox100" MaxLength="64"></asp:TextBox>.<uc1:DomainsSelectDomainControl ID="domain" runat="server" HideWebSites="false" HideDomainPointers="true" HideInstantAlias="true"/>
+                                <asp:RequiredFieldValidator ID="valRequireHostName" runat="server" meta:resourcekey="valRequireHostName" ControlToValidate="txtHostName"
+	                                ErrorMessage="Enter hostname" ValidationGroup="CreateSite" Display="Dynamic" Text="*" SetFocusOnError="True"></asp:RequiredFieldValidator>
+                                <asp:RegularExpressionValidator ID="valRequireCorrectHostName" runat="server"
+	                                ErrorMessage="Enter valid hostname" ControlToValidate="txtHostName" Display="Dynamic"
+	                                meta:resourcekey="valRequireCorrectHostName" ValidationExpression="^([0-9a-zA-Z])*[0-9a-zA-Z]+$" SetFocusOnError="True"></asp:RegularExpressionValidator>
+							</td>
+						</tr>
+						<tr>
+							<td class="SubHead">
+								<asp:Label ID="lblSiteCollectionOwner" runat="server" meta:resourcekey="lblSiteCollectionOwner"
+									Text="Owner:"></asp:Label>
+							</td>
+							<td class="Normal">
+								<wsp:UserSelector id="userSelector" IncludeMailboxes="true" runat="server"/>
+							</td>
+						</tr>
+						<tr>
+							<td class="SubHead">
+								<asp:Label ID="lblSiteCollectionLocaleID" runat="server" meta:resourcekey="lblSiteCollectionLocaleID"
+									Text="Locale ID:"></asp:Label>
+							</td>
+							<td class="Normal">
+								<asp:DropDownList ID="ddlLocaleID" runat="server" DataTextField="DisplayName" DataValueField="LCID" ></asp:DropDownList>
+							</td>
+						</tr>
+						<tr>
+							<td class="SubHead">
+								<asp:Label ID="lblMaxStorage" runat="server" meta:resourcekey="lblMaxStorage"></asp:Label>
+							</td>
+							<td class="Normal">																
+                                <uc1:QuotaEditor ID="maxStorage" runat="server"  Width="200px" CssClass="NormalTextBox" QuotaTypeId="2" />
+                                
+                                </td>
+						</tr>
+						
+						<tr>
+							<td class="SubHead">
+								<asp:Label ID="lblWarningStorage" runat="server" meta:resourcekey="lblWarningStorage"></asp:Label>
+							</td>
+							<td class="Normal">																
+                                <uc1:QuotaEditor ID="warningStorage" runat="server" Width="200px" QuotaTypeId="2" CssClass="NormalTextBox"/>                                
+                                </td>
+						</tr>
+						
+						<tr>
+							<td class="SubHead">
+								<asp:Label ID="lblTitle" runat="server" meta:resourcekey="lblTitle" Text="Title:"></asp:Label>
+							</td>
+							<td class="Normal">
+								<asp:TextBox ID="txtTitle" runat="server" Width="200px" CssClass="NormalTextBox" ></asp:TextBox>
+								<asp:RequiredFieldValidator ID="valRequireTitle" runat="server" ErrorMessage="*"
+									ControlToValidate="txtTitle" ValidationGroup="CreateSiteCollection"></asp:RequiredFieldValidator>
+							</td>
+						</tr>
+						<tr>
+							<td class="SubHead">
+								<asp:Label ID="lblDescription" runat="server" meta:resourcekey="lblDescription" Text="Description:"></asp:Label>
+							</td>
+							<td class="Normal">
+								<asp:TextBox ID="txtDescription" runat="server" Width="200px" CssClass="NormalTextBox"
+									TextMode="MultiLine" Rows="5"></asp:TextBox>
+								<asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ErrorMessage="*"
+									ControlToValidate="txtDescription" ValidationGroup="CreateSiteCollection"></asp:RequiredFieldValidator>
+							</td>
+						</tr>
+					</table>
+					<table id="tblViewItem" runat="server" cellspacing="0" cellpadding="5" width="100%">
+						<tr>
+							<td class="SubHead" nowrap width="200">
+								<asp:Label ID="lblSiteCollectionUrl2" runat="server" meta:resourcekey="lblSiteCollectionUrl"
+									Text="Url:"></asp:Label>
+							</td>
+							<td width="100%" class="NormalBold">
+								<span class="Huge">
+								<asp:HyperLink runat="server" ID="lnkUrl" />								</span>
+							</td>
+						</tr>
+						<tr>
+							<td class="SubHead">
+								<asp:Label ID="lblSiteCollectionOwner2" runat="server" meta:resourcekey="lblSiteCollectionOwner"
+									Text="Owner:"></asp:Label>
+							</td>
+							<td class="Normal">
+								<asp:Literal ID="litSiteCollectionOwner" runat="server"></asp:Literal>
+							</td>
+						</tr>
+						<tr>
+							<td class="SubHead">
+								<asp:Label ID="lblSiteCollectionLocaleID2" runat="server" meta:resourcekey="lblSiteCollectionLocaleID"
+									Text="Locale ID:"></asp:Label>
+							</td>
+							<td class="Normal">
+								<asp:Literal ID="litLocaleID" runat="server"></asp:Literal>
+							</td>
+						</tr>
+						
+						<tr>
+							<td class="SubHead">
+								<asp:Label ID="lblMaxStorageView" runat="server" meta:resourcekey="lblMaxStorage"
+									Text="Limit site storage to a maximum of:"></asp:Label>
+							</td>
+							<td class="Normal">								
+								<uc1:QuotaEditor ID="editMaxStorage" runat="server" Width="200px" QuotaTypeId="2" CssClass="NormalTextBox"/>                                
+								
+							</td>
+						</tr>
+						
+						<tr>
+							<td class="SubHead">
+								<asp:Label ID="lblWarningStorageView" runat="server" meta:resourcekey="lblWarningStorage"
+									Text="Send warning E-mail when site storage reaches:"></asp:Label>
+							</td>
+							<td class="Normal">								
+								<uc1:QuotaEditor ID="editWarningStorage" runat="server" Width="200px" QuotaTypeId="2" CssClass="NormalTextBox"/>                                
+							</td>
+						</tr>
+						
+						<tr>
+							<td class="SubHead">
+								<asp:Label ID="lblTitle2" runat="server" meta:resourcekey="lblTitle" Text="Title:"></asp:Label>
+							</td>
+							<td class="Normal">
+								<asp:Literal ID="litTitle" runat="server"></asp:Literal>
+							</td>
+						</tr>
+						<tr>
+							<td class="SubHead">
+								<asp:Label ID="lblDescription2" runat="server" meta:resourcekey="lblDescription"
+									Text="Description:"></asp:Label>
+							</td>
+							<td class="Normal">
+								<asp:Literal ID="litDescription" runat="server"></asp:Literal>
+							</td>
+						</tr>
+					</table>
+					<table width="100%">
+						<tr>
+							<td>
+								<wsp:CollapsiblePanel id="secMainTools" runat="server" IsCollapsed="true" TargetControlID="ToolsPanel"
+									meta:resourcekey="secMainTools" Text="SharePoint Site Collection Tools">
+								</wsp:CollapsiblePanel>
+								<asp:Panel ID="ToolsPanel" runat="server" Height="0" Style="overflow: hidden;">
+									<table id="tblMaintenance" runat="server" cellpadding="10">
+										<tr>
+											<td>
+												<asp:Button ID="btnBackup" runat="server" meta:resourcekey="btnBackup" CausesValidation="false"
+													Text="Backup Site Collection" CssClass="Button3" OnClick="btnBackup_Click" />
+											</td>
+										</tr>
+										<tr>
+											<td>
+												<asp:Button ID="btnRestore" runat="server" meta:resourcekey="btnRestore" CausesValidation="false"
+													Text="Restore Site Collection" CssClass="Button3" OnClick="btnRestore_Click" />
+											</td>
+										</tr>
+									</table>
+								</asp:Panel>
+							</td>
+						</tr>
+					</table>
+					<div class="FormFooterClean">
+						<asp:Button ID="btnUpdate" runat="server"  CssClass="Button1"
+							Text="Update" OnClick="btnUpdate_Click"  ValidationGroup="CreateSiteCollection" />
+						<asp:Button ID="btnCancel" runat="server" meta:resourcekey="btnCancel" CssClass="Button1"
+							CausesValidation="false" Text="Cancel" OnClick="btnCancel_Click" />
+						<asp:Button ID="btnDelete" runat="server" meta:resourcekey="btnDelete" CssClass="Button1"
+							CausesValidation="false" Text="Delete" OnClientClick="return confirm('Delete Site?');"
+							OnClick="btnDelete_Click" />
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseEditSiteCollection.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseEditSiteCollection.ascx.cs
new file mode 100644
index 00000000..80585245
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseEditSiteCollection.ascx.cs
@@ -0,0 +1,450 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Web;
+using System.Web.UI.WebControls;
+using WebsitePanel.EnterpriseServer;
+using WebsitePanel.Providers.DNS;
+using WebsitePanel.Providers.HostedSolution;
+using WebsitePanel.Providers.SharePoint;
+
+
+namespace WebsitePanel.Portal
+{
+    public partial class HostedSharePointEnterpriseEditSiteCollection : WebsitePanelModuleBase
+    {
+        SharePointEnterpriseSiteCollection item = null;
+
+        private int OrganizationId
+        {
+            get
+            {
+                return PanelRequest.GetInt("ItemID");
+            }
+        }
+
+        private int SiteCollectionId
+        {
+            get
+            {
+                return PanelRequest.GetInt("SiteCollectionID");
+            }
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            domain.PackageId = PanelSecurity.PackageId;
+
+            warningStorage.UnlimitedText = GetLocalizedString("WarningUnlimitedValue");
+            editWarningStorage.UnlimitedText = GetLocalizedString("WarningUnlimitedValue");
+
+            bool newItem = (this.SiteCollectionId == 0);
+
+            tblEditItem.Visible = newItem;
+            tblViewItem.Visible = !newItem;
+
+            //btnUpdate.Visible = newItem;
+            btnDelete.Visible = !newItem;
+            btnUpdate.Text = newItem ? GetLocalizedString("Text.Add") : GetLocalizedString("Text.Update");
+            btnUpdate.OnClientClick = newItem ? GetLocalizedString("btnCreate.OnClientClick") : GetLocalizedString("btnUpdate.OnClientClick");
+
+            btnBackup.Enabled = btnRestore.Enabled = !newItem;
+
+            // bind item
+            BindItem();
+
+        }
+
+        private void BindItem()
+        {
+            try
+            {
+                if (!IsPostBack)
+                {
+                    if (!this.IsDnsServiceAvailable())
+                    {
+                        localMessageBox.ShowWarningMessage("HOSTEDSHAREPOINT_NO_DNS");
+                    }
+
+                    // load item if required
+                    if (this.SiteCollectionId > 0)
+                    {
+                        // existing item
+                        item = ES.Services.HostedSharePointServersEnt.Enterprise_GetSiteCollection(this.SiteCollectionId);
+                        if (item != null)
+                        {
+                            // save package info
+                            ViewState["PackageId"] = item.PackageId;
+                        }
+                        else
+                            RedirectToBrowsePage();
+                    }
+                    else
+                    {
+                        // new item
+                        ViewState["PackageId"] = PanelSecurity.PackageId;
+                        if (UseSharedSLL(PanelSecurity.PackageId))
+                        {
+
+                            rowUrl.Visible = false;
+                            valRequireHostName.Enabled = false;
+                            valRequireCorrectHostName.Enabled = false;
+                        }
+                    }
+
+                    //this.gvUsers.DataBind();
+
+                    List<CultureInfo> cultures = new List<CultureInfo>();
+                    foreach (int localeId in ES.Services.HostedSharePointServersEnt.Enterprise_GetSupportedLanguages(PanelSecurity.PackageId))
+                    {
+                        cultures.Add(new CultureInfo(localeId, false));
+                    }
+
+                    this.ddlLocaleID.DataSource = cultures;
+                    this.ddlLocaleID.DataBind();
+                }
+
+                if (!IsPostBack)
+                {
+                    // bind item to controls
+                    if (item != null)
+                    {
+                        // bind item to controls
+                        lnkUrl.Text = item.PhysicalAddress;
+                        lnkUrl.NavigateUrl = item.PhysicalAddress;
+                        litSiteCollectionOwner.Text = String.Format("{0} ({1})", item.OwnerName, item.OwnerEmail);
+                        litLocaleID.Text = new CultureInfo(item.LocaleId, false).DisplayName;
+                        litTitle.Text = item.Title;
+                        litDescription.Text = item.Description;
+                        editWarningStorage.QuotaValue = (int)item.WarningStorage;
+                        editMaxStorage.QuotaValue = (int)item.MaxSiteStorage;
+                    }
+
+                    Organization org = ES.Services.Organizations.GetOrganization(OrganizationId);
+
+                    if (org != null)
+                    {
+                        SetStorageQuotas(org, item);
+                    }
+                }
+                //OrganizationDomainName[] domains = ES.Services.Organizations.GetOrganizationDomains(PanelRequest.ItemID);
+
+                //DomainInfo[] domains = ES.Services.Servers.GetMyDomains(PanelSecurity.PackageId);
+
+                EnterpriseServer.DomainInfo[] domains = ES.Services.Servers.GetDomains(PanelSecurity.PackageId);
+
+                if (domains.Length == 0)
+                {
+                    localMessageBox.ShowWarningMessage("HOSTEDSHAREPOINT_NO_DOMAINS");
+                    DisableFormControls(this, btnCancel);
+                    return;
+                }
+                //if (this.gvUsers.Rows.Count == 0)
+                //{
+                //    localMessageBox.ShowWarningMessage("HOSTEDSHAREPOINT_NO_USERS");
+                //    DisableFormControls(this, btnCancel);
+                //    return;
+                //}
+            }
+            catch
+            {
+
+                localMessageBox.ShowWarningMessage("INIT_SERVICE_ITEM_FORM");
+
+                DisableFormControls(this, btnCancel);
+                return;
+            }
+        }
+
+        /// <summary> Checks and sets disk quotas values.</summary>
+        /// <param name="organization"> The organization.</param>
+        /// <param name="collection"> The site collection.</param>
+        private void SetStorageQuotas(Organization organization, SharePointEnterpriseSiteCollection collection)
+        {
+            var quotaValue = organization.MaxSharePointEnterpriseStorage;
+
+            if (quotaValue != -1)
+            {
+                var spaceResrved = GetReservedDiskStorageSpace();
+
+                if (spaceResrved > quotaValue)
+                {
+                    quotaValue = 0;
+                }
+                else
+                {
+                    quotaValue -= spaceResrved;
+                }
+
+                if (collection != null)
+                {
+                    quotaValue += (int)collection.MaxSiteStorage;
+                }
+            }
+            
+            maxStorage.ParentQuotaValue = quotaValue;
+            maxStorage.QuotaValue = quotaValue;
+            editMaxStorage.ParentQuotaValue = quotaValue;
+            warningStorage.ParentQuotaValue = quotaValue;
+            warningStorage.QuotaValue = quotaValue;
+            editWarningStorage.ParentQuotaValue = quotaValue;
+
+            btnUpdate.Enabled = quotaValue != 0;
+        }
+
+        /// <summary> Gets disk space reserved by existing site collections.</summary>
+        /// <returns> Reserved disk space vallue.</returns>
+        private int GetReservedDiskStorageSpace()
+        {
+            var existingCollections = ES.Services.HostedSharePointServersEnt.Enterprise_GetSiteCollections(PanelSecurity.PackageId, false);
+
+            return (int)existingCollections.Sum(siteCollection => siteCollection.MaxSiteStorage);
+        }
+
+        private void SaveItem()
+        {
+            if (!Page.IsValid)
+            {
+                return;
+            }
+
+
+            if (this.SiteCollectionId == 0)
+            {
+                if (this.userSelector.GetAccount() == null)
+                {
+                    localMessageBox.ShowWarningMessage("HOSTEDSHAREPOINT_NO_USERS");
+                    return;
+                }
+
+
+                // new item
+                try
+                {
+                    item = new SharePointEnterpriseSiteCollection();
+
+                       if (!UseSharedSLL(PanelSecurity.PackageId))
+                    {                        
+                        SharePointEnterpriseSiteCollectionListPaged existentSiteCollections = ES.Services.HostedSharePointServersEnt.Enterprise_GetSiteCollectionsPaged(PanelSecurity.PackageId, this.OrganizationId, "ItemName", String.Format("%{0}", this.domain.DomainName), String.Empty, 0, Int32.MaxValue);
+                        foreach (SharePointEnterpriseSiteCollection existentSiteCollection in existentSiteCollections.SiteCollections)
+                        {
+                            Uri existentSiteCollectionUri = new Uri(existentSiteCollection.Name);
+                            if (existentSiteCollection.Name == String.Format("{0}://{1}", existentSiteCollectionUri.Scheme, this.txtHostName.Text.ToLower() + "." + this.domain.DomainName))
+                            {
+                                localMessageBox.ShowWarningMessage("HOSTEDSHAREPOINT_DOMAIN_IN_USE");
+                                return;
+                            }
+                        }
+
+                        item.Name = this.txtHostName.Text.ToLower() + "." + this.domain.DomainName;
+                    }
+                    else
+                        item.Name = string.Empty;
+
+                    // get form data
+
+                    item.OrganizationId = this.OrganizationId;
+                    item.Id = this.SiteCollectionId;
+                    item.PackageId = PanelSecurity.PackageId;
+
+                    item.LocaleId = Int32.Parse(this.ddlLocaleID.SelectedValue);
+                    item.OwnerLogin = this.userSelector.GetSAMAccountName();
+                    item.OwnerEmail = this.userSelector.GetPrimaryEmailAddress();
+                    item.OwnerName = this.userSelector.GetDisplayName();
+                    item.Title = txtTitle.Text;
+                    item.Description = txtDescription.Text;
+
+
+                    item.MaxSiteStorage = maxStorage.QuotaValue;
+                    item.WarningStorage = warningStorage.QuotaValue;                    
+
+                    int result = ES.Services.HostedSharePointServersEnt.Enterprise_AddSiteCollection(item);
+                    if (result < 0)
+                    {
+                        localMessageBox.ShowResultMessage(result);
+                        return;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    localMessageBox.ShowErrorMessage("HOSTEDSHAREPOINT_ADD_SITECOLLECTION", ex);
+                    return;
+                }
+            }
+            else
+            {
+                ES.Services.HostedSharePointServersEnt.Enterprise_UpdateQuota(PanelRequest.ItemID, SiteCollectionId, editMaxStorage.QuotaValue, editWarningStorage.QuotaValue);
+            }
+
+            // return
+            RedirectToSiteCollectionsList();
+        }
+
+        private void AddDnsRecord(int domainId, string recordName, string recordData)
+        {
+            int result = ES.Services.Servers.AddDnsZoneRecord(domainId, recordName, DnsRecordType.A, recordData, 0, 0, 0, 0);
+            if (result < 0)
+            {
+                ShowResultMessage(result);
+            }
+        }
+
+        private bool IsDnsServiceAvailable()
+        {
+            ProviderInfo dnsProvider = ES.Services.Servers.GetPackageServiceProvider(PanelSecurity.PackageId, ResourceGroups.Dns);
+            return dnsProvider != null;
+        }
+
+        private void DeleteItem()
+        {
+            // delete
+            try
+            {
+                int result = ES.Services.HostedSharePointServersEnt.Enterprise_DeleteSiteCollection(this.SiteCollectionId);
+                if (result < 0)
+                {
+                    ShowResultMessage(result);
+                    return;
+                }
+            }
+            catch (Exception ex)
+            {
+                localMessageBox.ShowErrorMessage("HOSTEDSHAREPOINT_DELETE_SITECOLLECTION", ex);
+                return;
+            }
+
+            // return
+            RedirectToSiteCollectionsList();
+        }
+
+        protected void odsAccountsPaged_Selected(object sender, ObjectDataSourceStatusEventArgs e)
+        {
+            if (e.Exception != null)
+            {
+                localMessageBox.ShowErrorMessage("ORGANIZATION_GET_USERS", e.Exception);
+                e.ExceptionHandled = true;
+            }
+        }
+
+
+        protected void btnCancel_Click(object sender, EventArgs e)
+        {
+            // return
+            RedirectToSiteCollectionsList();
+        }
+
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            DeleteItem();
+        }
+
+        protected void btnUpdate_Click(object sender, EventArgs e)
+        {
+            SaveItem();
+        }
+
+        protected void btnBackup_Click(object sender, EventArgs e)
+        {
+            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_enterprise_backup_sitecollection", "SiteCollectionID=" + this.SiteCollectionId, "ItemID=" + PanelRequest.ItemID.ToString()));
+        }
+
+        protected void btnRestore_Click(object sender, EventArgs e)
+        {
+            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_enterprise_restore_sitecollection", "SiteCollectionID=" + this.SiteCollectionId, "ItemID=" + PanelRequest.ItemID.ToString()));
+        }
+
+
+
+        private void RedirectToSiteCollectionsList()
+        {
+            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_enterprise_sitecollections", "ItemID=" + PanelRequest.ItemID.ToString()));
+        }
+
+        private bool UseSharedSLL(int packageID)
+        {
+            PackageContext cntx = ES.Services.Packages.GetPackageContext(PanelSecurity.PackageId);
+            if (cntx != null)
+            {
+                foreach (QuotaValueInfo quota in cntx.QuotasArray)
+                {
+                    switch (quota.QuotaId)
+                    {
+                        case 552:
+                            if (Convert.ToBoolean(quota.QuotaAllocatedValue))
+                            {
+                                return true;
+                            }
+
+                            break;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+
+        //private void RegisterOwnerSelector()
+        //{
+        //    // Define the name and type of the client scripts on the page.
+        //    String csname = "OwnerSelectorScript";
+        //    Type cstype = this.GetType();
+
+        //    // Get a ClientScriptManager reference from the Page class.
+        //    ClientScriptManager cs = Page.ClientScript;
+
+        //    // Check to see if the client script is already registered.
+        //    if (!cs.IsClientScriptBlockRegistered(cstype, csname))
+        //    {
+        //        StringBuilder ownerSelector = new StringBuilder();
+        //        ownerSelector.Append("<script type=text/javascript> function DoSelectOwner(ownerId, ownerDisplayName, email) {");
+        //        ownerSelector.AppendFormat("{0}.{1}.value=ownerId;", this.Page.Form.ID, this.hdnSiteCollectionOwner.ClientID);
+        //        ownerSelector.AppendFormat("{0}.{1}.value=ownerDisplayName;", this.Page.Form.ID, this.txtSiteCollectionOwner.ClientID);
+        //        ownerSelector.AppendFormat("{0}.{1}.value=email;", this.Page.Form.ID, this.hdnSiteCollectionOwnerEmail.ClientID);
+        //        ownerSelector.Append("} </script>");
+        //        cs.RegisterClientScriptBlock(cstype, csname, ownerSelector.ToString(), false);
+        //    }
+
+        //}
+
+        //private StringDictionary ConvertArrayToDictionary(string[] settings)
+        //{
+        //    StringDictionary r = new StringDictionary();
+        //    foreach (string setting in settings)
+        //    {
+        //        int idx = setting.IndexOf('=');
+        //        r.Add(setting.Substring(0, idx), setting.Substring(idx + 1));
+        //    }
+        //    return r;
+        //}
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseEditSiteCollection.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseEditSiteCollection.ascx.designer.cs
new file mode 100644
index 00000000..37f5fdf5
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseEditSiteCollection.ascx.designer.cs
@@ -0,0 +1,447 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal {
+    
+    
+    public partial class HostedSharePointEnterpriseEditSiteCollection {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// Image1 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.Image Image1;
+        
+        /// <summary>
+        /// locTitle 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 locTitle;
+        
+        /// <summary>
+        /// localMessageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox localMessageBox;
+        
+        /// <summary>
+        /// tblEditItem 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.HtmlTable tblEditItem;
+        
+        /// <summary>
+        /// rowUrl 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 rowUrl;
+        
+        /// <summary>
+        /// lblSiteCollectionUrl 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.Label lblSiteCollectionUrl;
+        
+        /// <summary>
+        /// txtHostName 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 txtHostName;
+        
+        /// <summary>
+        /// domain control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.DomainsSelectDomainControl domain;
+        
+        /// <summary>
+        /// valRequireHostName 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.RequiredFieldValidator valRequireHostName;
+        
+        /// <summary>
+        /// valRequireCorrectHostName 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.RegularExpressionValidator valRequireCorrectHostName;
+        
+        /// <summary>
+        /// lblSiteCollectionOwner 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.Label lblSiteCollectionOwner;
+        
+        /// <summary>
+        /// userSelector 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.UserSelector userSelector;
+        
+        /// <summary>
+        /// lblSiteCollectionLocaleID 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.Label lblSiteCollectionLocaleID;
+        
+        /// <summary>
+        /// ddlLocaleID 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.DropDownList ddlLocaleID;
+        
+        /// <summary>
+        /// lblMaxStorage 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.Label lblMaxStorage;
+        
+        /// <summary>
+        /// maxStorage control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.QuotaEditor maxStorage;
+        
+        /// <summary>
+        /// lblWarningStorage 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.Label lblWarningStorage;
+        
+        /// <summary>
+        /// warningStorage control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.QuotaEditor warningStorage;
+        
+        /// <summary>
+        /// lblTitle 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.Label lblTitle;
+        
+        /// <summary>
+        /// txtTitle 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 txtTitle;
+        
+        /// <summary>
+        /// valRequireTitle 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.RequiredFieldValidator valRequireTitle;
+        
+        /// <summary>
+        /// lblDescription 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.Label lblDescription;
+        
+        /// <summary>
+        /// txtDescription 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 txtDescription;
+        
+        /// <summary>
+        /// RequiredFieldValidator1 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.RequiredFieldValidator RequiredFieldValidator1;
+        
+        /// <summary>
+        /// tblViewItem 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.HtmlTable tblViewItem;
+        
+        /// <summary>
+        /// lblSiteCollectionUrl2 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.Label lblSiteCollectionUrl2;
+        
+        /// <summary>
+        /// lnkUrl 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.HyperLink lnkUrl;
+        
+        /// <summary>
+        /// lblSiteCollectionOwner2 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.Label lblSiteCollectionOwner2;
+        
+        /// <summary>
+        /// litSiteCollectionOwner 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.Literal litSiteCollectionOwner;
+        
+        /// <summary>
+        /// lblSiteCollectionLocaleID2 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.Label lblSiteCollectionLocaleID2;
+        
+        /// <summary>
+        /// litLocaleID 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.Literal litLocaleID;
+        
+        /// <summary>
+        /// lblMaxStorageView 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.Label lblMaxStorageView;
+        
+        /// <summary>
+        /// editMaxStorage control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.QuotaEditor editMaxStorage;
+        
+        /// <summary>
+        /// lblWarningStorageView 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.Label lblWarningStorageView;
+        
+        /// <summary>
+        /// editWarningStorage control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.QuotaEditor editWarningStorage;
+        
+        /// <summary>
+        /// lblTitle2 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.Label lblTitle2;
+        
+        /// <summary>
+        /// litTitle 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.Literal litTitle;
+        
+        /// <summary>
+        /// lblDescription2 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.Label lblDescription2;
+        
+        /// <summary>
+        /// litDescription 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.Literal litDescription;
+        
+        /// <summary>
+        /// secMainTools control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secMainTools;
+        
+        /// <summary>
+        /// ToolsPanel 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 ToolsPanel;
+        
+        /// <summary>
+        /// tblMaintenance 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.HtmlTable tblMaintenance;
+        
+        /// <summary>
+        /// btnBackup 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.Button btnBackup;
+        
+        /// <summary>
+        /// btnRestore 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.Button btnRestore;
+        
+        /// <summary>
+        /// btnUpdate 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.Button btnUpdate;
+        
+        /// <summary>
+        /// btnCancel 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.Button btnCancel;
+        
+        /// <summary>
+        /// btnDelete 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.Button btnDelete;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseRestoreSiteCollection.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseRestoreSiteCollection.ascx
new file mode 100644
index 00000000..b2a36898
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseRestoreSiteCollection.ascx
@@ -0,0 +1,101 @@
+<%@ Control Language="C#" AutoEventWireup="true" Codebehind="HostedSharePointEnterpriseRestoreSiteCollection.ascx.cs"
+	Inherits="WebsitePanel.Portal.HostedSharePointEnterpriseRestoreSiteCollection" %>
+<%@ Register Src="../UserControls/FileLookup.ascx" TagName="FileLookup" TagPrefix="uc1" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox"
+	TagPrefix="wsp" %>	
+6  
+<%@ Register Src="../ExchangeServer/UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %> 
+ 
+
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport"
+	TagPrefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server" />
+
+		
+	
+<div id="ExchangeContainer">
+	<div class="Module">
+		<div class="Left">
+		</div>
+		<div class="Content">
+			<div class="Center">
+				<div class="Title">
+					<asp:Image ID="Image1" SkinID="SharePointSiteCollection48" runat="server" />
+					<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="SharePoint Site Collections"></asp:Localize>
+				</div>
+				<div class="FormBody">
+					<wsp:SimpleMessageBox id="messageBox" runat="server" />
+						<table cellspacing="0" cellpadding="5" width="100%">
+							<tr>
+								<td class="Huge" colspan="2">
+									<asp:Literal ID="litSiteCollectionName" runat="server"></asp:Literal></td>
+							</tr>
+							<tr>
+								<td>
+									&nbsp;</td>
+							</tr>
+							<tr>
+								<td class="SubHead" valign="top" nowrap width="200">
+									<asp:Label ID="lblRestoreFrom" runat="server" meta:resourcekey="lblRestoreFrom" Text="Restore From:"></asp:Label></td>
+								<td class="normal" width="100%">
+									<table width="100%">
+										<tr>
+											<td class="Normal">
+												<asp:RadioButton ID="radioUpload" meta:resourcekey="radioUpload" Checked="True" GroupName="media"
+													Text="Uploaded File" runat="server" AutoPostBack="True" OnCheckedChanged="radioUpload_CheckedChanged">
+												</asp:RadioButton></td>
+										</tr>
+										<tr>
+											<td class="Normal">
+												<asp:RadioButton ID="radioFile" meta:resourcekey="radioFile" GroupName="media" Text="Hosting Space File"
+													runat="server" AutoPostBack="True" OnCheckedChanged="radioUpload_CheckedChanged">
+												</asp:RadioButton></td>
+										</tr>
+										<tr>
+											<td class="Normal" id="cellUploadFile" runat="server">
+												<table width="100%">
+													<tr>
+														<td>
+															<asp:FileUpload ID="uploadFile" runat="server" Width="300px" /></td>
+													</tr>
+													<tr>
+														<td class="Small" nowrap>
+															<asp:Label ID="lblAllowedFiles1" runat="server" meta:resourcekey="lblAllowedFiles"
+																Text=".ZIP, .BAK files are allowed"></asp:Label></td>
+													</tr>
+												</table>
+											</td>
+										</tr>
+										<tr>
+											<td class="Normal" id="cellFile" runat="server">
+												<table width="100%">
+													<tr>
+														<td>
+															<uc1:FileLookup ID="fileLookup" runat="server" Width="300" IncludeFiles="true" />
+														</td>
+													</tr>
+													<tr>
+														<td class="Small" nowrap>
+															<asp:Label ID="lblAllowedFiles2" runat="server" meta:resourcekey="lblAllowedFiles"
+																Text=".ZIP, .BAK files are allowed"></asp:Label></td>
+													</tr>
+												</table>
+											</td>
+										</tr>
+									</table>
+									<br />
+								</td>
+							</tr>
+						</table>
+					<div class="FormFooterClean">
+						<asp:Button ID="btnRestore" runat="server" meta:resourcekey="btnRestore" CssClass="Button1"
+							Text="Restore" OnClick="btnRestore_Click" OnClientClick="ShowProgressDialog('Restoring site collection...');"/>
+						<asp:Button ID="btnCancel" runat="server" meta:resourcekey="btnCancel" CssClass="Button1"
+							CausesValidation="false" Text="Cancel" OnClick="btnCancel_Click" />
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseRestoreSiteCollection.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseRestoreSiteCollection.ascx.cs
new file mode 100644
index 00000000..191c7546
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseRestoreSiteCollection.ascx.cs
@@ -0,0 +1,176 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.IO;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using WebsitePanel.Providers.SharePoint;
+
+namespace WebsitePanel.Portal
+{
+	public partial class HostedSharePointEnterpriseRestoreSiteCollection : WebsitePanelModuleBase
+	{
+		private int OrganizationId
+		{
+			get
+			{
+				return PanelRequest.GetInt("ItemID");
+			}
+		}
+
+		private int SiteCollectionId
+		{
+			get
+			{
+				return PanelRequest.GetInt("SiteCollectionID");
+			}
+		}
+
+		protected void Page_Load(object sender, EventArgs e)
+		{
+			if (!IsPostBack)
+			{
+				BindSite();
+			}
+		}
+
+		private void BindSite()
+		{
+			try
+			{
+				SharePointEnterpriseSiteCollection siteCollection = ES.Services.HostedSharePointServersEnt.Enterprise_GetSiteCollection(this.SiteCollectionId);
+				litSiteCollectionName.Text = siteCollection.PhysicalAddress;
+				fileLookup.SelectedFile = String.Empty;
+				fileLookup.PackageId = siteCollection.PackageId;
+
+				ToggleControls();
+			}
+			catch (Exception ex)
+			{
+				ShowErrorMessage("SHAREPOINT_GET_SITE", ex);
+				return;
+			}
+		}
+
+		private void ToggleControls()
+		{
+			cellFile.Visible = radioFile.Checked;
+			cellUploadFile.Visible = radioUpload.Checked;
+		}
+
+		private void RestoreSiteCollection()
+		{
+			try
+			{
+				string uploadedFile = null;
+				string packageFile = null;
+
+				if (radioUpload.Checked)
+				{
+					if (uploadFile.PostedFile.FileName != "")
+					{
+						Stream stream = uploadFile.PostedFile.InputStream;
+
+						// save uploaded file
+						int FILE_BUFFER_LENGTH = 5000000;
+						string path = null;
+						int readBytes = 0;
+						string fileName = Path.GetFileName(uploadFile.PostedFile.FileName);
+
+						int offset = 0;
+						do
+						{
+							// read input stream
+							byte[] buffer = new byte[FILE_BUFFER_LENGTH];
+							readBytes = stream.Read(buffer, 0, FILE_BUFFER_LENGTH);
+
+							if (readBytes < FILE_BUFFER_LENGTH)
+								Array.Resize<byte>(ref buffer, readBytes);
+
+							// write remote backup file
+							string tempPath = ES.Services.HostedSharePointServersEnt.Enterprise_AppendBackupBinaryChunk(this.SiteCollectionId, fileName, path, buffer);
+							if (path == null)
+								path = tempPath;
+
+							offset += FILE_BUFFER_LENGTH;
+						}
+						while (readBytes == FILE_BUFFER_LENGTH);
+
+						uploadedFile = path;
+					}
+				}
+				else
+				{
+					// package files
+					packageFile = fileLookup.SelectedFile;
+				}
+
+				int result = ES.Services.HostedSharePointServersEnt.Enterprise_RestoreSiteCollection(this.SiteCollectionId, uploadedFile, packageFile);
+				if (result < 0)
+				{
+					ShowResultMessage(result);
+					return;
+				}
+			}
+			catch (Exception ex)
+			{
+				ShowErrorMessage("SHAREPOINT_RESTORE_SITE", ex);
+				return;
+			}
+
+			RedirectBack();
+		}
+
+		protected void btnRestore_Click(object sender, EventArgs e)
+		{
+			RestoreSiteCollection();
+		}
+
+		protected void btnCancel_Click(object sender, EventArgs e)
+		{
+			RedirectBack();
+		}
+
+		private void RedirectBack()
+		{
+            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_enterprise_edit_sitecollection", "SiteCollectionID=" + this.SiteCollectionId, "ItemID=" + PanelRequest.ItemID.ToString()));
+		}
+		protected void radioUpload_CheckedChanged(object sender, EventArgs e)
+		{
+			ToggleControls();
+		}
+	}
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseRestoreSiteCollection.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseRestoreSiteCollection.ascx.designer.cs
new file mode 100644
index 00000000..444b7e6c
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseRestoreSiteCollection.ascx.designer.cs
@@ -0,0 +1,159 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal {
+    
+    
+    public partial class HostedSharePointEnterpriseRestoreSiteCollection {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// Image1 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.Image Image1;
+        
+        /// <summary>
+        /// locTitle 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 locTitle;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// litSiteCollectionName 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.Literal litSiteCollectionName;
+        
+        /// <summary>
+        /// lblRestoreFrom 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.Label lblRestoreFrom;
+        
+        /// <summary>
+        /// radioUpload 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.RadioButton radioUpload;
+        
+        /// <summary>
+        /// radioFile 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.RadioButton radioFile;
+        
+        /// <summary>
+        /// cellUploadFile 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 cellUploadFile;
+        
+        /// <summary>
+        /// uploadFile 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.FileUpload uploadFile;
+        
+        /// <summary>
+        /// lblAllowedFiles1 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.Label lblAllowedFiles1;
+        
+        /// <summary>
+        /// cellFile 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 cellFile;
+        
+        /// <summary>
+        /// fileLookup control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.FileLookup fileLookup;
+        
+        /// <summary>
+        /// lblAllowedFiles2 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.Label lblAllowedFiles2;
+        
+        /// <summary>
+        /// btnRestore 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.Button btnRestore;
+        
+        /// <summary>
+        /// btnCancel 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.Button btnCancel;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseSiteCollections.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseSiteCollections.ascx
new file mode 100644
index 00000000..02e376d4
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseSiteCollections.ascx
@@ -0,0 +1,92 @@
+<%@ Control Language="C#" AutoEventWireup="true" Codebehind="HostedSharePointEnterpriseSiteCollections.ascx.cs"
+	Inherits="WebsitePanel.Portal.HostedSharePointEnterpriseSiteCollections" %>
+<%@ Register Src="../UserControls/SpaceServiceItems.ascx" TagName="SpaceServiceItems"
+	TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox"
+	TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/QuotaViewer.ascx" TagName="QuotaViewer" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/Quota.ascx" TagName="Quota" TagPrefix="wsp" %>
+	
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport"
+	TagPrefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server" />
+
+<script type="text/javascript">
+
+function confirmation() 
+{
+	if (!confirm("Are you sure you want to delete Site Collection?")) return false; else ShowProgressDialog('Deleting SharePoint site collection...');	
+}
+</script>
+	
+<div id="ExchangeContainer">
+	<div class="Module">
+		<div class="Left">
+		</div>
+		<div class="Content">
+			<div class="Center">
+				<div class="Title">
+					<asp:Image ID="Image1" SkinID="SharePointSiteCollection48" runat="server" />
+					<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="SharePoint Site Collections"></asp:Localize>
+				</div>
+				<div class="FormBody">
+					<wsp:SimpleMessageBox id="messageBox" runat="server" />
+					<div class="FormButtonsBarClean">
+						<div class="FormButtonsBarCleanLeft">
+							<asp:Button ID="btnCreateSiteCollection" runat="server" meta:resourcekey="btnCreateSiteCollection"
+								Text="Create New Site Collection" CssClass="Button1" OnClick="btnCreateSiteCollection_Click" />
+						</div>
+						<div class="FormButtonsBarCleanRight">
+							<asp:Panel ID="SearchPanel" runat="server" DefaultButton="cmdSearch">
+								<asp:Localize ID="locSearch" runat="server" meta:resourcekey="locSearch" Visible="false"></asp:Localize>
+								<asp:DropDownList ID="ddlSearchColumn" runat="server" CssClass="NormalTextBox">
+									<asp:ListItem Value="ItemName" meta:resourcekey="ddlSearchColumnUrl">Url</asp:ListItem>
+								</asp:DropDownList><asp:TextBox ID="txtSearchValue" runat="server" CssClass="NormalTextBox"
+									Width="100"></asp:TextBox><asp:ImageButton ID="cmdSearch" runat="server" meta:resourcekey="cmdSearch"
+										SkinID="SearchButton" CausesValidation="false" />
+							</asp:Panel>
+						</div>
+					</div>
+					<asp:GridView ID="gvSiteCollections" runat="server" AutoGenerateColumns="False" EnableViewState="true"
+						Width="100%" EmptyDataText="gvSiteCollection" CssSelectorClass="NormalGridView" OnRowCommand="gvSiteCollections_RowCommand"
+						AllowPaging="True" AllowSorting="True" DataSourceID="odsSiteCollectionsPaged">
+						<Columns>
+							<asp:TemplateField meta:resourcekey="gvSiteCollectionUrl" SortExpression="ItemName">
+								<ItemStyle Width="50%"></ItemStyle>
+								<ItemTemplate>
+									<asp:HyperLink ID="lnk1" runat="server" NavigateUrl='<%# GetSiteCollectionEditUrl(Eval("Id").ToString()) %>'>
+									    <%# Eval("PhysicalAddress") %>
+									</asp:HyperLink>
+								</ItemTemplate>
+							</asp:TemplateField>
+							<asp:BoundField meta:resourcekey="gvOwnerDisplayName" DataField="OwnerName"	ItemStyle-Width="50%" />
+							<asp:TemplateField>
+								<ItemTemplate>
+									<asp:ImageButton ID="cmdDelete" runat="server" Text="Delete" SkinID="ExchangeDelete"
+										CommandName="DeleteItem" CommandArgument='<%# Eval("Id") %>' 
+										OnClientClick="confirmation()"></asp:ImageButton>
+								</ItemTemplate>
+							</asp:TemplateField>
+						</Columns>
+					</asp:GridView>
+					<asp:ObjectDataSource ID="odsSiteCollectionsPaged" runat="server" EnablePaging="True" SelectCountMethod="GetSharePointEnterpriseSiteCollectionPagedCount"
+						SelectMethod="GetSharePointEnterpriseSiteCollectionPaged" SortParameterName="sortColumn" TypeName="WebsitePanel.Portal.HostedSharePointEnterpriseSiteCollectionsHelper"
+						OnSelected="odsSharePointEnterpriseSiteCollectionPaged_Selected">
+						<SelectParameters>
+					        <asp:QueryStringParameter Name="packageId" QueryStringField="SpaceID" DefaultValue="-1" />
+							<asp:QueryStringParameter Name="organizationId" QueryStringField="ItemID" DefaultValue="0" />
+                            <asp:ControlParameter Name="filterColumn" ControlID="ddlSearchColumn" PropertyName="SelectedValue" />
+							<asp:ControlParameter Name="filterValue" ControlID="txtSearchValue" PropertyName="Text" />
+						</SelectParameters>
+					</asp:ObjectDataSource>
+					<br />
+					<asp:Localize ID="locQuota" runat="server" meta:resourcekey="locQuota" Text="Total Site Collections Created:"></asp:Localize>
+					&nbsp;&nbsp;&nbsp;
+					<%--<wsp:Quota ID="siteCollectionsQuota1" runat="server" QuotaName="HostedSharePoint.Sites" />--%>
+					<wsp:QuotaViewer ID="siteCollectionsQuota" runat="server" QuotaTypeId="2" />
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseSiteCollections.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseSiteCollections.ascx.cs
new file mode 100644
index 00000000..43fafca9
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseSiteCollections.ascx.cs
@@ -0,0 +1,110 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Data;
+using System.Configuration;
+using System.Collections;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Web.UI.WebControls.WebParts;
+using System.Web.UI.HtmlControls;
+using System.Collections.Generic;
+using WebsitePanel.Providers.SharePoint;
+using WebsitePanel.Providers.HostedSolution;
+
+namespace WebsitePanel.Portal
+{
+	public partial class HostedSharePointEnterpriseSiteCollections :  WebsitePanelModuleBase
+	{
+ 
+		protected void Page_Load(object sender, EventArgs e)
+		{
+			this.BindStats();
+		}
+
+		private void BindStats()
+		{
+			// quota values
+			OrganizationStatistics stats = ES.Services.Organizations.GetOrganizationStatisticsByOrganization(PanelRequest.ItemID);
+            OrganizationStatistics tenantStats = ES.Services.Organizations.GetOrganizationStatistics(PanelRequest.ItemID);
+
+			siteCollectionsQuota.QuotaUsedValue = stats.CreatedSharePointEnterpriseSiteCollections;
+			siteCollectionsQuota.QuotaValue = stats.AllocatedSharePointEnterpriseSiteCollections;
+            if (stats.AllocatedSharePointEnterpriseSiteCollections != -1) siteCollectionsQuota.QuotaAvailable = tenantStats.AllocatedSharePointEnterpriseSiteCollections - tenantStats.CreatedSharePointEnterpriseSiteCollections;
+		}
+
+		protected void btnCreateSiteCollection_Click(object sender, EventArgs e)
+		{
+			Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "sharepoint_enterprise_edit_sitecollection", "SpaceID=" + PanelSecurity.PackageId.ToString()));
+		}
+
+		public string GetSiteCollectionEditUrl(string siteCollectionId)
+		{
+            return EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_enterprise_edit_sitecollection",
+					"SiteCollectionID=" + siteCollectionId,
+					"ItemID=" + PanelRequest.ItemID.ToString());
+		}
+
+		protected void odsSharePointEnterpriseSiteCollectionPaged_Selected(object sender, ObjectDataSourceStatusEventArgs e)
+		{
+			if (e.Exception != null)
+			{
+				messageBox.ShowErrorMessage("HOSTEDSHAREPOINT_GET_SITECOLLECTIONS", e.Exception);
+				e.ExceptionHandled = true;
+			}
+		}
+
+		protected void gvSiteCollections_RowCommand(object sender, GridViewCommandEventArgs e)
+		{
+			if (e.CommandName == "DeleteItem")
+			{
+				int siteCollectionId = Utils.ParseInt(e.CommandArgument.ToString(), 0);
+
+				try
+				{
+					int result = ES.Services.HostedSharePointServersEnt.Enterprise_DeleteSiteCollection(siteCollectionId);
+					if (result < 0)
+					{
+						messageBox.ShowResultMessage(result);
+						return;
+					}
+
+					gvSiteCollections.DataBind();
+					this.BindStats();
+				}
+				catch (Exception ex)
+				{
+					messageBox.ShowErrorMessage("HOSTEDSHAREPOINT_DELETE_SITECOLLECTION", ex);
+				}
+			}
+		}
+	}
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseSiteCollections.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseSiteCollections.ascx.designer.cs
new file mode 100644
index 00000000..7c4bf6b7
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseSiteCollections.ascx.designer.cs
@@ -0,0 +1,141 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal {
+    
+    
+    public partial class HostedSharePointEnterpriseSiteCollections {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// Image1 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.Image Image1;
+        
+        /// <summary>
+        /// locTitle 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 locTitle;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// btnCreateSiteCollection 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.Button btnCreateSiteCollection;
+        
+        /// <summary>
+        /// SearchPanel 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 SearchPanel;
+        
+        /// <summary>
+        /// locSearch 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 locSearch;
+        
+        /// <summary>
+        /// ddlSearchColumn 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.DropDownList ddlSearchColumn;
+        
+        /// <summary>
+        /// txtSearchValue 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 txtSearchValue;
+        
+        /// <summary>
+        /// cmdSearch 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.ImageButton cmdSearch;
+        
+        /// <summary>
+        /// gvSiteCollections 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.GridView gvSiteCollections;
+        
+        /// <summary>
+        /// odsSiteCollectionsPaged 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.ObjectDataSource odsSiteCollectionsPaged;
+        
+        /// <summary>
+        /// locQuota 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 locQuota;
+        
+        /// <summary>
+        /// siteCollectionsQuota control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.QuotaViewer siteCollectionsQuota;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageSettings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageSettings.ascx
new file mode 100644
index 00000000..ab641896
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageSettings.ascx
@@ -0,0 +1,62 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="HostedSharePointEnterpriseStorageSettings.ascx.cs" Inherits="WebsitePanel.Portal.HostedSharePointEnterpriseStorageSettings" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport"
+    TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel"
+    TagPrefix="wsp" %>
+<%@ Register Src="../ExchangeServer/UserControls/SizeBox.ascx" TagName="SizeBox" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox"
+    TagPrefix="wsp" %>
+<%@ Register Src="../ExchangeServer/UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register src="../UserControls/QuotaEditor.ascx" tagname="QuotaEditor" tagprefix="uc1" %>
+
+
+
+<div id="ExchangeContainer">
+	<div class="Module">
+		<div class="Left">
+        </div>
+		<div class="Content">
+			<div class="Center">
+				<div class="Title">
+					<asp:Image ID="Image1" SkinID="ExchangeStorageConfig48" runat="server" />
+					<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" ></asp:Localize>
+				</div>
+				<div class="FormBody">
+				    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+				    
+					<wsp:CollapsiblePanel id="secStorageLimits" runat="server"
+                        TargetControlID="StorageLimits" meta:resourcekey="secStorageLimits" >
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="StorageLimits" runat="server" Height="0" style="overflow:hidden;">
+					    <table>
+						    
+						    <tr>
+							    <td class="FormLabel200" align="right"><asp:Localize ID="locMaxStorage" runat="server" meta:resourcekey="locMaxStorage" ></asp:Localize></td>
+							    <td>                                    
+									<uc1:QuotaEditor QuotaTypeId="2" ID="maxStorageSettingsValue" runat="server" />                                    																	    
+								</td>
+						    </tr>
+						    <tr>
+							    <td class="FormLabel200" align="right"><asp:Localize ID="locWarningStorage" runat="server" meta:resourcekey="locWarningStorage" ></asp:Localize></td>
+							    <td>
+									<uc1:QuotaEditor  QuotaTypeId="2" ID="warningValue" runat="server" />
+									
+								</td>
+						    </tr>
+					    </table>
+					    <br />
+					</asp:Panel>
+                   									                    
+				    <div class="FormFooterClean">
+					    <asp:Button id="btnSave" runat="server" Text="Save Changes" CssClass="Button1" meta:resourcekey="btnSave"
+							 ValidationGroup="EditStorageSettings" OnClick="btnSave_Click" ></asp:Button>
+						<asp:Button id="btnSaveApply" runat="server" Text="Save and Apply to All SiteCollections" CssClass="Button1" meta:resourcekey="btnSaveApply"
+							 ValidationGroup="EditStorageSettings" OnClick="btnSaveApply_Click" ></asp:Button>
+						
+				    </div>
+				    
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageSettings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageSettings.ascx.cs
new file mode 100644
index 00000000..d2b2547b
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageSettings.ascx.cs
@@ -0,0 +1,93 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using WebsitePanel.EnterpriseServer;
+using WebsitePanel.Providers.HostedSolution;
+
+namespace WebsitePanel.Portal
+{
+    public partial class HostedSharePointEnterpriseStorageSettings : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            warningValue.UnlimitedText = GetLocalizedString("WarningUnlimitedValue");
+            
+            
+            if (!IsPostBack)
+            {
+                Organization org = ES.Services.Organizations.GetOrganization(PanelRequest.ItemID);
+
+                PackageContext cntx = ES.Services.Packages.GetPackageContext(PanelSecurity.PackageId);
+                foreach(QuotaValueInfo quota in cntx.QuotasArray)
+                {
+                    if (quota.QuotaId == 551 /*Max storage quota*/)
+                    {
+                        maxStorageSettingsValue.ParentQuotaValue = quota.QuotaAllocatedValue;
+                        warningValue.ParentQuotaValue = quota.QuotaAllocatedValue;
+                    }
+                }
+                
+                maxStorageSettingsValue.QuotaValue = org.MaxSharePointEnterpriseStorage;
+                warningValue.QuotaValue = org.WarningSharePointEnterpriseStorage;
+                
+            }
+        }
+
+        private void Save(bool apply)
+        {            
+            try
+            {                
+                int res = ES.Services.HostedSharePointServersEnt.Enterprise_SetStorageSettings(PanelRequest.ItemID, maxStorageSettingsValue.QuotaValue,
+                                                                   warningValue.QuotaValue,
+                                                                       apply);
+                if (res < 0)
+                {
+                    messageBox.ShowResultMessage(res);
+                    return;
+                }            
+                messageBox.ShowSuccessMessage("HOSTED_SHAREPOINT_UPDATE_QUOTAS");
+            }
+            catch (Exception)
+            {
+                messageBox.ShowErrorMessage("HOSTED_SHAREPOINT_UPDATE_QUOTAS");
+            }
+
+        }
+        
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            Save(false);            
+        }
+
+        protected void btnSaveApply_Click(object sender, EventArgs e)
+        {
+            Save(true);
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageSettings.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageSettings.ascx.designer.cs
new file mode 100644
index 00000000..26170885
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageSettings.ascx.designer.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal {
+    
+    
+    public partial class HostedSharePointEnterpriseStorageSettings {
+        
+        /// <summary>
+        /// Image1 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.Image Image1;
+        
+        /// <summary>
+        /// locTitle 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 locTitle;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// secStorageLimits control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secStorageLimits;
+        
+        /// <summary>
+        /// StorageLimits 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 StorageLimits;
+        
+        /// <summary>
+        /// locMaxStorage 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 locMaxStorage;
+        
+        /// <summary>
+        /// maxStorageSettingsValue control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.QuotaEditor maxStorageSettingsValue;
+        
+        /// <summary>
+        /// locWarningStorage 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 locWarningStorage;
+        
+        /// <summary>
+        /// warningValue control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.QuotaEditor warningValue;
+        
+        /// <summary>
+        /// btnSave 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.Button btnSave;
+        
+        /// <summary>
+        /// btnSaveApply 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.Button btnSaveApply;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageUsage.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageUsage.ascx
new file mode 100644
index 00000000..5e30898b
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageUsage.ascx
@@ -0,0 +1,57 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="HostedSharePointEnterpriseStorageUsage.ascx.cs" Inherits="WebsitePanel.Portal.HostedSharePointEnterpriseStorageUsage" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport"
+    TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel"
+    TagPrefix="wsp" %>
+<%@ Register Src="../ExchangeServer/UserControls/SizeBox.ascx" TagName="SizeBox" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox"
+    TagPrefix="wsp" %>
+<%@ Register Src="../ExchangeServer/UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+
+<div id="ExchangeContainer">
+	<div class="Module">
+		<div class="Left">
+        </div>
+		<div class="Content">
+			<div class="Center">
+				<div class="Title">
+					<asp:Image ID="Image1" SkinID="ExchangeStorageConfig48" runat="server" />
+					<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Storage Usage"></asp:Localize>
+				</div>
+				<div class="FormBody">
+				    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+				    
+					<wsp:CollapsiblePanel id="secSiteCollectionsReport" runat="server"
+                        TargetControlID="siteCollectionsReport" meta:resourcekey="secSiteCollectionsReport" Text="Site Collections">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="siteCollectionsReport" runat="server" Height="0" style="overflow:hidden;">
+				        <asp:GridView ID="gvStorageUsage" runat="server" AutoGenerateColumns="False" meta:resourcekey="gvStorageUsage"
+					        Width="100%" EmptyDataText="gvSiteCollections" CssSelectorClass="NormalGridView">
+					        <Columns>
+						        <asp:BoundField meta:resourcekey="gvSiteCollectionName" DataField="Url" />
+						        <asp:BoundField meta:resourcekey="gvSiteCollectionSize" DataField="DiskSpace" />						        
+					        </Columns>
+				        </asp:GridView>
+				        <br />
+			            <table cellpadding="2">
+					        <tr>
+					            <td class="FormLabel150"><asp:Localize ID="locTotalboxItems" runat="server" meta:resourcekey="locTotalMailboxItems" ></asp:Localize></td>
+					            <td><asp:Label ID="lblTotalItems" runat="server" CssClass="NormalBold">177</asp:Label></td>
+					        </tr>
+					        <tr>
+					            <td class="FormLabel150"><asp:Localize ID="locTotalMailboxesSize" runat="server" meta:resourcekey="locTotalMailboxesSize" ></asp:Localize></td>
+					            <td><asp:Label ID="lblTotalSize" runat="server" CssClass="NormalBold">100</asp:Label></td>
+					        </tr>
+				        </table>
+				        <br />
+				    </asp:Panel>                   										                    								    
+				
+				
+				<div class="FormFooterClean">
+					    <asp:Button id="btnRecalculateDiscSpace" runat="server" Text="Recalculate Disk Space" CssClass="Button1" meta:resourcekey="btnRecalculateDiscSpace" OnClick="btnRecalculateDiscSpace_Click" ></asp:Button>						
+				    </div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageUsage.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageUsage.ascx.cs
new file mode 100644
index 00000000..da030e66
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageUsage.ascx.cs
@@ -0,0 +1,94 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using WebsitePanel.Providers.SharePoint;
+
+namespace WebsitePanel.Portal
+{
+    public partial class HostedSharePointEnterpriseStorageUsage : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+                BindGrid();
+        }
+
+        protected void btnRecalculateDiscSpace_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+
+        private void BindGrid()
+        {
+            int errorCode;
+            try
+            {
+                SharePointEnterpriseSiteDiskSpace[] sharePointEnterpriseSiteDiskSpace =
+                    ES.Services.HostedSharePointServersEnt.Enterprise_CalculateSharePointSitesDiskSpace(PanelRequest.ItemID,
+                                                                                          out errorCode);
+
+
+                if (errorCode < 0)
+                {
+                    messageBox.ShowResultMessage(errorCode);
+                    return;
+                }
+                
+                if (sharePointEnterpriseSiteDiskSpace != null && sharePointEnterpriseSiteDiskSpace.Length == 1 && string.IsNullOrEmpty(sharePointEnterpriseSiteDiskSpace[0].Url))
+                {
+                    gvStorageUsage.DataSource = null;
+                    gvStorageUsage.DataBind();
+                    lblTotalItems.Text = "0";
+                    lblTotalSize.Text = "0";
+                    return;
+                }
+                
+                gvStorageUsage.DataSource = sharePointEnterpriseSiteDiskSpace;
+                gvStorageUsage.DataBind();
+
+                if (sharePointEnterpriseSiteDiskSpace != null)
+                {
+                    lblTotalItems.Text = sharePointEnterpriseSiteDiskSpace.Length.ToString();
+
+                    long total = 0;
+                    foreach (SharePointEnterpriseSiteDiskSpace current in sharePointEnterpriseSiteDiskSpace)
+                    {
+                        total += current.DiskSpace;
+                    }
+
+                    lblTotalSize.Text = total.ToString();
+                }
+            }
+            catch(Exception ex)
+            {
+                messageBox.ShowErrorMessage("HOSTED_SHAREPOINT_RECALCULATE_SIZE", ex);   
+            }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageUsage.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageUsage.ascx.designer.cs
new file mode 100644
index 00000000..a91f43f8
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointEnterpriseStorageUsage.ascx.designer.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal {
+    
+    
+    public partial class HostedSharePointEnterpriseStorageUsage {
+        
+        /// <summary>
+        /// Image1 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.Image Image1;
+        
+        /// <summary>
+        /// locTitle 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 locTitle;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// secSiteCollectionsReport control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secSiteCollectionsReport;
+        
+        /// <summary>
+        /// siteCollectionsReport 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 siteCollectionsReport;
+        
+        /// <summary>
+        /// gvStorageUsage 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.GridView gvStorageUsage;
+        
+        /// <summary>
+        /// locTotalboxItems 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 locTotalboxItems;
+        
+        /// <summary>
+        /// lblTotalItems 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.Label lblTotalItems;
+        
+        /// <summary>
+        /// locTotalMailboxesSize 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 locTotalMailboxesSize;
+        
+        /// <summary>
+        /// lblTotalSize 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.Label lblTotalSize;
+        
+        /// <summary>
+        /// btnRecalculateDiscSpace 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.Button btnRecalculateDiscSpace;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointRestoreSiteCollection.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointRestoreSiteCollection.ascx
similarity index 88%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointRestoreSiteCollection.ascx
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointRestoreSiteCollection.ascx
index 4b256403..abd8ad0c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointRestoreSiteCollection.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointRestoreSiteCollection.ascx
@@ -1,10 +1,13 @@
 <%@ Control Language="C#" AutoEventWireup="true" Codebehind="HostedSharePointRestoreSiteCollection.ascx.cs"
 	Inherits="WebsitePanel.Portal.HostedSharePointRestoreSiteCollection" %>
-<%@ Register Src="UserControls/FileLookup.ascx" TagName="FileLookup" TagPrefix="uc1" %>
-<%@ Register Src="UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox"
+<%@ Register Src="../UserControls/FileLookup.ascx" TagName="FileLookup" TagPrefix="uc1" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox"
 	TagPrefix="wsp" %>	
+6  
+<%@ Register Src="../ExchangeServer/UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %> 
+ 
 
-<%@ Register Src="UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport"
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport"
 	TagPrefix="wsp" %>
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server" />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointRestoreSiteCollection.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointRestoreSiteCollection.ascx.cs
similarity index 93%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointRestoreSiteCollection.ascx.cs
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointRestoreSiteCollection.ascx.cs
index 74c9be70..de33f161 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointRestoreSiteCollection.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointRestoreSiteCollection.ascx.cs
@@ -59,11 +59,6 @@ namespace WebsitePanel.Portal
 			}
 		}
 
-        public static string GroupName
-        {
-            get { return HttpContext.Current.Request["GroupName"]; }
-        }
-
 		protected void Page_Load(object sender, EventArgs e)
 		{
 			if (!IsPostBack)
@@ -171,7 +166,7 @@ namespace WebsitePanel.Portal
 
 		private void RedirectBack()
 		{
-            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_edit_sitecollection", "SiteCollectionID=" + this.SiteCollectionId, "ItemID=" + PanelRequest.ItemID.ToString(), "GroupName=" + GroupName));
+            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_edit_sitecollection", "SiteCollectionID=" + this.SiteCollectionId, "ItemID=" + PanelRequest.ItemID.ToString()));
 		}
 		protected void radioUpload_CheckedChanged(object sender, EventArgs e)
 		{
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointRestoreSiteCollection.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointRestoreSiteCollection.ascx.designer.cs
similarity index 75%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointRestoreSiteCollection.ascx.designer.cs
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointRestoreSiteCollection.ascx.designer.cs
index 061c85f8..c59bec70 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointRestoreSiteCollection.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointRestoreSiteCollection.ascx.designer.cs
@@ -1,31 +1,3 @@
-// Copyright (c) 2015, 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.
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointSiteCollections.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointSiteCollections.ascx
similarity index 85%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointSiteCollections.ascx
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointSiteCollections.ascx
index a1734e43..7a5430e3 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointSiteCollections.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointSiteCollections.ascx
@@ -1,13 +1,13 @@
 <%@ Control Language="C#" AutoEventWireup="true" Codebehind="HostedSharePointSiteCollections.ascx.cs"
 	Inherits="WebsitePanel.Portal.HostedSharePointSiteCollections" %>
-<%@ Register Src="UserControls/SpaceServiceItems.ascx" TagName="SpaceServiceItems"
+<%@ Register Src="../UserControls/SpaceServiceItems.ascx" TagName="SpaceServiceItems"
 	TagPrefix="wsp" %>
-<%@ Register Src="UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox"
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox"
 	TagPrefix="wsp" %>
-<%@ Register Src="UserControls/QuotaViewer.ascx" TagName="QuotaViewer" TagPrefix="wsp" %>
-<%@ Register Src="UserControls/Quota.ascx" TagName="Quota" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/QuotaViewer.ascx" TagName="QuotaViewer" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/Quota.ascx" TagName="Quota" TagPrefix="wsp" %>
 	
-<%@ Register Src="UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport"
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport"
 	TagPrefix="wsp" %>
 
 <wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server" />
@@ -76,8 +76,7 @@ function confirmation()
 						<SelectParameters>
 					        <asp:QueryStringParameter Name="packageId" QueryStringField="SpaceID" DefaultValue="-1" />
 							<asp:QueryStringParameter Name="organizationId" QueryStringField="ItemID" DefaultValue="0" />
-                            <asp:QueryStringParameter Name="groupName" QueryStringField="GroupName" DefaultValue="" />
-							<asp:ControlParameter Name="filterColumn" ControlID="ddlSearchColumn" PropertyName="SelectedValue" />
+                            <asp:ControlParameter Name="filterColumn" ControlID="ddlSearchColumn" PropertyName="SelectedValue" />
 							<asp:ControlParameter Name="filterValue" ControlID="txtSearchValue" PropertyName="Text" />
 						</SelectParameters>
 					</asp:ObjectDataSource>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointSiteCollections.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointSiteCollections.ascx.cs
similarity index 91%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointSiteCollections.ascx.cs
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointSiteCollections.ascx.cs
index 0bd9b7b0..b03fd0f0 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointSiteCollections.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointSiteCollections.ascx.cs
@@ -44,11 +44,7 @@ namespace WebsitePanel.Portal
 {
 	public partial class HostedSharePointSiteCollections :  WebsitePanelModuleBase
 	{
-        public static string GroupName
-        {
-            get { return HttpContext.Current.Request["GroupName"]; }
-        }
-
+ 
 		protected void Page_Load(object sender, EventArgs e)
 		{
 			this.BindStats();
@@ -67,14 +63,14 @@ namespace WebsitePanel.Portal
 
 		protected void btnCreateSiteCollection_Click(object sender, EventArgs e)
 		{
-			Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "sharepoint_edit_sitecollection", "SpaceID=" + PanelSecurity.PackageId.ToString(), "GroupName=" + GroupName));
+			Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "sharepoint_edit_sitecollection", "SpaceID=" + PanelSecurity.PackageId.ToString()));
 		}
 
 		public string GetSiteCollectionEditUrl(string siteCollectionId)
 		{
 			return EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "sharepoint_edit_sitecollection",
 					"SiteCollectionID=" + siteCollectionId,
-					"ItemID=" + PanelRequest.ItemID.ToString(), "GroupName=" + GroupName);
+					"ItemID=" + PanelRequest.ItemID.ToString());
 		}
 
 		protected void odsSharePointSiteCollectionPaged_Selected(object sender, ObjectDataSourceStatusEventArgs e)
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointSiteCollections.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointSiteCollections.ascx.designer.cs
similarity index 100%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointSiteCollections.ascx.designer.cs
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointSiteCollections.ascx.designer.cs
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageSettings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointStorageSettings.ascx
similarity index 79%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageSettings.ascx
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointStorageSettings.ascx
index 6329dc5b..a4557072 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageSettings.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointStorageSettings.ascx
@@ -1,13 +1,13 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="HostedSharePointStorageSettings.ascx.cs" Inherits="WebsitePanel.Portal.HostedSharePointStorageSettings" %>
-<%@ Register Src="UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport"
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport"
     TagPrefix="wsp" %>
-<%@ Register Src="UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel"
+<%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel"
     TagPrefix="wsp" %>
-<%@ Register Src="ExchangeServer/UserControls/SizeBox.ascx" TagName="SizeBox" TagPrefix="wsp" %>
-<%@ Register Src="UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox"
+<%@ Register Src="../ExchangeServer/UserControls/SizeBox.ascx" TagName="SizeBox" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox"
     TagPrefix="wsp" %>
-
-<%@ Register src="UserControls/QuotaEditor.ascx" tagname="QuotaEditor" tagprefix="uc1" %>
+<%@ Register Src="../ExchangeServer/UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register src="../UserControls/QuotaEditor.ascx" tagname="QuotaEditor" tagprefix="uc1" %>
 
 
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageSettings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointStorageSettings.ascx.cs
similarity index 100%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageSettings.ascx.cs
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointStorageSettings.ascx.cs
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageSettings.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointStorageSettings.ascx.designer.cs
similarity index 69%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageSettings.ascx.designer.cs
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointStorageSettings.ascx.designer.cs
index 8cc0e3cc..04b5be91 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageSettings.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointStorageSettings.ascx.designer.cs
@@ -1,31 +1,3 @@
-// Copyright (c) 2015, 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.
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageUsage.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointStorageUsage.ascx
similarity index 83%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageUsage.ascx
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointStorageUsage.ascx
index 54db370b..b551a4a7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageUsage.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointStorageUsage.ascx
@@ -1,11 +1,12 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="HostedSharePointStorageUsage.ascx.cs" Inherits="WebsitePanel.Portal.HostedSharePointStorageUsage" %>
-<%@ Register Src="UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport"
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport"
     TagPrefix="wsp" %>
-<%@ Register Src="UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel"
+<%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel"
     TagPrefix="wsp" %>
-<%@ Register Src="ExchangeServer/UserControls/SizeBox.ascx" TagName="SizeBox" TagPrefix="wsp" %>
-<%@ Register Src="UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox"
+<%@ Register Src="../ExchangeServer/UserControls/SizeBox.ascx" TagName="SizeBox" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox"
     TagPrefix="wsp" %>
+<%@ Register Src="../ExchangeServer/UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
 
 <div id="ExchangeContainer">
 	<div class="Module">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageUsage.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointStorageUsage.ascx.cs
similarity index 100%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageUsage.ascx.cs
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointStorageUsage.ascx.cs
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageUsage.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointStorageUsage.ascx.designer.cs
similarity index 69%
rename from WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageUsage.ascx.designer.cs
rename to WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointStorageUsage.ascx.designer.cs
index 43f100c7..4c003393 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePointStorageUsage.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/HostedSharePoint/HostedSharePointStorageUsage.ascx.designer.cs
@@ -1,31 +1,3 @@
-// Copyright (c) 2015, 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.
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Login.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Login.ascx.cs
index dfaf5172..866f8426 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Login.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Login.ascx.cs
@@ -233,6 +233,26 @@ namespace WebsitePanel.Portal
                         }
                     }
 
+                    
+                    if (cntx.Groups.ContainsKey(ResourceGroups.VPS2012))
+                    {
+                        // VPS resource found
+                        // check created VPS
+                        VirtualMachineMetaItemsPaged vms = ES.Services.VPS2012.GetVirtualMachines(packageId, "", "", "", 0, Int32.MaxValue, false);
+                        if (vms.Items.Length == 1)
+                        {
+                            // one VPS - redirect to its properties screen
+                            Response.Redirect(PortalUtils.NavigatePageURL("SpaceVPS2012", "SpaceID", packageId.ToString(),
+                                "ItemID=" + vms.Items[0].ItemID.ToString(), "ctl=vps_general", "moduleDefId=VPS2012"));
+                        }
+                        else
+                        {
+                            // several VPS - redirect to VPS list page
+                            Response.Redirect(PortalUtils.NavigatePageURL("SpaceVPS2012", "SpaceID", packageId.ToString(),
+                                "ctl=", "moduleDefId=VPS2012"));
+                        }
+                    }
+
 
                     if (cntx.Groups.ContainsKey(ResourceGroups.VPSForPC))
                     {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/MailAccountsEditAccount.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/MailAccountsEditAccount.ascx.cs
index bc1bdca0..019e0b95 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/MailAccountsEditAccount.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/MailAccountsEditAccount.ascx.cs
@@ -153,6 +153,7 @@ namespace WebsitePanel.Portal
 				if (maxMailboxSizeLimit == -1 || maxMailboxSizeLimit == 0)
 				{
 					MaxMailboxSizeLimitValidator.Enabled = false;
+				    CompareValidator1.Enabled = false;
 				}
 				else
 				{
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IceWarp_EditAccount.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IceWarp_EditAccount.ascx.cs
index 858cb7d4..d6915278 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IceWarp_EditAccount.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IceWarp_EditAccount.ascx.cs
@@ -43,6 +43,7 @@ namespace WebsitePanel.Portal.ProviderControls
             secForwarding.Visible = (PanelRequest.ItemID > 0);
             OlderMailsPanel.Visible = (PanelRequest.ItemID > 0);
             secOlderMails.Visible = (PanelRequest.ItemID > 0);
+            Utils.SelectListItem(ddlAccountType, "1");  // Set default account type to POP3 & IMAP
         }
 
         public void BindItem(MailAccount item)
@@ -108,7 +109,6 @@ namespace WebsitePanel.Portal.ProviderControls
             item.ForwardingAddresses = Utils.ParseDelimitedString(txtForward.Text, ';', ' ', ',');
             item.DeleteOnForward = cbDeleteOnForward.Checked;
             item.ChangePassword = cbChangePassword.Checked;
-            item.ChangePassword = cbChangePassword.Checked;
             item.IsDomainAdmin = cbDomainAdmin.Checked;
 
             item.DeleteOlder = cbDeleteOlder.Checked;
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSEditUserExperience.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSEditUserExperience.ascx.resx
index 91b50033..1ba5fff1 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSEditUserExperience.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSEditUserExperience.ascx.resx
@@ -123,6 +123,15 @@
   <data name="cbUsers.Text" xml:space="preserve">
     <value>Users</value>
   </data>
+  <data name="secChangeDesktop.Text" xml:space="preserve">
+    <value>Changing Desktop Disabled</value>
+  </data>
+  <data name="secControlSession.Text" xml:space="preserve">
+    <value>Control RDS Session without Users's Permission</value>
+  </data>
+  <data name="secDisableCmd.Text" xml:space="preserve">
+    <value>Disable Command Prompt</value>
+  </data>
   <data name="secDriveSpace.Text" xml:space="preserve">
     <value>Drive Space Threshold</value>
   </data>
@@ -147,7 +156,7 @@
   <data name="secTimeout.Text" xml:space="preserve">
     <value>Lock Screen Timeout</value>
   </data>
-  <data name="sekChangeDesktop.Text" xml:space="preserve">
-    <value>Changing Desktop Disabled</value>
+  <data name="secViewSession.Text" xml:space="preserve">
+    <value>View RDS Session without Users's Permission</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSSetupLetter.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSSetupLetter.ascx.resx
index 61c375b4..a5c69ade 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSSetupLetter.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSSetupLetter.ascx.resx
@@ -138,4 +138,7 @@
   <data name="valRequireEmail.Text" xml:space="preserve">
     <value>* Enter E-Mail</value>
   </data>
+  <data name="btnExit.Text" xml:space="preserve">
+    <value>Back to Users List</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSUserSessions.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSUserSessions.ascx.resx
index e8f7f85d..54e311d7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSUserSessions.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/App_LocalResources/RDSUserSessions.ascx.resx
@@ -150,4 +150,16 @@
   <data name="btnRefresh.Text" xml:space="preserve">
     <value>Refresh</value>
   </data>
+  <data name="cmdControlSession.Text" xml:space="preserve">
+    <value>Control</value>
+  </data>
+  <data name="cmdControlSession.ToolTip" xml:space="preserve">
+    <value>Control Session</value>
+  </data>
+  <data name="cmdViewSession.Text" xml:space="preserve">
+    <value>View</value>
+  </data>
+  <data name="cmdViewSession.ToolTip" xml:space="preserve">
+    <value>View Session</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx
index cb177a39..c7cf7553 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx
@@ -29,7 +29,7 @@
                         <table>
                             <tr>            
                                 <td colspan="2">
-                                    <asp:TextBox ID="txtTimeout" runat="server" CssClass="TextBox200" ></asp:TextBox>                
+                                    <asp:DropDownList ID="ddTimeout" runat="server" CssClass="NormalTextBox"/>
                                 </td>            
                             </tr>
                             <tr>
@@ -145,13 +145,65 @@
                     <asp:Panel ID="driveSpacePanel" runat="server" Height="0" style="overflow:hidden;">
                         <table>
                             <tr>            
-                                <td colspan="2">
-                                    <asp:TextBox ID="txtThreshold" runat="server" CssClass="TextBox200" ></asp:TextBox>                
+                                <td colspan="2">                                          
+                                    <asp:DropDownList ID="ddTreshold" runat="server" CssClass="NormalTextBox">
+                                        <asp:ListItem Value="" Text="None" />
+                                        <asp:ListItem Value="5" Text="5%" />
+                                        <asp:ListItem Value="10" Text="10%" />
+                                        <asp:ListItem Value="15" Text="15%" />
+                                        <asp:ListItem Value="20" Text="20%" />
+                                        <asp:ListItem Value="25" Text="25%" />
+                                        <asp:ListItem Value="30" Text="30%" />
+                                        <asp:ListItem Value="35" Text="35%" />
+                                        <asp:ListItem Value="40" Text="40%" />
+                                    </asp:DropDownList>                          
                                 </td>           
                             </tr>        
                         </table>
                         <br />
                     </asp:Panel>
+                    <wsp:CollapsiblePanel id="secViewSession" runat="server" TargetControlID="viewSessionPanel" meta:resourcekey="secViewSession" Text="View RDS Session without Users's Permission"/>
+                    <asp:Panel ID="viewSessionPanel" runat="server" Height="0" style="overflow:hidden;">
+                        <table>
+                            <tr>
+                                <td>
+                                    <asp:CheckBox runat="server" Text="Users" ID="cbViewSessionUsers" meta:resourcekey="cbUsers" Checked="false" />
+                                </td>
+                                <td>
+                                    <asp:CheckBox runat="server" Text="Administrators" meta:resourcekey="cbAdministrators" ID="cbViewSessionAdministrators" Checked="false" />
+                                </td>           
+                            </tr>        
+                        </table>
+                        <br />
+                    </asp:Panel>
+                    <wsp:CollapsiblePanel id="secControlSession" runat="server" TargetControlID="controlSessionPanel" meta:resourcekey="secControlSession" Text="Control RDS Session without Users's Permission"/>
+                    <asp:Panel ID="controlSessionPanel" runat="server" Height="0" style="overflow:hidden;">
+                        <table>
+                            <tr>
+                                <td>
+                                    <asp:CheckBox runat="server" Text="Users" ID="cbControlSessionUsers" meta:resourcekey="cbUsers" Checked="false" />
+                                </td>
+                                <td>
+                                    <asp:CheckBox runat="server" Text="Administrators" meta:resourcekey="cbAdministrators" ID="cbControlSessionAdministrators" Checked="false" />
+                                </td>           
+                            </tr>
+                        </table>
+                        <br />
+                    </asp:Panel>
+                    <wsp:CollapsiblePanel id="secDisableCmd" runat="server" TargetControlID="disableCmdPanel" meta:resourcekey="secDisableCmd" Text="Disable Command Prompt"/>
+                    <asp:Panel ID="disableCmdPanel" runat="server" Height="0" style="overflow:hidden;">
+                        <table>
+                            <tr>
+                                <td>
+                                    <asp:CheckBox runat="server" Text="Users" ID="cbDisableCmdUsers" meta:resourcekey="cbUsers" Checked="false" />
+                                </td>
+                                <td>
+                                    <asp:CheckBox runat="server" Text="Administrators" meta:resourcekey="cbAdministrators" ID="cbDisableCmdAdministrators" Checked="false" />
+                                </td>           
+                            </tr>
+                        </table>
+                        <br />
+                    </asp:Panel>
                     <div class="FormFooterClean">
                         <wsp:ItemButtonPanel id="buttonPanel" runat="server" ValidationGroup="SaveRDSCollection" 
                             OnSaveClick="btnSave_Click" OnSaveExitClick="btnSaveExit_Click" />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx.cs
index 4d5ee15a..19e11012 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx.cs
@@ -15,6 +15,12 @@ namespace WebsitePanel.Portal.RDS
         {
             if (!IsPostBack)
             {
+                var timeouts = RdsServerSettings.ScreenSaverTimeOuts;
+                ddTimeout.DataSource = timeouts;
+                ddTimeout.DataTextField = "Value";
+                ddTimeout.DataValueField = "Key";
+                ddTimeout.DataBind();
+
                 var collection = ES.Services.RDS.GetRdsCollection(PanelRequest.CollectionID);
                 litCollectionName.Text = collection.DisplayName;
                 BindSettings();
@@ -27,8 +33,8 @@ namespace WebsitePanel.Portal.RDS
 
             if (serverSettings == null || !serverSettings.Settings.Any())
             {
-                var defaultSettings = ES.Services.Users.GetUserSettings(PanelSecurity.LoggedUserId, UserSettings.RDS_POLICY);
-                BindDefaultSettings(defaultSettings);
+                ddTimeout.SelectedValue = "";
+                ddTreshold.SelectedValue = "";
             }
             else
             {
@@ -39,45 +45,47 @@ namespace WebsitePanel.Portal.RDS
         private void BindSettings(RdsServerSettings settings)
         {
             var setting = GetServerSetting(settings, RdsServerSettings.LOCK_SCREEN_TIMEOUT);
-            txtTimeout.Text = setting.PropertyValue;
-            cbTimeoutAdministrators.Checked = setting.ApplyAdministrators;
-            cbTimeoutUsers.Checked = setting.ApplyUsers;
 
-            setting = GetServerSetting(settings, RdsServerSettings.REMOVE_RUN_COMMAND);
-            cbRunCommandAdministrators.Checked = setting.ApplyAdministrators;
-            cbRunCommandUsers.Checked = setting.ApplyUsers;
+            if (setting != null)
+            {
+                ddTimeout.SelectedValue = setting.PropertyValue;
+                cbTimeoutAdministrators.Checked = setting.ApplyAdministrators;
+                cbTimeoutUsers.Checked = setting.ApplyUsers;
+            }
 
-            setting = GetServerSetting(settings, RdsServerSettings.REMOVE_POWERSHELL_COMMAND);
-            cbPowershellAdministrators.Checked = setting.ApplyAdministrators;
-            cbPowershellUsers.Checked = setting.ApplyUsers;
-
-            setting = GetServerSetting(settings, RdsServerSettings.HIDE_C_DRIVE);
-            cbHideCDriveAdministrators.Checked = setting.ApplyAdministrators;
-            cbHideCDriveUsers.Checked = setting.ApplyUsers;
-
-            setting = GetServerSetting(settings, RdsServerSettings.REMOVE_SHUTDOWN_RESTART);
-            cbShutdownAdministrators.Checked = setting.ApplyAdministrators;
-            cbShutdownUsers.Checked = setting.ApplyUsers;
-
-            setting = GetServerSetting(settings, RdsServerSettings.DISABLE_TASK_MANAGER);
-            cbTaskManagerAdministrators.Checked = setting.ApplyAdministrators;
-            cbTaskManagerUsers.Checked = setting.ApplyUsers;
-
-            setting = GetServerSetting(settings, RdsServerSettings.CHANGE_DESKTOP_DISABLED);
-            cbDesktopAdministrators.Checked = setting.ApplyAdministrators;
-            cbDesktopUsers.Checked = setting.ApplyUsers;
-
-            setting = GetServerSetting(settings, RdsServerSettings.SCREEN_SAVER_DISABLED);
-            cbScreenSaverAdministrators.Checked = setting.ApplyAdministrators;
-            cbScreenSaverUsers.Checked = setting.ApplyUsers;
+            SetCheckboxes(settings, RdsServerSettings.REMOVE_RUN_COMMAND, cbRunCommandAdministrators, cbRunCommandUsers);
+            SetCheckboxes(settings, RdsServerSettings.REMOVE_POWERSHELL_COMMAND, cbPowershellAdministrators, cbPowershellUsers);
+            SetCheckboxes(settings, RdsServerSettings.HIDE_C_DRIVE, cbHideCDriveAdministrators, cbHideCDriveUsers);
+            SetCheckboxes(settings, RdsServerSettings.REMOVE_SHUTDOWN_RESTART, cbShutdownAdministrators, cbShutdownUsers);
+            SetCheckboxes(settings, RdsServerSettings.DISABLE_TASK_MANAGER, cbTaskManagerAdministrators, cbTaskManagerUsers);
+            SetCheckboxes(settings, RdsServerSettings.CHANGE_DESKTOP_DISABLED, cbDesktopAdministrators, cbDesktopUsers);
+            SetCheckboxes(settings, RdsServerSettings.SCREEN_SAVER_DISABLED, cbScreenSaverAdministrators, cbScreenSaverUsers);
+            SetCheckboxes(settings, RdsServerSettings.RDS_VIEW_WITHOUT_PERMISSION, cbViewSessionAdministrators, cbViewSessionUsers);
+            SetCheckboxes(settings, RdsServerSettings.RDS_CONTROL_WITHOUT_PERMISSION, cbControlSessionAdministrators, cbControlSessionUsers);
+            SetCheckboxes(settings, RdsServerSettings.DISABLE_CMD, cbDisableCmdAdministrators, cbDisableCmdUsers);
 
             setting = GetServerSetting(settings, RdsServerSettings.DRIVE_SPACE_THRESHOLD);
-            txtThreshold.Text = setting.PropertyValue;
+
+            if (setting != null)
+            {
+                ddTreshold.SelectedValue = setting.PropertyValue;
+            }
+        }
+
+        private void SetCheckboxes(RdsServerSettings settings, string settingName, CheckBox cbAdministrators, CheckBox cbUsers)
+        {
+            var setting = GetServerSetting(settings, settingName);
+
+            if (setting != null)
+            {
+                cbAdministrators.Checked = setting.ApplyAdministrators;
+                cbUsers.Checked = setting.ApplyUsers;
+            }
         }
 
         private RdsServerSetting GetServerSetting(RdsServerSettings settings, string propertyName)
         {
-            return settings.Settings.First(s => s.PropertyName.Equals(propertyName));
+            return settings.Settings.FirstOrDefault(s => s.PropertyName.Equals(propertyName));
         }
 
         private RdsServerSettings GetSettings()
@@ -87,7 +95,7 @@ namespace WebsitePanel.Portal.RDS
             settings.Settings.Add(new RdsServerSetting
             {
                 PropertyName = RdsServerSettings.LOCK_SCREEN_TIMEOUT,
-                PropertyValue = txtTimeout.Text,
+                PropertyValue = ddTimeout.SelectedValue,
                 ApplyAdministrators = cbTimeoutAdministrators.Checked,
                 ApplyUsers = cbTimeoutUsers.Checked
             });
@@ -151,43 +159,37 @@ namespace WebsitePanel.Portal.RDS
             settings.Settings.Add(new RdsServerSetting
             {
                 PropertyName = RdsServerSettings.DRIVE_SPACE_THRESHOLD,
-                PropertyValue = txtThreshold.Text,
+                PropertyValue = ddTreshold.SelectedValue,
                 ApplyAdministrators = true,
                 ApplyUsers = true
             });
 
+            settings.Settings.Add(new RdsServerSetting
+            {
+                PropertyName = RdsServerSettings.RDS_VIEW_WITHOUT_PERMISSION,
+                PropertyValue = "",
+                ApplyAdministrators = cbViewSessionAdministrators.Checked,
+                ApplyUsers = cbViewSessionUsers.Checked
+            });
+
+            settings.Settings.Add(new RdsServerSetting
+            {
+                PropertyName = RdsServerSettings.RDS_CONTROL_WITHOUT_PERMISSION,
+                PropertyValue = "",
+                ApplyAdministrators = cbControlSessionAdministrators.Checked,
+                ApplyUsers = cbControlSessionUsers.Checked
+            });
+
+            settings.Settings.Add(new RdsServerSetting
+            {
+                PropertyName = RdsServerSettings.DISABLE_CMD,
+                PropertyValue = "",
+                ApplyAdministrators = cbDisableCmdAdministrators.Checked,
+                ApplyUsers = cbDisableCmdUsers.Checked
+            });
+
             return settings;
-        }
-
-        private void BindDefaultSettings(UserSettings settings)
-        {
-            txtTimeout.Text = settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_VALUE];
-            cbTimeoutAdministrators.Checked = Convert.ToBoolean(settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_ADMINISTRATORS]);
-            cbTimeoutUsers.Checked = Convert.ToBoolean(settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_USERS]);
-
-            cbRunCommandAdministrators.Checked = Convert.ToBoolean(settings[RdsServerSettings.REMOVE_RUN_COMMAND_ADMINISTRATORS]);
-            cbRunCommandUsers.Checked = Convert.ToBoolean(settings[RdsServerSettings.REMOVE_RUN_COMMAND_USERS]);
-
-            cbPowershellAdministrators.Checked = Convert.ToBoolean(settings[RdsServerSettings.REMOVE_POWERSHELL_COMMAND_ADMINISTRATORS]);
-            cbPowershellUsers.Checked = Convert.ToBoolean(settings[RdsServerSettings.REMOVE_POWERSHELL_COMMAND_USERS]);
-
-            cbHideCDriveAdministrators.Checked = Convert.ToBoolean(settings[RdsServerSettings.HIDE_C_DRIVE_ADMINISTRATORS]);
-            cbHideCDriveUsers.Checked = Convert.ToBoolean(settings[RdsServerSettings.HIDE_C_DRIVE_USERS]);
-
-            cbShutdownAdministrators.Checked = Convert.ToBoolean(settings[RdsServerSettings.REMOVE_SHUTDOWN_RESTART_ADMINISTRATORS]);
-            cbShutdownUsers.Checked = Convert.ToBoolean(settings[RdsServerSettings.REMOVE_SHUTDOWN_RESTART_USERS]);
-
-            cbTaskManagerAdministrators.Checked = Convert.ToBoolean(settings[RdsServerSettings.DISABLE_TASK_MANAGER_ADMINISTRATORS]);
-            cbTaskManagerUsers.Checked = Convert.ToBoolean(settings[RdsServerSettings.DISABLE_TASK_MANAGER_USERS]);
-
-            cbDesktopAdministrators.Checked = Convert.ToBoolean(settings[RdsServerSettings.CHANGE_DESKTOP_DISABLED_ADMINISTRATORS]);
-            cbDesktopUsers.Checked = Convert.ToBoolean(settings[RdsServerSettings.CHANGE_DESKTOP_DISABLED_USERS]);
-
-            cbScreenSaverAdministrators.Checked = Convert.ToBoolean(settings[RdsServerSettings.SCREEN_SAVER_DISABLED_ADMINISTRATORS]);
-            cbScreenSaverUsers.Checked = Convert.ToBoolean(settings[RdsServerSettings.SCREEN_SAVER_DISABLED_USERS]);
-
-            txtThreshold.Text = settings[RdsServerSettings.DRIVE_SPACE_THRESHOLD_VALUE];
-        }
+        }        
 
         private bool SaveServerSettings()
         {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx.designer.cs
index a743b041..b12d745a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSEditUserExperience.ascx.designer.cs
@@ -85,13 +85,13 @@ namespace WebsitePanel.Portal.RDS {
         protected global::System.Web.UI.WebControls.Panel timeoutPanel;
         
         /// <summary>
-        /// txtTimeout control.
+        /// ddTimeout 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 txtTimeout;
+        protected global::System.Web.UI.WebControls.DropDownList ddTimeout;
         
         /// <summary>
         /// cbTimeoutUsers control.
@@ -382,13 +382,121 @@ namespace WebsitePanel.Portal.RDS {
         protected global::System.Web.UI.WebControls.Panel driveSpacePanel;
         
         /// <summary>
-        /// txtThreshold control.
+        /// ddTreshold 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 txtThreshold;
+        protected global::System.Web.UI.WebControls.DropDownList ddTreshold;
+        
+        /// <summary>
+        /// secViewSession control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secViewSession;
+        
+        /// <summary>
+        /// viewSessionPanel 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 viewSessionPanel;
+        
+        /// <summary>
+        /// cbViewSessionUsers 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 cbViewSessionUsers;
+        
+        /// <summary>
+        /// cbViewSessionAdministrators 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 cbViewSessionAdministrators;
+        
+        /// <summary>
+        /// secControlSession control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secControlSession;
+        
+        /// <summary>
+        /// controlSessionPanel 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 controlSessionPanel;
+        
+        /// <summary>
+        /// cbControlSessionUsers 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 cbControlSessionUsers;
+        
+        /// <summary>
+        /// cbControlSessionAdministrators 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 cbControlSessionAdministrators;
+        
+        /// <summary>
+        /// secDisableCmd control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secDisableCmd;
+        
+        /// <summary>
+        /// disableCmdPanel 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 disableCmdPanel;
+        
+        /// <summary>
+        /// cbDisableCmdUsers 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 cbDisableCmdUsers;
+        
+        /// <summary>
+        /// cbDisableCmdAdministrators 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 cbDisableCmdAdministrators;
         
         /// <summary>
         /// buttonPanel control.
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSSetupLetter.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSSetupLetter.ascx
index 42fbacb1..23f91360 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSSetupLetter.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSSetupLetter.ascx
@@ -18,7 +18,7 @@
                 </div>
 				<div class="FormBody">                    
                     <wsp:SimpleMessageBox id="messageBox" runat="server" />
-                    <wsp:CollectionTabs id="tabs" runat="server" SelectedTab="rds_setup_letter" />
+                    <wsp:CollectionTabs id="tabs" runat="server" SelectedTab="rds_collection_edit_users" />
 
                     <wsp:CollapsiblePanel id="secEmail" runat="server" IsCollapsed="true"
                         TargetControlID="EmailPanel" meta:resourcekey="secEmail" Text="Send via E-Mail">
@@ -41,13 +41,13 @@
                                 </td>
                                 <td class="Normal">
                                     <asp:TextBox ID="txtCC" runat="server" CssClass="NormalTextBox" Width="300px"></asp:TextBox></td>
-                            </tr>
-                            <tr>
-                                <td></td>
-                                <td>
-                                    <asp:Button ID="btnSend" runat="server" CssClass="Button2" meta:resourcekey="btnSend" Text="Send" OnClick="btnSend_Click" ValidationGroup="SendEmail" /></td>
-                            </tr>
+                            </tr>                            
                         </table>
+                        <div class="FormFooterClean">
+                        <asp:Button id="btnExit" runat="server" Text="Back to Users List" CssClass="Button1" meta:resourcekey="btnExit" 
+                                        OnClick="btnExit_Click" OnClientClick="ShowProgressDialog('Loading ...');"/>
+                        <asp:Button ID="btnSend" runat="server" CssClass="Button2" meta:resourcekey="btnSend" Text="Send" OnClick="btnSend_Click" ValidationGroup="SendEmail" />
+			        </div>
                     </asp:Panel>
 					
                     <div class="PreviewArea">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSSetupLetter.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSSetupLetter.ascx.cs
index 41e33a4a..c50344f7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSSetupLetter.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSSetupLetter.ascx.cs
@@ -59,5 +59,10 @@ namespace WebsitePanel.Portal.RDS
                 return;
             }
         }
+
+        protected void btnExit_Click(object sender, EventArgs e)
+        {
+            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "rds_collection_edit_users", "CollectionId=" + PanelRequest.CollectionID, "ItemID=" + PanelRequest.ItemID));
+        }
     }
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSSetupLetter.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSSetupLetter.ascx.designer.cs
index 7a8f53e8..32a49f96 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSSetupLetter.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSSetupLetter.ascx.designer.cs
@@ -129,6 +129,15 @@ namespace WebsitePanel.Portal.RDS {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtCC;
         
+        /// <summary>
+        /// btnExit 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.Button btnExit;
+        
         /// <summary>
         /// btnSend control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSUserSessions.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSUserSessions.ascx
index 9afc8a5b..15d0ef9e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSUserSessions.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSUserSessions.ascx
@@ -40,7 +40,7 @@
                                         OnRowCommand="gvRDSCollections_RowCommand" AllowPaging="True" AllowSorting="True">
                                         <Columns>                                            
                                             <asp:TemplateField meta:resourcekey="gvUserName" HeaderText="gvUserName">
-                                                <ItemStyle Width="30%" Wrap="false"/>
+                                                <ItemStyle Width="25%" Wrap="false"/>
                                                 <ItemTemplate>
                                                     <asp:Image ID="vipImage" runat="server" ImageUrl='<%# GetAccountImage(Convert.ToBoolean(Eval("IsVip"))) %>' ImageAlign="AbsMiddle"/>
                                                     <asp:Literal ID="litUserName" runat="server" Text='<%# Eval("UserName") %>'/>
@@ -48,17 +48,29 @@
                                                 </ItemTemplate>
                                             </asp:TemplateField>
                                             <asp:TemplateField meta:resourcekey="gvHostServer" HeaderText="gvHostServer">
-                                                <ItemStyle Width="30%" Wrap="false"/>
+                                                <ItemStyle Width="25%" Wrap="false"/>
                                                 <ItemTemplate>
                                                     <asp:Literal ID="litHostServer" runat="server" Text='<%# Eval("HostServer") %>'/>
                                                 </ItemTemplate>
                                             </asp:TemplateField>
                                             <asp:TemplateField meta:resourcekey="gvSessionState" HeaderText="gvSessionState">
-                                                <ItemStyle Width="30%" Wrap="false"/>
+                                                <ItemStyle Width="25%" Wrap="false"/>
                                                 <ItemTemplate>
                                                     <asp:Literal ID="litSessionState" runat="server" Text='<%# Eval("SessionState") %>'/>
                                                 </ItemTemplate>
                                             </asp:TemplateField>
+                                            <asp:TemplateField>
+                                                <ItemTemplate>                                            
+                                                    <asp:LinkButton ID="lnkViewSession" runat="server" Text="View" CommandName="View" CommandArgument='<%# Eval("UnifiedSessionId") %>'
+                                                        meta:resourcekey="cmdViewSession"></asp:LinkButton>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
+                                            <asp:TemplateField>
+                                                <ItemTemplate>                                            
+                                                    <asp:LinkButton ID="lnkControlSession" runat="server" Text="Control" CommandName="Control" CommandArgument='<%# Eval("UnifiedSessionId") %>'
+                                                        meta:resourcekey="cmdControlSession"></asp:LinkButton>
+                                                </ItemTemplate>
+                                            </asp:TemplateField>
                                             <asp:TemplateField>
                                                 <ItemTemplate>                                            
                                                     <asp:LinkButton ID="lnkLogOff" runat="server" Text="Log Off" CommandName="LogOff" CommandArgument='<%# Eval("UnifiedSessionId") + ";" + Eval("HostServer") %>'
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSUserSessions.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSUserSessions.ascx.cs
index 9938e16e..bd4d5e20 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSUserSessions.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/RDSUserSessions.ascx.cs
@@ -44,6 +44,28 @@ namespace WebsitePanel.Portal.RDS
                     ShowErrorMessage("REMOTE_DESKTOP_SERVICES_LOG_OFF_USER", ex);
                 }
             }
+            else if (e.CommandName == "View")
+            {
+                try
+                {
+                    ES.Services.RDS.ShadowSession(PanelRequest.ItemID, e.CommandArgument.ToString(), false);                    
+                }
+                catch (Exception ex)
+                {
+                    ShowErrorMessage("REMOTE_DESKTOP_SERVICES_VIEW_SESSION", ex);
+                }
+            }
+            else if (e.CommandName == "Control")
+            {
+                try
+                {
+                    ES.Services.RDS.ShadowSession(PanelRequest.ItemID, e.CommandArgument.ToString(), true);
+                }
+                catch (Exception ex)
+                {
+                    ShowErrorMessage("REMOTE_DESKTOP_SERVICES_CONTROL_SESSION", ex);
+                }
+            }
         }
 
         protected void btnSave_Click(object sender, EventArgs e)
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionTabs.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionTabs.ascx
index 35aa06a7..9f434613 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionTabs.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionTabs.ascx
@@ -5,13 +5,13 @@
             <asp:DataList ID="rdsTabs" runat="server" RepeatDirection="Horizontal" RepeatLayout="Flow" EnableViewState="false">
                 <ItemStyle Wrap="False" />
                 <ItemTemplate >
-                    <asp:HyperLink ID="lnkTab" runat="server" CssClass="Tab" NavigateUrl='<%# Eval("Url") %>' OnClick="return tabClicked();">
+                    <asp:HyperLink ID="lnkTab" runat="server" CssClass="Tab" style="padding:10px 15px;" NavigateUrl='<%# Eval("Url") %>' OnClick="return tabClicked();">
                         <%# Eval("Name") %>
                     </asp:HyperLink>
                 </ItemTemplate>
                 <SelectedItemStyle Wrap="False" />
                 <SelectedItemTemplate>
-                    <asp:HyperLink ID="lnkSelTab" runat="server" CssClass="ActiveTab" NavigateUrl='<%# Eval("Url") %>' OnClick="return tabClicked;">
+                    <asp:HyperLink ID="lnkSelTab" runat="server" CssClass="ActiveTab" style="padding:10px 15px;" NavigateUrl='<%# Eval("Url") %>' OnClick="return tabClicked;">
                         <%# Eval("Name") %>
                     </asp:HyperLink>
                 </SelectedItemTemplate>                
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionTabs.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionTabs.ascx.cs
index 57e12294..9165638c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionTabs.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDS/UserControls/RDSCollectionTabs.ascx.cs
@@ -22,12 +22,11 @@ namespace WebsitePanel.Portal.RDS.UserControls
             List<Tab> tabsList = new List<Tab>();            
             tabsList.Add(CreateTab("rds_edit_collection", "Tab.RdsServers"));
             tabsList.Add(CreateTab("rds_edit_collection_settings", "Tab.Settings"));
+            tabsList.Add(CreateTab("rds_collection_user_experience", "Tab.UserExperience"));
             tabsList.Add(CreateTab("rds_collection_edit_apps", "Tab.RdsApplications"));
             tabsList.Add(CreateTab("rds_collection_edit_users", "Tab.RdsUsers"));
             tabsList.Add(CreateTab("rds_collection_user_sessions", "Tab.UserSessions"));
-            tabsList.Add(CreateTab("rds_collection_local_admins", "Tab.LocalAdmins"));
-            tabsList.Add(CreateTab("rds_collection_user_experience", "Tab.UserExperience"));
-            tabsList.Add(CreateTab("rds_setup_letter", "Tab.RdsSetupLetter"));            
+            tabsList.Add(CreateTab("rds_collection_local_admins", "Tab.LocalAdmins"));                                
             
             int idx = 0;
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx
index cb516139..af9ad456 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/RDSServers.ascx
@@ -63,10 +63,10 @@
                     </ItemTemplate>                    
                 </asp:TemplateField>
 		        <asp:BoundField DataField="Address" HeaderText="IP Address"><ItemStyle  Width="10%"/></asp:BoundField>
-                <asp:BoundField DataField="ItemName" HeaderText="Organization"><ItemStyle  Width="10%"/></asp:BoundField>
-                <asp:BoundField DataField="Description" HeaderText="Comments"><ItemStyle  Width="20%"/></asp:BoundField>
+                <asp:BoundField DataField="ItemName" HeaderText="Organization"><ItemStyle  Width="20%"/></asp:BoundField>
+                <asp:BoundField DataField="Description" HeaderText="Comments"><ItemStyle  Width="15%"/></asp:BoundField>
                 <asp:TemplateField meta:resourcekey="gvPopupStatus">
-                    <ItemStyle Width="20%" HorizontalAlign="Left" />
+                    <ItemStyle Width="15%" HorizontalAlign="Left" />
                     <ItemTemplate>
                         <asp:Literal ID="litStatus" runat="server" Text='<%# Eval("Status") %>'></asp:Literal>
                         <asp:HiddenField ID="hdnRdsCollectionId" runat="server" Value='<%# Eval("RdsCollectionId") %>' />
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditService.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditService.ascx.cs
index 3ed913ac..6142e465 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditService.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ServersEditService.ascx.cs
@@ -161,7 +161,7 @@ namespace WebsitePanel.Portal
                                                                 (resourceGroup.GroupName == ResourceGroups.Os)|
                                                                 (resourceGroup.GroupName == ResourceGroups.HostedOrganizations) |
                                                                 (resourceGroup.GroupName == ResourceGroups.SharepointFoundationServer) |
-                                                                (resourceGroup.GroupName == ResourceGroups.SharepointServer) |
+                                                                (resourceGroup.GroupName == ResourceGroups.SharepointEnterpriseServer) |
                                                                 (resourceGroup.GroupName == ResourceGroups.Mail)|
                                                                 (resourceGroup.GroupName == ResourceGroups.Lync)|
                                                                 (resourceGroup.GroupName == ResourceGroups.Exchange)|
@@ -177,6 +177,7 @@ namespace WebsitePanel.Portal
                                                                 (resourceGroup.GroupName == ResourceGroups.MySql5)|
                                                                 (resourceGroup.GroupName == ResourceGroups.Statistics)|
                                                                 (resourceGroup.GroupName == ResourceGroups.VPS)|
+                                                                (resourceGroup.GroupName == ResourceGroups.VPS2012)|
                                                                 (resourceGroup.GroupName == ResourceGroups.VPSForPC));
         }
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx
index 5b860eef..1f3300e5 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx
@@ -6,7 +6,7 @@
     <table>
         <tr>            
             <td colspan="2">
-                <asp:TextBox ID="txtTimeout" runat="server" CssClass="TextBox200" ></asp:TextBox>                
+                <asp:DropDownList ID="ddTimeout" runat="server" CssClass="NormalTextBox"/>                    
             </td>            
         </tr>
         <tr>
@@ -122,10 +122,62 @@
 <asp:Panel ID="driveSpacePanel" runat="server" Height="0" style="overflow:hidden;">
     <table>
         <tr>            
-            <td colspan="2">
-                <asp:TextBox ID="txtThreshold" runat="server" CssClass="TextBox200" ></asp:TextBox>                
+            <td colspan="2">                
+                <asp:DropDownList ID="ddTreshold" runat="server" CssClass="NormalTextBox">
+                    <asp:ListItem Value="" Text="None" />
+                    <asp:ListItem Value="5" Text="5%" />
+                    <asp:ListItem Value="10" Text="10%" />
+                    <asp:ListItem Value="15" Text="15%" />
+                    <asp:ListItem Value="20" Text="20%" />
+                    <asp:ListItem Value="25" Text="25%" />
+                    <asp:ListItem Value="30" Text="30%" />
+                    <asp:ListItem Value="35" Text="35%" />
+                    <asp:ListItem Value="40" Text="40%" />
+                </asp:DropDownList>              
             </td>           
         </tr>        
     </table>
     <br />
+</asp:Panel>
+<wsp:CollapsiblePanel id="secViewSession" runat="server" TargetControlID="viewSessionPanel" meta:resourcekey="secViewSession" Text="View RDS Session without Users's Permission"/>
+<asp:Panel ID="viewSessionPanel" runat="server" Height="0" style="overflow:hidden;">
+    <table>
+        <tr>
+            <td>
+                <asp:CheckBox runat="server" Text="Users" ID="cbViewSessionUsers" meta:resourcekey="cbUsers" Checked="false" />
+            </td>
+            <td>
+                <asp:CheckBox runat="server" Text="Administrators" meta:resourcekey="cbAdministrators" ID="cbViewSessionAdministrators" Checked="false" />
+            </td>           
+        </tr>        
+    </table>
+    <br />
+</asp:Panel>
+<wsp:CollapsiblePanel id="secControlSession" runat="server" TargetControlID="controlSessionPanel" meta:resourcekey="secControlSession" Text="Control RDS Session without Users's Permission"/>
+<asp:Panel ID="controlSessionPanel" runat="server" Height="0" style="overflow:hidden;">
+    <table>
+        <tr>
+            <td>
+                <asp:CheckBox runat="server" Text="Users" ID="cbControlSessionUsers" meta:resourcekey="cbUsers" Checked="false" />
+            </td>
+            <td>
+                <asp:CheckBox runat="server" Text="Administrators" meta:resourcekey="cbAdministrators" ID="cbControlSessionAdministrators" Checked="false" />
+            </td>           
+        </tr>        
+    </table>
+    <br />
+</asp:Panel>
+<wsp:CollapsiblePanel id="secDisableCmd" runat="server" TargetControlID="disableCmdPanel" meta:resourcekey="secDisableCmd" Text="Disable Command Prompt"/>
+<asp:Panel ID="disableCmdPanel" runat="server" Height="0" style="overflow:hidden;">
+    <table>
+        <tr>
+            <td>
+                <asp:CheckBox runat="server" Text="Users" ID="cbDisableCmdUsers" meta:resourcekey="cbUsers" Checked="false" />
+            </td>
+            <td>
+                <asp:CheckBox runat="server" Text="Administrators" meta:resourcekey="cbAdministrators" ID="cbDisableCmdAdministrators" Checked="false" />
+            </td>           
+        </tr>
+    </table>
+    <br />
 </asp:Panel>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.cs
index c7cc46ff..3e28ef23 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.cs
@@ -13,7 +13,13 @@ namespace WebsitePanel.Portal
     {        
         public void BindSettings(UserSettings settings)
         {
-            txtTimeout.Text = settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_VALUE];
+            var timeouts = RdsServerSettings.ScreenSaverTimeOuts;
+            ddTimeout.DataSource = timeouts;
+            ddTimeout.DataTextField = "Value";
+            ddTimeout.DataValueField = "Key";
+            ddTimeout.DataBind();
+
+            ddTimeout.SelectedValue = settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_VALUE];
             cbTimeoutAdministrators.Checked = Convert.ToBoolean(settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_ADMINISTRATORS]);
             cbTimeoutUsers.Checked = Convert.ToBoolean(settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_USERS]);
 
@@ -38,12 +44,20 @@ namespace WebsitePanel.Portal
             cbScreenSaverAdministrators.Checked = Convert.ToBoolean(settings[RdsServerSettings.SCREEN_SAVER_DISABLED_ADMINISTRATORS]);
             cbScreenSaverUsers.Checked = Convert.ToBoolean(settings[RdsServerSettings.SCREEN_SAVER_DISABLED_USERS]);
 
-            txtThreshold.Text = settings[RdsServerSettings.DRIVE_SPACE_THRESHOLD_VALUE];
+            cbViewSessionAdministrators.Checked = Convert.ToBoolean(settings[RdsServerSettings.RDS_VIEW_WITHOUT_PERMISSION_ADMINISTRATORS]);
+            cbViewSessionUsers.Checked = Convert.ToBoolean(settings[RdsServerSettings.RDS_VIEW_WITHOUT_PERMISSION_Users]);
+            cbControlSessionAdministrators.Checked = Convert.ToBoolean(settings[RdsServerSettings.RDS_CONTROL_WITHOUT_PERMISSION_ADMINISTRATORS]);
+            cbControlSessionUsers.Checked = Convert.ToBoolean(settings[RdsServerSettings.RDS_CONTROL_WITHOUT_PERMISSION_Users]);
+
+            cbDisableCmdAdministrators.Checked = Convert.ToBoolean(settings[RdsServerSettings.DISABLE_CMD_ADMINISTRATORS]);
+            cbDisableCmdUsers.Checked = Convert.ToBoolean(settings[RdsServerSettings.DISABLE_CMD_USERS]);
+
+            ddTreshold.SelectedValue = settings[RdsServerSettings.DRIVE_SPACE_THRESHOLD_VALUE];
         }
 
         public void SaveSettings(UserSettings settings)
         {
-            settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_VALUE] = txtTimeout.Text;
+            settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_VALUE] = ddTimeout.SelectedValue;
             settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_ADMINISTRATORS] = cbTimeoutAdministrators.Checked.ToString();
             settings[RdsServerSettings.LOCK_SCREEN_TIMEOUT_USERS] = cbTimeoutUsers.Checked.ToString();
             settings[RdsServerSettings.REMOVE_RUN_COMMAND_ADMINISTRATORS] = cbRunCommandAdministrators.Checked.ToString();
@@ -60,7 +74,13 @@ namespace WebsitePanel.Portal
             settings[RdsServerSettings.CHANGE_DESKTOP_DISABLED_USERS] = cbDesktopUsers.Checked.ToString();
             settings[RdsServerSettings.SCREEN_SAVER_DISABLED_ADMINISTRATORS] = cbScreenSaverAdministrators.Checked.ToString();
             settings[RdsServerSettings.SCREEN_SAVER_DISABLED_USERS] = cbScreenSaverUsers.Checked.ToString();
-            settings[RdsServerSettings.DRIVE_SPACE_THRESHOLD_VALUE] = txtThreshold.Text;
+            settings[RdsServerSettings.DRIVE_SPACE_THRESHOLD_VALUE] = ddTreshold.SelectedValue;
+            settings[RdsServerSettings.RDS_VIEW_WITHOUT_PERMISSION_ADMINISTRATORS] = cbViewSessionAdministrators.Checked.ToString();
+            settings[RdsServerSettings.RDS_VIEW_WITHOUT_PERMISSION_Users] = cbViewSessionUsers.Checked.ToString();
+            settings[RdsServerSettings.RDS_CONTROL_WITHOUT_PERMISSION_ADMINISTRATORS] = cbControlSessionAdministrators.Checked.ToString();
+            settings[RdsServerSettings.RDS_CONTROL_WITHOUT_PERMISSION_Users] = cbControlSessionUsers.Checked.ToString();
+            settings[RdsServerSettings.DISABLE_CMD_ADMINISTRATORS] = cbDisableCmdAdministrators.Checked.ToString();
+            settings[RdsServerSettings.DISABLE_CMD_USERS] = cbDisableCmdUsers.Checked.ToString();
         }
     }
 }
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.designer.cs
index ab5d3f15..9ecc5ff4 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SettingsRdsPolicy.ascx.designer.cs
@@ -31,13 +31,13 @@ namespace WebsitePanel.Portal {
         protected global::System.Web.UI.WebControls.Panel timeoutPanel;
         
         /// <summary>
-        /// txtTimeout control.
+        /// ddTimeout 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 txtTimeout;
+        protected global::System.Web.UI.WebControls.DropDownList ddTimeout;
         
         /// <summary>
         /// cbTimeoutUsers control.
@@ -328,12 +328,120 @@ namespace WebsitePanel.Portal {
         protected global::System.Web.UI.WebControls.Panel driveSpacePanel;
         
         /// <summary>
-        /// txtThreshold control.
+        /// ddTreshold 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 txtThreshold;
+        protected global::System.Web.UI.WebControls.DropDownList ddTreshold;
+        
+        /// <summary>
+        /// secViewSession control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secViewSession;
+        
+        /// <summary>
+        /// viewSessionPanel 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 viewSessionPanel;
+        
+        /// <summary>
+        /// cbViewSessionUsers 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 cbViewSessionUsers;
+        
+        /// <summary>
+        /// cbViewSessionAdministrators 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 cbViewSessionAdministrators;
+        
+        /// <summary>
+        /// secControlSession control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secControlSession;
+        
+        /// <summary>
+        /// controlSessionPanel 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 controlSessionPanel;
+        
+        /// <summary>
+        /// cbControlSessionUsers 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 cbControlSessionUsers;
+        
+        /// <summary>
+        /// cbControlSessionAdministrators 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 cbControlSessionAdministrators;
+        
+        /// <summary>
+        /// secDisableCmd control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secDisableCmd;
+        
+        /// <summary>
+        /// disableCmdPanel 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 disableCmdPanel;
+        
+        /// <summary>
+        /// cbDisableCmdUsers 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 cbDisableCmdUsers;
+        
+        /// <summary>
+        /// cbDisableCmdAdministrators 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 cbDisableCmdAdministrators;
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx
index b52a64b4..d5260819 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx
@@ -71,9 +71,14 @@
         <td class="Normal"><wsp:Quota ID="quotaBlackBerryUsers" runat="server" QuotaName="BlackBerry.Users" DisplayGauge="True" /></td>
     </tr>
     <tr ID="pnlSharepointSites" runat="server">
-        <td class="SubHead" nowrap><asp:Label ID="lblSharepointSites" runat="server" meta:resourcekey="lblSharepointSites" Text="Sharepoint Sites:"></asp:Label></td>
+        <td class="SubHead" nowrap><asp:Label ID="lblSharepointSites" runat="server" meta:resourcekey="lblSharepointSites" Text="Sharepoint Foundation Sites:"></asp:Label></td>
         <td class="Normal"><wsp:Quota ID="quotaSharepointSites" runat="server" QuotaName="HostedSharePoint.Sites" DisplayGauge="True" /></td>
     </tr>
+    <tr ID="pnlEnterpriseSharepointSites" runat="server">
+        <td class="SubHead" nowrap><asp:Label ID="lblEnterpriseSharepointSites" runat="server" meta:resourcekey="lblEnterpriseSharepointSites" Text="Sharepoint Server Sites:"></asp:Label></td>
+        <td class="Normal"><wsp:Quota ID="quotaEnterpriseSharepointSites" runat="server" QuotaName="HostedSharePointEnterprise.Sites" DisplayGauge="True" /></td>
+    </tr>    
+
     <tr ID="pnlWebSites" runat="server">
         <td class="SubHead" nowrap><asp:Label ID="lblWebSites" runat="server" meta:resourcekey="lblWebSites" Text="Web Sites:"></asp:Label></td>
         <td class="Normal"><wsp:Quota ID="quotaWebSites" runat="server" QuotaName="Web.Sites" DisplayGauge="True" /></td>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.cs
index 0f4cd791..1bba95c0 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.cs
@@ -66,14 +66,15 @@ namespace WebsitePanel.Portal
             { "quotaOCSUsers", "pnlOCSUsers" },
             { "quotaLyncUsers", "pnlLyncUsers" },
             { "quotaBlackBerryUsers", "pnlBlackBerryUsers" },
-            { "quotaSharepointSites", "pnlSharepointSites" },
+            { "quotaSharepointSites", "pnlSharepointSites" },            
 			{ "quotaWebSites", "pnlWebSites" },
             { "quotaDatabases", "pnlDatabases" },
 			{ "quotaNumberOfVm", "pnlHyperVForPC" },
             { "quotaFtpAccounts", "pnlFtpAccounts" },
             { "quotaExchangeStorage", "pnlExchangeStorage" },
             { "quotaNumberOfFolders", "pnlFolders" },
-            { "quotaEnterpriseStorage", "pnlEnterpriseStorage" }
+            { "quotaEnterpriseStorage", "pnlEnterpriseStorage" },
+            { "quotaEnterpriseSharepointSites", "pnlEnterpriseSharepointSites"}
 		};
 
         protected void Page_Load(object sender, EventArgs e)
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.designer.cs
index fbb13a74..309c02cb 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceQuotas.ascx.designer.cs
@@ -1,31 +1,3 @@
-// Copyright (c) 2015, 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.
@@ -454,6 +426,33 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::WebsitePanel.Portal.Quota quotaSharepointSites;
         
+        /// <summary>
+        /// pnlEnterpriseSharepointSites 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 pnlEnterpriseSharepointSites;
+        
+        /// <summary>
+        /// lblEnterpriseSharepointSites 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.Label lblEnterpriseSharepointSites;
+        
+        /// <summary>
+        /// quotaEnterpriseSharepointSites control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.Quota quotaEnterpriseSharepointSites;
+        
         /// <summary>
         /// pnlWebSites control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceSettings.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceSettings.ascx
index a93f67c0..91d4c4a6 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceSettings.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceSettings.ascx
@@ -27,6 +27,9 @@
         <div class="ToolLink">
             <asp:HyperLink ID="lnkVps" runat="server" meta:resourcekey="lnkVps" Text="Virtual Private Servers"></asp:HyperLink>
         </div>
+        <div class="ToolLink">
+            <asp:HyperLink ID="lnkVps2012" runat="server" meta:resourcekey="lnkVps2012" Text="Virtual Private Servers 2012"></asp:HyperLink>
+        </div>
         <div class="ToolLink">
             <asp:HyperLink ID="lnkVpsForPC" runat="server" meta:resourcekey="lnkVpsForPC" Text="Virtual Private Servers for Private Cloud"></asp:HyperLink>
         </div>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceSettings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceSettings.ascx.cs
index 0d27729f..03e3f186 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceSettings.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceSettings.ascx.cs
@@ -61,6 +61,8 @@ namespace WebsitePanel.Portal
 				"edit_settings", "SettingsName=ExchangeServer", "SpaceID=" + PanelSecurity.PackageId.ToString());
             lnkVps.NavigateUrl = EditUrl("SettingsControl", "SpaceSettingsVPS",
                 "edit_settings", "SettingsName=VirtualPrivateServers", "SpaceID=" + PanelSecurity.PackageId.ToString());
+            lnkVps2012.NavigateUrl = EditUrl("SettingsControl", "SpaceSettingsVPS2012",
+                "edit_settings", "SettingsName=VirtualPrivateServers2012", "SpaceID=" + PanelSecurity.PackageId.ToString());
             lnkVpsForPC.NavigateUrl = EditUrl("SettingsControl", "SpaceSettingsVPSForPC",
                 "edit_settings", "SettingsName=VirtualPrivateServersForPrivateCloud", "SpaceID=" + PanelSecurity.PackageId.ToString());
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceSettings.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceSettings.ascx.designer.cs
index 71f55ee5..7680bfbd 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceSettings.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceSettings.ascx.designer.cs
@@ -1,31 +1,3 @@
-// Copyright (c) 2015, 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.
@@ -121,6 +93,15 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink lnkVps;
         
+        /// <summary>
+        /// lnkVps2012 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.HyperLink lnkVps2012;
+        
         /// <summary>
         /// lnkVpsForPC control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/AllocatePackageIPAddresses.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/AllocatePackageIPAddresses.ascx.cs
index 8c5ea109..d73c8be3 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/AllocatePackageIPAddresses.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/AllocatePackageIPAddresses.ascx.cs
@@ -90,7 +90,13 @@ namespace WebsitePanel.Portal.UserControls
             }
 
             int quotaAllowed = -1;
-            string quotaName = (String.Compare(ResourceGroup, ResourceGroups.VPS, true) == 0) ? Quotas.VPS_EXTERNAL_IP_ADDRESSES_NUMBER : Quotas.WEB_IP_ADDRESSES;
+            string quotaName = Quotas.WEB_IP_ADDRESSES;
+
+            if (String.Compare(ResourceGroup, ResourceGroups.VPS, StringComparison.OrdinalIgnoreCase) == 0)
+                quotaName = Quotas.VPS_EXTERNAL_IP_ADDRESSES_NUMBER;
+            else if (String.Compare(ResourceGroup, ResourceGroups.VPS2012, StringComparison.OrdinalIgnoreCase) == 0)
+                quotaName = Quotas.VPS2012_EXTERNAL_IP_ADDRESSES_NUMBER;
+
             PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
             if (cntx.Quotas.ContainsKey(quotaName))
             {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
index 95925257..d493bed7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs
@@ -96,10 +96,10 @@ namespace WebsitePanel.Portal.UserControls
 
             //SharePoint menu group;
             if (Cntx.Groups.ContainsKey(ResourceGroups.SharepointFoundationServer))
-                PrepareSharePointMenuRoot(items, GetLocalizedString("Text.SharePointFoundationServerGroup"), ResourceGroups.SharepointFoundationServer.Replace(" ", ""));
+                PrepareSharePointMenuRoot(items);
 
-            if (Cntx.Groups.ContainsKey(ResourceGroups.SharepointServer))
-                PrepareSharePointMenuRoot(items, GetLocalizedString("Text.SharePointServerGroup"), ResourceGroups.SharepointServer.Replace(" ", ""));
+            if (Cntx.Groups.ContainsKey(ResourceGroups.SharepointEnterpriseServer))
+                PrepareSharePointEnterpriseMenuRoot(items);
 
             //CRM Menu
             if (Cntx.Groups.ContainsKey(ResourceGroups.HostedCRM2013))
@@ -362,19 +362,19 @@ namespace WebsitePanel.Portal.UserControls
             bbItems.Add(CreateMenuItem("BlackBerryUsers", "blackberry_users", @"Icons/blackberry_users_48.png"));
         }
 
-        private void PrepareSharePointMenuRoot(MenuItemCollection items, string menuItemText, string group)
+        private void PrepareSharePointMenuRoot(MenuItemCollection items)
         {
             if (ShortMenu)
             {
-                PrepareSharePointMenu(items, group);
+                PrepareSharePointMenu(items);
             }
             else
             {
-                MenuItem item = new MenuItem(menuItemText, "", "", null);
+                MenuItem item = new MenuItem(GetLocalizedString("Text.SharePointFoundationServerGroup"), "", "", null);
 
                 item.Selectable = false;
 
-                PrepareSharePointMenu(item.ChildItems, group);
+                PrepareSharePointMenu(item.ChildItems);
 
                 if (item.ChildItems.Count > 0)
                 {
@@ -383,30 +383,44 @@ namespace WebsitePanel.Portal.UserControls
             }
         }
 
-        private void PrepareSharePointMenu(MenuItemCollection spItems, string group)
+        private void PrepareSharePointMenu(MenuItemCollection spItems)
         {                        
-            spItems.Add(CreateSharepointMenuItem("Text.SiteCollections", "sharepoint_sitecollections", @"Icons/sharepoint_sitecollections_48.png", group));
-            spItems.Add(CreateSharepointMenuItem("Text.StorageUsage", "sharepoint_storage_usage", @"Icons/sharepoint_storage_usage_48.png", group));
-            spItems.Add(CreateSharepointMenuItem("Text.StorageLimits", "sharepoint_storage_settings", @"Icons/sharepoint_storage_settings_48.png", group));
+            spItems.Add(CreateMenuItem("SiteCollections", "sharepoint_sitecollections", @"Icons/sharepoint_sitecollections_48.png"));
+            spItems.Add(CreateMenuItem("StorageUsage", "sharepoint_storage_usage", @"Icons/sharepoint_storage_usage_48.png"));
+            spItems.Add(CreateMenuItem("StorageLimits", "sharepoint_storage_settings", @"Icons/sharepoint_storage_settings_48.png"));
         }
 
-        private MenuItem CreateSharepointMenuItem(string text, string key, string img, string group)
+
+        private void PrepareSharePointEnterpriseMenuRoot(MenuItemCollection items)
         {
-            MenuItem item = new MenuItem();
-            string PID_SPACE_EXCHANGE_SERVER = "SpaceExchangeServer";
-            item.Text = GetLocalizedString(text);
-            item.NavigateUrl = PortalUtils.NavigatePageURL(PID_SPACE_EXCHANGE_SERVER, "ItemID", ItemID.ToString(),
-                PortalUtils.SPACE_ID_PARAM + "=" + PackageId, DefaultPage.CONTROL_ID_PARAM + "=" + key, "GroupName=" + group,
-                "moduleDefId=exchangeserver");
-
-            if (ShowImg)
+            if (ShortMenu)
             {
-                item.ImageUrl = PortalUtils.GetThemedIcon(img);
+                PrepareSharePointEnterpriseMenu(items);
             }
+            else
+            {
+                MenuItem item = new MenuItem(GetLocalizedString("Text.SharePointEnterpriseServerGroup"), "", "", null);
 
-            return item;
+                item.Selectable = false;
+
+                PrepareSharePointEnterpriseMenu(item.ChildItems);
+
+                if (item.ChildItems.Count > 0)
+                {
+                    items.Add(item);
+                }
+            }
         }
 
+
+        private void PrepareSharePointEnterpriseMenu(MenuItemCollection spItems)
+        {
+            spItems.Add(CreateMenuItem("SiteCollections", "sharepoint_enterprise_sitecollections", @"Icons/sharepoint_sitecollections_48.png"));
+            spItems.Add(CreateMenuItem("StorageUsage", "sharepoint_enterprise_storage_usage", @"Icons/sharepoint_storage_usage_48.png"));
+            spItems.Add(CreateMenuItem("StorageLimits", "sharepoint_enterprise_storage_settings", @"Icons/sharepoint_storage_settings_48.png"));
+        }
+
+
         private void PrepareOCSMenuRoot(MenuItemCollection items)
         {
             if (ShortMenu)
@@ -542,8 +556,7 @@ namespace WebsitePanel.Portal.UserControls
             MenuItem item = new MenuItem();
 
             item.Text = GetLocalizedString("Text." + text);
-            item.NavigateUrl = PortalUtils.EditUrl("ItemID", ItemID.ToString(), key,
-                "SpaceID=" + PackageId);
+            item.NavigateUrl = PortalUtils.EditUrl("ItemID", ItemID.ToString(), key, "SpaceID=" + PackageId);
 
             if (ShowImg)
             {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/App_LocalResources/VdcCreateServer.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/App_LocalResources/VdcCreateServer.ascx.resx
index aad17c43..dab48649 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/App_LocalResources/VdcCreateServer.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/App_LocalResources/VdcCreateServer.ascx.resx
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="btnFinish.Text" xml:space="preserve">
     <value>Create</value>
@@ -369,4 +369,7 @@
   <data name="valNewDomainFormat.ErrorMessage" xml:space="preserve">
     <value>Enter correct domain name, for example "mydomain.com"</value>
   </data>
+  <data name="locGeneration.Text" xml:space="preserve">
+    <value>Generation:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/App_LocalResources/HyperV2012R2_Create.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/App_LocalResources/HyperV2012R2_Create.ascx.resx
index 5b5b2e6f..29dcb1b3 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/App_LocalResources/HyperV2012R2_Create.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/App_LocalResources/HyperV2012R2_Create.ascx.resx
@@ -117,16 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ddlGenerationItem.1" xml:space="preserve">
-    <value>First</value>
-  </data>
-  <data name="ddlGenerationItem.2" xml:space="preserve">
-    <value>Second</value>
-  </data>
-  <data name="locGeneration.Text" xml:space="preserve">
-    <value>Generation:</value>
-  </data>
-  <data name="secGeneration.Text" xml:space="preserve">
-    <value>Generation</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/App_LocalResources/HyperV2012R2_Edit.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/App_LocalResources/HyperV2012R2_Edit.ascx.resx
new file mode 100644
index 00000000..29dcb1b3
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/App_LocalResources/HyperV2012R2_Edit.ascx.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Create.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Create.ascx
index 04e7bb37..c3d1bc9d 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Create.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Create.ascx
@@ -1,20 +1,6 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="HyperV2012R2_Create.ascx.cs" Inherits="WebsitePanel.Portal.ProviderControls.HyperV2012R2_Create" %>
-<%@ Register TagPrefix="wsp" TagName="CollapsiblePanel" Src="../../UserControls/CollapsiblePanel.ascx" %>
+<%@ Register TagPrefix="wsp" TagName="Generation" Src="../UserControls/Generation.ascx" %>
+<%@ Register TagPrefix="wsp" TagName="DynamicMemory" Src="../UserControls/DynamicMemory.ascx" %>
 
-<wsp:CollapsiblePanel id="secGeneration" runat="server" TargetControlID="GenerationPanel" meta:resourcekey="secGeneration" Text="Generation">
-</wsp:CollapsiblePanel>
-<asp:Panel ID="GenerationPanel" runat="server" Height="0" Style="overflow: hidden; padding: 5px;">
-    <table>
-        <tr>
-            <td class="FormLabel150">
-                <asp:Localize ID="locGeneration" runat="server"
-                    meta:resourcekey="locGeneration" Text="Generation:"></asp:Localize></td>
-            <td>
-                <asp:DropDownList ID="ddlGeneration" runat="server" CssClass="NormalTextBox" resourcekey="ddlGeneration">
-                    <asp:ListItem Value="1">1</asp:ListItem>
-                    <asp:ListItem Value="2">2</asp:ListItem>
-                </asp:DropDownList>
-            </td>
-        </tr>
-    </table>
-</asp:Panel>
+<wsp:Generation runat="server" ID="GenerationSetting"></wsp:Generation>
+<wsp:DynamicMemory runat="server" ID="DynamicMemorySetting"></wsp:DynamicMemory>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Create.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Create.ascx.cs
index 18553f3d..884535d6 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Create.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Create.ascx.cs
@@ -27,25 +27,51 @@
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.UI;
 using WebsitePanel.Providers.Virtualization;
 
 namespace WebsitePanel.Portal.ProviderControls
 {
-    public partial class HyperV2012R2_Create : WebsitePanelControlBase, IVirtualMachineCreateControl
+    public partial class HyperV2012R2_Create : WebsitePanelControlBase, IVirtualMachineSettingsControl
     {
+        private bool _isEditMode;
+
         protected void Page_Load(object sender, EventArgs e)
         {
         }
 
+        public bool IsEditMode
+        {
+            get { return _isEditMode; }
+            set
+            {
+                _isEditMode = value;
+                SettingContols.ForEach(s=>s.IsEditMode = _isEditMode);
+            }
+        }
+
         public void BindItem(VirtualMachine item)
         {
-            var generation = item.Generation > 1 ? item.Generation : 1;
-            ddlGeneration.SelectedValue = generation.ToString();
+            SettingContols.ForEach(s => s.BindItem(item));
         }
 
         public void SaveItem(VirtualMachine item)
         {
-            item.Generation = Convert.ToInt32(ddlGeneration.SelectedValue);
+            SettingContols.ForEach(s => s.SaveItem(item));
+        }
+
+        private List<IVirtualMachineSettingsControl> SettingContols
+        {
+            get
+            {
+                return Controls
+                    .Cast<Control>()
+                    .Where(c => c is IVirtualMachineSettingsControl)
+                    .Cast<IVirtualMachineSettingsControl>()
+                    .ToList();
+            }
         }
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Create.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Create.ascx.designer.cs
index ffb228ce..a48cb3d9 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Create.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Create.ascx.designer.cs
@@ -13,39 +13,21 @@ namespace WebsitePanel.Portal.ProviderControls {
     public partial class HyperV2012R2_Create {
         
         /// <summary>
-        /// secGeneration control.
+        /// GenerationSetting control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::WebsitePanel.Portal.CollapsiblePanel secGeneration;
+        protected global::WebsitePanel.Portal.VPS.UserControls.Generation GenerationSetting;
         
         /// <summary>
-        /// GenerationPanel control.
+        /// DynamicMemorySetting 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 GenerationPanel;
-        
-        /// <summary>
-        /// locGeneration 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 locGeneration;
-        
-        /// <summary>
-        /// ddlGeneration 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.DropDownList ddlGeneration;
+        protected global::WebsitePanel.Portal.VPS.UserControls.DynamicMemory DynamicMemorySetting;
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Edit.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Edit.ascx
new file mode 100644
index 00000000..6be1b29e
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Edit.ascx
@@ -0,0 +1,4 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="HyperV2012R2_Edit.ascx.cs" Inherits="WebsitePanel.Portal.ProviderControls.HyperV2012R2_Edit" %>
+<%@ Register TagPrefix="wsp" TagName="DynamicMemory" Src="../UserControls/DynamicMemory.ascx" %>
+
+<wsp:DynamicMemory runat="server" ID="DynamicMemorySetting"></wsp:DynamicMemory>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Edit.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Edit.ascx.cs
new file mode 100644
index 00000000..1fd43a45
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Edit.ascx.cs
@@ -0,0 +1,52 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using WebsitePanel.Providers.Virtualization;
+
+namespace WebsitePanel.Portal.ProviderControls
+{
+    public partial class HyperV2012R2_Edit : WebsitePanelControlBase, IVirtualMachineSettingsControl
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+        }
+
+        public bool IsEditMode { get; set; }
+
+        public void BindItem(VirtualMachine item)
+        {
+            DynamicMemorySetting.BindItem(item);
+        }
+
+        public void SaveItem(VirtualMachine item)
+        {
+            DynamicMemorySetting.SaveItem(item);
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Edit.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Edit.ascx.designer.cs
new file mode 100644
index 00000000..8d77b902
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/ProviderControls/HyperV2012R2_Edit.ascx.designer.cs
@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.ProviderControls {
+    
+    
+    public partial class HyperV2012R2_Edit {
+        
+        /// <summary>
+        /// DynamicMemorySetting control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS.UserControls.DynamicMemory DynamicMemorySetting;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/App_LocalResources/DynamicMemory.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/App_LocalResources/DynamicMemory.ascx.resx
new file mode 100644
index 00000000..de7f7771
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/App_LocalResources/DynamicMemory.ascx.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="locDymanicMemory.Text" xml:space="preserve">
+    <value>Dymanic memory:</value>
+  </data>
+  <data name="secDymanicMemory.Text" xml:space="preserve">
+    <value>Dymanic memory</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/App_LocalResources/Generation.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/App_LocalResources/Generation.ascx.resx
new file mode 100644
index 00000000..5b5b2e6f
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/App_LocalResources/Generation.ascx.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ddlGenerationItem.1" xml:space="preserve">
+    <value>First</value>
+  </data>
+  <data name="ddlGenerationItem.2" xml:space="preserve">
+    <value>Second</value>
+  </data>
+  <data name="locGeneration.Text" xml:space="preserve">
+    <value>Generation:</value>
+  </data>
+  <data name="secGeneration.Text" xml:space="preserve">
+    <value>Generation</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/DynamicMemory.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/DynamicMemory.ascx
new file mode 100644
index 00000000..65e54d68
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/DynamicMemory.ascx
@@ -0,0 +1,17 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="DynamicMemory.ascx.cs" Inherits="WebsitePanel.Portal.VPS.UserControls.DynamicMemory" %>
+<%@ Register TagPrefix="wsp" TagName="CollapsiblePanel" Src="../../UserControls/CollapsiblePanel.ascx" %>
+
+<wsp:CollapsiblePanel id="secDymanicMemory" runat="server" TargetControlID="DymanicMemoryPanel" meta:resourcekey="secDymanicMemory" Text="Dymanic memory">
+</wsp:CollapsiblePanel>
+<asp:Panel ID="DymanicMemoryPanel" runat="server" Height="0" Style="overflow: hidden; padding: 5px;">
+    <table>
+        <tr>
+            <td class="FormLabel150">
+                <asp:Localize ID="locDymanicMemory" runat="server"
+                    meta:resourcekey="locDymanicMemory" Text="Dymanic Memory:"></asp:Localize></td>
+            <td>
+                
+            </td>
+        </tr>
+    </table>
+</asp:Panel>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/DynamicMemory.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/DynamicMemory.ascx.cs
new file mode 100644
index 00000000..99314d09
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/DynamicMemory.ascx.cs
@@ -0,0 +1,50 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using WebsitePanel.Providers.Virtualization;
+
+namespace WebsitePanel.Portal.VPS.UserControls
+{
+    public partial class DynamicMemory : WebsitePanelControlBase, IVirtualMachineSettingsControl
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+        }
+
+        public bool IsEditMode { get; set; }
+
+        public void BindItem(VirtualMachine item)
+        {
+        }
+
+        public void SaveItem(VirtualMachine item)
+        {
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/DynamicMemory.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/DynamicMemory.ascx.designer.cs
new file mode 100644
index 00000000..55c21c10
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/DynamicMemory.ascx.designer.cs
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS.UserControls {
+    
+    
+    public partial class DynamicMemory {
+        
+        /// <summary>
+        /// secDymanicMemory control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secDymanicMemory;
+        
+        /// <summary>
+        /// DymanicMemoryPanel 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 DymanicMemoryPanel;
+        
+        /// <summary>
+        /// locDymanicMemory 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 locDymanicMemory;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/Generation.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/Generation.ascx
new file mode 100644
index 00000000..bab1e23d
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/Generation.ascx
@@ -0,0 +1,24 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Generation.ascx.cs" Inherits="WebsitePanel.Portal.VPS.UserControls.Generation" %>
+<%@ Register TagPrefix="wsp" TagName="CollapsiblePanel" Src="../../UserControls/CollapsiblePanel.ascx" %>
+
+<wsp:CollapsiblePanel ID="secGeneration" runat="server" TargetControlID="GenerationPanel" meta:ResourceKey="secGeneration" Text="Generation"></wsp:CollapsiblePanel>
+<asp:Panel ID="GenerationPanel" runat="server" Height="0" Style="overflow: hidden; padding: 5px;">
+    <table>
+        <tr>
+            <td class="FormLabel150">
+                <asp:Localize ID="locGeneration" runat="server" meta:resourcekey="locGeneration" Text="Generation:"></asp:Localize>
+            </td>
+            <td>
+                <% if (IsEditMode)
+                   { %>
+                    <asp:DropDownList ID="ddlGeneration" runat="server" CssClass="NormalTextBox" resourcekey="ddlGeneration">
+                        <asp:ListItem Value="1">1</asp:ListItem>
+                        <asp:ListItem Value="2">2</asp:ListItem>
+                    </asp:DropDownList>
+                <% } else { %>
+                    <asp:Label runat="server" ID="lblGeneration"/>
+                <% } %>
+            </td>
+        </tr>
+    </table>
+</asp:Panel>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/Generation.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/Generation.ascx.cs
new file mode 100644
index 00000000..8b135de2
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/Generation.ascx.cs
@@ -0,0 +1,54 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using WebsitePanel.Providers.Virtualization;
+
+namespace WebsitePanel.Portal.VPS.UserControls
+{
+    public partial class Generation : WebsitePanelControlBase, IVirtualMachineSettingsControl
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+        }
+
+        public bool IsEditMode { get; set; }
+
+        public void BindItem(VirtualMachine item)
+        {
+            var generation = item.Generation > 1 ? item.Generation : 1;
+            ddlGeneration.SelectedValue = generation.ToString();
+            lblGeneration.Text = generation.ToString();
+        }
+
+        public void SaveItem(VirtualMachine item)
+        {
+            item.Generation = Convert.ToInt32(ddlGeneration.SelectedValue);
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/Generation.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/Generation.ascx.designer.cs
new file mode 100644
index 00000000..14a00d87
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/Generation.ascx.designer.cs
@@ -0,0 +1,60 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS.UserControls {
+    
+    
+    public partial class Generation {
+        
+        /// <summary>
+        /// secGeneration control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secGeneration;
+        
+        /// <summary>
+        /// GenerationPanel 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 GenerationPanel;
+        
+        /// <summary>
+        /// locGeneration 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 locGeneration;
+        
+        /// <summary>
+        /// ddlGeneration 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.DropDownList ddlGeneration;
+        
+        /// <summary>
+        /// lblGeneration 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.Label lblGeneration;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/ServerTabs.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/ServerTabs.ascx.cs
index c1c05f80..bbcd3638 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/ServerTabs.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/UserControls/ServerTabs.ascx.cs
@@ -215,9 +215,14 @@ namespace WebsitePanel.Portal.VPS.UserControls
                 gauge.Visible = false;
                 if (e.Item.ItemIndex == task.GetLogs().Count - 1)
                 {
-                    gauge.Visible = true;
-                    gauge.Total = task.IndicatorMaximum;
-                    gauge.Progress = task.IndicatorCurrent;
+                    if (task.IndicatorCurrent == -1)
+                        litRecord.Text += "...";
+                    else
+                    {
+                        gauge.Visible = true;
+                        gauge.Total = task.IndicatorMaximum;
+                        gauge.Progress = task.IndicatorCurrent;
+                    }
                 }
             }
         }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VdcCreateServer.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VdcCreateServer.ascx
index c864299e..4836faf1 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VdcCreateServer.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VdcCreateServer.ascx
@@ -188,8 +188,6 @@
                                             </tr>
                                         </table>
                                     </asp:Panel>
-                                    
-                                	<asp:PlaceHolder ID="providerControl" runat="server"></asp:PlaceHolder>
 
                                     <wsp:CollapsiblePanel id="secSnapshots" runat="server"
                                         TargetControlID="SnapshotsPanel" meta:resourcekey="secSnapshots" Text="Snapshots">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VdcCreateServer.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VdcCreateServer.ascx.cs
index 4fb5436e..f8f4a212 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VdcCreateServer.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VdcCreateServer.ascx.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2015, Outercurve Foundation.
+// Copyright (c) 2015, Outercurve Foundation.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without modification,
@@ -26,7 +26,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-using System;
+ using System;
 using System.Collections.Generic;
 using System.Web;
 using System.Web.UI;
@@ -42,8 +42,6 @@ namespace WebsitePanel.Portal.VPS
     {
         protected void Page_Load(object sender, EventArgs e)
         {
-            LoadCustomProviderControl();
-
             if (!IsPostBack)
             {
                 BindFormControls();
@@ -55,27 +53,7 @@ namespace WebsitePanel.Portal.VPS
             // toggle
             ToggleControls();
         }
-
-        private void LoadCustomProviderControl()
-        {
-            try
-            {
-                LoadProviderControl(PanelSecurity.PackageId, "VPS", providerControl, "Create.ascx");
-            }
-            catch { /* skip */ }
-        }
-
-        private IVirtualMachineCreateControl CustomProviderControl
-        {
-            get
-            {
-                if (providerControl.Controls.Count == 0)
-                    return null;
-
-                return (IVirtualMachineCreateControl)providerControl.Controls[0];
-            }
-        }
-
+        
         private void ToggleWizardSteps()
         {
             // external network
@@ -135,13 +113,6 @@ namespace WebsitePanel.Portal.VPS
 
             ddlCpu.SelectedIndex = ddlCpu.Items.Count - 1; // select last (maximum) item
 
-            // the custom provider control
-            if (CustomProviderControl != null)
-            {
-                IVirtualMachineCreateControl ctrl = (IVirtualMachineCreateControl)providerControl.Controls[0];
-                ctrl.BindItem(new VirtualMachine());  
-            }
-
             // external network details
             if (PackagesHelper.IsQuotaEnabled(PanelSecurity.PackageId, Quotas.VPS_EXTERNAL_NETWORK_ENABLED))
             {
@@ -316,15 +287,6 @@ namespace WebsitePanel.Portal.VPS
 
             try
             {
-                VirtualMachine virtualMachine = new VirtualMachine();
-
-                // the custom provider control
-                if (CustomProviderControl != null)
-                {
-                    IVirtualMachineCreateControl ctrl = (IVirtualMachineCreateControl)providerControl.Controls[0];
-                    ctrl.SaveItem(virtualMachine);
-                }
-
                 // collect and prepare data
                 string hostname = String.Format("{0}.{1}", txtHostname.Text.Trim(), txtDomain.Text.Trim());
 
@@ -343,7 +305,7 @@ namespace WebsitePanel.Portal.VPS
                 // create virtual machine
                 IntResult res = ES.Services.VPS.CreateVirtualMachine(PanelSecurity.PackageId,
                     hostname, listOperatingSystems.SelectedValue, adminPassword, summaryEmail,
-                    virtualMachine.Generation, Utils.ParseInt(ddlCpu.SelectedValue), Utils.ParseInt(txtRam.Text.Trim()),
+                    1, Utils.ParseInt(ddlCpu.SelectedValue), Utils.ParseInt(txtRam.Text.Trim()),
                     Utils.ParseInt(txtHdd.Text.Trim()), Utils.ParseInt(txtSnapshots.Text.Trim()),
                     chkDvdInstalled.Checked, chkBootFromCd.Checked, chkNumLock.Checked,
                     chkStartShutdown.Checked, chkPauseResume.Checked, chkReboot.Checked, chkReset.Checked, chkReinstall.Checked,
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VdcCreateServer.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VdcCreateServer.ascx.designer.cs
index c179bdcf..f5ea6588 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VdcCreateServer.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VdcCreateServer.ascx.designer.cs
@@ -372,15 +372,6 @@ namespace WebsitePanel.Portal.VPS {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Localize locGB;
         
-        /// <summary>
-        /// providerControl 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.PlaceHolder providerControl;
-        
         /// <summary>
         /// secSnapshots control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VpsDetailsEditConfiguration.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VpsDetailsEditConfiguration.ascx.cs
index b4252e5c..2bd4d455 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VpsDetailsEditConfiguration.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VpsDetailsEditConfiguration.ascx.cs
@@ -96,9 +96,6 @@ namespace WebsitePanel.Portal.VPS
                 chkExternalNetworkEnabled.Checked = vm.ExternalNetworkEnabled;
                 chkPrivateNetworkEnabled.Checked = vm.PrivateNetworkEnabled;
 
-                // toggle controls
-
-
                 // other quotas
                 BindCheckboxOption(chkDvdInstalled, Quotas.VPS_DVD_ENABLED);
                 chkBootFromCd.Enabled = PackagesHelper.IsQuotaEnabled(PanelSecurity.PackageId, Quotas.VPS_BOOT_CD_ALLOWED);
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VpsDetailsEditConfiguration.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VpsDetailsEditConfiguration.ascx.designer.cs
index 3a79a132..d7975256 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VpsDetailsEditConfiguration.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS/VpsDetailsEditConfiguration.ascx.designer.cs
@@ -1,38 +1,9 @@
-// Copyright (c) 2015, 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.
-//     Runtime Version:2.0.50727.1434
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -463,14 +434,5 @@ namespace WebsitePanel.Portal.VPS {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btnCancel;
-        
-        /// <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/VPS2012/App_LocalResources/VdcAddExternalAddress.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcAddExternalAddress.ascx.resx
new file mode 100644
index 00000000..9b619b66
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcAddExternalAddress.ascx.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;The form allows allocating of additional External IP addresses to this hosting space. These IP addresses are used to configure VPS network adapter connected to External network.&lt;/p&gt;&lt;p&gt;VPS module is looking for free external IP addresses in "VPS External Network" pool, so WebsitePanel administrator must make sure there are sufficient number of unallotted IP addresses in that pool.&lt;/p&gt;</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Allocate IP Addresses</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcAuditLog.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcAuditLog.ascx.resx
new file mode 100644
index 00000000..0ec75155
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcAuditLog.ascx.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;Audit log displays the chronology of events for all VPS located in the hosting space.&lt;/p&gt;&lt;p&gt;By default audit log displays all today's events. You may filter the log by date (day, week, month), severity, task and item name (VPS host name).&lt;/p&gt;&lt;p&gt;To see task details click the link with task name in "Task" column.&lt;/p&gt;&lt;p&gt;To export log in CSV format click "Export Log" button.&lt;/p&gt;</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Audit Log</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcCreateServer.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcCreateServer.ascx.resx
new file mode 100644
index 00000000..b095172a
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcCreateServer.ascx.resx
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnFinish.Text" xml:space="preserve">
+    <value>Create</value>
+  </data>
+  <data name="btnNext.Text" xml:space="preserve">
+    <value>Next &gt;</value>
+  </data>
+  <data name="btnPrevious.Text" xml:space="preserve">
+    <value>&lt; Back</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;&lt;b&gt;Welcome to VPS Creation Wizard!&lt;/b&gt;&lt;/p&gt;&lt;p&gt;The wizard allows specifying parameters of new VPS such as host name, operating system template, administrator password, External and Private (if allowed in the hosting plan) network parameters.&lt;/p&gt;&lt;p&gt;If e-mail address is specified in "Send summary letter to" then VPS summary information will be sent on that e-mail upon provisioning process completion.&lt;/p&gt;&lt;p&gt;After clicking "Create" button on the last step of the wizard the process of provisioning a new VPS will be started. The process is asynchronous, so it's not necessary to wait until it's finished.&lt;/p&gt;</value>
+  </data>
+  <data name="stepConfig.Title" xml:space="preserve">
+    <value>Configuration</value>
+  </data>
+  <data name="stepExternalNetwork.Title" xml:space="preserve">
+    <value>External Network</value>
+  </data>
+  <data name="stepName.Title" xml:space="preserve">
+    <value>Name &amp; OS</value>
+  </data>
+  <data name="stepPrivateNetwork.Title" xml:space="preserve">
+    <value>Private Network</value>
+  </data>
+  <data name="stepSummary.Title" xml:space="preserve">
+    <value>Summary</value>
+  </data>
+  <data name="DomainValidator.ErrorMessage" xml:space="preserve">
+    <value>Enter domain name</value>
+  </data>
+  <data name="ExternalAddressesValidator.ErrorMessage" xml:space="preserve">
+    <value>Enter the number of external IP addresses</value>
+  </data>
+  <data name="HostnameValidator.ErrorMessage" xml:space="preserve">
+    <value>Enter host name</value>
+  </data>
+  <data name="PrivateAddressesValidator.ErrorMessage" xml:space="preserve">
+    <value>Enter the number of private IP addresses</value>
+  </data>
+  <data name="RequireHddValidator.ErrorMessage" xml:space="preserve">
+    <value>Enter the size of hard disk drive</value>
+  </data>
+  <data name="RequireRamValidator.ErrorMessage" xml:space="preserve">
+    <value>Enter amount of RAM allocated to new VPS</value>
+  </data>
+  <data name="SnapshotsValidator.ErrorMessage" xml:space="preserve">
+    <value>Enter the maximum number of snapshots</value>
+  </data>
+  <data name="SummaryEmailValidator.ErrorMessage" xml:space="preserve">
+    <value>Enter e-mail address to send summary letter</value>
+  </data>
+  <data name="chkBootFromCd.Text" xml:space="preserve">
+    <value>Boot from CD</value>
+  </data>
+  <data name="chkDvdInstalled.Text" xml:space="preserve">
+    <value>DVD drive installed</value>
+  </data>
+  <data name="chkExternalNetworkEnabled.Text" xml:space="preserve">
+    <value>External network enabled</value>
+  </data>
+  <data name="chkNumLock.Text" xml:space="preserve">
+    <value>"Num Lock" enabled</value>
+  </data>
+  <data name="chkPauseResume.Text" xml:space="preserve">
+    <value>Pause, Resume</value>
+  </data>
+  <data name="chkPrivateNetworkEnabled.Text" xml:space="preserve">
+    <value>Private network enabled</value>
+  </data>
+  <data name="chkReboot.Text" xml:space="preserve">
+    <value>Reboot</value>
+  </data>
+  <data name="chkReinstall.Text" xml:space="preserve">
+    <value>Re-install</value>
+  </data>
+  <data name="chkReset.Text" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="chkSendSummary.Text" xml:space="preserve">
+    <value>Send summary e-mail to:</value>
+  </data>
+  <data name="chkStartShutdown.Text" xml:space="preserve">
+    <value>Start, Turn off and Shutdown</value>
+  </data>
+  <data name="lblCpu.Text" xml:space="preserve">
+    <value>CPU:</value>
+  </data>
+  <data name="lblHdd.Text" xml:space="preserve">
+    <value>HDD:</value>
+  </data>
+  <data name="lblRam.Text" xml:space="preserve">
+    <value>RAM:</value>
+  </data>
+  <data name="locAdminPassword.Text" xml:space="preserve">
+    <value>Administrator password:</value>
+  </data>
+  <data name="locBootFromCd.Text" xml:space="preserve">
+    <value>Boot from CD:</value>
+  </data>
+  <data name="locConfigStepTitle.Text" xml:space="preserve">
+    <value>Configuration</value>
+  </data>
+  <data name="locCores.Text" xml:space="preserve">
+    <value>cores</value>
+  </data>
+  <data name="locCpu.Text" xml:space="preserve">
+    <value>CPU cores:</value>
+  </data>
+  <data name="locDvdInstalled.Text" xml:space="preserve">
+    <value>DVD Drive installed:</value>
+  </data>
+  <data name="locExternalAddresses.Text" xml:space="preserve">
+    <value>Number of IP addresses:</value>
+  </data>
+  <data name="locExternalAddressesList.Text" xml:space="preserve">
+    <value>IP addresses list:</value>
+  </data>
+  <data name="locExternalAddressesNumber.Text" xml:space="preserve">
+    <value>Number of IP addresses:</value>
+  </data>
+  <data name="locExternalNetwork.Text" xml:space="preserve">
+    <value>External Network</value>
+  </data>
+  <data name="locExternalNetworkEnabled.Text" xml:space="preserve">
+    <value>External network enabled:</value>
+  </data>
+  <data name="locGB.Text" xml:space="preserve">
+    <value>GB</value>
+  </data>
+  <data name="locHdd.Text" xml:space="preserve">
+    <value>Hard disk size, GB:</value>
+  </data>
+  <data name="locHoldCtrl.Text" xml:space="preserve">
+    <value>* Hold CTRL key to select multiple addresses</value>
+  </data>
+  <data name="locHostname.Text" xml:space="preserve">
+    <value>Host name:</value>
+  </data>
+  <data name="locMB.Text" xml:space="preserve">
+    <value>MB</value>
+  </data>
+  <data name="locNameStepTitle.Text" xml:space="preserve">
+    <value>Name and Operating System</value>
+  </data>
+  <data name="locNumLock.Text" xml:space="preserve">
+    <value>"Num Lock" enabled:</value>
+  </data>
+  <data name="locOnePerLine.Text" xml:space="preserve">
+    <value>* Type one IP address per line</value>
+  </data>
+  <data name="locOperatingSystem.Text" xml:space="preserve">
+    <value>Operating system:</value>
+  </data>
+  <data name="locPauseResumeAllowed.Text" xml:space="preserve">
+    <value>Pause, resume allowed:</value>
+  </data>
+  <data name="locPrivateAddresses.Text" xml:space="preserve">
+    <value>Number of IP addresses:</value>
+  </data>
+  <data name="locPrivateAddressesList.Text" xml:space="preserve">
+    <value>IP addresses list:</value>
+  </data>
+  <data name="locPrivateAddressesNumber.Text" xml:space="preserve">
+    <value>Number of IP addresses:</value>
+  </data>
+  <data name="locPrivateNetwork.Text" xml:space="preserve">
+    <value>Private Network</value>
+  </data>
+  <data name="locPrivateNetworkEnabled.Text" xml:space="preserve">
+    <value>Private network enabled:</value>
+  </data>
+  <data name="locPrivateNetworkFormat.Text" xml:space="preserve">
+    <value>Network addresses format:</value>
+  </data>
+  <data name="locPrivateSubnetMask.Text" xml:space="preserve">
+    <value>Subnet mask:</value>
+  </data>
+  <data name="locRam.Text" xml:space="preserve">
+    <value>RAM, MB:</value>
+  </data>
+  <data name="locRebootAllowed.Text" xml:space="preserve">
+    <value>Reboot allowed:</value>
+  </data>
+  <data name="locReinstallAllowed.Text" xml:space="preserve">
+    <value>Re-install allowed:</value>
+  </data>
+  <data name="locResetAllowed.Text" xml:space="preserve">
+    <value>Reset allowed:</value>
+  </data>
+  <data name="locSnapshots.Text" xml:space="preserve">
+    <value>Number of snapshots:</value>
+  </data>
+  <data name="locStartShutdownAllowed.Text" xml:space="preserve">
+    <value>Start, turn off and shutdown allowed:</value>
+  </data>
+  <data name="locSummary.Text" xml:space="preserve">
+    <value>Summary</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Create New VPS</value>
+  </data>
+  <data name="radioExternalRandom.Text" xml:space="preserve">
+    <value>Randomly select IP addresses from the pool</value>
+  </data>
+  <data name="radioExternalSelected.Text" xml:space="preserve">
+    <value>Select IP addresses from the list</value>
+  </data>
+  <data name="radioPrivateRandom.Text" xml:space="preserve">
+    <value>Randomly select next available IP addresses to the addresses format</value>
+  </data>
+  <data name="radioPrivateSelected.Text" xml:space="preserve">
+    <value>Assign specified IP addresses</value>
+  </data>
+  <data name="secActions.Text" xml:space="preserve">
+    <value>Allowed actions</value>
+  </data>
+  <data name="secBios.Text" xml:space="preserve">
+    <value>BIOS</value>
+  </data>
+  <data name="secDvd.Text" xml:space="preserve">
+    <value>DVD</value>
+  </data>
+  <data name="secResources.Text" xml:space="preserve">
+    <value>Resources</value>
+  </data>
+  <data name="secSnapshots.Text" xml:space="preserve">
+    <value>Snapshots</value>
+  </data>
+  <data name="OperatingSystemValidator.ErrorMessage" xml:space="preserve">
+    <value>Select operating system template</value>
+  </data>
+  <data name="SelectOsTemplate.Text" xml:space="preserve">
+    <value>&lt;Select OS template&gt;</value>
+  </data>
+  <data name="btnFinish.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Creating Virtual Server...');</value>
+  </data>
+  <data name="litMaxExternalAddresses.Text" xml:space="preserve">
+    <value>({0} max)</value>
+  </data>
+  <data name="litMaxPrivateAddresses.Text" xml:space="preserve">
+    <value>({0} max)</value>
+  </data>
+  <data name="locNotEnoughExternalAddresses.Text" xml:space="preserve">
+    <value>The pool of available external IP addresses is empty. All IP addresses allocated to the current hosting space are assigned to existing virtual servers. More external IP addresses could be allocated by the host.</value>
+  </data>
+  <data name="valCorrectHostname.ErrorMessage" xml:space="preserve">
+    <value>Enter correct host name, for example "vps01"</value>
+  </data>
+  <data name="valNewDomainFormat.ErrorMessage" xml:space="preserve">
+    <value>Enter correct domain name, for example "mydomain.com"</value>
+  </data>
+  <data name="locGeneration.Text" xml:space="preserve">
+    <value>Generation:</value>
+  </data>
+  <data name="locDynamicMemory.Text" xml:space="preserve">
+    <value>Dynamic Memory</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcExternalNetwork.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcExternalNetwork.ascx.resx
new file mode 100644
index 00000000..a0d73a20
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcExternalNetwork.ascx.resx
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;The form displays the list of IP addresses from "VPS External Network" pool allocated to the hosting space. Alternatively, this form could be considered as a "map" of external IP addresses and their assignments to virtual machines.&lt;/p&gt;&lt;p&gt;If any IP has already assigned to some VPS then there will be VPS host name in the "Item name" column.&lt;/p&gt;&lt;p&gt;If there are lot of VPS in the hosting space you can easily search them by their external IP.&lt;/p&gt;&lt;p&gt;"Number of IP addresses" quota shows the maximum number of external IP addresses that could be allocated to this space.&lt;/p&gt;</value>
+  </data>
+  <data name="locBandwidthQuota.Text" xml:space="preserve">
+    <value>Bandwidth, GB:</value>
+  </data>
+  <data name="locIPQuota.Text" xml:space="preserve">
+    <value>Number of IP Addresses:</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>External Network</value>
+  </data>
+  <data name="secQuotas.Text" xml:space="preserve">
+    <value>Quotas</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcHome.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcHome.ascx.resx
new file mode 100644
index 00000000..8b86f534
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcHome.ascx.resx
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnCreate.Text" xml:space="preserve">
+    <value>Create VM</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;The form displays the list of Virtual Private Servers created in the hosting space.&lt;/p&gt;&lt;p&gt;In terms of WebsitePanel VPS module hosting space could be compared to the Virtual Dedicated Center (VDC). You can see VPS bindings to external and private IP addresses as well as search VPS by these fields.&lt;/p&gt;&lt;p&gt;Quotas in the bottom of the forms show the total amount of computer resources available for VPS.&lt;/p&gt;</value>
+  </data>
+  <data name="gvServers.Empty" xml:space="preserve">
+    <value>No VPS have been created. To create a new VPS click "Create VPS" button.</value>
+  </data>
+  <data name="gvServersExternalIP.HeaderText" xml:space="preserve">
+    <value>External IP</value>
+  </data>
+  <data name="gvServersName.HeaderText" xml:space="preserve">
+    <value>Host name</value>
+  </data>
+  <data name="gvServersPrivateIP.HeaderText" xml:space="preserve">
+    <value>Private IP</value>
+  </data>
+  <data name="gvServersSpace.HeaderText" xml:space="preserve">
+    <value>Space</value>
+  </data>
+  <data name="gvServersUser.HeaderText" xml:space="preserve">
+    <value>User</value>
+  </data>
+  <data name="SearchField.ExternalIP" xml:space="preserve">
+    <value>External IP</value>
+  </data>
+  <data name="SearchField.IPAddress" xml:space="preserve">
+    <value>Private IP</value>
+  </data>
+  <data name="SearchField.ItemName" xml:space="preserve">
+    <value>VPS Name</value>
+  </data>
+  <data name="SearchField.Username" xml:space="preserve">
+    <value>User Name</value>
+  </data>
+  <data name="cmdDelete.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="locHddQuota.Text" xml:space="preserve">
+    <value>HDD, GB:</value>
+  </data>
+  <data name="locRamQuota.Text" xml:space="preserve">
+    <value>RAM, MB:</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Virtual Private Servers</value>
+  </data>
+  <data name="locVpsQuota.Text" xml:space="preserve">
+    <value>Number of VPS:</value>
+  </data>
+  <data name="secQuotas.Text" xml:space="preserve">
+    <value>Quotas</value>
+  </data>
+  <data name="btnImport.Text" xml:space="preserve">
+    <value>Import VPS</value>
+  </data>
+  <data name="cmdDetach.OnClientClick" xml:space="preserve">
+    <value>return confirm('Remove this VM from meta-base?');</value>
+  </data>
+  <data name="cmdDetach.Text" xml:space="preserve">
+    <value>Detach</value>
+  </data>
+  <data name="cmdMove.Text" xml:space="preserve">
+    <value>Move</value>
+  </data>
+  <data name="btnFastCreate.Text" xml:space="preserve">
+    <value>Fast Create VM</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcImportServer.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcImportServer.ascx.resx
new file mode 100644
index 00000000..d8cecd56
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcImportServer.ascx.resx
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AllowPause.Text" xml:space="preserve">
+    <value>Pause, Resume</value>
+  </data>
+  <data name="AllowReboot.Text" xml:space="preserve">
+    <value>Reboot</value>
+  </data>
+  <data name="AllowReset.Text" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="AllowStartShutdown.Text" xml:space="preserve">
+    <value>Start, Turn off and Shutdown</value>
+  </data>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="btnImport.Text" xml:space="preserve">
+    <value>Import</value>
+  </data>
+  <data name="EnableRemoteDesktop.Text" xml:space="preserve">
+    <value>Enable Remote Desktop Web Connection</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;This wizard allows you to import existing Virtual Machine to control panel meta-base to provide its owner self-service functions.&lt;/p&gt;&lt;p&gt;Importing is absolutely safe for VM as nor VM configuration, nor its state are changing during the process.&lt;/p&gt;&lt;p&gt;To import VM, first, select registered in control panel Hyper-V service where VM is located. Then select VM, specify its allowed actions and select network adapter bindings.&lt;/p&gt;&lt;p&gt;External and management networks are determined on appropriate Hyper-V service properties page.&lt;/p&gt;&lt;p&gt;To enable Remote Desktop Web connections you have to provide real guest OS administrator password (for automatic sign-on).&lt;/p&gt;</value>
+  </data>
+  <data name="locAdminPassword.Text" xml:space="preserve">
+    <value>Administrator password:</value>
+  </data>
+  <data name="locBootFromCd.Text" xml:space="preserve">
+    <value>Boot from CD</value>
+  </data>
+  <data name="locCPU.Text" xml:space="preserve">
+    <value>CPU, cores:</value>
+  </data>
+  <data name="locDvdInstalled.Text" xml:space="preserve">
+    <value>DVD drive is installed</value>
+  </data>
+  <data name="locExternalAdapter.Text" xml:space="preserve">
+    <value>Connected NIC:</value>
+  </data>
+  <data name="locExternalAddresses.Text" xml:space="preserve">
+    <value>Assign IP addresses:</value>
+  </data>
+  <data name="locHDD.Text" xml:space="preserve">
+    <value>HDD, Gb:</value>
+  </data>
+  <data name="locHyperVService.Text" xml:space="preserve">
+    <value>Hyper-V Service:</value>
+  </data>
+  <data name="locManagementAdapter.Text" xml:space="preserve">
+    <value>Connected NIC:</value>
+  </data>
+  <data name="locManagementAddresses.Text" xml:space="preserve">
+    <value>Assign IP addresses:</value>
+  </data>
+  <data name="locNumLockEnabled.Text" xml:space="preserve">
+    <value>Num Lock</value>
+  </data>
+  <data name="locRAM.Text" xml:space="preserve">
+    <value>RAM, Mb:</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Import Existing VPS</value>
+  </data>
+  <data name="locVhdPath.Text" xml:space="preserve">
+    <value>VHD location:</value>
+  </data>
+  <data name="locVirtualMachine.Text" xml:space="preserve">
+    <value>Virtual Machine:</value>
+  </data>
+  <data name="secAllowedActions.Text" xml:space="preserve">
+    <value>Allowed Actions</value>
+  </data>
+  <data name="secBios.Text" xml:space="preserve">
+    <value>BIOS</value>
+  </data>
+  <data name="secConfiguration.Text" xml:space="preserve">
+    <value>Configuration</value>
+  </data>
+  <data name="secDvd.Text" xml:space="preserve">
+    <value>DVD</value>
+  </data>
+  <data name="secExternalNetwork.Text" xml:space="preserve">
+    <value>External Network</value>
+  </data>
+  <data name="secManagementNetwork.Text" xml:space="preserve">
+    <value>Management Network</value>
+  </data>
+  <data name="secOsTemplate.Text" xml:space="preserve">
+    <value>OS Template:</value>
+  </data>
+  <data name="SelectHyperVService.Text" xml:space="preserve">
+    <value>&lt;Select Hyper-V service&gt;</value>
+  </data>
+  <data name="SelectVirtualMachine.Text" xml:space="preserve">
+    <value>&lt;Select virtual machine&gt;</value>
+  </data>
+  <data name="RequiredOsTemplate.ErrorMessage" xml:space="preserve">
+    <value>Please select OS template</value>
+  </data>
+  <data name="RequiredVirtualMachine.ErrorMessage" xml:space="preserve">
+    <value>Please select virtual machine to import</value>
+  </data>
+  <data name="RequireHyperVService.ErrorMessage" xml:space="preserve">
+    <value>Please select Hyper-V service to import VPS from</value>
+  </data>
+  <data name="SelectOsTemplate.Text" xml:space="preserve">
+    <value>&lt;Select Operating System template&gt;</value>
+  </data>
+  <data name="btnImport.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Importing Virtual Server...');</value>
+  </data>
+  <data name="RequiredAdminPassword.ErrorMessage" xml:space="preserve">
+    <value>Please enter guest OS administrator password</value>
+  </data>
+  <data name="RequiredExternalAddresses.ErrorMessage" xml:space="preserve">
+    <value>Select at least one External IP address</value>
+  </data>
+  <data name="RequiredManagementAddresses.ErrorMessage" xml:space="preserve">
+    <value>Select at least one Management IP address</value>
+  </data>
+  <data name="SelectNetworkAdapter.Text" xml:space="preserve">
+    <value>&lt;Not connected&gt;</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcManagementNetwork.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcManagementNetwork.ascx.resx
new file mode 100644
index 00000000..ead4bdcd
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcManagementNetwork.ascx.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;&lt;b&gt;This form is visible to administrators only.&lt;/b&gt;&lt;/p&gt;&lt;p&gt; Management network is not available to resellers and users and it's being managed by WebsitePanel on their behalf.&lt;/p&gt;&lt;p&gt;Management network is a back-end company network used by system administrators to manage customers' VPS. This network is also used by VPS to access various utility resources and services such as DNS, KMS, backups, etc.&lt;/p&gt;&lt;p&gt;If Management network is enabled on Hyper-V service properties then every created VPS will be assigned one IP address from "VPS Management Network" pool, so WebsitePanel administrator must make sure there are sufficient number of IP addresses in that pool.&lt;/p&gt;</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Management Network</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcPermissions.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcPermissions.ascx.resx
new file mode 100644
index 00000000..101f29ae
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcPermissions.ascx.resx
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnUpdateVdcPermissions.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Updating permissions...');</value>
+  </data>
+  <data name="btnUpdateVpsPermissions.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Updating permissions...');</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>User permissions allow...</value>
+  </data>
+  <data name="gvVdcPermissions.Empty" xml:space="preserve">
+    <value>No peers exist under your user account.</value>
+  </data>
+  <data name="gvVpsPermissions.Empty" xml:space="preserve">
+    <value>No peers exist under your user account.</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>User Permissions</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcPrivateNetwork.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcPrivateNetwork.ascx.resx
new file mode 100644
index 00000000..c3aa3949
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VdcPrivateNetwork.ascx.resx
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;If this form is available in the hosting space then it means that all VPS in this hosting space are connected to dedicated private network available only to this hosting space.&lt;/p&gt; &lt;p&gt;Private network is a very powerful mechanizm that allows additional increase of network security. For example, you might have only one front-end server (e.g. server with Exchange CAS and HUB roles installed) connected to External network and all the rest of servers connected to private (internal) network only (e.g. one server with Exchange MB role and second one with DC).&lt;/p&gt;&lt;p&gt;Quota in the bottom of the form displays the maximum number of private IP addresses that could be assigned to every VPS.&lt;/p&gt;</value>
+  </data>
+  <data name="gvAddresses.Empty" xml:space="preserve">
+    <value>No private IP addresses have been used in this hosting space.</value>
+  </data>
+  <data name="SearchField.IPAddress" xml:space="preserve">
+    <value>IP Address</value>
+  </data>
+  <data name="SearchField.ItemName" xml:space="preserve">
+    <value>VPS Name</value>
+  </data>
+  <data name="gvAddressesIPAddress.HeaderText" xml:space="preserve">
+    <value>IP</value>
+  </data>
+  <data name="gvAddressesItemName.HeaderText" xml:space="preserve">
+    <value>VPS</value>
+  </data>
+  <data name="gvAddressesPrimary.HeaderText" xml:space="preserve">
+    <value>Primary</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Private Network</value>
+  </data>
+  <data name="locVpsAddressesQuota.Text" xml:space="preserve">
+    <value>IP addresses per VPS:</value>
+  </data>
+  <data name="secQuotas.Text" xml:space="preserve">
+    <value>Quotas</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsAddExternalAddress.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsAddExternalAddress.ascx.resx
new file mode 100644
index 00000000..17810cf9
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsAddExternalAddress.ascx.resx
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnAdd.Text" xml:space="preserve">
+    <value>Add</value>
+  </data>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="ExternalAddressesValidator.ErrorMessage" xml:space="preserve">
+    <value>Enter the number of IP addresses</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;This form allows assigning of new IP addresses to VPS "External" network adapter.&lt;/p&gt;&lt;p&gt;Additional IP addresses could be assigned to the VPS if only there is enough number of free (unassigned) external IP addresses allocated to this hosting space.&lt;/p&gt;&lt;p&gt;After clicking "Add" button special configuration instructions will be sent to VPS, so it may take some time (up to few minutes) until network adapter parameters are changed.&lt;/p&gt;</value>
+  </data>
+  <data name="locExternalAddresses.Text" xml:space="preserve">
+    <value>Number of IP addresses:</value>
+  </data>
+  <data name="locHoldCtrl.Text" xml:space="preserve">
+    <value>* Hold CTRL key to select multiple addresses</value>
+  </data>
+  <data name="locSubTitle.Text" xml:space="preserve">
+    <value>Add External IP Addresses</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Network</value>
+  </data>
+  <data name="radioExternalRandom.Text" xml:space="preserve">
+    <value>Randomly select IP addresses from the pool</value>
+  </data>
+  <data name="radioExternalSelected.Text" xml:space="preserve">
+    <value>Select IP addresses from the list</value>
+  </data>
+  <data name="litMaxExternalAddresses.Text" xml:space="preserve">
+    <value>({0} max)</value>
+  </data>
+  <data name="locNotEnoughExternalAddresses.Text" xml:space="preserve">
+    <value>The pool of available external IP addresses is empty. All IP addresses allocated to the current hosting space are assigned to existing virtual servers. More external IP addresses could be allocated by the host.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsAddPrivateAddress.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsAddPrivateAddress.ascx.resx
new file mode 100644
index 00000000..63bd6af6
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsAddPrivateAddress.ascx.resx
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnAdd.Text" xml:space="preserve">
+    <value>Add</value>
+  </data>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;This form allows assigning of new IP addresses to VPS "Private" network adapter.&lt;/p&gt;&lt;p&gt;In the private network you could assign any IP addresses to VPS, however if you decide to leave this job for WebsitePanel then it will generate private IP addresses for you by the algorithm set on the service level and make sure IPs are not duplicated.&lt;/p&gt;&lt;p&gt;After clicking "Add" button special configuration instructions will be sent to VPS, so it may take some time (up to few minutes) until network adapter parameters are changed.&lt;/p&gt;</value>
+  </data>
+  <data name="locOnePerLine.Text" xml:space="preserve">
+    <value>* Type one IP address per line</value>
+  </data>
+  <data name="locPrivateAddresses.Text" xml:space="preserve">
+    <value>Number of IP addresses:</value>
+  </data>
+  <data name="locSubTitle.Text" xml:space="preserve">
+    <value>Add Private IP Addresses</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Network</value>
+  </data>
+  <data name="PrivateAddressesValidator.ErrorMessage" xml:space="preserve">
+    <value>Enter the number of private IP addresses</value>
+  </data>
+  <data name="radioPrivateRandom.Text" xml:space="preserve">
+    <value>Randomly select next available IP addresses to the addresses format</value>
+  </data>
+  <data name="radioPrivateSelected.Text" xml:space="preserve">
+    <value>Assign specified IP addresses</value>
+  </data>
+  <data name="litMaxPrivateAddresses.Text" xml:space="preserve">
+    <value>({0} max)</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsAuditLog.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsAuditLog.ascx.resx
new file mode 100644
index 00000000..b3ea1412
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsAuditLog.ascx.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;Audit log displays the chronology of events for this VPS.&lt;/p&gt;&lt;p&gt;By default audit log displays all today's events. You may filter the log by date (day, week, month), severity, task and item name (VPS host name).&lt;/p&gt;&lt;p&gt;To see task details click the link with task name in "Task" column.&lt;/p&gt;&lt;p&gt;To export log in CSV format click "Export Log" button.&lt;/p&gt;</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Audit Log</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsConfiguration.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsConfiguration.ascx.resx
new file mode 100644
index 00000000..c2391630
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsConfiguration.ascx.resx
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnChangePassword.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Changing password...', 'PasswordModal');</value>
+  </data>
+  <data name="CpuCores.Text" xml:space="preserve">
+    <value>{0} cores</value>
+  </data>
+  <data name="Hdd.Text" xml:space="preserve">
+    <value>{0} GB</value>
+  </data>
+  <data name="Ram.Text" xml:space="preserve">
+    <value>{0} MB</value>
+  </data>
+  <data name="secNetwork.Text" xml:space="preserve">
+    <value>Network</value>
+  </data>
+  <data name="btnCancelChangePassword.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="btnChangePassword.Text" xml:space="preserve">
+    <value>Change password</value>
+  </data>
+  <data name="btnChangePasswordPopup.Text" xml:space="preserve">
+    <value>Change</value>
+  </data>
+  <data name="btnEdit.Text" xml:space="preserve">
+    <value>Edit configuration</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;This form shows VPS configuration.&lt;/p&gt;&lt;p&gt;To change VPS Administrator account password click "Change" link in "Software" section.&lt;br/&gt;To change password special configuration instructions will be sent to VPS, so it may take some time (up to few minutes) until it is changed.&lt;/p&gt;&lt;p&gt;To change VPS configuration (if allowed in the hosting plan) click "Edit configuration" button.&lt;/p&gt;</value>
+  </data>
+  <data name="lblCpu.Text" xml:space="preserve">
+    <value>CPU:</value>
+  </data>
+  <data name="lblHdd.Text" xml:space="preserve">
+    <value>HDD:</value>
+  </data>
+  <data name="lblRam.Text" xml:space="preserve">
+    <value>RAM:</value>
+  </data>
+  <data name="locAdministratorPassword.Text" xml:space="preserve">
+    <value>Administrator password:</value>
+  </data>
+  <data name="locChangePassword.Text" xml:space="preserve">
+    <value>Change Administrator Password</value>
+  </data>
+  <data name="locNewPassword.Text" xml:space="preserve">
+    <value>Enter new password:</value>
+  </data>
+  <data name="locOperatingSystem.Text" xml:space="preserve">
+    <value>Operating system:</value>
+  </data>
+  <data name="locSnapshots.Text" xml:space="preserve">
+    <value>Number of snapshots:</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Configuration</value>
+  </data>
+  <data name="optionBootFromCd.Text" xml:space="preserve">
+    <value>Boot from CD</value>
+  </data>
+  <data name="optionDvdInstalled.Text" xml:space="preserve">
+    <value>DVD drive installed</value>
+  </data>
+  <data name="optionExternalNetwork.Text" xml:space="preserve">
+    <value>External network enabled</value>
+  </data>
+  <data name="optionNumLock.Text" xml:space="preserve">
+    <value>Num Lock enabled</value>
+  </data>
+  <data name="optionPauseResume.Text" xml:space="preserve">
+    <value>Pause, Resume</value>
+  </data>
+  <data name="optionPrivateNetwork.Text" xml:space="preserve">
+    <value>Private network enabled</value>
+  </data>
+  <data name="optionReboot.Text" xml:space="preserve">
+    <value>Reboot</value>
+  </data>
+  <data name="optionReinstall.Text" xml:space="preserve">
+    <value>Re-Install</value>
+  </data>
+  <data name="optionReset.Text" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="optionStartShutdown.Text" xml:space="preserve">
+    <value>Start, Turn off and Shutdown</value>
+  </data>
+  <data name="secActions.Text" xml:space="preserve">
+    <value>Server Actions</value>
+  </data>
+  <data name="secBios.Text" xml:space="preserve">
+    <value>BIOS</value>
+  </data>
+  <data name="secDvd.Text" xml:space="preserve">
+    <value>DVD</value>
+  </data>
+  <data name="secResources.Text" xml:space="preserve">
+    <value>Resources</value>
+  </data>
+  <data name="secSnapshots.Text" xml:space="preserve">
+    <value>Snapshots</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsDvd.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsDvd.ascx.resx
new file mode 100644
index 00000000..7357567a
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsDvd.ascx.resx
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnEjectDisk.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Ejecting disk...');</value>
+  </data>
+  <data name="NoDisk.Text" xml:space="preserve">
+    <value>&lt;empty&gt;</value>
+  </data>
+  <data name="btnEjectDisk.Text" xml:space="preserve">
+    <value>Eject</value>
+  </data>
+  <data name="btnInsertDisk.Text" xml:space="preserve">
+    <value>Insert Disk...</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;The form shows the status of DVD drive. If there is &lt;b&gt;&amp;lt;empty&amp;gt;&lt;/b&gt; then there is no disk in the drive.&lt;/p&gt;&lt;p&gt;Click &lt;b&gt;"Insert Disk..."&lt;/b&gt; button to browse Media Library.&lt;/p&gt;&lt;p&gt;Click &lt;b&gt;"Eject"&lt;/b&gt; button to remove disk from DVD drive.&lt;/p&gt;</value>
+  </data>
+  <data name="locDvdDrive.Text" xml:space="preserve">
+    <value>DVD Drive:</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>DVD</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsEditConfiguration.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsEditConfiguration.ascx.resx
new file mode 100644
index 00000000..f01b77a7
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsEditConfiguration.ascx.resx
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="btnUpdate.OnClientClick" xml:space="preserve">
+    <value>if(!confirm('Before applying new configuration VPS will be stopped.\n\nAfter the configuration is changed it will be started again automatically.\n\nDo you want to proceed?')) return false; ShowProgressDialog('Updating configuration...');</value>
+  </data>
+  <data name="btnUpdate.Text" xml:space="preserve">
+    <value>Update</value>
+  </data>
+  <data name="chkBootFromCd.Text" xml:space="preserve">
+    <value>Boot from CD</value>
+  </data>
+  <data name="chkDvdInstalled.Text" xml:space="preserve">
+    <value>DVD drive installed</value>
+  </data>
+  <data name="chkExternalNetworkEnabled.Text" xml:space="preserve">
+    <value>External network enabled</value>
+  </data>
+  <data name="chkNumLock.Text" xml:space="preserve">
+    <value>Num Lock enabled</value>
+  </data>
+  <data name="chkPauseResume.Text" xml:space="preserve">
+    <value>Pause, Resume</value>
+  </data>
+  <data name="chkPrivateNetworkEnabled.Text" xml:space="preserve">
+    <value>Private network enabled</value>
+  </data>
+  <data name="chkReboot.Text" xml:space="preserve">
+    <value>Reboot</value>
+  </data>
+  <data name="chkReinstall.Text" xml:space="preserve">
+    <value>Re-Install</value>
+  </data>
+  <data name="chkReset.Text" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="chkStartShutdown.Text" xml:space="preserve">
+    <value>Start, Turn off and Shutdown</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;Change VPS configuration and click "Update" button.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Before applying new configuration settings VPS will be stopped. After new configuration is applied it will be started again.&lt;/b&gt;&lt;/p&gt;</value>
+  </data>
+  <data name="lblCpu.Text" xml:space="preserve">
+    <value>CPU:</value>
+  </data>
+  <data name="lblHdd.Text" xml:space="preserve">
+    <value>HDD:</value>
+  </data>
+  <data name="lblRam.Text" xml:space="preserve">
+    <value>RAM:</value>
+  </data>
+  <data name="locCores.Text" xml:space="preserve">
+    <value>cores</value>
+  </data>
+  <data name="locGB.Text" xml:space="preserve">
+    <value>GB</value>
+  </data>
+  <data name="locMB.Text" xml:space="preserve">
+    <value>MB</value>
+  </data>
+  <data name="locSnapshots.Text" xml:space="preserve">
+    <value>Number of snapshots:</value>
+  </data>
+  <data name="locSubTitle.Text" xml:space="preserve">
+    <value>Edit Configuration</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Edit Configuration</value>
+  </data>
+  <data name="RequireHddValidator.ErrorMessage" xml:space="preserve">
+    <value>Please specify HDD size</value>
+  </data>
+  <data name="RequireRamValidator.ErrorMessage" xml:space="preserve">
+    <value>Please specify RAM size</value>
+  </data>
+  <data name="secActions.Text" xml:space="preserve">
+    <value>Server Actions</value>
+  </data>
+  <data name="secBios.Text" xml:space="preserve">
+    <value>BIOS</value>
+  </data>
+  <data name="secDvd.Text" xml:space="preserve">
+    <value>DVD</value>
+  </data>
+  <data name="secNetwork.Text" xml:space="preserve">
+    <value>Network</value>
+  </data>
+  <data name="secResources.Text" xml:space="preserve">
+    <value>Resources</value>
+  </data>
+  <data name="secSnapshots.Text" xml:space="preserve">
+    <value>Snapshots</value>
+  </data>
+  <data name="SnapshotsValidator.ErrorMessage" xml:space="preserve">
+    <value>Please enter the number of snapshots</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsGeneral.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsGeneral.ascx.resx
new file mode 100644
index 00000000..5d662ca5
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsGeneral.ascx.resx
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnChangeHostname.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Changing host name...', 'ChangeHostnameModal');</value>
+  </data>
+  <data name="btnDelete.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="Command.Pause" xml:space="preserve">
+    <value>Pause</value>
+  </data>
+  <data name="Command.Reboot" xml:space="preserve">
+    <value>Reboot</value>
+  </data>
+  <data name="Command.Reset" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="Command.Resume" xml:space="preserve">
+    <value>Resume</value>
+  </data>
+  <data name="Command.ShutDown" xml:space="preserve">
+    <value>Shut&amp;nbsp;Down</value>
+  </data>
+  <data name="Command.Snapshot" xml:space="preserve">
+    <value>Snapshot</value>
+  </data>
+  <data name="Command.Start" xml:space="preserve">
+    <value>Start</value>
+  </data>
+  <data name="Command.TurnOff" xml:space="preserve">
+    <value>Turn&amp;nbsp;Off</value>
+  </data>
+  <data name="CpuPercentage.Text" xml:space="preserve">
+    <value>{0}%</value>
+  </data>
+  <data name="MemoryPercentage.Text" xml:space="preserve">
+    <value>{0}%</value>
+  </data>
+  <data name="MemoryUsage.Text" xml:space="preserve">
+    <value>Used: {0} MB, Total: {1} MB</value>
+  </data>
+  <data name="OnClientClick.Pause" xml:space="preserve">
+    <value>if(!confirm('Pause VPS?')) return false; ShowProgressDialog('Pausing...');</value>
+  </data>
+  <data name="OnClientClick.Reboot" xml:space="preserve">
+    <value>if(!confirm('Reboot VPS?')) return false; ShowProgressDialog('Rebooting...');</value>
+  </data>
+  <data name="OnClientClick.Reset" xml:space="preserve">
+    <value>if(!confirm('Reset VPS?')) return false; ShowProgressDialog('Resetting...');</value>
+  </data>
+  <data name="OnClientClick.Resume" xml:space="preserve">
+    <value>ShowProgressDialog('Resuming...');</value>
+  </data>
+  <data name="OnClientClick.ShutDown" xml:space="preserve">
+    <value>if(!confirm('Shut down VPS?')) return false; ShowProgressDialog('Shutting down...');</value>
+  </data>
+  <data name="OnClientClick.Snapshot" xml:space="preserve">
+    <value>ShowProgressDialog('Taking snapshot...');</value>
+  </data>
+  <data name="OnClientClick.Start" xml:space="preserve">
+    <value>ShowProgressDialog('Starting...');</value>
+  </data>
+  <data name="OnClientClick.TurnOff" xml:space="preserve">
+    <value>if(!confirm('Turn off VPS?')) return false; ShowProgressDialog('Turning off...');</value>
+  </data>
+  <data name="locHostname.Text" xml:space="preserve">
+    <value>Host&amp;nbsp;name:</value>
+  </data>
+  <data name="btnCancelHostname.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="btnChangeHostname.Text" xml:space="preserve">
+    <value>Change</value>
+  </data>
+  <data name="btnChangeHostnamePopup.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="chkUpdateComputerName.Text" xml:space="preserve">
+    <value>Update computer network name</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;&lt;b&gt;Status&lt;/b&gt; shows the current state of VPS. The list of available VPS action buttons on the right depends on the current status.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Uptime&lt;/b&gt; is the time since the last VPS start.&lt;/p&gt;&lt;b&gt;Heartbeat&lt;/b&gt; is a very useful indicator as it shows whether VPS operating system is active and respond. If there is "No contact" then it means the system is not started yet, but if there is an "Error" then it means OS does not respond to the host machine.&lt;/p&gt;&lt;p&gt;&lt;b&gt;CPU&lt;/b&gt; meter displays VPS processor utilization.&lt;/p&gt;&lt;p&gt;&lt;b&gt;RAM&lt;/b&gt; and &lt;b&gt;HDD&lt;/b&gt; meters show real-time data provided by VPS operating system.&lt;/p&gt;</value>
+  </data>
+  <data name="Heartbeat.Error" xml:space="preserve">
+    <value>Error</value>
+  </data>
+  <data name="Heartbeat.LostCommunication" xml:space="preserve">
+    <value>Lost communication</value>
+  </data>
+  <data name="Heartbeat.NoContact" xml:space="preserve">
+    <value>No contact</value>
+  </data>
+  <data name="Heartbeat.None" xml:space="preserve">
+    <value>None</value>
+  </data>
+  <data name="Heartbeat.OK" xml:space="preserve">
+    <value>OK</value>
+  </data>
+  <data name="Heartbeat.Paused" xml:space="preserve">
+    <value>Paused</value>
+  </data>
+  <data name="locChangeHostname.Text" xml:space="preserve">
+    <value>Change VPS Host Name</value>
+  </data>
+  <data name="locCpu.Text" xml:space="preserve">
+    <value>CPU:</value>
+  </data>
+  <data name="locCreated.Text" xml:space="preserve">
+    <value>Created:</value>
+  </data>
+  <data name="locDomain.Text" xml:space="preserve">
+    <value>Domain:</value>
+  </data>
+  <data name="locHeartbeat.Text" xml:space="preserve">
+    <value>Heartbeat:</value>
+  </data>
+  <data name="locHostname1.Text" xml:space="preserve">
+    <value>Host name:</value>
+  </data>
+  <data name="locRam.Text" xml:space="preserve">
+    <value>RAM:</value>
+  </data>
+  <data name="locStatus.Text" xml:space="preserve">
+    <value>Status:</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>General</value>
+  </data>
+  <data name="locUptime.Text" xml:space="preserve">
+    <value>Uptime:</value>
+  </data>
+  <data name="State.Deleted" xml:space="preserve">
+    <value>Deleted</value>
+  </data>
+  <data name="State.Migrating" xml:space="preserve">
+    <value>Migrating</value>
+  </data>
+  <data name="State.Off" xml:space="preserve">
+    <value>Off</value>
+  </data>
+  <data name="State.Paused" xml:space="preserve">
+    <value>Paused</value>
+  </data>
+  <data name="State.Pausing" xml:space="preserve">
+    <value>Pausing</value>
+  </data>
+  <data name="State.Saved" xml:space="preserve">
+    <value>Saved</value>
+  </data>
+  <data name="State.Saving" xml:space="preserve">
+    <value>Saving</value>
+  </data>
+  <data name="State.Snapshotting" xml:space="preserve">
+    <value>Taking Snapshot</value>
+  </data>
+  <data name="State.Started" xml:space="preserve">
+    <value>Running</value>
+  </data>
+  <data name="State.Starting" xml:space="preserve">
+    <value>Starting</value>
+  </data>
+  <data name="State.Running" xml:space="preserve">
+    <value>Running</value>
+  </data>
+  <data name="State.Stopping" xml:space="preserve">
+    <value>Stopping</value>
+  </data>
+  <data name="valCorrectHostname.ErrorMessage" xml:space="preserve">
+    <value>Enter correct host name, for example "vps01"</value>
+  </data>
+  <data name="valNewDomainFormat.ErrorMessage" xml:space="preserve">
+    <value>Enter correct domain name, for example "mydomain.com"</value>
+  </data>
+  <data name="HddPercentage.Text" xml:space="preserve">
+    <value>{0}%</value>
+  </data>
+  <data name="HddUsage.Text" xml:space="preserve">
+    <value>Free: {0} GB, Total: {1} GB on {2} drive(s)</value>
+  </data>
+  <data name="locHdd.Text" xml:space="preserve">
+    <value>HDD:</value>
+  </data>
+  <data name="locDomainTop.Text" xml:space="preserve">
+    <value>Domain:</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsHelp.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsHelp.ascx.resx
new file mode 100644
index 00000000..59a45d4c
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsHelp.ascx.resx
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnSend.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Sending e-mail...');</value>
+  </data>
+  <data name="btnSend.Text" xml:space="preserve">
+    <value>Send</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;This form displays VPS summary information prepared by the host.&lt;/p&gt;&lt;p&gt;This information could be re-send to any e-mail address specified in "Send instructions by e-mail" section. This section is collapsed by default.&lt;/p&gt;</value>
+  </data>
+  <data name="lblBCC.Text" xml:space="preserve">
+    <value>BCC:</value>
+  </data>
+  <data name="lblTo.Text" xml:space="preserve">
+    <value>To:</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Help</value>
+  </data>
+  <data name="secEmail.Text" xml:space="preserve">
+    <value>Send instructions by e-mail</value>
+  </data>
+  <data name="valRequireEmail.ErrorMessage" xml:space="preserve">
+    <value>Please enter e-mail address</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsInsertDvd.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsInsertDvd.ascx.resx
new file mode 100644
index 00000000..5f5792c4
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsInsertDvd.ascx.resx
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="btnInsert.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Inserting disk...');</value>
+  </data>
+  <data name="btnInsert.Text" xml:space="preserve">
+    <value>Insert</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;Browse Media Library and click &lt;b&gt;"Insert"&lt;/b&gt; button in the row with DVD you want to insert into drive.&lt;/p&gt;&lt;p&gt;Click &lt;b&gt;"Cancel"&lt;/b&gt; button to return to DVD drive properties screen.&lt;/p&gt;</value>
+  </data>
+  <data name="gvDisks.Empty" xml:space="preserve">
+    <value>No disks found in the media library.</value>
+  </data>
+  <data name="gvTitle.HeaderText" xml:space="preserve">
+    <value>Title</value>
+  </data>
+  <data name="locSubTitle.Text" xml:space="preserve">
+    <value>Browse Media Library</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>DVD</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsNetwork.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsNetwork.ascx.resx
new file mode 100644
index 00000000..98dfebbe
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsNetwork.ascx.resx
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnAddExternalAddress.Text" xml:space="preserve">
+    <value>Add IP...</value>
+  </data>
+  <data name="btnAddPrivateAddress.Text" xml:space="preserve">
+    <value>Add IP...</value>
+  </data>
+  <data name="btnDeleteExternal.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="btnDeletePrivate.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="btnSetPrimaryExternal.Text" xml:space="preserve">
+    <value>Set As Primary</value>
+  </data>
+  <data name="btnSetPrimaryPrivate.Text" xml:space="preserve">
+    <value>Set As Primary</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;This form shows VPS network configuration.&lt;/p&gt;&lt;p&gt;To assign additional IP addresses to "External" or "Private" adapter click "Add" button in the appropriate section.&lt;/p&gt;&lt;p&gt;When you delete external or private IP or change network adapter primary IP address the system sends special configuration instructions to VPS operating system, so it may take some time (up to few minutes) until network adapter parameters are changed.&lt;/p&gt;</value>
+  </data>
+  <data name="gvExternalAddresses.Empty" xml:space="preserve">
+    <value>No IP addresses are assigned to external network adapter.</value>
+  </data>
+  <data name="gvIpAddress.HeaderText" xml:space="preserve">
+    <value>IP Address</value>
+  </data>
+  <data name="gvPrimary.HeaderText" xml:space="preserve">
+    <value>Primary</value>
+  </data>
+  <data name="gvPrivateAddresses.Empty" xml:space="preserve">
+    <value>No IP addresses are assigned to private network adapter.</value>
+  </data>
+  <data name="locExtAddress.Text" xml:space="preserve">
+    <value>Server address:</value>
+  </data>
+  <data name="locExtGateway.Text" xml:space="preserve">
+    <value>Default gateway:</value>
+  </data>
+  <data name="locExtSubnet.Text" xml:space="preserve">
+    <value>Subnet mask:</value>
+  </data>
+  <data name="locPrivAddress.Text" xml:space="preserve">
+    <value>Server address:</value>
+  </data>
+  <data name="locPrivFormat.Text" xml:space="preserve">
+    <value>Network format:</value>
+  </data>
+  <data name="locPrivSubnet.Text" xml:space="preserve">
+    <value>Subnet mask:</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Network</value>
+  </data>
+  <data name="locTotalExternal.Text" xml:space="preserve">
+    <value>IP addresses:</value>
+  </data>
+  <data name="locTotalPrivate.Text" xml:space="preserve">
+    <value>IP addresses:</value>
+  </data>
+  <data name="secExternalNetwork.Text" xml:space="preserve">
+    <value>External Network</value>
+  </data>
+  <data name="secPrivateNetwork.Text" xml:space="preserve">
+    <value>Private Network</value>
+  </data>
+  <data name="Automatic.Text" xml:space="preserve">
+    <value>&amp;lt;auto&amp;gt;</value>
+  </data>
+  <data name="gvDefaultGateway.HeaderText" xml:space="preserve">
+    <value>Gateway</value>
+  </data>
+  <data name="gvSubnetMask.HeaderText" xml:space="preserve">
+    <value>Subnet Mask</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsPermissions.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsPermissions.ascx.resx
new file mode 100644
index 00000000..867a4a7f
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsPermissions.ascx.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnUpdateVpsPermissions.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Updating permissions...');</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>User permissions allow...</value>
+  </data>
+  <data name="gvVpsPermissions.Empty" xml:space="preserve">
+    <value>No peers exist under your user account.</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Permissions</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsSnapshots.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsSnapshots.ascx.resx
new file mode 100644
index 00000000..3b106beb
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsSnapshots.ascx.resx
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnApply.OnClientClick" xml:space="preserve">
+    <value>if(this.disabled) return false;if(!confirm('Do you want to apply selected snapshot to VPS?')) return false;ShowProgressDialog('Applying snapshot...');</value>
+  </data>
+  <data name="btnDelete.OnClientClick" xml:space="preserve">
+    <value>if(this.disabled) return false;if(!confirm('Do you want to completely delete selected snapshot?')) return false;ShowProgressDialog('Deleting snapshot...');</value>
+  </data>
+  <data name="btnDeleteSubtree.OnClientClick" xml:space="preserve">
+    <value>if(!confirm('Do you want to completely delete selected snapshot and all its sub-tree?')) return false;ShowProgressDialog('Deleting snapshot sub-tree...');</value>
+  </data>
+  <data name="btnRenameSnapshot.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Renaming snapshot...', 'RenameSnapshotModal');</value>
+  </data>
+  <data name="btnTakeSnapshot.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Taking snapshot...');</value>
+  </data>
+  <data name="Now.Text" xml:space="preserve">
+    <value>Now</value>
+  </data>
+  <data name="locNoSnapshots.Text" xml:space="preserve">
+    <value>This virtual server has no snapshots.</value>
+  </data>
+  <data name="btnApply.Text" xml:space="preserve">
+    <value>Apply</value>
+  </data>
+  <data name="btnCancelRename.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="btnDelete.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="btnDeleteSubtree.Text" xml:space="preserve">
+    <value>Delete Subtree</value>
+  </data>
+  <data name="btnRename.Text" xml:space="preserve">
+    <value>Rename</value>
+  </data>
+  <data name="btnRenameSnapshot.Text" xml:space="preserve">
+    <value>Rename</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;To take a &lt;b&gt;snapshot&lt;/b&gt; is much like to take a picture of current VPS state: its configuration, memory and hard disk.&lt;/p&gt;&lt;p&gt;Snapshots maybe used as backup/restore points when installing new software or using VPS for development or testing purposes. If something has gone wrong there is an ability to roll-back and &lt;b&gt;"Apply"&lt;/b&gt; a snapshot with good configuration.&lt;/p&gt;&lt;p&gt;&lt;b&gt;"Rename"&lt;/b&gt; button allows renaming snapshot and giving it some informative name, for example "Before applying service pack".&lt;/p&gt;</value>
+  </data>
+  <data name="locCreated.Text" xml:space="preserve">
+    <value>Created:</value>
+  </data>
+  <data name="locQuota.Text" xml:space="preserve">
+    <value>Number of Snapshots:</value>
+  </data>
+  <data name="locRenameSnapshot.Text" xml:space="preserve">
+    <value>Rename Snapshot</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Snapshots</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsTools.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsTools.ascx.resx
new file mode 100644
index 00000000..0f143aa1
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsDetailsTools.ascx.resx
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnDelete.Text" xml:space="preserve">
+    <value>Delete VPS</value>
+  </data>
+  <data name="btnReinstall.Text" xml:space="preserve">
+    <value>Re-install VPS</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value />
+  </data>
+  <data name="locDelete.Text" xml:space="preserve">
+    <value>Completely removes VPS and all its data.</value>
+  </data>
+  <data name="locReinstall.Text" xml:space="preserve">
+    <value>Re-creates VPS with the same configuration settings and operating system template. The wizard allows to preserve existing virtual disk data.</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Tools</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsMoveServer.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsMoveServer.ascx.resx
new file mode 100644
index 00000000..166a5167
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsMoveServer.ascx.resx
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;This wizard allows you to change Hyper-V service binding for existing Virtual Machine meta-item.&lt;/p&gt;&lt;p&gt;The wizard &lt;b&gt;DOES NOT PERFORM&lt;/b&gt; physical virtual machine migration, but it could be used to point control panel to the right Hyper-V service AFTER virtual machine was moved with some external management tool like Hyper-V manager or SCVMM.&lt;/p&gt;</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Move VPS</value>
+  </data>
+  <data name="btnMove.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Moving Virtual Server...');</value>
+  </data>
+  <data name="btnMove.Text" xml:space="preserve">
+    <value>Move</value>
+  </data>
+  <data name="locDestinationService.Text" xml:space="preserve">
+    <value>Destination Hyper-V Service:</value>
+  </data>
+  <data name="RequiredHyperVService.ErrorMessage" xml:space="preserve">
+    <value>Please select Hyper-V where VPS has been moved</value>
+  </data>
+  <data name="locSourceService.Text" xml:space="preserve">
+    <value>Source Hyper-V service:</value>
+  </data>
+  <data name="SelectHyperVService.Text" xml:space="preserve">
+    <value>&lt;Select Hyper-V service&gt;</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsToolsDeleteServer.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsToolsDeleteServer.ascx.resx
new file mode 100644
index 00000000..93428664
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsToolsDeleteServer.ascx.resx
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="btnDelete.OnClientClick" xml:space="preserve">
+    <value>ShowProgressDialog('Deleting Virtual Server...');</value>
+  </data>
+  <data name="btnDelete.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="chkConfirmDelete.Text" xml:space="preserve">
+    <value>Delete this Virtual Server</value>
+  </data>
+  <data name="chkExport.Text" xml:space="preserve">
+    <value>Export VPS before deletion to the following folder:</value>
+  </data>
+  <data name="chkSaveFiles.Text" xml:space="preserve">
+    <value>Do not delete VPS files (virtual hard disk, snapshots)</value>
+  </data>
+  <data name="ExportPathValidator.ErrorMessage" xml:space="preserve">
+    <value>Please enter export path</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value>&lt;p&gt;This form confirms deletion of VPS.&lt;/p&gt;&lt;p&gt;In order to confirm "Delete this virtual server" checkbox must be checked.&lt;/p&gt;</value>
+  </data>
+  <data name="locAdminOptions.Text" xml:space="preserve">
+    <value>Administrator options</value>
+  </data>
+  <data name="locDescription.Text" xml:space="preserve">
+    <value>This wizard will delete VPS and all its contents from the virtualization server.</value>
+  </data>
+  <data name="locSubTitle.Text" xml:space="preserve">
+    <value>Delete VPS Server</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Delete Server</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsToolsReinstallServer.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsToolsReinstallServer.ascx.resx
new file mode 100644
index 00000000..ae295246
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/App_LocalResources/VpsToolsReinstallServer.ascx.resx
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnCancel.Text" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="btnReinstall.Text" xml:space="preserve">
+    <value>Re-install</value>
+  </data>
+  <data name="chkConfirmReinstall.Text" xml:space="preserve">
+    <value>Yes, I confirm re-installation of this VPS</value>
+  </data>
+  <data name="chkExport.Text" xml:space="preserve">
+    <value>Export VPS before re-installation to the following folder:</value>
+  </data>
+  <data name="chkPreserveExistingFiles.Text" xml:space="preserve">
+    <value>Save existing VPS hard drive files</value>
+  </data>
+  <data name="chkSaveVhd.Text" xml:space="preserve">
+    <value>Do not delete VPS virtual hard drive file</value>
+  </data>
+  <data name="ExportPathValidator.ErrorMessage" xml:space="preserve">
+    <value>Enter export path</value>
+  </data>
+  <data name="FormComments.Text" xml:space="preserve">
+    <value />
+  </data>
+  <data name="locDescription.Text" xml:space="preserve">
+    <value>This wizard will re-create VPS with the same configuration settings from scratch and then apply current OS template.</value>
+  </data>
+  <data name="locPassword.Text" xml:space="preserve">
+    <value>New administrator password:</value>
+  </data>
+  <data name="locPreserveHelp.Text" xml:space="preserve">
+    <value>All files from existing hard drive will be copied to &amp;quot;old&amp;quot; disk folder on hard drive of new VPS.</value>
+  </data>
+  <data name="locSubTitle.Text" xml:space="preserve">
+    <value>Re-install VPS Server</value>
+  </data>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Re-install Server</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/RemoteDesktop/App_LocalResources/Connect.aspx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/RemoteDesktop/App_LocalResources/Connect.aspx.resx
new file mode 100644
index 00000000..2c7a42b1
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/RemoteDesktop/App_LocalResources/Connect.aspx.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="locTitle.Text" xml:space="preserve">
+    <value>Remote Desktop Connection</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/RemoteDesktop/Connect.aspx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/RemoteDesktop/Connect.aspx
new file mode 100644
index 00000000..4222b165
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/RemoteDesktop/Connect.aspx
@@ -0,0 +1,231 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Connect.aspx.cs" Inherits="WebsitePanel.Portal.VPS2012.RemoteDesktop.Connect" %>
+
+<!DOCTYPE html>
+<html>
+<head runat="server">
+    <title>
+        <asp:Literal ID="litServerName" runat="server"></asp:Literal>
+        <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Remote Desktop Web Connection"></asp:Localize></title>
+</head>
+<body style="margin:0;">
+
+
+<script language="vbscript" type="text/vbscript">
+<!--
+const L_FullScreenWarn1_Text = "Your current security settings do not allow automatically switching to fullscreen mode."
+const L_FullScreenWarn2_Text = "You can use ctrl-alt-pause to toggle your remote desktop session to fullscreen mode"
+const L_FullScreenTitle_Text = "Remote Desktop Web Connection "
+const L_ErrMsg_Text         = "Error connecting to remote computer: "
+const L_PlatformCheck_ErrorMessage = "The Remote Desktop Web connection ActiveX control can only run in the 32-bit version of Internet Explorer."
+
+' error messages
+const L_DisconnectedCaption_ErrorMessage =  "Remote Desktop Disconnected"
+const L_ErrConnectCallFailed_ErrorMessage =  "An error occurred when the client attempted to connect to the remote computer. Check your system memory and then try the connection again."
+const L_DisconnectRemoteByServer_ErrorMessage = "The remote computer has ended the connection."
+const L_LowMemory_ErrorMessage = "The local computer is low on memory. Close some programs, and then connect to the remote computer again."
+const L_SecurityErr_ErrorMessage = "Because of a security error, the client could not connect to the remote computer. Verify that you are logged on to the network, and then try connecting again."
+const L_BadServerName_ErrorMessage = "The specified remote computer could not be found. Verify that you have typed the correct computer name or IP address, and then try connecting again."
+const L_ConnectFailedProtocol_ErrorMessage = "Because of a protocol error, the client could not connect to the remote computer. Please try connecting to the remote computer again. If the client still fails to connect, contact your network administrator."
+const L_CannotLoopBackConnect_ErrorMessage = "The client could not connect. You cannot connect to the console from a console session of the same computer."
+const L_NetworkErr_ErrorMessage = "The connection was ended because of a network error. Please try connecting to the remote computer again."
+const L_InternalErr_ErrorMessage = "An internal error has occurred."
+const L_NotResponding_ErrorMessage = "The client could not connect to the remote computer. Remote connections might not be enabled or the computer might be too busy to accept new connections.It is also possible that network problems are preventing your connection.Please try connecting again later. If the problem continues to occur, contact your administrator."
+const L_VersionMismatch_ErrorMessage = "Client and server versions do not match. Please upgrade your client software and then try connecting again."
+const L_EncryptionError_ErrorMessage = "Because of an error in data encryption, this session will end. Please try connecting to the remote computer again."
+const L_ProtocolErr_ErrorMessage = "Because of a protocol error, this session will be disconnected. Please try connecting to the remote computer again."
+const L_IllegalServerName_ErrorMessage = "The specified computer name contains invalid characters. Please verify the name and try again."
+const L_ConnectionTimeout_ErrorMessage = "The remote connection has timed out. Please try connecting to the remote computer again."
+const L_DisconnectIdleTimeout_ErrorMessage = "The remote session was ended because the idle timeout limit was reached. This limit is set by the server administrator or by network policies."
+const L_DisconnectLogonTimeout_ErrorMessage ="The remote session ended because the total logon time limit was reached. This limit is set by the server administrator or by network policies."
+const L_ProtocolErrWITHCODE_ErrorMessage  = "Client disconnected due to internal protocol error: "
+const L_LicensingTimeout_ErrorMessage = "A licensing error occurred while the client was attempting to connect (Licensing timed out).Please try connecting to the remote computer again."
+const L_LicensingNegotFailed_ErrorMessage = "The remote computer disconnected the session because of an error in the licensing protocol.Please try connecting to the remote computer again or contact your server administrator."
+const L_DisconnectRemoteByServerTool_ErrorMessage = "The remote session to the remote computer was ended by means of an administration tool.Your administrator might have ended your connection."
+const L_LogoffRemoteByServer_ErrorMessage = "The remote session was disconnected because your session was logged off at the remote computer.Your administrator or another user might have ended your connection."
+const L_DisconnectByOtherConnection_ErrorMessage = "The remote session was disconnected because another user has connected to the session."
+const L_ConnectionBroken_ErrorMessage  = "The connection to the remote computer was broken. This may have been caused by a network error.Please try connecting to the remote computer again."
+const L_ServerOutOfMemory_ErrorMessage = "The connection was disconnected because the remote computer is low on memory."
+const L_LicenseInternal_ErrorMessage = "The remote session was disconnected because there was an internal error in the remote computer's licensing protocol."
+const L_NoLicenseServer_ErrorMessage = "The remote session was disconnected because there are no Terminal Server License Servers available to provide a license.Please contact the server administrator."
+const L_NoLicense_ErrorMessage = "The remote session was disconnected because there are no Terminal Server client access licenses available for this computer.Please contact the server administrator."
+const L_LicenseBadClientMsg_ErrorMessage = "The remote session was disconnected because the remote computer received an invalid licensing message from this computer."
+const L_LicenseHwidDoesntMatch_ErrorMessage = "The remote session was disconnected because the Terminal Server client access license stored on this computer has been modified."
+const L_BadClientLicense_ErrorMessage = "The remote session was disconnected because the Terminal Server client access license stored on this computer is in an invalid format."
+const L_LicenseCantFinishProtocol_ErrorMessage = "The remote session was disconnected because there were network problems during the licensing protocol.Please try connecting to the remote computer again."
+const L_LicenseClientEndedProtocol_ErrorMessage = "The remote session was disconnected because the client prematurely ended the licensing protocol."
+const L_LicenseBadClientEncryption_ErrorMessage = "The remote session was disconnected because a licensing message was incorrectly encrypted."
+const L_CantUpgradeLicense_ErrorMessage = "The remote session was disconnected because the local computer's client access license could not be upgraded or renewed.Please contact the server administrator."
+const L_LicenseNoRemoteConnections_ErrorMessage = "The remote session was disconnected because the remote computer is not licensed to accept remote connections.Please contact the server administrator."
+const L_DecompressionFailed_ErrorMessage = "The remote session was disconnected because of a decompression failure at the client side. Please try connecting to the remote computer again."
+const L_ServerDeniedConnection_ErrorMessage ="The client could not establish a connection to the remote computer.The most likely causes for this error are:1) Remote connections might not be enabled at the remote computer.2) The maximum number of connections was exceeded at the remote computer.3) A network error occurred while establishing the connection."
+
+resWidth = 0
+resHeight = 0
+resolution = "<asp:Literal id="resolution" runat="server"/>"
+
+serverName = "<asp:Literal id="serverName" runat="server"/>"
+username = "<asp:Literal id="username" runat="server"/>"
+domain = ""
+password = "<asp:Literal id="password" runat="server"/>"
+
+sub OnControlLoad
+   set Control = Document.getElementById("MsRdpClient")
+   if Not Control is Nothing then
+      if Control.readyState = 4 then
+         BtnConnect()
+      end if
+   end if
+end sub
+
+
+sub BtnConnect
+
+   if not LCase(Navigator.CpuClass) = "x86" then
+      msgbox L_PlatformCheck_ErrorMessage
+   end if
+   
+   'Resolution
+   MsRdpClient.FullScreen = FALSE
+   select case resolution
+   case "1"
+      MsRdpClient.FullScreen = TRUE
+      resWidth  = screen.width
+      resHeight = screen.height
+   case "2"
+      resWidth  = "800"
+      resHeight = "600"
+   case "3"
+      resWidth  = "1024"
+      resHeight = "768"
+   case "4"
+      resWidth  = "1280"
+      resHeight = "1024"
+   end select
+   
+   'ResizeWindow resWidth, resHeight
+   
+    MsRdpClient.server = serverName
+    MsRdpClient.UserName = username
+    MsRdpClient.Domain = domain
+    MsRdpClient.AdvancedSettings2.ClearTextPassword = password
+  
+    MsRdpClient.DesktopWidth = resWidth
+    MsRdpClient.DesktopHeight = resHeight
+
+    MsRdpClient.Width = resWidth
+    MsRdpClient.Height = resHeight
+
+    'Device redirection options
+    MsRdpClient.AdvancedSettings2.RedirectDrives     = FALSE
+    MsRdpClient.AdvancedSettings2.RedirectPrinters   = FALSE
+    MsRdpClient.AdvancedSettings2.RedirectPorts      = FALSE
+    MsRdpClient.AdvancedSettings2.RedirectSmartCards = FALSE
+
+    'FullScreen title
+    MsRdpClient.FullScreenTitle = L_FullScreenTitle_Text & "(" & serverName & ")"
+
+    'Connect
+    MsRdpClient.Connect
+end sub
+
+sub MsRdpClient_OnConnected()
+   ' nothing to do
+end sub
+
+sub MsRdpClient_OnDisconnected(disconnectCode)
+
+   extendedDiscReason = MsRdpClient.ExtendedDisconnectReason
+   majorDiscReason = disconnectCode And &hFF
+
+   if (disconnectCode = &hB08 or majorDiscReason = 2 or majorDiscReason = 1) and not (extendedDiscReason = 5) then
+      window.close()
+      exit sub
+   end if
+   
+   errMsgText = L_DisconnectRemoteByServer_ErrorMessage
+   if not extendedDiscReason = 0 then
+      'Use the extended disconnect code
+      select case extendedDiscReason
+      case 0   errMsgText  = ""
+      case 1   errMsgText  = L_DisconnectRemoteByServerTool_ErrorMessage
+      case 2   errMsgText  = L_LogoffRemoteByServer_ErrorMessage
+      case 3   errMsgText  = L_DisconnectIdleTimeout_ErrorMessage
+      case 4   errMsgText  = L_DisconnectLogonTimeout_ErrorMessage
+      case 5   errMsgText  = L_DisconnectByOtherConnection_ErrorMessage
+      case 6   errMsgText  = L_ServerOutOfMemory_ErrorMessage
+      case 7   errMsgText  = L_ServerDeniedConnection_ErrorMessage
+      case 256 errMsgText  = L_LicenseInternal_ErrorMessage
+      case 257 errMsgText  = L_NoLicenseServer_ErrorMessage
+      case 258 errMsgText  = L_NoLicense_ErrorMessage
+      case 259 errMsgText  = L_LicenseBadClientMsg_ErrorMessage
+      case 260 errMsgText  = L_LicenseHwidDoesntMatch_ErrorMessage
+      case 261 errMsgText  = L_BadClientLicense_ErrorMessage
+      case 262 errMsgText  = L_LicenseCantFinishProtocol_ErrorMessage
+      case 263 errMsgText  = L_LicenseClientEndedProtocol_ErrorMessage
+      case 264 errMsgText  = L_LicenseBadClientEncryption_ErrorMessage
+      case 265 errMsgText  = L_CantUpgradeLicense_ErrorMessage
+      case 266 errMsgText  = L_LicenseNoRemoteConnections_ErrorMessage
+      case else errMsgText = L_ErrMsg_Text
+      end select
+      if extendedDiscReason > 4096 then
+         errMsgText = L_ProtocolErrWITHCODE_ErrorMessage  & errMsgText
+      end if
+   else
+      ' no extended error information, use the disconnect code
+      select case disconnectCode
+      case 0   errMsgText  = L_ErrMsg_Text
+      case 1   errMsgText  = L_ErrMsg_Text
+      case 2   errMsgText  = L_ErrMsg_Text
+      case 260 errMsgText  = L_BadServerName_ErrorMessage
+      case 262 errMsgText  = L_LowMemory_ErrorMessage
+      case 264 errMsgText  = L_ConnectionTimeout_ErrorMessage
+      case 516 errMsgText  = L_NotResponding_ErrorMessage
+      case 518 errMsgText  = L_LowMemory_ErrorMessage
+      case 520 errMsgText  = L_BadServerName_ErrorMessage
+      case 772 errMsgText  = L_NetworkErr_ErrorMessage
+      case 774 errMsgText  = L_LowMemory_ErrorMessage
+      case 776 errMsgText  = L_BadServerName_ErrorMessage
+      case 1028 errMsgText = L_NetworkErr_ErrorMessage
+      case 1030 errMsgText = L_SecurityErr_ErrorMessage
+      case 1032 errMsgText = L_IllegalServerName_ErrorMessage
+      case 1286 errMsgText = L_EncryptionError_ErrorMessage
+      case 1288 errMsgText = L_BadServerName_ErrorMessage
+      case 1540 errMsgText = L_BadServerName_ErrorMessage
+      case 1542 errMsgText = L_SecurityErr_ErrorMessage
+      case 1544 errMsgText = L_LowMemory_ErrorMessage
+      case 1796 errMsgText = L_NotResponding_ErrorMessage
+      case 1798 errMsgText = L_SecurityErr_ErrorMessage
+      case 1800 errMsgText = L_CannotLoopBackConnect_ErrorMessage
+      case 2052 errMsgText = L_BadServerName_ErrorMessage
+      case 2056 errMsgText = L_LicensingNegotFailed_ErrorMessage
+      case 2310 errMsgText = L_SecurityErr_ErrorMessage
+      case 2566 errMsgText = L_SecurityErr_ErrorMessage
+      case 2822 errMsgText = L_EncryptionError_ErrorMessage
+      case 3078 errMsgText = L_EncryptionError_ErrorMessage
+      case 3080 errMsgText = L_DecompressionFailed_ErrorMessage
+      case 3334 errMsgText = L_ProtocolErr_ErrorMessage
+      case 10500 errMsgText = L_ProtocolErr_ErrorMessage
+      case else errMsgText = L_InternalErr_ErrorMessage
+      end select
+   end if
+   
+   msgbox errMsgText,0,L_DisconnectedCaption_ErrorMessage
+   
+   window.close()
+   
+end sub
+
+-->
+</script>
+
+<object language="vbscript" id="MsRdpClient"
+    onreadystatechange="OnControlLoad"
+    classid="CLSID:9059f30f-4eb1-4bd2-9fdc-36f43a218f4a"
+    codebase="msrdp.cab#version=5,1,2600,2180"
+    width="100" height="100">
+</object>
+
+    <form id="AspForm" runat="server">
+    </form>
+</body>
+</html>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/RemoteDesktop/Connect.aspx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/RemoteDesktop/Connect.aspx.cs
new file mode 100644
index 00000000..ea83ecab
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/RemoteDesktop/Connect.aspx.cs
@@ -0,0 +1,56 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using WebsitePanel.Providers.Virtualization;
+using WebsitePanel.EnterpriseServer;
+
+namespace WebsitePanel.Portal.VPS2012.RemoteDesktop
+{
+    public partial class Connect : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            resolution.Text = Request["Resolution"];
+
+            // load server info
+            VirtualMachine vm = VirtualMachines2012Helper.GetCachedVirtualMachine(PanelRequest.ItemID);
+            litServerName.Text = vm.Name + " - ";
+            username.Text = "Administrator";
+            password.Text = vm.AdministratorPassword;
+            
+            // load external network parameters
+            NetworkAdapterDetails nic = ES.Services.VPS2012.GetExternalNetworkAdapterDetails(PanelRequest.ItemID);
+            if (nic.IPAddresses.Length > 0)
+            {
+                NetworkAdapterIPAddress ip = nic.IPAddresses[0];
+                serverName.Text = !String.IsNullOrEmpty(ip.NATAddress) ? ip.NATAddress : ip.IPAddress;
+            }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/RemoteDesktop/Connect.aspx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/RemoteDesktop/Connect.aspx.designer.cs
new file mode 100644
index 00000000..b9b9ff55
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/RemoteDesktop/Connect.aspx.designer.cs
@@ -0,0 +1,78 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012.RemoteDesktop {
+    
+    
+    public partial class Connect {
+        
+        /// <summary>
+        /// litServerName 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.Literal litServerName;
+        
+        /// <summary>
+        /// locTitle 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 locTitle;
+        
+        /// <summary>
+        /// resolution 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.Literal resolution;
+        
+        /// <summary>
+        /// serverName 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.Literal serverName;
+        
+        /// <summary>
+        /// username 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.Literal username;
+        
+        /// <summary>
+        /// password 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.Literal password;
+        
+        /// <summary>
+        /// AspForm 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.HtmlForm AspForm;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/RemoteDesktop/msrdp.cab b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/RemoteDesktop/msrdp.cab
new file mode 100644
index 00000000..695c0137
Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/RemoteDesktop/msrdp.cab differ
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/TestVirtualMachineTemplate.aspx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/TestVirtualMachineTemplate.aspx
new file mode 100644
index 00000000..31661d8d
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/TestVirtualMachineTemplate.aspx
@@ -0,0 +1,46 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TestVirtualMachineTemplate.aspx.cs" Inherits="WebsitePanel.Portal.VPS2012.TestVirtualMachineTemplate" %>
+
+<%@ Register src="../UserControls/MessageBox.ascx" tagname="MessageBox" tagprefix="wsp" %>
+
+<%@ Register src="../UserControls/SimpleMessageBox.ascx" tagname="SimpleMessageBox" tagprefix="uc1" %>
+
+<!DOCTYPE html>
+<html>
+<head runat="server">
+    <title>Test VPS2012 Summary Template</title>
+    <style type="text/css">
+        BODY
+        {
+            background-color: #ffffff!important;
+            margin: 5px!important;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div>
+        <h1>Test VPS2012 Summary Template
+        </h1>
+        
+        <uc1:SimpleMessageBox ID="messageBox"  runat="server" />
+        
+        <p>
+            Item ID: <br />
+            <asp:TextBox ID="txtItemId" runat="server" Width="50"></asp:TextBox>
+        </p>
+        <p>
+            Template:<br />
+            <asp:TextBox ID="txtTemplate" runat="server" Width="100%" Rows="20" TextMode="MultiLine"></asp:TextBox>
+            <br />
+            <asp:Button ID="btnEvaluate" runat="server" onclick="btnEvaluate_Click" 
+                Text="Evaluate" />
+        </p>
+        <p>
+            Results:
+            <br />
+            <pre><asp:Literal ID="litResults" runat="server"></asp:Literal></pre>            
+        </p>
+    </div>
+    </form>
+</body>
+</html>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/TestVirtualMachineTemplate.aspx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/TestVirtualMachineTemplate.aspx.cs
new file mode 100644
index 00000000..479d409d
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/TestVirtualMachineTemplate.aspx.cs
@@ -0,0 +1,55 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Web;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class TestVirtualMachineTemplate : System.Web.UI.Page
+    {
+        public const string EVALUATE_VIRTUAL_MACHINE_TEMPLATE = "EVALUATE_VIRTUAL_MACHINE_TEMPLATE";
+        
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        protected void btnEvaluate_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                litResults.Text = HttpUtility.HtmlEncode(ES.Services.VPS2012.EvaluateVirtualMachineTemplate(Utils.ParseInt(txtItemId.Text.Trim(), 0), txtTemplate.Text));
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage(EVALUATE_VIRTUAL_MACHINE_TEMPLATE, ex);                
+            }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/TestVirtualMachineTemplate.aspx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/TestVirtualMachineTemplate.aspx.designer.cs
new file mode 100644
index 00000000..2cd00d39
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/TestVirtualMachineTemplate.aspx.designer.cs
@@ -0,0 +1,69 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class TestVirtualMachineTemplate {
+        
+        /// <summary>
+        /// form1 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.HtmlForm form1;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// txtItemId 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 txtItemId;
+        
+        /// <summary>
+        /// txtTemplate 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 txtTemplate;
+        
+        /// <summary>
+        /// btnEvaluate 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.Button btnEvaluate;
+        
+        /// <summary>
+        /// litResults 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.Literal litResults;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/App_LocalResources/Breadcrumb.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/App_LocalResources/Breadcrumb.ascx.resx
new file mode 100644
index 00000000..5ea0895e
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/App_LocalResources/Breadcrumb.ascx.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/App_LocalResources/DynamicMemoryControl.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/App_LocalResources/DynamicMemoryControl.ascx.resx
new file mode 100644
index 00000000..8ddc22e8
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/App_LocalResources/DynamicMemoryControl.ascx.resx
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="locMinimum.Text" xml:space="preserve">
+    <value>Minimum RAM, Mb:</value>
+  </data>
+  <data name="MinimumCompareValidator.ErrorMessage" xml:space="preserve">
+    <value>Minimum memory must be a whole number</value>
+  </data>
+  <data name="MinimumRequireValidator.ErrorMessage" xml:space="preserve">
+    <value>Enter the minimum memory</value>
+  </data>
+  <data name="optionDymanicMemory.Text" xml:space="preserve">
+    <value>Dymanic memory enabled</value>
+  </data>
+  <data name="secDymanicMemory.Text" xml:space="preserve">
+    <value>Dymanic memory</value>
+  </data>
+  <data name="locDymanicMemorySummary.Text" xml:space="preserve">
+    <value>Dymanic memory enabled:</value>
+  </data>
+  <data name="chkDynamicMemoryEnabled" xml:space="preserve">
+    <value>Dynamic memory enabled</value>
+  </data>
+  <data name="BufferRangeValidator.ErrorMessage" xml:space="preserve">
+    <value>Buffer must be a whole number between 0 and 100</value>
+  </data>
+  <data name="BufferRequireValidator.ErrorMessage" xml:space="preserve">
+    <value>Enter the buffer</value>
+  </data>
+  <data name="locBuffer.Text" xml:space="preserve">
+    <value>Buffer, %:</value>
+  </data>
+  <data name="locMaximum.Text" xml:space="preserve">
+    <value>Maximum RAM, Mb:</value>
+  </data>
+  <data name="locPriority.Text" xml:space="preserve">
+    <value>Weight (Priority):</value>
+  </data>
+  <data name="MaximumCompareValidator.ErrorMessage" xml:space="preserve">
+    <value>Maximum memory must be a whole number</value>
+  </data>
+  <data name="MaximumRequireValidator.ErrorMessage" xml:space="preserve">
+    <value>Enter the maximum memory</value>
+  </data>
+  <data name="PriorityRangeValidator.ErrorMessage" xml:space="preserve">
+    <value>Weight (priority) must be a whole number between 0 and 100</value>
+  </data>
+  <data name="PriorityRequireValidator.ErrorMessage" xml:space="preserve">
+    <value>Enter the weight (priority)</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/App_LocalResources/Generation.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/App_LocalResources/Generation.ascx.resx
new file mode 100644
index 00000000..5b5b2e6f
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/App_LocalResources/Generation.ascx.resx
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ddlGenerationItem.1" xml:space="preserve">
+    <value>First</value>
+  </data>
+  <data name="ddlGenerationItem.2" xml:space="preserve">
+    <value>Second</value>
+  </data>
+  <data name="locGeneration.Text" xml:space="preserve">
+    <value>Generation:</value>
+  </data>
+  <data name="secGeneration.Text" xml:space="preserve">
+    <value>Generation</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/App_LocalResources/Menu.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/App_LocalResources/Menu.ascx.resx
new file mode 100644
index 00000000..a4af7bf0
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/App_LocalResources/Menu.ascx.resx
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Text.AuditLog" xml:space="preserve">
+    <value>Audit Log</value>
+  </data>
+  <data name="Text.ExternalNetwork" xml:space="preserve">
+    <value>External Network</value>
+  </data>
+  <data name="Text.ManagementNetwork" xml:space="preserve">
+    <value>Management Network</value>
+  </data>
+  <data name="Text.PrivateNetwork" xml:space="preserve">
+    <value>Private Network</value>
+  </data>
+  <data name="Text.UserPermissions" xml:space="preserve">
+    <value>User Permissions</value>
+  </data>
+  <data name="Text.Vps" xml:space="preserve">
+    <value>Virtual Private Servers</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/App_LocalResources/ServerTabs.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/App_LocalResources/ServerTabs.ascx.resx
new file mode 100644
index 00000000..eaf0db7c
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/App_LocalResources/ServerTabs.ascx.resx
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="btnCancelOperation.OnClientClick" xml:space="preserve">
+    <value>return CancelOperation('Cancel current operation?', 'Cancelling operation...');</value>
+  </data>
+  <data name="Tab.AuditLog" xml:space="preserve">
+    <value>Audit Log</value>
+  </data>
+  <data name="Tab.Configuration" xml:space="preserve">
+    <value>Configuration</value>
+  </data>
+  <data name="Tab.DVD" xml:space="preserve">
+    <value>DVD</value>
+  </data>
+  <data name="Tab.General" xml:space="preserve">
+    <value>General</value>
+  </data>
+  <data name="Tab.Help" xml:space="preserve">
+    <value>Help</value>
+  </data>
+  <data name="Tab.Network" xml:space="preserve">
+    <value>Network</value>
+  </data>
+  <data name="Tab.Permissions" xml:space="preserve">
+    <value>Permissions</value>
+  </data>
+  <data name="Tab.Snapshots" xml:space="preserve">
+    <value>Snapshots</value>
+  </data>
+  <data name="Tab.Tools" xml:space="preserve">
+    <value>Tools</value>
+  </data>
+  <data name="locElapsed.Text" xml:space="preserve">
+    <value>Elapsed:</value>
+  </data>
+  <data name="locStarted.Text" xml:space="preserve">
+    <value>Started:</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Breadcrumb.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Breadcrumb.ascx
new file mode 100644
index 00000000..2dd3eb5c
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Breadcrumb.ascx
@@ -0,0 +1,4 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Breadcrumb.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb" %>
+<div class="Breadcrumb">
+    <asp:Literal ID="litSpaceName" runat="server"></asp:Literal>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Breadcrumb.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Breadcrumb.ascx.cs
new file mode 100644
index 00000000..1bf7495d
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Breadcrumb.ascx.cs
@@ -0,0 +1,50 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.EnterpriseServer;
+
+namespace WebsitePanel.Portal.VPS2012.UserControls
+{
+    public partial class Breadcrumb : System.Web.UI.UserControl
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                // bind package name
+                PackageInfo package = ES.Services.Packages.GetPackage(PanelSecurity.PackageId);
+                litSpaceName.Text = package.PackageName;
+            }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Breadcrumb.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Breadcrumb.ascx.designer.cs
new file mode 100644
index 00000000..4231a1d5
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Breadcrumb.ascx.designer.cs
@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012.UserControls {
+    
+    
+    public partial class Breadcrumb {
+        
+        /// <summary>
+        /// litSpaceName 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.Literal litSpaceName;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/DynamicMemoryControl.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/DynamicMemoryControl.ascx
new file mode 100644
index 00000000..a8c9888a
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/DynamicMemoryControl.ascx
@@ -0,0 +1,126 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="DynamicMemoryControl.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.UserControls.DynamicMemoryControl" %>
+<%@ Import Namespace="WebsitePanel.Portal" %>
+<%@ Register TagPrefix="wsp" TagName="CollapsiblePanel" Src="../../UserControls/CollapsiblePanel.ascx" %>
+<%@ Register TagPrefix="wsp" TagName="CheckBoxOption" Src="../../UserControls/CheckBoxOption.ascx" %>
+
+<% if (Mode != VirtualMachineSettingsMode.Summary){ %>
+    <wsp:CollapsiblePanel id="secDymanicMemory" runat="server" TargetControlID="DymanicMemoryPanel" meta:resourcekey="secDymanicMemory" Text="Dymanic memory">
+    </wsp:CollapsiblePanel>
+    <asp:Panel ID="DymanicMemoryPanel" runat="server" Height="0" Style="overflow: hidden; padding: 5px;">
+        <table>
+            <% if (Mode == VirtualMachineSettingsMode.Edit) { %>
+            <tr>
+                <td colspan="2">
+                    <asp:CheckBox ID="chkDynamicMemoryEnabled" runat="server" AutoPostBack="true" meta:resourcekey="chkDynamicMemoryEnabled" Text="Dynamic memory enabled" />
+                
+                    <table id="tableDynamicMemory" runat="server" cellspacing="5" style="width: 100%; margin-top: 15px">
+                        <tr>
+                            <td class="FormLabel150" >
+                                <asp:Localize ID="locMinimum" runat="server" meta:resourcekey="locMinimum" Text="Minimum RAM:"></asp:Localize>
+                            </td>
+                            <td>
+                                <asp:TextBox ID="txtMinimum" runat="server" CssClass="NormalTextBox" Width="50" Text=""></asp:TextBox>
+
+                                <asp:RequiredFieldValidator ControlToValidate="txtMinimum" Display="Dynamic"
+                                    meta:resourcekey="MinimumRequireValidator" runat="server" SetFocusOnError="true"
+                                    Text="*" ValidationGroup="Vps">*</asp:RequiredFieldValidator>
+                                <asp:CompareValidator ControlToValidate="txtMinimum" ErrorMessage="Value must be a whole number" 
+                                    meta:resourcekey="MinimumCompareValidator" Operator="DataTypeCheck" runat="server" SetFocusOnError="True" 
+                                    Text="*" Type="Integer" ValidationGroup="Vps">*</asp:CompareValidator>
+                            </td>
+                        </tr>   
+                        <tr>
+                            <td class="FormLabel150" >
+                                <asp:Localize ID="locMaximum" runat="server" meta:resourcekey="locMaximum" Text="Maximum RAM:"></asp:Localize>
+                            </td>
+                            <td>
+                                <asp:TextBox ID="txtMaximum" runat="server" CssClass="NormalTextBox" Width="50" Text=""></asp:TextBox>
+
+                                <asp:RequiredFieldValidator ControlToValidate="txtMaximum" Display="Dynamic"
+                                    meta:resourcekey="MaximumRequireValidator" runat="server" SetFocusOnError="true"
+                                    Text="*" ValidationGroup="Vps">*</asp:RequiredFieldValidator>
+                                <asp:CompareValidator ControlToValidate="txtMaximum" ErrorMessage="Value must be a whole number" 
+                                    meta:resourcekey="MaximumCompareValidator" Operator="DataTypeCheck" runat="server" SetFocusOnError="True" 
+                                    Text="*" Type="Integer" ValidationGroup="Vps">*</asp:CompareValidator>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="FormLabel150" >
+                                <asp:Localize ID="locBuffer" runat="server" meta:resourcekey="locBuffer" Text="Buffer (%):"></asp:Localize>
+                            </td>
+                            <td>
+                                <asp:TextBox ID="txtBuffer" runat="server" CssClass="NormalTextBox" Width="50" Text=""></asp:TextBox>
+
+                                <asp:RequiredFieldValidator ControlToValidate="txtBuffer" Display="Dynamic"
+                                    meta:resourcekey="BufferRequireValidator" runat="server" SetFocusOnError="true"
+                                    Text="*" ValidationGroup="Vps">*</asp:RequiredFieldValidator>
+                                <asp:RangeValidator runat="server" Type="Integer" MinimumValue="0" MaximumValue="100" ControlToValidate="txtBuffer" 
+                                    meta:resourcekey="BufferRangeValidator" ErrorMessage="Value must be a whole number between 0 and 100" 
+                                    Text="*" ValidationGroup="Vps">*</asp:RangeValidator>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="FormLabel150" >
+                                <asp:Localize ID="locPriority" runat="server" meta:resourcekey="locPriority" Text="Weight (Priority):"></asp:Localize>
+                            </td>
+                            <td>
+                                <asp:TextBox ID="txtPriority" runat="server" CssClass="NormalTextBox" Width="50" Text=""></asp:TextBox>
+
+                                <asp:RequiredFieldValidator ControlToValidate="txtPriority" Display="Dynamic"
+                                    meta:resourcekey="PriorityRequireValidator" runat="server" SetFocusOnError="true"
+                                    Text="*" ValidationGroup="Vps">*</asp:RequiredFieldValidator>
+                                <asp:RangeValidator runat="server" Type="Integer" MinimumValue="0" MaximumValue="100" ControlToValidate="txtPriority" 
+                                    meta:resourcekey="PriorityRangeValidator" ErrorMessage="Value must be a whole number between 0 and 100" 
+                                    Text="*" ValidationGroup="Vps">*</asp:RangeValidator>
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+            <% } else { %>
+            <tr>
+                <td colspan="2">
+                    <wsp:CheckBoxOption ID="optionDymanicMemoryDisplay" runat="server" Text="Dymanic memory enabled" meta:resourcekey="optionDymanicMemory" />
+                </td>
+            </tr>
+            <tr runat="server" id="trMinimumDisplay">
+                <td><asp:Localize ID="locMinimumDisplay" runat="server" meta:resourcekey="locMinimum" Text="Minimum:" /></td>
+                <td><asp:Literal ID="litMinimumDisplay" runat="server"></asp:Literal></td>
+            </tr>
+            <tr runat="server" id="trMaximumDisplay">
+                <td><asp:Localize ID="locMaximumDisplay" runat="server" meta:resourcekey="locMaximum" Text="Maximum:" /></td>
+                <td><asp:Literal ID="litMaximumDisplay" runat="server"></asp:Literal></td>
+            </tr>
+            <tr runat="server" id="trBufferDisplay">
+                <td><asp:Localize ID="locBufferDisplay" runat="server" meta:resourcekey="locBuffer" Text="Buffer (%):" /></td>
+                <td><asp:Literal ID="litBufferDisplay" runat="server"></asp:Literal></td>
+            </tr>
+            <tr runat="server" id="trPriorityDisplay">
+                <td><asp:Localize ID="locPriorityDisplay" runat="server" meta:resourcekey="locPriority" Text="Weight (Priority):" /></td>
+                <td><asp:Literal ID="litPriorityDisplay" runat="server"></asp:Literal></td>
+            </tr>
+            <% } %>
+        </table>
+    </asp:Panel>
+<% } else { %>
+    <tr>
+        <td><asp:Localize ID="locDymanicMemorySummary" runat="server" meta:resourcekey="locDymanicMemorySummary" Text="Dymanic memory enabled:" /></td>
+        <td><wsp:CheckBoxOption id="optionDymanicMemorySummary" runat="server" /></td>
+    </tr>
+    <tr runat="server" id="trMinimumSummary">
+        <td><asp:Localize ID="locMinimumSummary" runat="server" meta:resourcekey="locMinimum" Text="Minimum:" /></td>
+        <td><asp:Literal ID="litMinimumSummary" runat="server"></asp:Literal></td>
+    </tr>
+    <tr runat="server" id="trMaximumSummary">
+        <td><asp:Localize ID="locMaximumSummary" runat="server" meta:resourcekey="locMaximum" Text="Maximum:" /></td>
+        <td><asp:Literal ID="litMaximumSummary" runat="server"></asp:Literal></td>
+    </tr>
+    <tr runat="server" id="trBufferSummary">
+        <td><asp:Localize ID="locBufferSummary" runat="server" meta:resourcekey="locBuffer" Text="Buffer (%):" /></td>
+        <td><asp:Literal ID="litBufferSummary" runat="server"></asp:Literal></td>
+    </tr>
+    <tr runat="server" id="trPrioritySummary">
+        <td><asp:Localize ID="locPrioritySummary" runat="server" meta:resourcekey="locPriority" Text="Weight (Priority):" /></td>
+        <td><asp:Literal ID="litPrioritySummary" runat="server"></asp:Literal></td>
+    </tr>
+<% } %>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/DynamicMemoryControl.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/DynamicMemoryControl.ascx.cs
new file mode 100644
index 00000000..1ee4fc95
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/DynamicMemoryControl.ascx.cs
@@ -0,0 +1,88 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using WebsitePanel.Providers.Virtualization;
+
+namespace WebsitePanel.Portal.VPS2012.UserControls
+{
+    public partial class DynamicMemoryControl : WebsitePanelControlBase, IVirtualMachineSettingsControl
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            ToggleControls();
+        }
+
+        private void ToggleControls()
+        {
+            tableDynamicMemory.Visible = chkDynamicMemoryEnabled.Checked;
+        }
+
+        public VirtualMachineSettingsMode Mode { get; set; }
+
+        public void BindItem(VirtualMachine item)
+        {
+            if (item.DynamicMemory == null)
+                item.DynamicMemory = new DynamicMemory();
+
+            // set values
+            chkDynamicMemoryEnabled.Checked = optionDymanicMemoryDisplay.Value = optionDymanicMemorySummary.Value = item.DynamicMemory.Enabled;
+            txtMinimum.Text = litMinimumDisplay.Text = litMinimumSummary.Text = item.DynamicMemory.Minimum.ToString();
+            txtMaximum.Text = litMaximumDisplay.Text = litMaximumSummary.Text = item.DynamicMemory.Maximum.ToString();
+            txtBuffer.Text = litBufferDisplay.Text = litBufferSummary.Text = item.DynamicMemory.Buffer.ToString();
+            txtPriority.Text = litPriorityDisplay.Text = litPrioritySummary.Text = item.DynamicMemory.Priority.ToString();
+
+            // set visibilities
+            trMinimumDisplay.Visible = trMaximumDisplay.Visible = trBufferDisplay.Visible = trPriorityDisplay.Visible = item.DynamicMemory.Enabled;
+            trMinimumSummary.Visible = trMaximumSummary.Visible = trBufferSummary.Visible = trPrioritySummary.Visible = item.DynamicMemory.Enabled;
+        }
+
+        public void SaveItem(ref VirtualMachine item)
+        {
+            if (Mode != VirtualMachineSettingsMode.Edit)
+                return;
+
+            item.DynamicMemory = new DynamicMemory
+            {
+                Enabled = chkDynamicMemoryEnabled.Checked,
+                Minimum = ParseInt(txtMinimum.Text),
+                Maximum = ParseInt(txtMaximum.Text),
+                Buffer = ParseInt(txtBuffer.Text),
+                Priority = ParseInt(txtPriority.Text),
+            };
+        }
+
+        private int ParseInt(string text)
+        {
+            if (string.IsNullOrEmpty(text))
+                return 0;
+
+            return Int32.Parse(text);
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/DynamicMemoryControl.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/DynamicMemoryControl.ascx.designer.cs
new file mode 100644
index 00000000..328179bb
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/DynamicMemoryControl.ascx.designer.cs
@@ -0,0 +1,366 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012.UserControls {
+    
+    
+    public partial class DynamicMemoryControl {
+        
+        /// <summary>
+        /// secDymanicMemory control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secDymanicMemory;
+        
+        /// <summary>
+        /// DymanicMemoryPanel 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 DymanicMemoryPanel;
+        
+        /// <summary>
+        /// chkDynamicMemoryEnabled 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 chkDynamicMemoryEnabled;
+        
+        /// <summary>
+        /// tableDynamicMemory 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.HtmlTable tableDynamicMemory;
+        
+        /// <summary>
+        /// locMinimum 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 locMinimum;
+        
+        /// <summary>
+        /// txtMinimum 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 txtMinimum;
+        
+        /// <summary>
+        /// locMaximum 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 locMaximum;
+        
+        /// <summary>
+        /// txtMaximum 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 txtMaximum;
+        
+        /// <summary>
+        /// locBuffer 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 locBuffer;
+        
+        /// <summary>
+        /// txtBuffer 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 txtBuffer;
+        
+        /// <summary>
+        /// locPriority 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 locPriority;
+        
+        /// <summary>
+        /// txtPriority 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 txtPriority;
+        
+        /// <summary>
+        /// optionDymanicMemoryDisplay control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionDymanicMemoryDisplay;
+        
+        /// <summary>
+        /// trMinimumDisplay 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 trMinimumDisplay;
+        
+        /// <summary>
+        /// locMinimumDisplay 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 locMinimumDisplay;
+        
+        /// <summary>
+        /// litMinimumDisplay 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.Literal litMinimumDisplay;
+        
+        /// <summary>
+        /// trMaximumDisplay 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 trMaximumDisplay;
+        
+        /// <summary>
+        /// locMaximumDisplay 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 locMaximumDisplay;
+        
+        /// <summary>
+        /// litMaximumDisplay 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.Literal litMaximumDisplay;
+        
+        /// <summary>
+        /// trBufferDisplay 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 trBufferDisplay;
+        
+        /// <summary>
+        /// locBufferDisplay 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 locBufferDisplay;
+        
+        /// <summary>
+        /// litBufferDisplay 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.Literal litBufferDisplay;
+        
+        /// <summary>
+        /// trPriorityDisplay 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 trPriorityDisplay;
+        
+        /// <summary>
+        /// locPriorityDisplay 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 locPriorityDisplay;
+        
+        /// <summary>
+        /// litPriorityDisplay 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.Literal litPriorityDisplay;
+        
+        /// <summary>
+        /// locDymanicMemorySummary 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 locDymanicMemorySummary;
+        
+        /// <summary>
+        /// optionDymanicMemorySummary control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionDymanicMemorySummary;
+        
+        /// <summary>
+        /// trMinimumSummary 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 trMinimumSummary;
+        
+        /// <summary>
+        /// locMinimumSummary 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 locMinimumSummary;
+        
+        /// <summary>
+        /// litMinimumSummary 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.Literal litMinimumSummary;
+        
+        /// <summary>
+        /// trMaximumSummary 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 trMaximumSummary;
+        
+        /// <summary>
+        /// locMaximumSummary 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 locMaximumSummary;
+        
+        /// <summary>
+        /// litMaximumSummary 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.Literal litMaximumSummary;
+        
+        /// <summary>
+        /// trBufferSummary 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 trBufferSummary;
+        
+        /// <summary>
+        /// locBufferSummary 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 locBufferSummary;
+        
+        /// <summary>
+        /// litBufferSummary 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.Literal litBufferSummary;
+        
+        /// <summary>
+        /// trPrioritySummary 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 trPrioritySummary;
+        
+        /// <summary>
+        /// locPrioritySummary 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 locPrioritySummary;
+        
+        /// <summary>
+        /// litPrioritySummary 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.Literal litPrioritySummary;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/FormTitle.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/FormTitle.ascx
new file mode 100644
index 00000000..4a361f2b
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/FormTitle.ascx
@@ -0,0 +1,4 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="FormTitle.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.UserControls.FormTitle" %>
+<asp:Literal ID="litTitle" runat="server" />
+-
+<asp:Literal ID="litServerName" runat="server" />
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/FormTitle.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/FormTitle.ascx.cs
new file mode 100644
index 00000000..bc88fcea
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/FormTitle.ascx.cs
@@ -0,0 +1,53 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.Virtualization;
+
+namespace WebsitePanel.Portal.VPS2012.UserControls
+{
+    public partial class FormTitle : WebsitePanelControlBase
+    {
+        public string Text
+        {
+            get { return litTitle.Text; }
+            set { litTitle.Text = value; }
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            VirtualMachine vm = VirtualMachines2012Helper.GetCachedVirtualMachine(PanelRequest.ItemID);
+            if (vm != null)
+                litServerName.Text = vm.Name;
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/FormTitle.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/FormTitle.ascx.designer.cs
new file mode 100644
index 00000000..e56c4e0e
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/FormTitle.ascx.designer.cs
@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012.UserControls {
+    
+    
+    public partial class FormTitle {
+        
+        /// <summary>
+        /// litTitle 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.Literal litTitle;
+        
+        /// <summary>
+        /// litServerName 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.Literal litServerName;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Generation.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Generation.ascx
new file mode 100644
index 00000000..ad9dc272
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Generation.ascx
@@ -0,0 +1,36 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Generation.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.UserControls.Generation" %>
+<%@ Import Namespace="WebsitePanel.Portal" %>
+<%@ Register TagPrefix="wsp" TagName="CollapsiblePanel" Src="../../UserControls/CollapsiblePanel.ascx" %>
+
+<% if (Mode != VirtualMachineSettingsMode.Summary){ %>
+    <wsp:CollapsiblePanel ID="secGeneration" runat="server" TargetControlID="GenerationPanel" meta:ResourceKey="secGeneration" Text="Generation"></wsp:CollapsiblePanel>
+    <asp:Panel ID="GenerationPanel" runat="server" Height="0" Style="overflow: hidden; padding: 5px;">
+        <table>
+            <% if (Mode == VirtualMachineSettingsMode.Edit) { %>
+            <tr>
+                <td class="FormLabel150">
+                    <asp:Localize ID="locGeneration" runat="server" meta:resourcekey="locGeneration" Text="Generation:"></asp:Localize>
+                </td>
+                <td>
+                    <asp:DropDownList ID="ddlGeneration" runat="server" CssClass="NormalTextBox" resourcekey="ddlGeneration">
+                        <asp:ListItem Value="1">1</asp:ListItem>
+                        <asp:ListItem Value="2">2</asp:ListItem>
+                    </asp:DropDownList>
+                </td>
+            </tr>
+            <% } else { %>
+            <tr>
+                <td>
+                    <asp:Localize ID="locGenerationDisplay" runat="server" meta:resourcekey="locGeneration" Text="Generation:"></asp:Localize>
+                    <asp:Label runat="server" ID="lblGeneration"/>
+                </td>
+            </tr>
+            <% } %>
+        </table>
+    </asp:Panel>
+<% } else { %>
+    <tr>
+        <td><asp:Localize ID="locGeneration2" runat="server" meta:resourcekey="locGeneration" Text="Generation:" /></td>
+        <td><asp:Literal ID="litGeneration" runat="server"></asp:Literal></td>
+    </tr>
+<% } %>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Generation.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Generation.ascx.cs
new file mode 100644
index 00000000..e092af49
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Generation.ascx.cs
@@ -0,0 +1,56 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using WebsitePanel.Providers.Virtualization;
+
+namespace WebsitePanel.Portal.VPS2012.UserControls
+{
+    public partial class Generation : WebsitePanelControlBase, IVirtualMachineSettingsControl
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+        }
+
+        public VirtualMachineSettingsMode Mode { get; set; }
+
+        public void BindItem(VirtualMachine item)
+        {
+            var generation = item.Generation > 1 ? item.Generation.ToString	() : "1";
+
+            ddlGeneration.SelectedValue = generation;
+            lblGeneration.Text = litGeneration.Text = GetLocalizedString("ddlGenerationItem." + generation);
+        }
+
+        public void SaveItem(ref VirtualMachine item)
+        {
+            if (Mode == VirtualMachineSettingsMode.Edit)
+                item.Generation = Convert.ToInt32(ddlGeneration.SelectedValue);
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Generation.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Generation.ascx.designer.cs
new file mode 100644
index 00000000..690bec4e
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Generation.ascx.designer.cs
@@ -0,0 +1,87 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012.UserControls {
+    
+    
+    public partial class Generation {
+        
+        /// <summary>
+        /// secGeneration control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secGeneration;
+        
+        /// <summary>
+        /// GenerationPanel 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 GenerationPanel;
+        
+        /// <summary>
+        /// locGeneration 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 locGeneration;
+        
+        /// <summary>
+        /// ddlGeneration 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.DropDownList ddlGeneration;
+        
+        /// <summary>
+        /// locGenerationDisplay 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 locGenerationDisplay;
+        
+        /// <summary>
+        /// lblGeneration 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.Label lblGeneration;
+        
+        /// <summary>
+        /// locGeneration2 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 locGeneration2;
+        
+        /// <summary>
+        /// litGeneration 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.Literal litGeneration;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Menu.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Menu.ascx
new file mode 100644
index 00000000..10902dd6
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Menu.ascx
@@ -0,0 +1,18 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Menu.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.UserControls.Menu" %>
+<div class="Menu">
+
+	<asp:DataList runat="server" ID="MenuItems" EnableViewState="false" RepeatDirection="Horizontal" RepeatLayout="Flow">
+	    <ItemTemplate>
+	        <div class="MenuItem">
+                <asp:HyperLink ID="lnkItem" runat="server" NavigateUrl='<%# Eval("Url") %>' Text='<%# Eval("Text") %>'/>			                
+            </div>
+	    </ItemTemplate>
+	    <SelectedItemTemplate>
+            <div class="SelectedMenuItem">
+                <asp:HyperLink ID="lnkItem" runat="server"
+	                NavigateUrl='<%# Eval("Url") %>'
+	                Text='<%# Eval("Text") %>'/>			                
+            </div>
+        </SelectedItemTemplate>
+	</asp:DataList>	
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Menu.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Menu.ascx.cs
new file mode 100644
index 00000000..fe628e86
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Menu.ascx.cs
@@ -0,0 +1,129 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.EnterpriseServer;
+
+namespace WebsitePanel.Portal.VPS2012.UserControls
+{
+    public partial class Menu : WebsitePanelControlBase
+    {
+        public class MenuItem
+        {
+            private string url;
+            private string text;
+            private string key;
+
+            public string Url
+            {
+                get { return url; }
+                set { url = value; }
+            }
+
+            public string Text
+            {
+                get { return text; }
+                set { text = value; }
+            }
+
+            public string Key
+            {
+                get { return key; }
+                set { key = value; }
+            }
+        }
+
+        private string selectedItem;
+        public string SelectedItem
+        {
+            get { return selectedItem; }
+            set { selectedItem = value; }
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            BindMenu();
+        }
+
+        private void BindMenu()
+        {
+            bool isAdmin = (PanelSecurity.EffectiveUser.Role == UserRole.Administrator);
+
+            // build the list of menu items
+            List<MenuItem> items = new List<MenuItem>();
+
+            // load package context
+            PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
+            
+            // add items
+            items.Add(CreateMenuItem("Vps", ""));
+
+            if(cntx.Quotas.ContainsKey(Quotas.VPS2012_EXTERNAL_NETWORK_ENABLED)
+                && !cntx.Quotas[Quotas.VPS2012_EXTERNAL_NETWORK_ENABLED].QuotaExhausted
+                || (PanelSecurity.PackageId == 1 && isAdmin))
+                items.Add(CreateMenuItem("ExternalNetwork", "vdc_external_network"));
+
+            if (isAdmin)
+                items.Add(CreateMenuItem("ManagementNetwork", "vdc_management_network"));
+
+            if (cntx.Quotas.ContainsKey(Quotas.VPS2012_PRIVATE_NETWORK_ENABLED)
+                && !cntx.Quotas[Quotas.VPS2012_PRIVATE_NETWORK_ENABLED].QuotaExhausted)
+                items.Add(CreateMenuItem("PrivateNetwork", "vdc_private_network"));
+
+            //items.Add(CreateMenuItem("UserPermissions", "vdc_permissions"));
+            items.Add(CreateMenuItem("AuditLog", "vdc_audit_log"));
+
+            // selected menu item
+            for (int i = 0; i < items.Count; i++)
+            {
+                if (String.Compare(items[i].Key, SelectedItem, true) == 0)
+                {
+                    MenuItems.SelectedIndex = i;
+                    break;
+                }
+            }
+
+            // bind items
+            MenuItems.DataSource = items;
+            MenuItems.DataBind();
+        }
+
+        private MenuItem CreateMenuItem(string text, string key)
+        {
+            MenuItem item = new MenuItem();
+            item.Key = key;
+            item.Text = GetLocalizedString("Text." + text);
+            item.Url = HostModule.EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), key);
+            return item;
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Menu.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Menu.ascx.designer.cs
new file mode 100644
index 00000000..625e22b8
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/Menu.ascx.designer.cs
@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012.UserControls {
+    
+    
+    public partial class Menu {
+        
+        /// <summary>
+        /// MenuItems 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.DataList MenuItems;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/ServerTabs.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/ServerTabs.ascx
new file mode 100644
index 00000000..d5a9c3ea
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/ServerTabs.ascx
@@ -0,0 +1,75 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ServerTabs.ascx.cs"
+    Inherits="WebsitePanel.Portal.VPS2012.UserControls.ServerTabs" %>
+<%@ Register Src="../../UserControls/Gauge.ascx" TagName="Gauge" TagPrefix="wsp" %>
+<%@ Register Src="../../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+
+<asp:Timer runat="server" Interval="3000" ID="refreshTimer" />
+<asp:UpdatePanel ID="TabsPanel" runat="server">
+    <Triggers>
+        <asp:AsyncPostBackTrigger ControlID="refreshTimer" EventName="Tick" />
+    </Triggers>
+    <ContentTemplate>
+    
+        <table id="TaskTable" runat="server" visible="false">
+            <tr>
+                <td>
+                    <asp:Literal ID="litTaskName" runat="server"></asp:Literal>
+                </td>
+            </tr>
+            <tr><td>&nbsp;</td></tr>
+            <tr>
+                <td>
+                    <asp:Localize ID="locStarted" runat="server" Text="Started:" meta:resourcekey="locStarted"></asp:Localize>
+                    <asp:Literal ID="litStarted" runat="server"></asp:Literal>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <asp:Localize ID="locElapsed" runat="server" Text="Elapsed:" meta:resourcekey="locElapsed"></asp:Localize>
+                    <asp:Literal ID="litElapsed" runat="server"></asp:Literal>
+                </td>
+            </tr>
+            <tr><td>&nbsp;</td></tr>
+            <tr>
+                <td>
+                    <asp:Repeater ID="repRecords" runat="server" 
+                        onitemdatabound="repRecords_ItemDataBound">
+                        <ItemTemplate>
+                            <div style="padding: 2px;">
+                                <asp:Literal ID="litRecord" runat="server"></asp:Literal>
+                                <wsp:Gauge id="gauge" runat="server" OneColour="true" />
+                            </div>
+                        </ItemTemplate>
+                    </asp:Repeater>
+                </td>
+            </tr>
+        </table>
+
+        <table id="TabsTable" runat="server" width="100%" cellpadding="0" cellspacing="1" visible="false">
+            <tr>
+                <td class="Tabs">
+                    &nbsp;&nbsp;
+                    <asp:DataList ID="dlTabs" runat="server" RepeatDirection="Horizontal" RepeatLayout="Flow"
+                        EnableViewState="false">
+                        <ItemStyle Wrap="False" />
+                        <ItemTemplate>
+                            <asp:HyperLink ID="lnkTab" runat="server" CssClass="Tab" NavigateUrl='<%# Eval("Url") %>'>
+                                <%# Eval("Name") %>
+                            </asp:HyperLink>
+                        </ItemTemplate>
+                        <SelectedItemStyle Wrap="False" />
+                        <SelectedItemTemplate>
+                            <asp:HyperLink ID="lnkSelTab" runat="server" CssClass="ActiveTab" NavigateUrl='<%# Eval("Url") %>'>
+                                <%# Eval("Name") %>
+                            </asp:HyperLink>
+                        </SelectedItemTemplate>
+                    </asp:DataList>
+                </td>
+            </tr>
+        </table>
+        <br />
+        
+        <wsp:SimpleMessageBox id="messageBox" runat="server" />
+
+    </ContentTemplate>
+</asp:UpdatePanel>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/ServerTabs.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/ServerTabs.ascx.cs
new file mode 100644
index 00000000..f5b51d3a
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/ServerTabs.ascx.cs
@@ -0,0 +1,230 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.ResultObjects;
+using WebsitePanel.Providers.Virtualization;
+using WebsitePanel.EnterpriseServer;
+
+namespace WebsitePanel.Portal.VPS2012.UserControls
+{
+    public partial class ServerTabs : WebsitePanelControlBase
+    {
+        class Tab
+        {
+            string id;
+            string name;
+            string url;
+
+            public Tab(string id, string name, string url)
+            {
+                this.id = id;
+                this.name = name;
+                this.url = url;
+            }
+
+            public string Id
+            {
+                get { return this.id; }
+                set { this.id = value; }
+            }
+
+            public string Name
+            {
+                get { return this.name; }
+                set { this.name = value; }
+            }
+
+            public string Url
+            {
+                get { return this.url; }
+                set { this.url = value; }
+            }
+        }
+
+        private string selectedTab;
+        public string SelectedTab
+        {
+            get { return selectedTab; }
+            set { selectedTab = value; }
+        }
+
+        private BackgroundTask task = null;
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            BindTabs();
+        }
+
+        private void BindTabs()
+        {
+            // load item
+            VirtualMachine vm = VirtualMachines2012Helper.GetCachedVirtualMachine(PanelRequest.ItemID);
+
+            if (!String.IsNullOrEmpty(vm.CurrentTaskId))
+            {
+                // show panel
+                TaskTable.Visible = true;
+
+                // bind task details
+                BindTask(vm);
+
+                return;
+            }
+
+            if (TaskTable.Visible)
+                Response.Redirect(Request.Url.ToString()); // refresh screen
+
+            // show tabs
+            TabsTable.Visible = true;
+
+            // disable timer
+            refreshTimer.Enabled = false;
+
+            // check if VPS2012 created with error
+            bool createError = (vm.ProvisioningStatus == VirtualMachineProvisioningStatus.Error);
+
+            // load package context
+            PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
+
+            // build tabs list
+            List<Tab> tabsList = new List<Tab>();
+
+            tabsList.Add(CreateTab("vps_general", "Tab.General"));
+
+            if (!createError)
+                tabsList.Add(CreateTab("vps_config", "Tab.Configuration"));
+
+            if (vm.DvdDriveInstalled && !createError)
+                tabsList.Add(CreateTab("vps_dvd", "Tab.DVD"));
+
+            if (vm.SnapshotsNumber > 0 && !createError)
+                tabsList.Add(CreateTab("vps_snapshots", "Tab.Snapshots"));
+
+            if ((vm.ExternalNetworkEnabled || vm.PrivateNetworkEnabled) && !createError)
+                tabsList.Add(CreateTab("vps_network", "Tab.Network"));
+
+            //tabsList.Add(CreateTab("vps_permissions", "Tab.Permissions"));
+            //tabsList.Add(CreateTab("vps_tools", "Tab.Tools"));
+            tabsList.Add(CreateTab("vps_audit_log", "Tab.AuditLog"));
+
+            if (!createError)
+                tabsList.Add(CreateTab("vps_help", "Tab.Help"));
+
+
+            // find selected menu item
+            int idx = 0;
+            foreach (Tab tab in tabsList)
+            {
+                if (String.Compare(tab.Id, SelectedTab, true) == 0)
+                    break;
+                idx++;
+            }
+            dlTabs.SelectedIndex = idx;
+
+            dlTabs.DataSource = tabsList;
+            dlTabs.DataBind();
+
+            // show provision error message
+            if(createError && idx == 0)
+                messageBox.ShowErrorMessage("VPS_PROVISION_ERROR");
+        }
+
+        private void BindTask(VirtualMachine vm)
+        {
+            task = ES.Services.Tasks.GetTaskWithLogRecords(vm.CurrentTaskId, DateTime.MinValue);
+            if (task == null)
+                return;
+
+            // bind task details
+            litTaskName.Text = String.Format("{0} &quot;{1}&quot;",
+                GetAuditLogTaskName(task.Source, task.TaskName),
+                task.ItemName);
+
+            // time
+            litStarted.Text = task.StartDate.ToString("T");
+            TimeSpan d = (TimeSpan)(DateTime.Now - task.StartDate);
+            litElapsed.Text = new TimeSpan(d.Hours, d.Minutes, d.Seconds).ToString();
+
+            // bind records
+            repRecords.DataSource = task.GetLogs();
+            repRecords.DataBind();
+        }
+
+        private Tab CreateTab(string id, string text)
+        {
+            return new Tab(id, GetLocalizedString(text),
+                HostModule.EditUrl("ItemID", PanelRequest.ItemID.ToString(), id,
+                "SpaceID=" + PanelSecurity.PackageId.ToString()));
+        }
+
+        protected void repRecords_ItemDataBound(object sender, RepeaterItemEventArgs e)
+        {
+            BackgroundTaskLogRecord record = (BackgroundTaskLogRecord)e.Item.DataItem;
+
+            Literal litRecord = (Literal)e.Item.FindControl("litRecord");
+            Gauge gauge = (Gauge)e.Item.FindControl("gauge");
+
+            if (litRecord != null)
+            {
+                string text = record.Text;
+
+                // localize text
+                string locText = GetSharedLocalizedString("TaskActivity." + text);
+                if (locText != null)
+                    text = locText;
+
+                // format parameters
+                if (record.TextParameters != null
+                    && record.TextParameters.Length > 0
+                    && record.Severity == 0)
+                    text = String.Format(text, record.TextParameters);
+
+                litRecord.Text = text;
+
+                // gauge
+                gauge.Visible = false;
+                if (e.Item.ItemIndex == task.GetLogs().Count - 1)
+                {
+                    if (task.IndicatorCurrent == -1)
+                        litRecord.Text += "...";
+                    else
+                    {
+                        gauge.Visible = true;
+                        gauge.Total = task.IndicatorMaximum;
+                        gauge.Progress = task.IndicatorCurrent;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/ServerTabs.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/ServerTabs.ascx.designer.cs
new file mode 100644
index 00000000..fd9d70f8
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/UserControls/ServerTabs.ascx.designer.cs
@@ -0,0 +1,123 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012.UserControls {
+    
+    
+    public partial class ServerTabs {
+        
+        /// <summary>
+        /// refreshTimer control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.Timer refreshTimer;
+        
+        /// <summary>
+        /// TabsPanel 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 TabsPanel;
+        
+        /// <summary>
+        /// TaskTable 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.HtmlTable TaskTable;
+        
+        /// <summary>
+        /// litTaskName 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.Literal litTaskName;
+        
+        /// <summary>
+        /// locStarted 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 locStarted;
+        
+        /// <summary>
+        /// litStarted 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.Literal litStarted;
+        
+        /// <summary>
+        /// locElapsed 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 locElapsed;
+        
+        /// <summary>
+        /// litElapsed 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.Literal litElapsed;
+        
+        /// <summary>
+        /// repRecords 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.Repeater repRecords;
+        
+        /// <summary>
+        /// TabsTable 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.HtmlTable TabsTable;
+        
+        /// <summary>
+        /// dlTabs 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.DataList dlTabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAddExternalAddress.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAddExternalAddress.ascx
new file mode 100644
index 00000000..b589e4ec
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAddExternalAddress.ascx
@@ -0,0 +1,39 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VdcAddExternalAddress.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VdcAddExternalAddress" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/AllocatePackageIPAddresses.ascx" TagName="AllocatePackageIPAddresses" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="vdc_external_network" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="Network48" runat="server" />
+				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Allocate IP Addresses"></asp:Localize>
+			    </div>
+			    <div class="FormBody">
+
+                <wsp:AllocatePackageIPAddresses id="allocateAddresses" runat="server"
+                        Pool="VPSExternalNetwork"
+                        ResourceGroup="VPS2012"
+                        ListAddressesControl="vdc_external_network" />
+				    
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
+
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAddExternalAddress.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAddExternalAddress.ascx.cs
new file mode 100644
index 00000000..38ee774d
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAddExternalAddress.ascx.cs
@@ -0,0 +1,43 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.Common;
+using WebsitePanel.EnterpriseServer;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VdcAddExternalAddress : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAddExternalAddress.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAddExternalAddress.ascx.designer.cs
new file mode 100644
index 00000000..37393f5f
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAddExternalAddress.ascx.designer.cs
@@ -0,0 +1,69 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VdcAddExternalAddress {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle 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 locTitle;
+        
+        /// <summary>
+        /// allocateAddresses control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.AllocatePackageIPAddresses allocateAddresses;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAuditLog.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAuditLog.ascx
new file mode 100644
index 00000000..3df88dc9
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAuditLog.ascx
@@ -0,0 +1,34 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VdcAuditLog.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VdcAuditLog" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/PopupHeader.ascx" TagName="PopupHeader" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/AuditLogControl.ascx" TagName="AuditLogControl" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="vdc_audit_log" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="AuditLog48" runat="server" />
+				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Audit Log"></asp:Localize>
+			    </div>
+			    <div class="FormBody">
+
+                    <wsp:AuditLogControl id="auditLog" runat="server" LogSource="VPS2012" />
+
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAuditLog.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAuditLog.ascx.cs
new file mode 100644
index 00000000..f2fea5eb
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAuditLog.ascx.cs
@@ -0,0 +1,44 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VdcAuditLog : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAuditLog.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAuditLog.ascx.designer.cs
new file mode 100644
index 00000000..8b560f54
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcAuditLog.ascx.designer.cs
@@ -0,0 +1,60 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VdcAuditLog {
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle 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 locTitle;
+        
+        /// <summary>
+        /// auditLog control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.AuditLogControl auditLog;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcCreateServer.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcCreateServer.ascx
new file mode 100644
index 00000000..058854d5
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcCreateServer.ascx
@@ -0,0 +1,580 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VdcCreateServer.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VdcCreate" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/PasswordControl.ascx" TagName="PasswordControl" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CheckBoxOption.ascx" TagName="CheckBoxOption" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+<%@ Register TagPrefix="wsp" TagName="Generation" Src="UserControls/Generation.ascx" %>
+<%@ Register TagPrefix="wsp" TagName="DynamicMemoryControl" Src="UserControls/DynamicMemoryControl.ascx" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="AddServer48" runat="server" />
+				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Create New VPS"></asp:Localize>
+			    </div>
+			    <div class="FormBody">
+    			    	
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+                    <asp:ValidationSummary ID="validatorsSummary" runat="server" 
+                        ValidationGroup="Vps" ShowMessageBox="True" ShowSummary="False" />
+                    
+                    <asp:Wizard ID="wizard" runat="server"
+                        meta:resourcekey="wizard" CellSpacing="5" 
+                        onfinishbuttonclick="wizard_FinishButtonClick" 
+                        onsidebarbuttonclick="wizard_SideBarButtonClick" 
+                        onactivestepchanged="wizard_ActiveStepChanged" 
+                        onnextbuttonclick="wizard_NextButtonClick">
+                        
+                        <SideBarStyle CssClass="SideBar" VerticalAlign="Top" />
+                        <StepStyle VerticalAlign="Top" />
+                        
+                        <StartNavigationTemplate>
+                            <asp:Button ID="btnNext" runat="server" CommandName="MoveNext" ValidationGroup="Vps"
+                                    CssClass="Button1" Text="Next" meta:resourcekey="btnNext" />
+                        </StartNavigationTemplate>
+                        
+                        <StepNavigationTemplate>
+                            <asp:Button ID="btnPrevious" runat="server" CommandName="MovePrevious" ValidationGroup="Vps"
+                                    CssClass="Button1" Text="Previous" meta:resourcekey="btnPrevious" />
+
+                            <asp:Button ID="btnNext" runat="server" CommandName="MoveNext" ValidationGroup="Vps"
+                                    CssClass="Button1" Text="Next" meta:resourcekey="btnNext" />
+
+                        </StepNavigationTemplate>
+                        
+                        <FinishNavigationTemplate>
+                            <asp:Button ID="btnPrevious" runat="server" CommandName="MovePrevious" ValidationGroup="Vps"
+                                    CssClass="Button1" Text="Previous" meta:resourcekey="btnPrevious" />
+                                    
+                            <asp:Button ID="btnFinish" runat="server" CommandName="MoveComplete" ValidationGroup="Vps"
+                                    CssClass="Button1" Text="Finish" meta:resourcekey="btnFinish" />
+                        </FinishNavigationTemplate>
+                       
+                        
+                        <WizardSteps>
+                            <asp:WizardStep ID="stepName" runat="server" meta:resourcekey="stepName" Title="Name and OS">
+
+                                    <p class="SubTitle"><asp:Localize ID="locNameStepTitle" runat="server"
+                                        meta:resourcekey="locNameStepTitle" Text="Name and Operating System" /></p>
+                                    <br />
+                                    
+                                    <table>
+                                        <tr>
+                                            <td class="FormLabel150"><asp:Localize ID="locHostname" runat="server"
+                                                meta:resourcekey="locHostname" Text="Host name:"></asp:Localize></td>
+                                            <td>
+                                                <asp:TextBox ID="txtHostname" runat="server" CssClass="NormalTextBox" Width="70"></asp:TextBox>
+                                                
+                                                <asp:RequiredFieldValidator ID="HostnameValidator" runat="server" Text="*" Display="Dynamic"
+                                                    ControlToValidate="txtHostname" meta:resourcekey="HostnameValidator" SetFocusOnError="true"
+                                                    ValidationGroup="Vps">*</asp:RequiredFieldValidator>
+                                                <asp:RegularExpressionValidator id="valCorrectHostname" runat="server" Text="*" meta:resourcekey="valCorrectHostname"
+                                                    ValidationExpression="^[a-zA-Z]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?$"
+			                                        ControlToValidate="txtHostname" Display="Dynamic" SetFocusOnError="true" ValidationGroup="Vps">
+			                                    </asp:RegularExpressionValidator>
+                                                
+                                                <span class="Medium">.</span>
+                                                <asp:TextBox ID="txtDomain" runat="server" CssClass="NormalTextBox" Width="150"></asp:TextBox>
+                                                    
+                                                <asp:RequiredFieldValidator ID="DomainValidator" runat="server" Text="*" Display="Dynamic"
+                                                    ControlToValidate="txtDomain" meta:resourcekey="DomainValidator" SetFocusOnError="true"
+                                                    ValidationGroup="Vps">*</asp:RequiredFieldValidator>
+                                                <asp:RegularExpressionValidator id="valNewDomainFormat" runat="server" Text="*" meta:resourcekey="valNewDomainFormat"
+                                                    ValidationExpression="^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.){1,10}[a-zA-Z]{2,6}$"
+			                                        ControlToValidate="txtDomain" Display="Dynamic" SetFocusOnError="true" ValidationGroup="Vps">
+			                                    </asp:RegularExpressionValidator>
+                                            </td>
+                                        </tr>
+                                        <tr><td>&nbsp;</td></tr>
+                                        <tr>
+                                            <td class="FormLabel150"><asp:Localize ID="locOperatingSystem" runat="server"
+                                                meta:resourcekey="locOperatingSystem" Text="Operating system:"></asp:Localize></td>
+                                            <td>
+                                                <asp:DropDownList ID="listOperatingSystems" runat="server"
+                                                    DataValueField="Path" DataTextField="Name">
+                                                </asp:DropDownList>
+                                                <asp:RequiredFieldValidator ID="OperatingSystemValidator" runat="server" Text="*" Display="Dynamic"
+                                                    ControlToValidate="listOperatingSystems" meta:resourcekey="OperatingSystemValidator" SetFocusOnError="true"
+                                                    ValidationGroup="Vps">*</asp:RequiredFieldValidator>
+                                            </td>
+                                        </tr>
+                                        <tr><td>&nbsp;</td></tr>
+                                        <tr>
+                                            <td class="FormLabel150" valign="top"><asp:Localize ID="locAdminPassword" runat="server"
+                                                meta:resourcekey="locAdminPassword" Text="Administrator password:"></asp:Localize></td>
+                                            <td>
+                                                <wsp:PasswordControl id="password" runat="server" ValidationGroup="Vps" AllowGeneratePassword="true">
+                                                </wsp:PasswordControl>
+  
+                                            </td>
+                                        </tr>
+                                        <tr><td>&nbsp;</td></tr>
+                                        <tr>
+                                            <td class="FormLabel150">
+                                                <asp:CheckBox ID="chkSendSummary" runat="server" AutoPostBack="true" Checked="true"
+                                                    meta:resourcekey="chkSendSummary" Text="Send summary letter to:" />
+                                            </td>
+                                            <td>
+                                                <asp:TextBox ID="txtSummaryEmail" runat="server" CssClass="NormalTextBox" AutoPostBack="true"></asp:TextBox>
+                                                <asp:RequiredFieldValidator ID="SummaryEmailValidator" runat="server" Text="*" Display="Dynamic"
+                                                    ControlToValidate="txtSummaryEmail" meta:resourcekey="SummaryEmailValidator" SetFocusOnError="true"
+                                                    ValidationGroup="Vps">*</asp:RequiredFieldValidator>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <br />
+                                    
+                            </asp:WizardStep>
+                            <asp:WizardStep ID="stepConfig" runat="server" meta:resourcekey="stepConfig" Title="Configuration">
+                                    
+                                    <p class="SubTitle"><asp:Localize ID="locConfigStepTitle" runat="server"
+                                        meta:resourcekey="locConfigStepTitle" Text="Configuration" /></p>
+                                    <br />
+                                    
+                                    <wsp:Generation runat="server" ID="GenerationSetting" Mode="Edit"/>
+
+                                    <wsp:CollapsiblePanel id="secResources" runat="server"
+                                        TargetControlID="ResourcesPanel" meta:resourcekey="secResources" Text="Resources">
+                                    </wsp:CollapsiblePanel>
+                                    <asp:Panel ID="ResourcesPanel" runat="server" Height="0" style="overflow: hidden; padding: 5px;">
+                                        <table cellpadding="3">
+                                            <tr>
+                                                <td class="FormLabel150"><asp:Label ID="lblCpu" runat="server" 
+                                                        meta:resourcekey="lblCpu" Text="CPU:" /></td>
+                                                <td>
+                                                    <asp:DropDownList ID="ddlCpu" runat="server" CssClass="HugeTextBox" Width="70">
+                                                    </asp:DropDownList>
+                                                </td>
+                                                <td><asp:Localize ID="locCores" runat="server" meta:resourcekey="locCores" Text="cores"/></td>
+                                            </tr>
+                                        </table>
+                                        <table cellpadding="3">
+                                            <tr>
+                                                <td class="FormLabel150"><asp:Label ID="lblRam" runat="server" 
+                                                        meta:resourcekey="lblRam" Text="RAM:"/></td>
+                                                <td>
+                                                    <asp:TextBox ID="txtRam" runat="server" CssClass="HugeTextBox" Width="70" Text="0"></asp:TextBox>
+                                                    <asp:RequiredFieldValidator ID="RequireRamValidator" runat="server" Text="*" Display="Dynamic"
+                                                        ControlToValidate="txtRam" meta:resourcekey="RequireRamValidator" SetFocusOnError="true"
+                                                        ValidationGroup="Vps">*</asp:RequiredFieldValidator>
+                                                </td>
+                                                <td><asp:Localize ID="locMB" runat="server" meta:resourcekey="locMB" Text="MB"/></td>
+                                            </tr>
+                                        </table>
+                                        <table cellpadding="3">
+                                            <tr>
+                                                <td class="FormLabel150"><asp:Label ID="lblHdd" runat="server" 
+                                                        meta:resourcekey="lblHdd" Text="HDD:" /></td>
+                                                <td>
+                                                    <asp:TextBox ID="txtHdd" runat="server" CssClass="HugeTextBox" Width="70" Text="0"></asp:TextBox>
+                                                    <asp:RequiredFieldValidator ID="RequireHddValidator" runat="server" Text="*" Display="Dynamic"
+                                                        ControlToValidate="txtHdd" meta:resourcekey="RequireHddValidator" SetFocusOnError="true"
+                                                        ValidationGroup="Vps">*</asp:RequiredFieldValidator>
+                                                </td>
+                                                <td><asp:Localize ID="locGB" runat="server" meta:resourcekey="locGB" Text="GB"/></td>
+                                            </tr>
+                                        </table>
+                                    </asp:Panel>
+
+                                    <wsp:DynamicMemoryControl runat="server" ID="DynamicMemorySetting" Mode="Edit"/>
+
+                                    <wsp:CollapsiblePanel id="secSnapshots" runat="server"
+                                        TargetControlID="SnapshotsPanel" meta:resourcekey="secSnapshots" Text="Snapshots">
+                                    </wsp:CollapsiblePanel>
+                                    <asp:Panel ID="SnapshotsPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                                        <table>
+                                            <tr>
+                                                <td class="FormLabel150"><asp:Localize ID="locSnapshots" runat="server"
+                                                    meta:resourcekey="locSnapshots" Text="Number of snapshots:"></asp:Localize></td>
+                                                <td>
+                                                    <asp:TextBox ID="txtSnapshots" runat="server" CssClass="NormalTextBox" Width="50" Text="0"></asp:TextBox>
+                                                    
+                                                    <asp:RequiredFieldValidator ID="SnapshotsValidator" runat="server" Text="*" Display="Dynamic"
+                                                        ControlToValidate="txtSnapshots" meta:resourcekey="SnapshotsValidator" SetFocusOnError="true"
+                                                        ValidationGroup="Vps">*</asp:RequiredFieldValidator>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </asp:Panel>
+                                    
+                                    <wsp:CollapsiblePanel id="secDvd" runat="server"
+                                        TargetControlID="DvdPanel" meta:resourcekey="secDvd" Text="DVD">
+                                    </wsp:CollapsiblePanel>
+                                    <asp:Panel ID="DvdPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                                        <table>
+                                            <tr>
+                                                <td>
+                                                    <asp:CheckBox ID="chkDvdInstalled" runat="server"
+                                                        Text="DVD drive installed" meta:resourcekey="chkDvdInstalled" />
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </asp:Panel>
+                                    
+                                    <wsp:CollapsiblePanel id="secBios" runat="server"
+                                        TargetControlID="BiosPanel" meta:resourcekey="secBios" Text="BIOS">
+                                    </wsp:CollapsiblePanel>
+                                    <asp:Panel ID="BiosPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                                        <table>
+                                            <tr>
+                                                <td style="width:200px;">
+                                                    <asp:CheckBox ID="chkBootFromCd" runat="server" Text="Boot from CD" meta:resourcekey="chkBootFromCd" />
+                                                </td>
+                                                <td>
+                                                    <asp:CheckBox ID="chkNumLock" runat="server" Text="Num Lock enabled" meta:resourcekey="chkNumLock" />
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </asp:Panel>
+                                    
+                                    <wsp:CollapsiblePanel id="secActions" runat="server"
+                                        TargetControlID="ActionsPanel" meta:resourcekey="secActions" Text="Allowed actions">
+                                    </wsp:CollapsiblePanel>
+                                    <asp:Panel ID="ActionsPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                                        <table style="width:400px;">
+                                            <tr>
+                                                <td style="width:200px;">
+                                                    <asp:CheckBox ID="chkStartShutdown" runat="server" Text="Start, Turn off and Shutdown" meta:resourcekey="chkStartShutdown" />
+                                                </td>
+                                                <td>
+                                                    <asp:CheckBox ID="chkReset" runat="server" Text="Reset" meta:resourcekey="chkReset" />
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <asp:CheckBox ID="chkPauseResume" runat="server" Text="Pause, Resume" meta:resourcekey="chkPauseResume" />
+                                                </td>
+                                                <td>
+                                                    <asp:CheckBox ID="chkReinstall" runat="server" Text="Re-install" meta:resourcekey="chkReinstall" />
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td>
+                                                    <asp:CheckBox ID="chkReboot" runat="server" Text="Reboot" meta:resourcekey="chkReboot" />
+                                                </td>
+                                                <td>
+                                                    
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </asp:Panel>
+                                    <br />
+                                    
+                            </asp:WizardStep>
+                            
+                            
+                            
+                            <asp:WizardStep ID="stepExternalNetwork" runat="server" meta:resourcekey="stepExternalNetwork" Title="External network">
+                                    <p class="SubTitle"><asp:Localize ID="locExternalNetwork" runat="server"
+                                        meta:resourcekey="locExternalNetwork" Text="External Network" /></p>
+                                    <br />
+                                    
+                                    <p>
+                                        <asp:CheckBox ID="chkExternalNetworkEnabled" runat="server" AutoPostBack="true" Checked="true"
+                                                    meta:resourcekey="chkExternalNetworkEnabled" Text="External network enabled" />
+                                    </p>
+                                    
+                                     <div runat="server" ID="EmptyExternalAddressesMessage" style="padding: 5px;" visible="false">
+                                        <asp:Localize ID="locNotEnoughExternalAddresses" runat="server" Text="Not enough..."
+                                                meta:resourcekey="locNotEnoughExternalAddresses"></asp:Localize>
+                                     </div>
+                                    
+                                    <table id="tableExternalNetwork" runat="server" cellspacing="5" style="width: 100%;">
+                                        <tr>
+                                            <td>
+                                                <asp:RadioButton ID="radioExternalRandom" runat="server" AutoPostBack="true"
+                                                    meta:resourcekey="radioExternalRandom" Text="Randomly select IP addresses from the pool" 
+                                                    Checked="True" GroupName="ExternalAddress" />
+                                            </td>
+                                        </tr>
+                                        <tr id="ExternalAddressesNumberRow" runat="server">
+                                            <td style="padding-left: 30px;">
+                                                <asp:Localize ID="locExternalAddresses" runat="server"
+                                                        meta:resourcekey="locExternalAddresses" Text="Number of IP addresses:"></asp:Localize>
+
+                                                <asp:TextBox ID="txtExternalAddressesNumber" runat="server" CssClass="NormalTextBox" Width="50" Text=""></asp:TextBox>
+                                                
+                                                <asp:RequiredFieldValidator ID="ExternalAddressesValidator" runat="server" Text="*" Display="Dynamic"
+                                                        ControlToValidate="txtExternalAddressesNumber" meta:resourcekey="ExternalAddressesValidator" SetFocusOnError="true"
+                                                        ValidationGroup="Vps">*</asp:RequiredFieldValidator>
+                                                        
+                                                <asp:Literal ID="litMaxExternalAddresses" runat="server"></asp:Literal>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <asp:RadioButton ID="radioExternalSelected" runat="server" AutoPostBack="true"
+                                                    meta:resourcekey="radioExternalSelected" Text="Select IP addresses from the list" 
+                                                    GroupName="ExternalAddress" />
+                                            </td>
+                                        </tr>
+                                        <tr id="ExternalAddressesListRow" runat="server">
+                                            <td style="padding-left: 30px;">
+                                                <asp:ListBox ID="listExternalAddresses" runat="server" Rows="8"
+                                                    CssClass="NormalTextBox" Width="220" SelectionMode="Multiple" Height="80"></asp:ListBox>
+                                                <br />
+                                                <asp:Localize ID="locHoldCtrl" runat="server"
+                                                        meta:resourcekey="locHoldCtrl" Text="* Hold CTRL key to select multiple addresses"></asp:Localize>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <br />
+                            </asp:WizardStep>
+                            
+                            
+                            
+                            <asp:WizardStep ID="stepPrivateNetwork" runat="server" meta:resourcekey="stepPrivateNetwork" Title="Private network">
+                                    <p class="SubTitle"><asp:Localize ID="locPrivateNetwork" runat="server"
+                                        meta:resourcekey="locPrivateNetwork" Text="Private Network" /></p>
+                                    <br />
+                                    
+                                    <p>
+                                        <asp:CheckBox ID="chkPrivateNetworkEnabled" runat="server" AutoPostBack="true" Checked="true"
+                                                    meta:resourcekey="chkPrivateNetworkEnabled" Text="Private network enabled" />
+                                    </p>
+                                    
+                                   
+                                    <table id="tablePrivateNetwork" runat="server" cellspacing="5" style="width: 100%;">
+                                        <tr>
+                                            <td>
+                                                <asp:RadioButton ID="radioPrivateRandom" runat="server" AutoPostBack="true"
+                                                    meta:resourcekey="radioPrivateRandom" Text="Randomly select next available IP addresses to the addresses format" 
+                                                    Checked="True" GroupName="PrivateAddress" />
+                                            </td>
+                                        </tr>
+                                        <tr id="PrivateAddressesNumberRow" runat="server">
+                                            <td style="padding-left: 30px;">
+                                                <asp:Localize ID="locPrivateAddresses" runat="server"
+                                                        meta:resourcekey="locPrivateAddresses" Text="Number of IP addresses:"></asp:Localize>
+
+                                                <asp:TextBox ID="txtPrivateAddressesNumber" runat="server" CssClass="NormalTextBox" Width="50" Text=""></asp:TextBox>
+                                                
+                                                <asp:RequiredFieldValidator ID="PrivateAddressesValidator" runat="server" Text="*" Display="Dynamic"
+                                                        ControlToValidate="txtPrivateAddressesNumber" meta:resourcekey="PrivateAddressesValidator" SetFocusOnError="true"
+                                                        ValidationGroup="Vps">*</asp:RequiredFieldValidator>
+                                                        
+                                                <asp:Literal ID="litMaxPrivateAddresses" runat="server"></asp:Literal>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <asp:RadioButton ID="radioPrivateSelected" runat="server" AutoPostBack="true"
+                                                    meta:resourcekey="radioPrivateSelected" Text="Assign specified IP addresses" 
+                                                    GroupName="PrivateAddress" />
+                                            </td>
+                                        </tr>
+                                        <tr id="PrivateAddressesListRow" runat="server">
+                                            <td style="padding-left: 30px;">
+                                                <asp:TextBox ID="txtPrivateAddressesList" runat="server" TextMode="MultiLine"
+                                                    CssClass="NormalTextBox" Width="170" Rows="5"></asp:TextBox>
+                                                <br />
+                                                <asp:Localize ID="locOnePerLine" runat="server"
+                                                        meta:resourcekey="locOnePerLine" Text="* Type one IP address per line"></asp:Localize>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <br />
+                                    
+                                    <table cellspacing="3">
+                                        <tr>
+                                            <td><asp:Localize ID="locPrivateNetworkFormat" runat="server"
+                                            meta:resourcekey="locPrivateNetworkFormat" Text="Network addresses format:"></asp:Localize></td>
+                                            <td><b><asp:Literal ID="litPrivateNetworkFormat" runat="server" Text="[network format]"></asp:Literal></b></td>
+                                        </tr>
+                                        <tr>
+                                            <td><asp:Localize ID="locPrivateSubnetMask" runat="server"
+                                            meta:resourcekey="locPrivateSubnetMask" Text="Subnet mask:"></asp:Localize></td>
+                                            <td><b><asp:Literal ID="litPrivateSubnetMask" runat="server" Text="[subnet mask]"></asp:Literal></b></td>
+                                        </tr>
+                                    </table>
+                                    
+                                    <br />
+                                    
+                            </asp:WizardStep>
+                            
+                            
+                            
+                            <asp:WizardStep ID="stepSummary" runat="server" meta:resourcekey="stepSummary" Title="Summary">
+                                    <p class="SubTitle"><asp:Localize ID="locSummary" runat="server"
+                                        meta:resourcekey="locSummary" Text="Summary" /></p>
+                                    <br />
+                                    
+                                    <table cellspacing="6">
+                                        <tr>
+                                            <td colspan="2" class="NormalBold">
+                                                <asp:Localize ID="locNameStepTitle2" runat="server"
+                                                    meta:resourcekey="locNameStepTitle" Text="Name and Operating System" />
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td><asp:Localize ID="Localize1" runat="server"
+                                                meta:resourcekey="locHostname" Text="Host name"></asp:Localize></td>
+                                            <td><asp:Literal ID="litHostname" runat="server"></asp:Literal></td>
+                                        </tr>
+                                        <tr>
+                                            <td><asp:Localize ID="Localize2" runat="server"
+                                                meta:resourcekey="locOperatingSystem" Text="Operating system"></asp:Localize></td>
+                                            <td><asp:Literal ID="litOperatingSystem" runat="server"></asp:Literal></td>
+                                        </tr>
+                                        <tr id="SummSummaryEmailRow" runat="server">
+                                            <td><asp:Localize ID="locSendSummary" runat="server"
+                                                meta:resourcekey="chkSendSummary" Text="Send summary letter to"></asp:Localize></td>
+                                            <td><asp:Literal ID="litSummaryEmail" runat="server"></asp:Literal></td>
+                                        </tr>
+                                        <tr>
+                                            <td>&nbsp;</td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan="2" class="NormalBold">
+                                                <asp:Localize ID="locConfig2" runat="server"
+                                                    meta:resourcekey="locConfigStepTitle" Text="Configuration" />
+                                            </td>
+                                        </tr>
+
+                                        <wsp:Generation runat="server" ID="GenerationSettingsSummary" Mode="Summary"/>
+
+                                        <tr>
+                                            <td><asp:Localize ID="locCpu" runat="server" meta:resourcekey="locCpu" Text="CPU cores:" /></td>
+                                            <td><asp:Literal ID="litCpu" runat="server"></asp:Literal></td>
+                                        </tr>
+                                        <tr>
+                                            <td><asp:Localize ID="locRam" runat="server" meta:resourcekey="locRam" Text="RAM, MB:" /></td>
+                                            <td><asp:Literal ID="litRam" runat="server"></asp:Literal></td>
+                                        </tr>
+                                        <tr>
+                                            <td><asp:Localize ID="locHdd" runat="server" meta:resourcekey="locHdd" Text="Hard disk size, GB:" /></td>
+                                            <td><asp:Literal ID="litHdd" runat="server"></asp:Literal></td>
+                                        </tr>
+                                        <tr>
+                                            <td><asp:Localize ID="locSnapshots2" runat="server" meta:resourcekey="locSnapshots" Text="Number of snapshots:" /></td>
+                                            <td><asp:Literal ID="litSnapshots" runat="server"></asp:Literal></td>
+                                        </tr>
+                                        <tr>
+                                            <td><asp:Localize ID="locDvdInstalled" runat="server" meta:resourcekey="locDvdInstalled" Text="DVD Drive installed:" /></td>
+                                            <td><wsp:CheckBoxOption id="optionDvdInstalled" runat="server" Value="True" /></td>
+                                        </tr>
+                                        <tr>
+                                            <td><asp:Localize ID="locBootFromCd" runat="server" meta:resourcekey="locBootFromCd" Text="Boot from CD:" /></td>
+                                            <td><wsp:CheckBoxOption id="optionBootFromCd" runat="server" Value="False" /></td>
+                                        </tr>
+                                        <tr>
+                                            <td><asp:Localize ID="locNumLock" runat="server" meta:resourcekey="locNumLock" Text="Num Lock enabled:" /></td>
+                                            <td><wsp:CheckBoxOption id="optionNumLock" runat="server" Value="False" /></td>
+                                        </tr>
+                                        <tr>
+                                            <td><asp:Localize ID="locStartShutdownAllowed" runat="server"
+                                                meta:resourcekey="locStartShutdownAllowed" Text="Start, turn off and shutdown allowed:" /></td>
+                                            <td><wsp:CheckBoxOption id="optionStartShutdown" runat="server" Value="True" /></td>
+                                        </tr>
+                                        <tr>
+                                            <td><asp:Localize ID="locPauseResumeAllowed" runat="server"
+                                                meta:resourcekey="locPauseResumeAllowed" Text="Pause, resume allowed:" /></td>
+                                            <td><wsp:CheckBoxOption id="optionPauseResume" runat="server" Value="True" /></td>
+                                        </tr>
+                                        <tr>
+                                            <td><asp:Localize ID="locRebootAllowed" runat="server"
+                                                meta:resourcekey="locRebootAllowed" Text="Reboot allowed:" /></td>
+                                            <td><wsp:CheckBoxOption id="optionReboot" runat="server" Value="True" /></td>
+                                        </tr>
+                                        <tr>
+                                            <td><asp:Localize ID="locResetAllowed" runat="server"
+                                                meta:resourcekey="locResetAllowed" Text="Reset allowed:" /></td>
+                                            <td><wsp:CheckBoxOption id="optionReset" runat="server" Value="True" /></td>
+                                        </tr>
+                                        <tr>
+                                            <td><asp:Localize ID="locReinstallAllowed" runat="server"
+                                                meta:resourcekey="locReinstallAllowed" Text="Re-install allowed:" /></td>
+                                            <td><wsp:CheckBoxOption id="optionReinstall" runat="server" Value="True" /></td>
+                                        </tr>
+                                        
+                                        <tr>
+                                            <td>&nbsp;</td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan="2" class="NormalBold">
+                                                <asp:Localize ID="locDynamicMemory" runat="server"
+                                                    meta:resourcekey="locDynamicMemory" Text="Dynamic Memory" />
+                                            </td>
+                                        </tr>
+                                        <wsp:DynamicMemoryControl runat="server" ID="DynamicMemoryControlSummary" Mode="Summary"/>
+                                        
+                                        <tr>
+                                            <td>&nbsp;</td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan="2" class="NormalBold">
+                                                <asp:Localize ID="locExternalNetwork2" runat="server"
+                                                    meta:resourcekey="locExternalNetwork" Text="External Network" />
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td><asp:Localize ID="locExternalNetworkEnabled" runat="server"
+                                                meta:resourcekey="locExternalNetworkEnabled" Text="External network enabled:" /></asp:Localize></td>
+                                            <td><wsp:CheckBoxOption id="optionExternalNetwork" runat="server" Value="True" /></td>
+                                        </tr>
+                                        <tr id="SummExternalAddressesNumberRow" runat="server">
+                                            <td><asp:Localize ID="locExternalAddressesNumber" runat="server"
+                                                meta:resourcekey="locExternalAddressesNumber" Text="Number of IP addresses:" /></td>
+                                            <td><asp:Literal ID="litExternalAddressesNumber" runat="server"></asp:Literal></td>
+                                        </tr>
+                                        <tr id="SummExternalAddressesListRow" runat="server">
+                                            <td><asp:Localize ID="locExternalAddressesList" runat="server"
+                                                meta:resourcekey="locExternalAddressesList" Text="IP addresses list:" /></td>
+                                            <td><asp:Literal ID="litExternalAddresses" runat="server"></asp:Literal></td>
+                                        </tr>
+                                        
+                                        <tr>
+                                            <td>&nbsp;</td>
+                                        </tr>
+                                        <tr>
+                                            <td colspan="2" class="NormalBold">
+                                                <asp:Localize ID="locPrivateNetwork2" runat="server"
+                                                    meta:resourcekey="locPrivateNetwork" Text="Private Network" />
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td><asp:Localize ID="locPrivateNetworkEnabled" runat="server"
+                                                meta:resourcekey="locPrivateNetworkEnabled" Text="Private network enabled:" /></asp:Localize></td>
+                                            <td><wsp:CheckBoxOption id="optionPrivateNetwork" runat="server" Value="True" /></td>
+                                        </tr>
+                                        <tr id="SummPrivateAddressesNumberRow" runat="server">
+                                            <td><asp:Localize ID="locPrivateAddressesNumber" runat="server"
+                                                meta:resourcekey="locPrivateAddressesNumber" Text="Number of IP addresses:" /></td>
+                                            <td><asp:Literal ID="litPrivateAddressesNumber" runat="server"></asp:Literal></td>
+                                        </tr>
+                                        <tr id="SummPrivateAddressesListRow" runat="server">
+                                            <td><asp:Localize ID="locPrivateAddressesList" runat="server"
+                                                meta:resourcekey="locPrivateAddressesList" Text="IP addresses list:" /></td>
+                                            <td><asp:Literal ID="litPrivateAddressesList" runat="server"></asp:Literal></td>
+                                        </tr>
+                                    </table>
+                                    <br />
+                            </asp:WizardStep>
+                        </WizardSteps>
+                        <StepPreviousButtonStyle CssClass="Button1" />
+                        <CancelButtonStyle CssClass="Button1" />
+                    </asp:Wizard>
+				    
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcCreateServer.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcCreateServer.ascx.cs
new file mode 100644
index 00000000..ad7cdbb3
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcCreateServer.ascx.cs
@@ -0,0 +1,392 @@
+// Copyright (c) 2015, 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.
+
+ using System;
+using System.Collections.Generic;
+ using System.Linq;
+ using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.EnterpriseServer;
+ using WebsitePanel.Portal.Code.Helpers;
+ using WebsitePanel.Providers.Virtualization;
+using WebsitePanel.Providers.Common;
+using WebsitePanel.Providers.ResultObjects;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VdcCreate : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BindFormControls();
+            }
+
+            // remove non-required steps
+            ToggleWizardSteps();
+
+            // toggle
+            ToggleControls();
+        }
+
+        private void ToggleWizardSteps()
+        {
+            // external network
+            if (!PackagesHelper.IsQuotaEnabled(PanelSecurity.PackageId, Quotas.VPS2012_EXTERNAL_NETWORK_ENABLED))
+            {
+                wizard.WizardSteps.Remove(stepExternalNetwork);
+                chkExternalNetworkEnabled.Checked = false;
+            }
+
+            // private network
+            if (!PackagesHelper.IsQuotaEnabled(PanelSecurity.PackageId, Quotas.VPS2012_PRIVATE_NETWORK_ENABLED))
+            {
+                wizard.WizardSteps.Remove(stepPrivateNetwork);
+                chkPrivateNetworkEnabled.Checked = false;
+            }
+        }
+
+
+        private void BindFormControls()
+        {
+            var virtualMachine = new VirtualMachine
+            {
+                DynamicMemory = new DynamicMemory
+                {
+                    Buffer = 20,
+                    Priority = 50
+                }
+            };
+
+            // bind password policy
+            password.SetPackagePolicy(PanelSecurity.PackageId, UserSettings.VPS_POLICY, "AdministratorPasswordPolicy");
+
+            // OS templates
+            listOperatingSystems.DataSource = ES.Services.VPS2012.GetOperatingSystemTemplates(PanelSecurity.PackageId);
+            listOperatingSystems.DataBind();
+            listOperatingSystems.Items.Insert(0, new ListItem(GetLocalizedString("SelectOsTemplate.Text"), ""));
+
+            // summary letter e-mail
+            PackageInfo package = ES.Services.Packages.GetPackage(PanelSecurity.PackageId);
+            if (package != null)
+            {
+                UserInfo user = ES.Services.Users.GetUserById(package.UserId);
+                if (user != null)
+                {
+                    chkSendSummary.Checked = true;
+                    txtSummaryEmail.Text = user.Email;
+                }
+            }
+
+            // load package context
+            PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
+
+            // bind CPU cores
+            int maxCores = ES.Services.VPS2012.GetMaximumCpuCoresNumber(PanelSecurity.PackageId);
+
+            if (cntx.Quotas.ContainsKey(Quotas.VPS2012_CPU_NUMBER))
+            {
+                QuotaValueInfo cpuQuota = cntx.Quotas[Quotas.VPS2012_CPU_NUMBER];
+
+                if (cpuQuota.QuotaAllocatedValue != -1
+                    && maxCores > cpuQuota.QuotaAllocatedValue)
+                    maxCores = cpuQuota.QuotaAllocatedValue;
+            }
+
+            for (int i = 1; i < maxCores + 1; i++)
+                ddlCpu.Items.Add(i.ToString());
+
+            ddlCpu.SelectedIndex = ddlCpu.Items.Count - 1; // select last (maximum) item
+            
+            // external network details
+            if (PackagesHelper.IsQuotaEnabled(PanelSecurity.PackageId, Quotas.VPS2012_EXTERNAL_NETWORK_ENABLED))
+            {
+                // bind list
+                PackageIPAddress[] ips = ES.Services.Servers.GetPackageUnassignedIPAddresses(PanelSecurity.PackageId, 0, IPAddressPool.VpsExternalNetwork);
+                foreach (PackageIPAddress ip in ips)
+                {
+                    string txt = ip.ExternalIP;
+                    if (!String.IsNullOrEmpty(ip.DefaultGateway))
+                        txt += "/" + ip.DefaultGateway;
+                    listExternalAddresses.Items.Add(new ListItem(txt, ip.PackageAddressID.ToString()));
+                }
+
+                // toggle controls
+                int maxAddresses = listExternalAddresses.Items.Count;
+                litMaxExternalAddresses.Text = String.Format(GetLocalizedString("litMaxExternalAddresses.Text"), maxAddresses);
+                if (maxAddresses > 0)
+                    txtExternalAddressesNumber.Text = "1";
+            }
+
+            // private network
+            if (PackagesHelper.IsQuotaEnabled(PanelSecurity.PackageId, Quotas.VPS2012_PRIVATE_NETWORK_ENABLED))
+            {
+                NetworkAdapterDetails nic = ES.Services.VPS2012.GetPrivateNetworkDetails(PanelSecurity.PackageId);
+                litPrivateNetworkFormat.Text = nic.NetworkFormat;
+                litPrivateSubnetMask.Text = nic.SubnetMask;
+
+                // set max number
+                QuotaValueInfo privQuota = cntx.Quotas[Quotas.VPS2012_PRIVATE_IP_ADDRESSES_NUMBER];
+                int maxPrivate = privQuota.QuotaAllocatedValue;
+                if (maxPrivate == -1)
+                    maxPrivate = 10;
+
+                // handle DHCP mode
+                if (nic.IsDHCP)
+                {
+                    maxPrivate = 0;
+                    ViewState["DHCP"] = true;
+                }
+
+                txtPrivateAddressesNumber.Text = "1";
+                litMaxPrivateAddresses.Text = String.Format(GetLocalizedString("litMaxPrivateAddresses.Text"), maxPrivate);
+            }
+
+            // RAM size
+            if (cntx.Quotas.ContainsKey(Quotas.VPS2012_RAM))
+            {
+                QuotaValueInfo ramQuota = cntx.Quotas[Quotas.VPS2012_RAM];
+                if (ramQuota.QuotaAllocatedValue == -1)
+                {
+                    // unlimited RAM
+                    txtRam.Text = "";
+                }
+                else
+                {
+                    int availSize = ramQuota.QuotaAllocatedValue - ramQuota.QuotaUsedValue;
+                    txtRam.Text = availSize < 0 ? "" : availSize.ToString();
+
+                    if (availSize > 0)
+                    {
+                        virtualMachine.DynamicMemory.Minimum = availSize/2;
+                        virtualMachine.DynamicMemory.Maximum = availSize;
+                    }
+                }
+            }
+
+            // HDD size
+            if (cntx.Quotas.ContainsKey(Quotas.VPS2012_HDD))
+            {
+                QuotaValueInfo hddQuota = cntx.Quotas[Quotas.VPS2012_HDD];
+                if (hddQuota.QuotaAllocatedValue == -1)
+                {
+                    // unlimited HDD
+                    txtHdd.Text = "";
+                }
+                else
+                {
+                    int availSize = hddQuota.QuotaAllocatedValue - hddQuota.QuotaUsedValue;
+                    txtHdd.Text = availSize < 0 ? "" : availSize.ToString();
+                }
+            }
+
+            // snapshots number
+            if (cntx.Quotas.ContainsKey(Quotas.VPS2012_SNAPSHOTS_NUMBER))
+            {
+                int snapsNumber = cntx.Quotas[Quotas.VPS2012_SNAPSHOTS_NUMBER].QuotaAllocatedValue;
+                txtSnapshots.Text = (snapsNumber != -1) ? snapsNumber.ToString() : "";
+                txtSnapshots.Enabled = (snapsNumber != 0);
+            }
+
+            // toggle controls
+            BindCheckboxOption(chkDvdInstalled, Quotas.VPS2012_DVD_ENABLED);
+            chkBootFromCd.Enabled = PackagesHelper.IsQuotaEnabled(PanelSecurity.PackageId, Quotas.VPS2012_BOOT_CD_ALLOWED);
+
+            BindCheckboxOption(chkStartShutdown, Quotas.VPS2012_START_SHUTDOWN_ALLOWED);
+            BindCheckboxOption(chkPauseResume, Quotas.VPS2012_PAUSE_RESUME_ALLOWED);
+            BindCheckboxOption(chkReset, Quotas.VPS2012_RESET_ALOWED);
+            BindCheckboxOption(chkReboot, Quotas.VPS2012_REBOOT_ALLOWED);
+            BindCheckboxOption(chkReinstall, Quotas.VPS2012_REINSTALL_ALLOWED);
+
+            // the settings user controls
+            this.BindSettingsControls(virtualMachine);
+        }
+
+        private void BindCheckboxOption(CheckBox chk, string quotaName)
+        {
+            chk.Enabled = PackagesHelper.IsQuotaEnabled(PanelSecurity.PackageId, quotaName);
+            chk.Checked = chk.Enabled;
+        }
+
+        private void ToggleControls()
+        {
+            // send letter
+            txtSummaryEmail.Enabled = chkSendSummary.Checked;
+            SummaryEmailValidator.Enabled = chkSendSummary.Checked;
+
+            // external network
+            bool emptyIps = listExternalAddresses.Items.Count == 0;
+            EmptyExternalAddressesMessage.Visible = emptyIps;
+            tableExternalNetwork.Visible = chkExternalNetworkEnabled.Checked && !emptyIps;
+            chkExternalNetworkEnabled.Enabled = !emptyIps;
+            chkExternalNetworkEnabled.Checked = chkExternalNetworkEnabled.Checked && !emptyIps;
+            ExternalAddressesNumberRow.Visible = radioExternalRandom.Checked;
+            ExternalAddressesListRow.Visible = radioExternalSelected.Checked;
+
+            // private network
+            tablePrivateNetwork.Visible = chkPrivateNetworkEnabled.Checked && (ViewState["DHCP"] == null);
+            PrivateAddressesNumberRow.Visible = radioPrivateRandom.Checked;
+            PrivateAddressesListRow.Visible = radioPrivateSelected.Checked;
+        }
+
+        private void BindSummary()
+        {
+            var resultVm = new VirtualMachine();
+
+            // the user controls
+            this.SaveSettingsControls(ref resultVm);
+            this.BindSettingsControls(resultVm);
+            
+            // general
+            litHostname.Text =  PortalAntiXSS.Encode(String.Format("{0}.{1}", txtHostname.Text.Trim(), txtDomain.Text.Trim()));
+            litOperatingSystem.Text = listOperatingSystems.SelectedItem.Text;
+
+            litSummaryEmail.Text = PortalAntiXSS.Encode(txtSummaryEmail.Text.Trim());
+            SummSummaryEmailRow.Visible = chkSendSummary.Checked;
+
+            // config
+            litCpu.Text = PortalAntiXSS.Encode(ddlCpu.SelectedValue);
+            litRam.Text = PortalAntiXSS.Encode(txtRam.Text.Trim());
+            litHdd.Text = PortalAntiXSS.Encode(txtHdd.Text.Trim());
+            litSnapshots.Text = PortalAntiXSS.Encode(txtSnapshots.Text.Trim());
+            optionDvdInstalled.Value = chkDvdInstalled.Checked;
+            optionBootFromCd.Value = chkBootFromCd.Checked;
+            optionNumLock.Value = chkNumLock.Checked;
+            optionStartShutdown.Value = chkStartShutdown.Checked;
+            optionPauseResume.Value = chkPauseResume.Checked;
+            optionReboot.Value = chkReboot.Checked;
+            optionReset.Value = chkReset.Checked;
+            optionReinstall.Value = chkReinstall.Checked;
+
+            // external network
+            optionExternalNetwork.Value = chkExternalNetworkEnabled.Checked;
+            SummExternalAddressesNumberRow.Visible = radioExternalRandom.Checked && chkExternalNetworkEnabled.Checked;
+            litExternalAddressesNumber.Text = PortalAntiXSS.Encode(txtExternalAddressesNumber.Text.Trim());
+            SummExternalAddressesListRow.Visible = radioExternalSelected.Checked && chkExternalNetworkEnabled.Checked;
+
+            List<string> ipAddresses = new List<string>();
+            foreach (ListItem li in listExternalAddresses.Items)
+                if (li.Selected)
+                    ipAddresses.Add(li.Text);
+            litExternalAddresses.Text = PortalAntiXSS.Encode(String.Join(", ", ipAddresses.ToArray()));
+
+            // private network
+            optionPrivateNetwork.Value = chkPrivateNetworkEnabled.Checked;
+            SummPrivateAddressesNumberRow.Visible = radioPrivateRandom.Checked && chkPrivateNetworkEnabled.Checked && (ViewState["DHCP"] == null);
+            litPrivateAddressesNumber.Text = PortalAntiXSS.Encode(txtPrivateAddressesNumber.Text.Trim());
+            SummPrivateAddressesListRow.Visible = radioPrivateSelected.Checked && chkPrivateNetworkEnabled.Checked && (ViewState["DHCP"] == null);
+
+            string[] privIps = Utils.ParseDelimitedString(txtPrivateAddressesList.Text, '\n', '\r', ' ', '\t');
+            litPrivateAddressesList.Text = PortalAntiXSS.Encode(String.Join(", ", privIps));
+
+        }
+
+        protected void wizard_FinishButtonClick(object sender, WizardNavigationEventArgs e)
+        {
+            if (!Page.IsValid)
+                return;
+
+            try
+            {
+                VirtualMachine virtualMachine = new VirtualMachine();
+
+                // the user controls
+                this.SaveSettingsControls(ref virtualMachine);
+
+                // collect and prepare data
+                string hostname = String.Format("{0}.{1}", txtHostname.Text.Trim(), txtDomain.Text.Trim());
+
+                string adminPassword = (string)ViewState["Password"];
+
+                // external IPs
+                List<int> extIps = new List<int>();
+                foreach (ListItem li in listExternalAddresses.Items)
+                    if (li.Selected) extIps.Add(Utils.ParseInt(li.Value));
+
+                // private IPs
+                string[] privIps = Utils.ParseDelimitedString(txtPrivateAddressesList.Text, '\n', '\r', ' ', '\t');
+
+                string summaryEmail = chkSendSummary.Checked ? txtSummaryEmail.Text.Trim() : null;
+
+                // create virtual machine
+                IntResult res = ES.Services.VPS2012.CreateVirtualMachine(PanelSecurity.PackageId,
+                    hostname, listOperatingSystems.SelectedValue, adminPassword, summaryEmail,
+                    Utils.ParseInt(ddlCpu.SelectedValue), Utils.ParseInt(txtRam.Text.Trim()),
+                    Utils.ParseInt(txtHdd.Text.Trim()), Utils.ParseInt(txtSnapshots.Text.Trim()),
+                    chkDvdInstalled.Checked, chkBootFromCd.Checked, chkNumLock.Checked,
+                    chkStartShutdown.Checked, chkPauseResume.Checked, chkReboot.Checked, chkReset.Checked, chkReinstall.Checked,
+                    chkExternalNetworkEnabled.Checked, Utils.ParseInt(txtExternalAddressesNumber.Text.Trim()), radioExternalRandom.Checked, extIps.ToArray(),
+                    chkPrivateNetworkEnabled.Checked, Utils.ParseInt(txtPrivateAddressesNumber.Text.Trim()), radioPrivateRandom.Checked, privIps,
+                    virtualMachine);
+
+                if (res.IsSuccess)
+                {
+                    Response.Redirect(EditUrl("ItemID", res.Value.ToString(), "vps_general",
+                        "SpaceID=" + PanelSecurity.PackageId.ToString()));
+                }
+                else
+                {
+                    messageBox.ShowMessage(res, "VPS_ERROR_CREATE", "VPS");
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_ERROR_CREATE", ex);
+            }
+        }
+
+        protected void wizard_SideBarButtonClick(object sender, WizardNavigationEventArgs e)
+        {
+            if (e.NextStepIndex < e.CurrentStepIndex)
+                return;
+
+            // save password
+            if (wizard.ActiveStepIndex == 0)
+                ViewState["Password"] = password.Password;
+
+            Page.Validate("Vps");
+
+            if (!Page.IsValid)
+                e.Cancel = true;
+        }
+
+        protected void wizard_ActiveStepChanged(object sender, EventArgs e)
+        {
+            BindSummary();
+        }
+
+        protected void wizard_NextButtonClick(object sender, WizardNavigationEventArgs e)
+        {
+            // save password
+            if (wizard.ActiveStepIndex == 0)
+                ViewState["Password"] = password.Password;
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcCreateServer.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcCreateServer.ascx.designer.cs
new file mode 100644
index 00000000..4baed83d
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcCreateServer.ascx.designer.cs
@@ -0,0 +1,1374 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VdcCreate {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle 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 locTitle;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// validatorsSummary 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.ValidationSummary validatorsSummary;
+        
+        /// <summary>
+        /// wizard 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.Wizard wizard;
+        
+        /// <summary>
+        /// stepName 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.WizardStep stepName;
+        
+        /// <summary>
+        /// locNameStepTitle 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 locNameStepTitle;
+        
+        /// <summary>
+        /// locHostname 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 locHostname;
+        
+        /// <summary>
+        /// txtHostname 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 txtHostname;
+        
+        /// <summary>
+        /// HostnameValidator 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.RequiredFieldValidator HostnameValidator;
+        
+        /// <summary>
+        /// valCorrectHostname 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.RegularExpressionValidator valCorrectHostname;
+        
+        /// <summary>
+        /// txtDomain 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 txtDomain;
+        
+        /// <summary>
+        /// DomainValidator 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.RequiredFieldValidator DomainValidator;
+        
+        /// <summary>
+        /// valNewDomainFormat 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.RegularExpressionValidator valNewDomainFormat;
+        
+        /// <summary>
+        /// locOperatingSystem 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 locOperatingSystem;
+        
+        /// <summary>
+        /// listOperatingSystems 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.DropDownList listOperatingSystems;
+        
+        /// <summary>
+        /// OperatingSystemValidator 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.RequiredFieldValidator OperatingSystemValidator;
+        
+        /// <summary>
+        /// locAdminPassword 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 locAdminPassword;
+        
+        /// <summary>
+        /// password control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.PasswordControl password;
+        
+        /// <summary>
+        /// chkSendSummary 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 chkSendSummary;
+        
+        /// <summary>
+        /// txtSummaryEmail 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 txtSummaryEmail;
+        
+        /// <summary>
+        /// SummaryEmailValidator 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.RequiredFieldValidator SummaryEmailValidator;
+        
+        /// <summary>
+        /// stepConfig 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.WizardStep stepConfig;
+        
+        /// <summary>
+        /// locConfigStepTitle 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 locConfigStepTitle;
+        
+        /// <summary>
+        /// GenerationSetting control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Generation GenerationSetting;
+        
+        /// <summary>
+        /// secResources control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secResources;
+        
+        /// <summary>
+        /// ResourcesPanel 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 ResourcesPanel;
+        
+        /// <summary>
+        /// lblCpu 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.Label lblCpu;
+        
+        /// <summary>
+        /// ddlCpu 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.DropDownList ddlCpu;
+        
+        /// <summary>
+        /// locCores 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 locCores;
+        
+        /// <summary>
+        /// lblRam 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.Label lblRam;
+        
+        /// <summary>
+        /// txtRam 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 txtRam;
+        
+        /// <summary>
+        /// RequireRamValidator 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.RequiredFieldValidator RequireRamValidator;
+        
+        /// <summary>
+        /// locMB 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 locMB;
+        
+        /// <summary>
+        /// lblHdd 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.Label lblHdd;
+        
+        /// <summary>
+        /// txtHdd 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 txtHdd;
+        
+        /// <summary>
+        /// RequireHddValidator 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.RequiredFieldValidator RequireHddValidator;
+        
+        /// <summary>
+        /// locGB 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 locGB;
+        
+        /// <summary>
+        /// DynamicMemorySetting control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.DynamicMemoryControl DynamicMemorySetting;
+        
+        /// <summary>
+        /// secSnapshots control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secSnapshots;
+        
+        /// <summary>
+        /// SnapshotsPanel 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 SnapshotsPanel;
+        
+        /// <summary>
+        /// locSnapshots 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 locSnapshots;
+        
+        /// <summary>
+        /// txtSnapshots 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 txtSnapshots;
+        
+        /// <summary>
+        /// SnapshotsValidator 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.RequiredFieldValidator SnapshotsValidator;
+        
+        /// <summary>
+        /// secDvd control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secDvd;
+        
+        /// <summary>
+        /// DvdPanel 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 DvdPanel;
+        
+        /// <summary>
+        /// chkDvdInstalled 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 chkDvdInstalled;
+        
+        /// <summary>
+        /// secBios control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secBios;
+        
+        /// <summary>
+        /// BiosPanel 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 BiosPanel;
+        
+        /// <summary>
+        /// chkBootFromCd 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 chkBootFromCd;
+        
+        /// <summary>
+        /// chkNumLock 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 chkNumLock;
+        
+        /// <summary>
+        /// secActions control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secActions;
+        
+        /// <summary>
+        /// ActionsPanel 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 ActionsPanel;
+        
+        /// <summary>
+        /// chkStartShutdown 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 chkStartShutdown;
+        
+        /// <summary>
+        /// chkReset 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 chkReset;
+        
+        /// <summary>
+        /// chkPauseResume 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 chkPauseResume;
+        
+        /// <summary>
+        /// chkReinstall 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 chkReinstall;
+        
+        /// <summary>
+        /// chkReboot 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 chkReboot;
+        
+        /// <summary>
+        /// stepExternalNetwork 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.WizardStep stepExternalNetwork;
+        
+        /// <summary>
+        /// locExternalNetwork 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 locExternalNetwork;
+        
+        /// <summary>
+        /// chkExternalNetworkEnabled 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 chkExternalNetworkEnabled;
+        
+        /// <summary>
+        /// EmptyExternalAddressesMessage 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.HtmlGenericControl EmptyExternalAddressesMessage;
+        
+        /// <summary>
+        /// locNotEnoughExternalAddresses 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 locNotEnoughExternalAddresses;
+        
+        /// <summary>
+        /// tableExternalNetwork 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.HtmlTable tableExternalNetwork;
+        
+        /// <summary>
+        /// radioExternalRandom 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.RadioButton radioExternalRandom;
+        
+        /// <summary>
+        /// ExternalAddressesNumberRow 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 ExternalAddressesNumberRow;
+        
+        /// <summary>
+        /// locExternalAddresses 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 locExternalAddresses;
+        
+        /// <summary>
+        /// txtExternalAddressesNumber 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 txtExternalAddressesNumber;
+        
+        /// <summary>
+        /// ExternalAddressesValidator 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.RequiredFieldValidator ExternalAddressesValidator;
+        
+        /// <summary>
+        /// litMaxExternalAddresses 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.Literal litMaxExternalAddresses;
+        
+        /// <summary>
+        /// radioExternalSelected 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.RadioButton radioExternalSelected;
+        
+        /// <summary>
+        /// ExternalAddressesListRow 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 ExternalAddressesListRow;
+        
+        /// <summary>
+        /// listExternalAddresses 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.ListBox listExternalAddresses;
+        
+        /// <summary>
+        /// locHoldCtrl 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 locHoldCtrl;
+        
+        /// <summary>
+        /// stepPrivateNetwork 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.WizardStep stepPrivateNetwork;
+        
+        /// <summary>
+        /// locPrivateNetwork 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 locPrivateNetwork;
+        
+        /// <summary>
+        /// chkPrivateNetworkEnabled 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 chkPrivateNetworkEnabled;
+        
+        /// <summary>
+        /// tablePrivateNetwork 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.HtmlTable tablePrivateNetwork;
+        
+        /// <summary>
+        /// radioPrivateRandom 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.RadioButton radioPrivateRandom;
+        
+        /// <summary>
+        /// PrivateAddressesNumberRow 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 PrivateAddressesNumberRow;
+        
+        /// <summary>
+        /// locPrivateAddresses 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 locPrivateAddresses;
+        
+        /// <summary>
+        /// txtPrivateAddressesNumber 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 txtPrivateAddressesNumber;
+        
+        /// <summary>
+        /// PrivateAddressesValidator 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.RequiredFieldValidator PrivateAddressesValidator;
+        
+        /// <summary>
+        /// litMaxPrivateAddresses 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.Literal litMaxPrivateAddresses;
+        
+        /// <summary>
+        /// radioPrivateSelected 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.RadioButton radioPrivateSelected;
+        
+        /// <summary>
+        /// PrivateAddressesListRow 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 PrivateAddressesListRow;
+        
+        /// <summary>
+        /// txtPrivateAddressesList 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 txtPrivateAddressesList;
+        
+        /// <summary>
+        /// locOnePerLine 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 locOnePerLine;
+        
+        /// <summary>
+        /// locPrivateNetworkFormat 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 locPrivateNetworkFormat;
+        
+        /// <summary>
+        /// litPrivateNetworkFormat 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.Literal litPrivateNetworkFormat;
+        
+        /// <summary>
+        /// locPrivateSubnetMask 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 locPrivateSubnetMask;
+        
+        /// <summary>
+        /// litPrivateSubnetMask 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.Literal litPrivateSubnetMask;
+        
+        /// <summary>
+        /// stepSummary 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.WizardStep stepSummary;
+        
+        /// <summary>
+        /// locSummary 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 locSummary;
+        
+        /// <summary>
+        /// locNameStepTitle2 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 locNameStepTitle2;
+        
+        /// <summary>
+        /// Localize1 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 Localize1;
+        
+        /// <summary>
+        /// litHostname 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.Literal litHostname;
+        
+        /// <summary>
+        /// Localize2 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 Localize2;
+        
+        /// <summary>
+        /// litOperatingSystem 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.Literal litOperatingSystem;
+        
+        /// <summary>
+        /// SummSummaryEmailRow 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 SummSummaryEmailRow;
+        
+        /// <summary>
+        /// locSendSummary 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 locSendSummary;
+        
+        /// <summary>
+        /// litSummaryEmail 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.Literal litSummaryEmail;
+        
+        /// <summary>
+        /// locConfig2 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 locConfig2;
+        
+        /// <summary>
+        /// GenerationSettingsSummary control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Generation GenerationSettingsSummary;
+        
+        /// <summary>
+        /// locCpu 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 locCpu;
+        
+        /// <summary>
+        /// litCpu 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.Literal litCpu;
+        
+        /// <summary>
+        /// locRam 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 locRam;
+        
+        /// <summary>
+        /// litRam 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.Literal litRam;
+        
+        /// <summary>
+        /// locHdd 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 locHdd;
+        
+        /// <summary>
+        /// litHdd 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.Literal litHdd;
+        
+        /// <summary>
+        /// locSnapshots2 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 locSnapshots2;
+        
+        /// <summary>
+        /// litSnapshots 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.Literal litSnapshots;
+        
+        /// <summary>
+        /// locDvdInstalled 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 locDvdInstalled;
+        
+        /// <summary>
+        /// optionDvdInstalled control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionDvdInstalled;
+        
+        /// <summary>
+        /// locBootFromCd 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 locBootFromCd;
+        
+        /// <summary>
+        /// optionBootFromCd control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionBootFromCd;
+        
+        /// <summary>
+        /// locNumLock 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 locNumLock;
+        
+        /// <summary>
+        /// optionNumLock control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionNumLock;
+        
+        /// <summary>
+        /// locStartShutdownAllowed 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 locStartShutdownAllowed;
+        
+        /// <summary>
+        /// optionStartShutdown control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionStartShutdown;
+        
+        /// <summary>
+        /// locPauseResumeAllowed 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 locPauseResumeAllowed;
+        
+        /// <summary>
+        /// optionPauseResume control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionPauseResume;
+        
+        /// <summary>
+        /// locRebootAllowed 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 locRebootAllowed;
+        
+        /// <summary>
+        /// optionReboot control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionReboot;
+        
+        /// <summary>
+        /// locResetAllowed 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 locResetAllowed;
+        
+        /// <summary>
+        /// optionReset control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionReset;
+        
+        /// <summary>
+        /// locReinstallAllowed 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 locReinstallAllowed;
+        
+        /// <summary>
+        /// optionReinstall control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionReinstall;
+        
+        /// <summary>
+        /// locDynamicMemory 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 locDynamicMemory;
+        
+        /// <summary>
+        /// DynamicMemoryControlSummary control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.DynamicMemoryControl DynamicMemoryControlSummary;
+        
+        /// <summary>
+        /// locExternalNetwork2 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 locExternalNetwork2;
+        
+        /// <summary>
+        /// locExternalNetworkEnabled 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 locExternalNetworkEnabled;
+        
+        /// <summary>
+        /// optionExternalNetwork control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionExternalNetwork;
+        
+        /// <summary>
+        /// SummExternalAddressesNumberRow 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 SummExternalAddressesNumberRow;
+        
+        /// <summary>
+        /// locExternalAddressesNumber 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 locExternalAddressesNumber;
+        
+        /// <summary>
+        /// litExternalAddressesNumber 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.Literal litExternalAddressesNumber;
+        
+        /// <summary>
+        /// SummExternalAddressesListRow 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 SummExternalAddressesListRow;
+        
+        /// <summary>
+        /// locExternalAddressesList 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 locExternalAddressesList;
+        
+        /// <summary>
+        /// litExternalAddresses 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.Literal litExternalAddresses;
+        
+        /// <summary>
+        /// locPrivateNetwork2 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 locPrivateNetwork2;
+        
+        /// <summary>
+        /// locPrivateNetworkEnabled 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 locPrivateNetworkEnabled;
+        
+        /// <summary>
+        /// optionPrivateNetwork control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionPrivateNetwork;
+        
+        /// <summary>
+        /// SummPrivateAddressesNumberRow 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 SummPrivateAddressesNumberRow;
+        
+        /// <summary>
+        /// locPrivateAddressesNumber 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 locPrivateAddressesNumber;
+        
+        /// <summary>
+        /// litPrivateAddressesNumber 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.Literal litPrivateAddressesNumber;
+        
+        /// <summary>
+        /// SummPrivateAddressesListRow 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 SummPrivateAddressesListRow;
+        
+        /// <summary>
+        /// locPrivateAddressesList 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 locPrivateAddressesList;
+        
+        /// <summary>
+        /// litPrivateAddressesList 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.Literal litPrivateAddressesList;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcExternalNetwork.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcExternalNetwork.ascx
new file mode 100644
index 00000000..7d150f05
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcExternalNetwork.ascx
@@ -0,0 +1,61 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VdcExternalNetwork.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VdcExternalNetwork" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/Quota.ascx" TagName="Quota" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/PackageIPAddresses.ascx" TagName="PackageIPAddresses" TagPrefix="wsp" %>
+
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="vdc_external_network" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="Image1" SkinID="Network48" runat="server" />
+				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="External Network"></asp:Localize>
+			    </div>
+			    <div class="FormBody">
+
+                    
+                    <wsp:PackageIPAddresses id="packageAddresses" runat="server"
+                            Pool="VpsExternalNetwork"
+                            EditItemControl="vps_general"
+                            SpaceHomeControl="vdc_external_network"
+                            AllocateAddressesControl="vdc_allocate_external_ip" />
+
+    				
+    				<br />
+				    <wsp:CollapsiblePanel id="secQuotas" runat="server"
+                        TargetControlID="QuotasPanel" meta:resourcekey="secQuotas" Text="Quotas">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="QuotasPanel" runat="server" Height="0" style="overflow:hidden;">
+                    
+                        <table cellspacing="6">
+                            <tr>
+                                <td><asp:Localize ID="locIPQuota" runat="server" meta:resourcekey="locIPQuota" Text="Number of IP Addresses:"></asp:Localize></td>
+                                <td><wsp:Quota ID="addressesQuota" runat="server" QuotaName="VPS2012.ExternalIPAddressesNumber" /></td>
+                            </tr>
+                            <tr>
+                                <td><asp:Localize ID="locBandwidthQuota" runat="server" meta:resourcekey="locBandwidthQuota" Text="Bandwidth, GB:"></asp:Localize></td>
+                                <td><wsp:Quota ID="bandwidthQuota" runat="server" QuotaName="VPS2012.Bandwidth" /></td>
+                            </tr>
+                        </table>
+                    
+                    
+                    </asp:Panel>
+
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcExternalNetwork.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcExternalNetwork.ascx.cs
new file mode 100644
index 00000000..e8b3ec31
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcExternalNetwork.ascx.cs
@@ -0,0 +1,45 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.Common;
+using WebsitePanel.EnterpriseServer;
+using WebsitePanel.WebPortal;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VdcExternalNetwork : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            packageAddresses.ManageAllowed = VirtualMachines2012Helper.IsVirtualMachineManagementAllowed(PanelSecurity.PackageId);
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcExternalNetwork.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcExternalNetwork.ascx.designer.cs
new file mode 100644
index 00000000..c31d05c7
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcExternalNetwork.ascx.designer.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VdcExternalNetwork {
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// Image1 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.Image Image1;
+        
+        /// <summary>
+        /// locTitle 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 locTitle;
+        
+        /// <summary>
+        /// packageAddresses control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.PackageIPAddresses packageAddresses;
+        
+        /// <summary>
+        /// secQuotas control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secQuotas;
+        
+        /// <summary>
+        /// QuotasPanel 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 QuotasPanel;
+        
+        /// <summary>
+        /// locIPQuota 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 locIPQuota;
+        
+        /// <summary>
+        /// addressesQuota control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.Quota addressesQuota;
+        
+        /// <summary>
+        /// locBandwidthQuota 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 locBandwidthQuota;
+        
+        /// <summary>
+        /// bandwidthQuota control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.Quota bandwidthQuota;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcHome.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcHome.ascx
new file mode 100644
index 00000000..8e1fbfce
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcHome.ascx
@@ -0,0 +1,139 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VdcHome.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VdcHome" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/Quota.ascx" TagName="Quota" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/SearchBox.ascx" TagName="SearchBox" TagPrefix="wsp" %>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="Servers48" runat="server" />
+				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Virtual Private Servers"></asp:Localize>
+			    </div>
+			    <div class="FormBody">
+                    
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+
+                    <div class="FormButtonsBarClean">
+                        <div class="FormButtonsBarCleanLeft">
+                            <asp:Button ID="btnCreate" runat="server" meta:resourcekey="btnCreate"
+                                Text="Create VPS" CssClass="Button1" CausesValidation="False" 
+                                onclick="btnCreate_Click" />
+                            <asp:Button ID="btnImport" runat="server" meta:resourcekey="btnImport"
+                                Text="Import VPS" CssClass="Button1" CausesValidation="False" 
+                                onclick="btnImport_Click" />
+                        </div>
+                        <div class="FormButtonsBarCleanRight">
+                            <wsp:SearchBox ID="searchBox" runat="server" />
+                        </div>
+                    </div>
+
+			        <asp:GridView ID="gvServers" runat="server" AutoGenerateColumns="False" EnableViewState="true"
+				        Width="100%" EmptyDataText="gvServers" CssSelectorClass="NormalGridView"
+				        AllowPaging="True" AllowSorting="True" DataSourceID="odsServersPaged" 
+                        onrowcommand="gvServers_RowCommand">
+				        <Columns>
+					        <asp:TemplateField HeaderText="gvServersName" SortExpression="ItemName" meta:resourcekey="gvServersName">
+						        <ItemStyle></ItemStyle>
+						        <ItemTemplate>
+						            <asp:Image runat="server" SkinID="Vps16" />
+							        <asp:hyperlink id="lnk1" runat="server"
+								        NavigateUrl='<%# GetServerEditUrl(Eval("ItemID").ToString()) %>'>
+								        <%# Eval("ItemName") %>
+							        </asp:hyperlink>
+						        </ItemTemplate>
+					        </asp:TemplateField>
+					        <asp:BoundField HeaderText="gvServersExternalIP" meta:resourcekey="gvServersExternalIP"
+					            DataField="ExternalIP" SortExpression="ExternalIP" />
+					        <asp:BoundField HeaderText="gvServersPrivateIP" meta:resourcekey="gvServersPrivateIP"
+					            DataField="IPAddress" SortExpression="IPAddress" />
+					        <asp:TemplateField HeaderText="gvServersSpace" meta:resourcekey="gvServersSpace" SortExpression="PackageName" >
+						        <ItemTemplate>
+							        <asp:hyperlink id="lnkSpace" runat="server" NavigateUrl='<%# GetSpaceHomeUrl(Eval("PackageID").ToString()) %>'>
+								        <%# Eval("PackageName") %>
+							        </asp:hyperlink>
+						        </ItemTemplate>
+					        </asp:TemplateField>
+					        <asp:TemplateField HeaderText="gvServersUser" meta:resourcekey="gvServersUser" SortExpression="Username"  >						        
+						        <ItemTemplate>
+							        <asp:hyperlink id="lnkUser" runat="server" NavigateUrl='<%# GetUserHomeUrl((int)Eval("UserID")) %>'>
+                                        <%# Eval("UserName") %>
+							        </asp:hyperlink>
+						        </ItemTemplate>
+					        </asp:TemplateField>
+						    <asp:TemplateField>
+							    <ItemTemplate>
+								    <asp:ImageButton ID="cmdDelete" runat="server" Text="Delete" SkinID="VpsDelete"
+									    CommandName="DeleteItem" CommandArgument='<%# Eval("ItemID") %>'
+									    meta:resourcekey="cmdDelete"></asp:ImageButton>
+							    </ItemTemplate>
+						    </asp:TemplateField>
+                            <asp:TemplateField>
+			                    <ItemTemplate>
+				                    <asp:LinkButton ID="cmdMove" runat="server" Text="Move"
+					                    CommandName="Move" CommandArgument='<%# Eval("ItemID") %>'
+					                    meta:resourcekey="cmdMove"></asp:LinkButton>
+					                &nbsp;
+				                    <asp:LinkButton ID="cmdDetach" runat="server" Text="Detach"
+					                    CommandName="Detach" CommandArgument='<%# Eval("ItemID") %>'
+					                    meta:resourcekey="cmdDetach" OnClientClick="return confirm('Remove this item?');"></asp:LinkButton>
+			                    </ItemTemplate>
+                            </asp:TemplateField>
+				        </Columns>
+			        </asp:GridView>
+				    <asp:ObjectDataSource ID="odsServersPaged" runat="server" EnablePaging="True"
+						    SelectCountMethod="GetVirtualMachinesCount"
+						    SelectMethod="GetVirtualMachines"
+						    SortParameterName="sortColumn"
+						    TypeName="WebsitePanel.Portal.VirtualMachines2012Helper"
+						    OnSelected="odsServersPaged_Selected">
+					    <SelectParameters>
+						    <asp:QueryStringParameter Name="packageId" QueryStringField="SpaceID" DefaultValue="0" />						    
+                            <asp:ControlParameter Name="filterColumn" ControlID="searchBox"  PropertyName="FilterColumn" />
+                            <asp:ControlParameter Name="filterValue" ControlID="searchBox" PropertyName="FilterValue" />
+					    </SelectParameters>
+				    </asp:ObjectDataSource>
+				    <br />
+    				
+				    <wsp:CollapsiblePanel id="secQuotas" runat="server"
+                        TargetControlID="QuotasPanel" meta:resourcekey="secQuotas" Text="Quotas">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="QuotasPanel" runat="server" Height="0" style="overflow:hidden;">
+                    
+                        <table cellspacing="6">
+                            <tr>
+                                <td><asp:Localize ID="locVpsQuota" runat="server" meta:resourcekey="locVpsQuota" Text="Number of VPS:"></asp:Localize></td>
+                                <td><wsp:Quota ID="vpsQuota" runat="server" QuotaName="VPS2012.ServersNumber" /></td>
+                            </tr>
+                            <tr>
+                                <td><asp:Localize ID="locRamQuota" runat="server" meta:resourcekey="locRamQuota" Text="RAM, MB:"></asp:Localize></td>
+                                <td><wsp:Quota ID="ramQuota" runat="server" QuotaName="VPS2012.Ram" /></td>
+                            </tr>
+                            <tr>
+                                <td><asp:Localize ID="locHddQuota" runat="server" meta:resourcekey="locHddQuota" Text="HDD, GB:"></asp:Localize></td>
+                                <td><wsp:Quota ID="hddQuota" runat="server" QuotaName="VPS2012.Hdd" /></td>
+                            </tr>
+                        </table>
+                    
+                    
+                    </asp:Panel>
+    				
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcHome.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcHome.ascx.cs
new file mode 100644
index 00000000..b1adc433
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcHome.ascx.cs
@@ -0,0 +1,138 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.EnterpriseServer;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VdcHome : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                searchBox.AddCriteria("ItemName", GetLocalizedString("SearchField.ItemName"));
+                searchBox.AddCriteria("Username", GetLocalizedString("SearchField.Username"));
+                searchBox.AddCriteria("ExternalIP", GetLocalizedString("SearchField.ExternalIP"));
+                searchBox.AddCriteria("IPAddress", GetLocalizedString("SearchField.IPAddress"));
+            }
+
+            // toggle columns
+            bool isUserSelected = PanelSecurity.SelectedUser.Role == WebsitePanel.EnterpriseServer.UserRole.User;
+            gvServers.Columns[3].Visible = !isUserSelected;
+            gvServers.Columns[4].Visible = !isUserSelected;
+
+            // check package quotas
+            bool manageAllowed = VirtualMachines2012Helper.IsVirtualMachineManagementAllowed(PanelSecurity.PackageId);
+
+            btnCreate.Visible = manageAllowed;
+            btnImport.Visible = (PanelSecurity.EffectiveUser.Role == UserRole.Administrator);
+            gvServers.Columns[5].Visible = manageAllowed; // delete column
+
+            // admin operations column
+            gvServers.Columns[6].Visible = (PanelSecurity.EffectiveUser.Role == UserRole.Administrator);
+        }
+
+        public string GetServerEditUrl(string itemID)
+        {
+            return EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "vps_general",
+                    "ItemID=" + itemID);
+        }
+
+        public string GetSpaceHomeUrl(string spaceId)
+        {
+            return EditUrl("SpaceID", spaceId, "");
+        }
+
+        public string GetUserHomeUrl(int userId)
+        {
+            return PortalUtils.GetUserHomePageUrl(userId);
+        }
+
+        protected void odsServersPaged_Selected(object sender, ObjectDataSourceStatusEventArgs e)
+        {
+            if (e.Exception != null)
+            {
+                messageBox.ShowErrorMessage("EXCHANGE_GET_MAILBOXES", e.Exception);
+                e.ExceptionHandled = true;
+            }
+        }
+
+        protected void btnCreate_Click(object sender, EventArgs e)
+        {
+            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "vdc_create_server"));
+        }
+
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "vdc_import_server"));
+        }
+
+        protected void gvServers_RowCommand(object sender, GridViewCommandEventArgs e)
+        {
+            if (e.CommandName == "DeleteItem")
+            {
+                // get server ID
+                int itemId = Utils.ParseInt(e.CommandArgument.ToString(), 0);
+
+                // go to delete page
+                Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "vps_tools_delete",
+                    "ItemID=" + itemId));
+            }
+            else if (e.CommandName == "Detach")
+            {
+                // remove item from meta base
+                int itemId = Utils.ParseInt(e.CommandArgument.ToString(), 0);
+
+                int result = ES.Services.Packages.DetachPackageItem(itemId);
+                if (result < 0)
+                {
+                    ShowResultMessage(result);
+                    return;
+                }
+
+                // refresh the list
+                gvServers.DataBind();
+            }
+            else if (e.CommandName == "Move")
+            {
+                // get server ID
+                int itemId = Utils.ParseInt(e.CommandArgument.ToString(), 0);
+
+                // go to delete page
+                Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "vps_tools_move",
+                    "ItemID=" + itemId));
+            }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcHome.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcHome.ascx.designer.cs
new file mode 100644
index 00000000..0425a5ad
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcHome.ascx.designer.cs
@@ -0,0 +1,177 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VdcHome {
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle 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 locTitle;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// btnCreate 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.Button btnCreate;
+        
+        /// <summary>
+        /// btnImport 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.Button btnImport;
+        
+        /// <summary>
+        /// searchBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.SearchBox searchBox;
+        
+        /// <summary>
+        /// gvServers 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.GridView gvServers;
+        
+        /// <summary>
+        /// odsServersPaged 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.ObjectDataSource odsServersPaged;
+        
+        /// <summary>
+        /// secQuotas control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secQuotas;
+        
+        /// <summary>
+        /// QuotasPanel 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 QuotasPanel;
+        
+        /// <summary>
+        /// locVpsQuota 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 locVpsQuota;
+        
+        /// <summary>
+        /// vpsQuota control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.Quota vpsQuota;
+        
+        /// <summary>
+        /// locRamQuota 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 locRamQuota;
+        
+        /// <summary>
+        /// ramQuota control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.Quota ramQuota;
+        
+        /// <summary>
+        /// locHddQuota 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 locHddQuota;
+        
+        /// <summary>
+        /// hddQuota control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.Quota hddQuota;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcImportServer.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcImportServer.ascx
new file mode 100644
index 00000000..65b9f276
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcImportServer.ascx
@@ -0,0 +1,288 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VdcImportServer.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VdcImportServer" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/PasswordControl.ascx" TagName="PasswordControl" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CheckBoxOption.ascx" TagName="CheckBoxOption" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+<%@ Register TagPrefix="wsp" TagName="Generation" Src="UserControls/Generation.ascx" %>
+<%@ Register TagPrefix="wsp" TagName="DynamicMemoryControl" Src="UserControls/DynamicMemoryControl.ascx" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="AddServer48" runat="server" />
+				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Import VPS"></asp:Localize>
+			    </div>
+			    <div class="FormBody">
+    			    	
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+                    <asp:ValidationSummary ID="validatorsSummary" runat="server" 
+                        ValidationGroup="ImportWizard" ShowMessageBox="True" ShowSummary="False" />
+                        
+                    
+                    <table cellpadding="3">
+                        <tr>
+                            <td class="FormLabel150">
+                                <asp:Localize ID="locHyperVService" runat="server" meta:resourcekey="locHyperVService" Text="Hyper-V Service:"></asp:Localize>
+                            </td>
+                            <td>
+                                <asp:DropDownList ID="HyperVServices" runat="server" CssClass="NormalTextBox"
+                                    DataValueField="ServiceID" DataTextField="FullServiceName" AutoPostBack="true"
+                                    onselectedindexchanged="HyperVServices_SelectedIndexChanged"></asp:DropDownList>
+                                <asp:RequiredFieldValidator ID="RequireHyperVService" runat="server"
+                                    ControlToValidate="HyperVServices" ValidationGroup="ImportWizard" meta:resourcekey="RequireHyperVService"
+                                    Display="Dynamic" SetFocusOnError="true" Text="*">
+                                </asp:RequiredFieldValidator>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="FormLabel150">
+                                <asp:Localize ID="locVirtualMachine" runat="server" meta:resourcekey="locVirtualMachine" Text="Virtual machine:"></asp:Localize>
+                            </td>
+                            <td>
+                                <asp:DropDownList ID="VirtualMachines" runat="server" CssClass="NormalTextBox"
+                                    DataValueField="VirtualMachineId" DataTextField="Name" AutoPostBack="true"
+                                    onselectedindexchanged="VirtualMachines_SelectedIndexChanged"></asp:DropDownList>
+                                <asp:RequiredFieldValidator ID="RequiredVirtualMachine" runat="server"
+                                    ControlToValidate="VirtualMachines" ValidationGroup="ImportWizard" meta:resourcekey="RequiredVirtualMachine"
+                                    Display="Dynamic" SetFocusOnError="true" Text="*">
+                                </asp:RequiredFieldValidator>
+                            </td>
+                        </tr>
+                    </table>
+                    
+                    <wsp:CollapsiblePanel id="secOsTemplate" runat="server"
+                        TargetControlID="OsTemplatePanel" meta:resourcekey="secOsTemplate" Text="OS Template">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="OsTemplatePanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                        <table>
+                            <tr>
+                                <td class="FormLabel150">
+                                    <asp:Localize ID="locOsTemplate" runat="server" meta:resourcekey="locOsTemplate" Text="OS Template:"></asp:Localize>
+                                </td>
+                                <td>
+                                    <asp:DropDownList ID="OsTemplates" runat="server" CssClass="NormalTextBox"
+                                        DataValueField="Path" DataTextField="Name"></asp:DropDownList>
+                                    <asp:RequiredFieldValidator ID="RequiredOsTemplate" runat="server"
+                                        ControlToValidate="OsTemplates" ValidationGroup="ImportWizard" meta:resourcekey="RequiredOsTemplate"
+                                        Display="Dynamic" SetFocusOnError="true" Text="*">
+                                    </asp:RequiredFieldValidator>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>&nbsp;</td>
+                            </tr>
+                            <tr>
+                                <td></td>
+                                <td>
+                                    <asp:CheckBox ID="EnableRemoteDesktop" runat="server" AutoPostBack="true"
+                                        meta:resourcekey="EnableRemoteDesktop" Text="Enable Remote Desktop Web Connection" />
+                                </td>
+                            </tr>
+                            <tr id="AdminPasswordPanel" runat="server" visible="false">
+                                <td class="FormLabel150" valign="top">
+                                    <asp:Localize ID="locAdminPassword" runat="server" meta:resourcekey="locAdminPassword" Text="Administrator password:"></asp:Localize>
+                                </td>
+                                <td>
+                                    <asp:TextBox ID="adminPassword" runat="server" TextMode="Password" CssClass="NormalTextBox"></asp:TextBox>
+                                    <asp:RequiredFieldValidator ID="RequiredAdminPassword" runat="server"
+                                        ControlToValidate="adminPassword" ValidationGroup="ImportWizard" meta:resourcekey="RequiredAdminPassword"
+                                        Display="Dynamic" SetFocusOnError="true" Text="*">
+                                    </asp:RequiredFieldValidator>
+                                </td>
+                            </tr>
+                        </table>
+                    </asp:Panel>
+                    
+                    <asp:Panel ID="VirtualMachinePanel" runat="server">
+                        <wsp:CollapsiblePanel id="secConfiguration" runat="server"
+                            TargetControlID="ConfigurationPanel" meta:resourcekey="secConfiguration" Text="Configuration">
+                        </wsp:CollapsiblePanel>
+                        <asp:Panel ID="ConfigurationPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                            <table cellpadding="4">
+                                <wsp:Generation runat="server" ID="GenerationSetting" Mode="Summary"/>
+                                <tr>
+                                    <td>
+                                        <asp:Localize ID="locCPU" runat="server" meta:resourcekey="locCPU" Text="CPU:"></asp:Localize>
+                                    </td>
+                                    <td>
+                                        <asp:Literal ID="CpuCores" runat="server" Text="0"></asp:Literal>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <asp:Localize ID="locRAM" runat="server" meta:resourcekey="locRAM" Text="RAM:"></asp:Localize>
+                                    </td>
+                                    <td>
+                                        <asp:Literal ID="RamSize" runat="server" Text="0"></asp:Literal>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <asp:Localize ID="locHDD" runat="server" meta:resourcekey="locHDD" Text="HDD:"></asp:Localize>
+                                    </td>
+                                    <td>
+                                        <asp:Literal ID="HddSize" runat="server" Text="0"></asp:Literal>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <asp:Localize ID="locVhdPath" runat="server" meta:resourcekey="locVhdPath" Text="VHD location:"></asp:Localize>
+                                    </td>
+                                    <td>
+                                        <asp:Literal ID="VhdPath" runat="server" Text="0"></asp:Literal>
+                                    </td>
+                                </tr>
+                            </table>
+                        </asp:Panel>
+                        
+                        <wsp:DynamicMemoryControl runat="server" ID="DynamicMemorySetting" Mode="Display"/>
+
+                        <wsp:CollapsiblePanel id="secBios" runat="server"
+                            TargetControlID="BiosPanel" meta:resourcekey="secBios" Text="BIOS">
+                        </wsp:CollapsiblePanel>
+                        <asp:Panel ID="BiosPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                            <table cellpadding="4" width="100%">
+                                <tr>
+                                    <td style="width:30%;">
+                                        <wsp:CheckBoxOption id="BootFromCd" runat="server" Value="False" />
+                                        <asp:Localize ID="locBootFromCd" runat="server" meta:resourcekey="locBootFromCd"></asp:Localize>
+                                    </td>
+                                    <td>
+                                        <wsp:CheckBoxOption id="NumLockEnabled" runat="server" Value="False" />
+                                        <asp:Localize ID="locNumLockEnabled" runat="server" meta:resourcekey="locNumLockEnabled"></asp:Localize>
+                                    </td>
+                                </tr>
+                            </table>
+                        </asp:Panel>
+                        
+                        <wsp:CollapsiblePanel id="secDvd" runat="server"
+                            TargetControlID="DvdPanel" meta:resourcekey="secDvd" Text="DVD">
+                        </wsp:CollapsiblePanel>
+                        <asp:Panel ID="DvdPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                            <table cellpadding="4">
+                                <tr>
+                                    <td>
+                                        <wsp:CheckBoxOption id="DvdInstalled" runat="server" Value="False" />
+                                        <asp:Localize ID="locDvdInstalled" runat="server" meta:resourcekey="locDvdInstalled"></asp:Localize>
+                                    </td>
+                                </tr>
+                            </table>
+                        </asp:Panel>
+                        
+                        <wsp:CollapsiblePanel id="secAllowedActions" runat="server"
+                            TargetControlID="AllowedActionsPanel" meta:resourcekey="secAllowedActions" Text="Allowed Actions">
+                        </wsp:CollapsiblePanel>
+                        <asp:Panel ID="AllowedActionsPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                            <table cellpadding="4" width="100%">
+                                <tr>
+                                    <td style="width:30%;">
+                                        <asp:CheckBox ID="AllowStartShutdown" runat="server" meta:resourcekey="AllowStartShutdown" />
+                                    </td>
+                                    <td>
+                                        <asp:CheckBox ID="AllowReboot" runat="server" meta:resourcekey="AllowReboot" />
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <asp:CheckBox ID="AllowPause" runat="server" meta:resourcekey="AllowPause" />
+                                    </td>
+                                    <td>
+                                        <asp:CheckBox ID="AllowReset" runat="server" meta:resourcekey="AllowReset" />
+                                    </td>
+                                </tr>
+                            </table>
+                        </asp:Panel>
+                        
+                        <wsp:CollapsiblePanel id="secExternalNetwork" runat="server"
+                            TargetControlID="ExternalNetworkPanel" meta:resourcekey="secExternalNetwork" Text="External Network">
+                        </wsp:CollapsiblePanel>
+                        <asp:Panel ID="ExternalNetworkPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                            <table width="100%">
+                                <tr>
+                                    <td class="FormLabel150">
+                                        <asp:Localize ID="locExternalAdapter" runat="server" meta:resourcekey="locExternalAdapter" Text="Connected NIC:"></asp:Localize>
+                                    </td>
+                                    <td>
+                                        <asp:DropDownList ID="ExternalAdapters" runat="server" CssClass="NormalTextBox"
+                                            DataValueField="MacAddress" DataTextField="Name" AutoPostBack="true"></asp:DropDownList>
+                                    </td>
+                                </tr>
+                                <tr id="ExternalAddressesRow" runat="server">
+                                    <td valign="top">
+                                        <asp:Localize ID="locExternalAddresses" runat="server" meta:resourcekey="locExternalAddresses" Text="Assign IP addresses:"></asp:Localize>
+                                    </td>
+                                    <td>
+                                        <asp:ListBox ID="ExternalAddresses" runat="server" Rows="5"
+                                            Width="220" SelectionMode="Multiple"></asp:ListBox>
+                                        <asp:RequiredFieldValidator ID="RequiredExternalAddresses" runat="server"
+                                            ControlToValidate="ExternalAddresses" ValidationGroup="ImportWizard" meta:resourcekey="RequiredExternalAddresses"
+                                            Display="Dynamic" SetFocusOnError="true" Text="*">
+                                        </asp:RequiredFieldValidator>
+                                    </td>
+                                </tr>
+                            </table>
+                        </asp:Panel>
+                        
+                        <wsp:CollapsiblePanel id="secManagementNetwork" runat="server"
+                            TargetControlID="ManagementNetworkPanel" meta:resourcekey="secManagementNetwork" Text="Management Network">
+                        </wsp:CollapsiblePanel>
+                        <asp:Panel ID="ManagementNetworkPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                            <table width="100%">
+                                <tr>
+                                    <td class="FormLabel150">
+                                        <asp:Localize ID="locManagementAdapter" runat="server" meta:resourcekey="locManagementAdapter" Text="Connected NIC:"></asp:Localize>
+                                    </td>
+                                    <td>
+                                        <asp:DropDownList ID="ManagementAdapters" runat="server" CssClass="NormalTextBox"
+                                            DataValueField="MacAddress" DataTextField="Name" AutoPostBack="true"></asp:DropDownList>
+                                    </td>
+                                </tr>
+                                <tr id="ManagementAddressesRow" runat="server">
+                                    <td valign="top">
+                                        <asp:Localize ID="locManagementAddresses" runat="server" meta:resourcekey="locManagementAddresses" Text="Assign IP addresses:"></asp:Localize>
+                                    </td>
+                                    <td>
+                                        <asp:ListBox ID="ManagementAddresses" runat="server" Rows="5"
+                                            Width="220" SelectionMode="Single"></asp:ListBox>
+                                        <asp:RequiredFieldValidator ID="RequiredManagementAddresses" runat="server"
+                                            ControlToValidate="ManagementAddresses" ValidationGroup="ImportWizard" meta:resourcekey="RequiredManagementAddresses"
+                                            Display="Dynamic" SetFocusOnError="true" Text="*">
+                                        </asp:RequiredFieldValidator>
+                                    </td>
+                                </tr>
+                            </table>
+                        </asp:Panel>
+                    </asp:Panel>
+                    
+                    <p>
+                        <asp:Button ID="btnImport" runat="server" meta:resourcekey="btnImport"
+                            ValidationGroup="ImportWizard" Text="Import" CssClass="Button1" 
+                            onclick="btnImport_Click" />
+                        <asp:Button ID="btnCancel" runat="server" meta:resourcekey="btnCancel"
+                            CausesValidation="false" Text="Cancel" CssClass="Button1" 
+                            onclick="btnCancel_Click" />
+                    </p>
+                        
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcImportServer.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcImportServer.ascx.cs
new file mode 100644
index 00000000..a9a41098
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcImportServer.ascx.cs
@@ -0,0 +1,234 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Data;
+using WebsitePanel.EnterpriseServer;
+using WebsitePanel.Portal.Code.Helpers;
+using WebsitePanel.Providers.Virtualization;
+using WebsitePanel.Providers.ResultObjects;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VdcImportServer : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                // bind hyper-V services
+                BindHyperVServices();
+
+                // bind virtual machines
+                BindVirtualMachines();
+
+                // bind OS templates
+                BindOsTemplates();
+
+                // bind IP addresses
+                BindExternalAddresses();
+                BindManagementAddresses();
+            }
+
+            ToggleControls();
+        }
+
+        private void ToggleControls()
+        {
+            AdminPasswordPanel.Visible = EnableRemoteDesktop.Checked;
+            RequiredAdminPassword.Enabled = EnableRemoteDesktop.Checked;
+            VirtualMachinePanel.Visible = (VirtualMachines.SelectedValue != "");
+            ExternalAddressesRow.Visible = (ExternalAdapters.SelectedIndex != 0);
+            ManagementAddressesRow.Visible = (ManagementAdapters.SelectedIndex != 0);
+        }
+
+        public void BindHyperVServices()
+        {
+            // bind
+            HyperVServices.DataSource = ES.Services.Servers.GetRawServicesByGroupName(ResourceGroups.VPS2012).Tables[0].DefaultView;
+            HyperVServices.DataBind();
+
+            // add select value
+            HyperVServices.Items.Insert(0, new ListItem(GetLocalizedString("SelectHyperVService.Text"), ""));
+        }
+
+        public void BindVirtualMachines()
+        {
+            // clear list
+            VirtualMachines.Items.Clear();
+
+            // bind
+            int serviceId = Utils.ParseInt(HyperVServices.SelectedValue, 0);
+            if (serviceId > 0)
+            {
+                VirtualMachines.DataSource = ES.Services.VPS2012.GetVirtualMachinesByServiceId(serviceId);
+                VirtualMachines.DataBind();
+            }
+
+            // add select value
+            VirtualMachines.Items.Insert(0, new ListItem(GetLocalizedString("SelectVirtualMachine.Text"), ""));
+        }
+
+        public void BindOsTemplates()
+        {
+            // clear list
+            OsTemplates.Items.Clear();
+
+            int serviceId = Utils.ParseInt(HyperVServices.SelectedValue, 0);
+            if (serviceId > 0)
+            {
+                OsTemplates.DataSource = ES.Services.VPS2012.GetOperatingSystemTemplatesByServiceId(serviceId);
+                OsTemplates.DataBind();
+            }
+            OsTemplates.Items.Insert(0, new ListItem(GetLocalizedString("SelectOsTemplate.Text"), ""));
+        }
+
+        public void BindVirtualMachineDetails()
+        {
+            int serviceId = Utils.ParseInt(HyperVServices.SelectedValue, 0);
+            string vmId = VirtualMachines.SelectedValue;
+            if (serviceId > 0 && vmId != "")
+            {
+                VirtualMachine vm = ES.Services.VPS2012.GetVirtualMachineExtendedInfo(serviceId, vmId);
+                if (vm != null)
+                {
+                    // bind VM
+                    CpuCores.Text = vm.CpuCores.ToString();
+                    RamSize.Text = vm.RamSize.ToString();
+                    HddSize.Text = vm.HddSize.ToString();
+                    VhdPath.Text = vm.VirtualHardDrivePath;
+
+                    this.BindSettingsControls(vm);
+
+                    // other settings
+                    NumLockEnabled.Value = vm.NumLockEnabled;
+                    BootFromCd.Value = vm.BootFromCD;
+                    DvdInstalled.Value = vm.DvdDriveInstalled;
+
+                    // network adapters
+                    ExternalAdapters.DataSource = vm.Adapters;
+                    ExternalAdapters.DataBind();
+                    ExternalAdapters.Items.Insert(0, new ListItem(GetLocalizedString("SelectNetworkAdapter.Text"), ""));
+
+                    ManagementAdapters.DataSource = vm.Adapters;
+                    ManagementAdapters.DataBind();
+                    ManagementAdapters.Items.Insert(0, new ListItem(GetLocalizedString("SelectNetworkAdapter.Text"), ""));
+                }
+            }
+        }
+
+        public void BindExternalAddresses()
+        {
+            BindAddresses(ExternalAddresses, IPAddressPool.VpsExternalNetwork);
+        }
+
+        public void BindManagementAddresses()
+        {
+            BindAddresses(ManagementAddresses, IPAddressPool.VpsManagementNetwork);
+        }
+
+        public void BindAddresses(ListBox list, IPAddressPool pool)
+        {
+            IPAddressInfo[] ips = ES.Services.Servers.GetUnallottedIPAddresses(PanelSecurity.PackageId, ResourceGroups.VPS2012, pool);
+            foreach (IPAddressInfo ip in ips)
+            {
+                string txt = ip.ExternalIP;
+                if (!String.IsNullOrEmpty(ip.DefaultGateway))
+                    txt += "/" + ip.DefaultGateway;
+                list.Items.Add(new ListItem(txt, ip.AddressId.ToString()));
+            }
+        }
+
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                // external IPs
+                List<int> extIps = new List<int>();
+                foreach (ListItem li in ExternalAddresses.Items)
+                    if (li.Selected) extIps.Add(Utils.ParseInt(li.Value));
+
+                // management IPs
+                int manIp = 0;
+                foreach (ListItem li in ManagementAddresses.Items)
+                    if (li.Selected)
+                    {
+                        manIp = Utils.ParseInt(li.Value);
+                        break;
+                    }
+
+                // create virtual machine
+                IntResult res = ES.Services.VPS2012.ImportVirtualMachine(PanelSecurity.PackageId,
+                    Utils.ParseInt(HyperVServices.SelectedValue),
+                    VirtualMachines.SelectedValue,
+                    OsTemplates.SelectedValue, adminPassword.Text,
+                    AllowStartShutdown.Checked, AllowPause.Checked, AllowReboot.Checked, AllowReset.Checked, false,
+                    ExternalAdapters.SelectedValue, extIps.ToArray(),
+                    ManagementAdapters.SelectedValue, manIp);
+
+                if (res.IsSuccess)
+                {
+                    Response.Redirect(EditUrl("ItemID", res.Value.ToString(), "vps_general",
+                        "SpaceID=" + PanelSecurity.PackageId.ToString()));
+                }
+                else
+                {
+                    messageBox.ShowMessage(res, "VPS_ERROR_IMPORT", "VPS");
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_ERROR_IMPORT", ex);
+            }
+        }
+
+        protected void btnCancel_Click(object sender, EventArgs e)
+        {
+            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), ""));
+        }
+
+        protected void HyperVServices_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            // bind VMs
+            BindVirtualMachines();
+
+            // bind OS templates
+            BindOsTemplates();
+        }
+
+        protected void VirtualMachines_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            BindVirtualMachineDetails();
+            ToggleControls();
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcImportServer.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcImportServer.ascx.designer.cs
new file mode 100644
index 00000000..eb489aea
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcImportServer.ascx.designer.cs
@@ -0,0 +1,645 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VdcImportServer {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle 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 locTitle;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// validatorsSummary 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.ValidationSummary validatorsSummary;
+        
+        /// <summary>
+        /// locHyperVService 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 locHyperVService;
+        
+        /// <summary>
+        /// HyperVServices 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.DropDownList HyperVServices;
+        
+        /// <summary>
+        /// RequireHyperVService 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.RequiredFieldValidator RequireHyperVService;
+        
+        /// <summary>
+        /// locVirtualMachine 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 locVirtualMachine;
+        
+        /// <summary>
+        /// VirtualMachines 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.DropDownList VirtualMachines;
+        
+        /// <summary>
+        /// RequiredVirtualMachine 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.RequiredFieldValidator RequiredVirtualMachine;
+        
+        /// <summary>
+        /// secOsTemplate control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secOsTemplate;
+        
+        /// <summary>
+        /// OsTemplatePanel 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 OsTemplatePanel;
+        
+        /// <summary>
+        /// locOsTemplate 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 locOsTemplate;
+        
+        /// <summary>
+        /// OsTemplates 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.DropDownList OsTemplates;
+        
+        /// <summary>
+        /// RequiredOsTemplate 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.RequiredFieldValidator RequiredOsTemplate;
+        
+        /// <summary>
+        /// EnableRemoteDesktop 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 EnableRemoteDesktop;
+        
+        /// <summary>
+        /// AdminPasswordPanel 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 AdminPasswordPanel;
+        
+        /// <summary>
+        /// locAdminPassword 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 locAdminPassword;
+        
+        /// <summary>
+        /// adminPassword 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 adminPassword;
+        
+        /// <summary>
+        /// RequiredAdminPassword 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.RequiredFieldValidator RequiredAdminPassword;
+        
+        /// <summary>
+        /// VirtualMachinePanel 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 VirtualMachinePanel;
+        
+        /// <summary>
+        /// secConfiguration control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secConfiguration;
+        
+        /// <summary>
+        /// ConfigurationPanel 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 ConfigurationPanel;
+        
+        /// <summary>
+        /// GenerationSetting control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Generation GenerationSetting;
+        
+        /// <summary>
+        /// locCPU 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 locCPU;
+        
+        /// <summary>
+        /// CpuCores 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.Literal CpuCores;
+        
+        /// <summary>
+        /// locRAM 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 locRAM;
+        
+        /// <summary>
+        /// RamSize 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.Literal RamSize;
+        
+        /// <summary>
+        /// locHDD 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 locHDD;
+        
+        /// <summary>
+        /// HddSize 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.Literal HddSize;
+        
+        /// <summary>
+        /// locVhdPath 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 locVhdPath;
+        
+        /// <summary>
+        /// VhdPath 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.Literal VhdPath;
+        
+        /// <summary>
+        /// DynamicMemorySetting control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.DynamicMemoryControl DynamicMemorySetting;
+        
+        /// <summary>
+        /// secBios control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secBios;
+        
+        /// <summary>
+        /// BiosPanel 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 BiosPanel;
+        
+        /// <summary>
+        /// BootFromCd control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption BootFromCd;
+        
+        /// <summary>
+        /// locBootFromCd 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 locBootFromCd;
+        
+        /// <summary>
+        /// NumLockEnabled control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption NumLockEnabled;
+        
+        /// <summary>
+        /// locNumLockEnabled 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 locNumLockEnabled;
+        
+        /// <summary>
+        /// secDvd control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secDvd;
+        
+        /// <summary>
+        /// DvdPanel 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 DvdPanel;
+        
+        /// <summary>
+        /// DvdInstalled control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption DvdInstalled;
+        
+        /// <summary>
+        /// locDvdInstalled 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 locDvdInstalled;
+        
+        /// <summary>
+        /// secAllowedActions control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secAllowedActions;
+        
+        /// <summary>
+        /// AllowedActionsPanel 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 AllowedActionsPanel;
+        
+        /// <summary>
+        /// AllowStartShutdown 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 AllowStartShutdown;
+        
+        /// <summary>
+        /// AllowReboot 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 AllowReboot;
+        
+        /// <summary>
+        /// AllowPause 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 AllowPause;
+        
+        /// <summary>
+        /// AllowReset 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 AllowReset;
+        
+        /// <summary>
+        /// secExternalNetwork control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secExternalNetwork;
+        
+        /// <summary>
+        /// ExternalNetworkPanel 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 ExternalNetworkPanel;
+        
+        /// <summary>
+        /// locExternalAdapter 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 locExternalAdapter;
+        
+        /// <summary>
+        /// ExternalAdapters 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.DropDownList ExternalAdapters;
+        
+        /// <summary>
+        /// ExternalAddressesRow 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 ExternalAddressesRow;
+        
+        /// <summary>
+        /// locExternalAddresses 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 locExternalAddresses;
+        
+        /// <summary>
+        /// ExternalAddresses 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.ListBox ExternalAddresses;
+        
+        /// <summary>
+        /// RequiredExternalAddresses 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.RequiredFieldValidator RequiredExternalAddresses;
+        
+        /// <summary>
+        /// secManagementNetwork control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secManagementNetwork;
+        
+        /// <summary>
+        /// ManagementNetworkPanel 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 ManagementNetworkPanel;
+        
+        /// <summary>
+        /// locManagementAdapter 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 locManagementAdapter;
+        
+        /// <summary>
+        /// ManagementAdapters 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.DropDownList ManagementAdapters;
+        
+        /// <summary>
+        /// ManagementAddressesRow 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 ManagementAddressesRow;
+        
+        /// <summary>
+        /// locManagementAddresses 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 locManagementAddresses;
+        
+        /// <summary>
+        /// ManagementAddresses 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.ListBox ManagementAddresses;
+        
+        /// <summary>
+        /// RequiredManagementAddresses 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.RequiredFieldValidator RequiredManagementAddresses;
+        
+        /// <summary>
+        /// btnImport 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.Button btnImport;
+        
+        /// <summary>
+        /// btnCancel 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.Button btnCancel;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcManagementNetwork.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcManagementNetwork.ascx
new file mode 100644
index 00000000..60247599
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcManagementNetwork.ascx
@@ -0,0 +1,39 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VdcManagementNetwork.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VdcManagementNetwork" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/PackageIPAddresses.ascx" TagName="PackageIPAddresses" TagPrefix="wsp" %>
+
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="vdc_management_network" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="Network48" runat="server" />
+				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Management Network"></asp:Localize>
+			    </div>
+			    <div class="FormBody">
+
+                    
+                    <wsp:PackageIPAddresses id="packageAddresses" runat="server"
+                            Pool="VpsManagementNetwork"
+                            EditItemControl="vps_general"
+                            SpaceHomeControl="vdc_management_network"
+                            AllocateAddressesControl=""
+                            ManageAllowed="true" />
+                            
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcManagementNetwork.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcManagementNetwork.ascx.cs
new file mode 100644
index 00000000..121d9c43
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcManagementNetwork.ascx.cs
@@ -0,0 +1,44 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VdcManagementNetwork : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcManagementNetwork.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcManagementNetwork.ascx.designer.cs
new file mode 100644
index 00000000..55cc9f69
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcManagementNetwork.ascx.designer.cs
@@ -0,0 +1,60 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VdcManagementNetwork {
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle 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 locTitle;
+        
+        /// <summary>
+        /// packageAddresses control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.PackageIPAddresses packageAddresses;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPermissions.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPermissions.ascx
new file mode 100644
index 00000000..5e4cbd79
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPermissions.ascx
@@ -0,0 +1,121 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VdcPermissions.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VdcPermissions" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="vdc_permissions" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="Server48" runat="server" />
+				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="User Permissions"></asp:Localize>
+			    </div>
+			    <div class="FormBody">
+    			
+			        <wsp:SimpleMessageBox id="messageBox" runat="server" />
+    			
+			        <wsp:CollapsiblePanel id="secVdcPermissions" runat="server"
+                        TargetControlID="VdcPermissionsPanel" meta:resourcekey="secVdcPermissions" Text="Virtual Data Center Permissions">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="VdcPermissionsPanel" runat="server" Height="0" style="overflow:hidden;">
+                    
+			            <asp:GridView ID="gvVdcPermissions" runat="server" AutoGenerateColumns="False"
+				            EmptyDataText="gvVdcPermissions" CssSelectorClass="NormalGridView">
+				            <Columns>
+					            <asp:BoundField HeaderText="columnUsername" DataField="Username" />
+					            <asp:TemplateField HeaderText="columnCreateVps" ItemStyle-HorizontalAlign="Center">
+					                <ItemTemplate>
+					                    <asp:CheckBox ID="chkCreateVps" runat="server" />
+					                </ItemTemplate>
+					            </asp:TemplateField>
+					            <asp:TemplateField HeaderText="columnExternalNetwork" ItemStyle-HorizontalAlign="Center">
+					                <ItemTemplate>
+					                    <asp:CheckBox ID="chkExternalNetwork" runat="server" />
+					                </ItemTemplate>
+					            </asp:TemplateField>
+					            <asp:TemplateField HeaderText="columnPrivateNetwork" ItemStyle-HorizontalAlign="Center">
+					                <ItemTemplate>
+					                    <asp:CheckBox ID="chkPrivateNetwork" runat="server" />
+					                </ItemTemplate>
+					            </asp:TemplateField>
+					            <asp:TemplateField HeaderText="columnManagePermissions" ItemStyle-HorizontalAlign="Center">
+					                <ItemTemplate>
+					                    <asp:CheckBox ID="chkManagePermissions" runat="server" />
+					                </ItemTemplate>
+					            </asp:TemplateField>
+				            </Columns>
+			            </asp:GridView>
+			            <br />
+                        <asp:Button ID="btnUpdateVdcPermissions" runat="server" meta:resourcekey="btnUpdateVdcPermissions"
+                                CssClass="Button1" Text="Update" CausesValidation="false" 
+                            onclick="btnUpdateVdcPermissions_Click" />
+                        
+                        <br />
+                        <br />
+                    </asp:Panel>
+                    
+                    
+			        <wsp:CollapsiblePanel id="secVpsPermissions" runat="server"
+                        TargetControlID="VpsPermissionsPanel" meta:resourcekey="secVpsPermissions" Text="Virtual Private Server Permissions">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="VpsPermissionsPanel" runat="server" Height="0" style="overflow:hidden;">
+                    
+			            <asp:GridView ID="gvVpsPermissions" runat="server" AutoGenerateColumns="False"
+				            EmptyDataText="gvVpsPermissions" CssSelectorClass="NormalGridView">
+				            <Columns>
+					            <asp:BoundField HeaderText="columnUsername" DataField="Username" />
+					            <asp:TemplateField HeaderText="columnChangeState" ItemStyle-HorizontalAlign="Center">
+					                <ItemTemplate>
+					                    <asp:CheckBox ID="chkChangeState" runat="server" />
+					                </ItemTemplate>
+					            </asp:TemplateField>
+					            <asp:TemplateField HeaderText="columnChangeConfig" ItemStyle-HorizontalAlign="Center">
+					                <ItemTemplate>
+					                    <asp:CheckBox ID="chkChangeConfig" runat="server" />
+					                </ItemTemplate>
+					            </asp:TemplateField>
+					            <asp:TemplateField HeaderText="columnManageSnapshots" ItemStyle-HorizontalAlign="Center">
+					                <ItemTemplate>
+					                    <asp:CheckBox ID="chkManageSnapshots" runat="server" />
+					                </ItemTemplate>
+					            </asp:TemplateField>
+					            <asp:TemplateField HeaderText="columnDeleteVps" ItemStyle-HorizontalAlign="Center">
+					                <ItemTemplate>
+					                    <asp:CheckBox ID="chkDeleteVps" runat="server" />
+					                </ItemTemplate>
+					            </asp:TemplateField>
+					            <asp:TemplateField HeaderText="columnReinstallVps" ItemStyle-HorizontalAlign="Center">
+					                <ItemTemplate>
+					                    <asp:CheckBox ID="chkReinstallVps" runat="server" />
+					                </ItemTemplate>
+					            </asp:TemplateField>
+				            </Columns>
+			            </asp:GridView>
+			            <br />
+                        <asp:Button ID="btnUpdateVpsPermissions" runat="server" meta:resourcekey="btnUpdateVdcPermissions"
+                                CssClass="Button1" Text="Update" CausesValidation="false" 
+                            onclick="btnUpdateVpsPermissions_Click" />
+                        <br />
+                        
+                    </asp:Panel>
+
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPermissions.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPermissions.ascx.cs
new file mode 100644
index 00000000..b36dba6d
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPermissions.ascx.cs
@@ -0,0 +1,56 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VdcPermissions : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+           
+        }
+
+        protected void btnUpdateVdcPermissions_Click(object sender, EventArgs e)
+        {
+            System.Threading.Thread.Sleep(5000);
+            messageBox.ShowSuccessMessage("VDC_PERMISSIONS_VDC_UPDATED");
+        }
+
+        protected void btnUpdateVpsPermissions_Click(object sender, EventArgs e)
+        {
+            System.Threading.Thread.Sleep(5000);
+            messageBox.ShowSuccessMessage("VDC_PERMISSIONS_VPS_UPDATED");
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPermissions.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPermissions.ascx.designer.cs
new file mode 100644
index 00000000..48ccd1ab
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPermissions.ascx.designer.cs
@@ -0,0 +1,141 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VdcPermissions {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle 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 locTitle;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// secVdcPermissions control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secVdcPermissions;
+        
+        /// <summary>
+        /// VdcPermissionsPanel 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 VdcPermissionsPanel;
+        
+        /// <summary>
+        /// gvVdcPermissions 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.GridView gvVdcPermissions;
+        
+        /// <summary>
+        /// btnUpdateVdcPermissions 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.Button btnUpdateVdcPermissions;
+        
+        /// <summary>
+        /// secVpsPermissions control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secVpsPermissions;
+        
+        /// <summary>
+        /// VpsPermissionsPanel 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 VpsPermissionsPanel;
+        
+        /// <summary>
+        /// gvVpsPermissions 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.GridView gvVpsPermissions;
+        
+        /// <summary>
+        /// btnUpdateVpsPermissions 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.Button btnUpdateVpsPermissions;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPrivateNetwork.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPrivateNetwork.ascx
new file mode 100644
index 00000000..694c1296
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPrivateNetwork.ascx
@@ -0,0 +1,98 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VdcPrivateNetwork.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VdcPrivateNetwork" %>
+<%@ Import Namespace="WebsitePanel.Portal" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/SearchBox.ascx" TagName="SearchBox" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/Quota.ascx" TagName="Quota" TagPrefix="wsp" %>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="vdc_private_network" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="Network48" runat="server" />
+				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Private Network"></asp:Localize>
+			    </div>
+			    <div class="FormBody">
+
+
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+                    <div class="FormButtonsBarClean">
+                        <div class="FormButtonsBarCleanLeft">
+                        </div>
+                        <div class="FormButtonsBarCleanRight">
+                            <wsp:SearchBox ID="searchBox" runat="server" />
+                        </div>
+                    </div>
+
+			        <asp:GridView ID="gvAddresses" runat="server" AutoGenerateColumns="False" EnableViewState="false"
+				        Width="100%" EmptyDataText="gvAddresses" CssSelectorClass="NormalGridView"
+				        AllowPaging="True" AllowSorting="True" DataKeyNames="PrivateAddressId" DataSourceID="odsPrivateAddressesPaged">
+				        <Columns>
+					        <asp:BoundField HeaderText="gvAddressesIPAddress" meta:resourcekey="gvAddressesIPAddress"
+					            DataField="IPAddress" SortExpression="IPAddress" />
+					            
+					        <asp:TemplateField HeaderText="gvAddressesItemName" meta:resourcekey="gvAddressesItemName" SortExpression="ItemName">						        						        
+						        <ItemTemplate>						        
+							         <asp:hyperlink id="lnkEdit" runat="server" NavigateUrl='<%# GetServerEditUrl(Eval("ItemID").ToString()) %>'>
+								        <%# Eval("ItemName") %>
+							        </asp:hyperlink>
+						        </ItemTemplate>
+					        </asp:TemplateField>
+
+					        <asp:TemplateField HeaderText="gvAddressesPrimary" meta:resourcekey="gvAddressesPrimary" SortExpression="IsPrimary">						        						        
+						        <ItemTemplate>						        
+							            <asp:Image runat="server" ID="imgPrimary" ImageUrl='<%# PortalUtils.GetThemedImage("Exchange/checkbox.png")%>'
+							                Visible='<%# Eval("IsPrimary") %>' ImageAlign="AbsMiddle"  />&nbsp;
+						        </ItemTemplate>
+					        </asp:TemplateField>
+				        </Columns>
+			        </asp:GridView>
+				    <asp:ObjectDataSource ID="odsPrivateAddressesPaged" runat="server" EnablePaging="True"
+						    SelectCountMethod="GetPackagePrivateIPAddressesCount"
+						    SelectMethod="GetPackagePrivateIPAddresses"
+						    SortParameterName="sortColumn"
+						    TypeName="WebsitePanel.Portal.VirtualMachines2012Helper"
+						    OnSelected="odsPrivateAddressesPaged_Selected">
+					    <SelectParameters>
+						    <asp:QueryStringParameter Name="packageId" QueryStringField="SpaceID" DefaultValue="0" />						    
+                            <asp:ControlParameter Name="filterColumn" ControlID="searchBox"  PropertyName="FilterColumn" />
+                            <asp:ControlParameter Name="filterValue" ControlID="searchBox" PropertyName="FilterValue" />
+					    </SelectParameters>
+				    </asp:ObjectDataSource>
+				    <br />
+    				
+				    <wsp:CollapsiblePanel id="secQuotas" runat="server"
+                        TargetControlID="QuotasPanel" meta:resourcekey="secQuotas" Text="Quotas">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="QuotasPanel" runat="server" Height="0" style="overflow:hidden;">
+                    
+                        <table cellspacing="6">
+                            <tr>
+                                <td><asp:Localize ID="locVpsAddressesQuota" runat="server" meta:resourcekey="locVpsAddressesQuota" Text="IP addresses per VPS:"></asp:Localize></td>
+                                <td><wsp:Quota ID="addressesPerVps" runat="server" QuotaName="VPS2012.PrivateIPAddressesNumber" /></td>
+                            </tr>
+                        </table>
+                    
+                    
+                    </asp:Panel>
+
+
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPrivateNetwork.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPrivateNetwork.ascx.cs
new file mode 100644
index 00000000..62f0076e
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPrivateNetwork.ascx.cs
@@ -0,0 +1,66 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.Virtualization;
+using WebsitePanel.WebPortal;
+using WebsitePanel.EnterpriseServer;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VdcPrivateNetwork : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                searchBox.AddCriteria("IPAddress", GetLocalizedString("SearchField.IPAddress"));
+                searchBox.AddCriteria("ItemName", GetLocalizedString("SearchField.ItemName"));
+            }
+        }
+
+        public string GetServerEditUrl(string itemID)
+        {
+            return EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), "vps_general",
+                    "ItemID=" + itemID);
+        }
+
+        protected void odsPrivateAddressesPaged_Selected(object sender, ObjectDataSourceStatusEventArgs e)
+        {
+            if (e.Exception != null)
+            {
+                messageBox.ShowErrorMessage("EXCHANGE_GET_MAILBOXES", e.Exception);
+                e.ExceptionHandled = true;
+            }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPrivateNetwork.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPrivateNetwork.ascx.designer.cs
new file mode 100644
index 00000000..94d7c078
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VdcPrivateNetwork.ascx.designer.cs
@@ -0,0 +1,123 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VdcPrivateNetwork {
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle 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 locTitle;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// searchBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.SearchBox searchBox;
+        
+        /// <summary>
+        /// gvAddresses 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.GridView gvAddresses;
+        
+        /// <summary>
+        /// odsPrivateAddressesPaged 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.ObjectDataSource odsPrivateAddressesPaged;
+        
+        /// <summary>
+        /// secQuotas control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secQuotas;
+        
+        /// <summary>
+        /// QuotasPanel 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 QuotasPanel;
+        
+        /// <summary>
+        /// locVpsAddressesQuota 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 locVpsAddressesQuota;
+        
+        /// <summary>
+        /// addressesPerVps control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.Quota addressesPerVps;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VirtualMachineImage.ashx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VirtualMachineImage.ashx
new file mode 100644
index 00000000..2151135a
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VirtualMachineImage.ashx
@@ -0,0 +1 @@
+<%@ WebHandler Language="C#" CodeBehind="VirtualMachineImage.ashx.cs" Class="WebsitePanel.Portal.VPS2012.VirtualMachineImage" %>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VirtualMachineImage.ashx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VirtualMachineImage.ashx.cs
new file mode 100644
index 00000000..4b09917e
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VirtualMachineImage.ashx.cs
@@ -0,0 +1,66 @@
+// Copyright (c) 2015, 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.
+
+using System.Text;
+using System.Web;
+using System.Web.Services;
+using WebsitePanel.Providers.ResultObjects;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    /// <summary>
+    /// Summary description for $codebehindclassname$
+    /// </summary>
+    [WebService(Namespace = "http://tempuri.org/")]
+    [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
+    public class VirtualMachineImage : IHttpHandler
+    {
+
+        public void ProcessRequest(HttpContext context)
+        {
+            context.Response.Clear();
+            context.Response.ContentType = "image/png";
+
+            int itemId =  Utils.ParseInt(context.Request.QueryString["ItemID"]);
+            byte[] buffer = ES.Services.VPS2012.GetVirtualMachineThumbnail(itemId,
+                WebsitePanel.Providers.Virtualization.ThumbnailSize.Medium160x120);
+            if (buffer != null)
+            {
+                context.Response.OutputStream.Write(buffer, 0, buffer.Length);                
+            }
+        }
+
+        public bool IsReusable
+        {
+            get
+            {
+                return false;
+            }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VirtualMachineSnapshotImage.ashx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VirtualMachineSnapshotImage.ashx
new file mode 100644
index 00000000..4ce22da5
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VirtualMachineSnapshotImage.ashx
@@ -0,0 +1 @@
+<%@ WebHandler Language="C#" CodeBehind="VirtualMachineSnapshotImage.ashx.cs" Class="WebsitePanel.Portal.VPS2012.VirtualMachineSnapshotImage" %>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VirtualMachineSnapshotImage.ashx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VirtualMachineSnapshotImage.ashx.cs
new file mode 100644
index 00000000..12ad091c
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VirtualMachineSnapshotImage.ashx.cs
@@ -0,0 +1,71 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.Services;
+using WebsitePanel.Providers.ResultObjects;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    /// <summary>
+    /// Summary description for $codebehindclassname$
+    /// </summary>
+    [WebService(Namespace = "http://tempuri.org/")]
+    [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
+    public class VirtualMachineSnapshotImage : IHttpHandler
+    {
+
+        public void ProcessRequest(HttpContext context)
+        {
+            context.Response.Clear();
+            context.Response.ContentType = "image/png";
+
+            HttpRequest req = context.Request;
+
+            int itemId = Utils.ParseInt(req["ItemID"]);
+            string snapshotId = req["SnapshotID"];
+
+            byte[] res = ES.Services.VPS2012.GetSnapshotThumbnail(itemId, snapshotId,
+                WebsitePanel.Providers.Virtualization.ThumbnailSize.Medium160x120);
+            if (res != null)
+            {
+                context.Response.OutputStream.Write(res, 0, res.Length);
+            }
+        }
+
+        public bool IsReusable
+        {
+            get
+            {
+                return false;
+            }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx
new file mode 100644
index 00000000..84bcae9d
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx
@@ -0,0 +1,101 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VpsDetailsAddExternalAddress.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VpsDetailsAddExternalAddress" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/ServerTabs.ascx" TagName="ServerTabs" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/FormTitle.ascx" TagName="FormTitle" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="Network48" runat="server" />
+				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Network" />
+			    </div>
+			    <div class="FormBody">
+			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_network" />	
+			        
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+                    <asp:ValidationSummary ID="validatorsSummary" runat="server" 
+                        ValidationGroup="AddAddress" ShowMessageBox="True" ShowSummary="False" />
+                    
+		            <p class="SubTitle">
+		                <asp:Localize ID="locSubTitle" runat="server" meta:resourcekey="locSubTitle"
+		                    Text="Add External IP Addresses" />
+		            </p>
+		            
+                     <div runat="server" ID="EmptyExternalAddressesMessage" style="padding: 5px;" visible="false">
+                        <asp:Localize ID="locNotEnoughExternalAddresses" runat="server" Text="Not enough..."
+                                meta:resourcekey="locNotEnoughExternalAddresses"></asp:Localize>
+                     </div>
+                    
+                    <table id="ExternalAddressesTable" runat="server" cellspacing="5" style="width: 100%;">
+                        <tr>
+                            <td>
+                                <asp:RadioButton ID="radioExternalRandom" runat="server" AutoPostBack="true"
+                                    meta:resourcekey="radioExternalRandom" Text="Randomly select IP addresses from the pool" 
+                                    Checked="True" GroupName="ExternalAddress" />
+                            </td>
+                        </tr>
+                        <tr id="ExternalAddressesNumberRow" runat="server">
+                            <td style="padding-left: 30px;">
+                                <asp:Localize ID="locExternalAddresses" runat="server"
+                                        meta:resourcekey="locExternalAddresses" Text="Number of IP addresses:"></asp:Localize>
+
+                                <asp:TextBox ID="txtExternalAddressesNumber" runat="server" CssClass="NormalTextBox" Width="50" Text="1"></asp:TextBox>
+                                
+                                <asp:RequiredFieldValidator ID="ExternalAddressesValidator" runat="server" Text="*" Display="Dynamic"
+                                        ControlToValidate="txtExternalAddressesNumber" meta:resourcekey="ExternalAddressesValidator" SetFocusOnError="true"
+                                        ValidationGroup="AddAddress">*</asp:RequiredFieldValidator>
+                                
+                                <asp:Literal ID="litMaxExternalAddresses" runat="server"></asp:Literal>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <asp:RadioButton ID="radioExternalSelected" runat="server" AutoPostBack="true"
+                                    meta:resourcekey="radioExternalSelected" Text="Select IP addresses from the list" 
+                                    GroupName="ExternalAddress" />
+                            </td>
+                        </tr>
+                        <tr id="ExternalAddressesListRow" runat="server">
+                            <td style="padding-left: 30px;">
+                                <asp:ListBox ID="listExternalAddresses" SelectionMode="Multiple" runat="server" Rows="8"
+                                    CssClass="NormalTextBox" Width="220" ></asp:ListBox>
+                                <br />
+                                <asp:Localize ID="locHoldCtrl" runat="server"
+                                        meta:resourcekey="locHoldCtrl" Text="* Hold CTRL key to select multiple addresses"></asp:Localize>
+                            </td>
+                        </tr>
+                    </table>
+                    
+                    <p>
+                        <asp:Button ID="btnAdd" runat="server" meta:resourcekey="btnAdd"
+                            ValidationGroup="AddAddress" Text="Add" CssClass="Button1" 
+                            onclick="btnAdd_Click" />
+                        <asp:Button ID="btnCancel" runat="server" meta:resourcekey="btnCancel"
+                            CausesValidation="false" Text="Cancel" CssClass="Button1" 
+                            onclick="btnCancel_Click" />
+                    </p>
+
+				    
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx.cs
new file mode 100644
index 00000000..3cfabfb0
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx.cs
@@ -0,0 +1,119 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.Common;
+using WebsitePanel.Providers.Virtualization;
+using WebsitePanel.EnterpriseServer;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VpsDetailsAddExternalAddress : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            ToggleControls();
+
+            if (!IsPostBack)
+            {
+                BindExternalIPAddresses();
+            }
+        }
+
+        private void BindExternalIPAddresses()
+        {
+            PackageIPAddress[] ips = ES.Services.Servers.GetPackageUnassignedIPAddresses(PanelSecurity.PackageId, 0, IPAddressPool.VpsExternalNetwork);
+            foreach (PackageIPAddress ip in ips)
+            {
+                string txt = ip.ExternalIP;
+                if (!String.IsNullOrEmpty(ip.DefaultGateway))
+                    txt += "/" + ip.DefaultGateway;
+                listExternalAddresses.Items.Add(new ListItem(txt, ip.PackageAddressID.ToString()));
+            }
+
+            // toggle controls
+            int maxAddresses = listExternalAddresses.Items.Count;
+            litMaxExternalAddresses.Text = String.Format(GetLocalizedString("litMaxExternalAddresses.Text"), maxAddresses);
+
+            bool empty = maxAddresses == 0;
+            EmptyExternalAddressesMessage.Visible = empty;
+            ExternalAddressesTable.Visible = !empty;
+            btnAdd.Enabled = !empty;
+        }
+
+        protected void btnCancel_Click(object sender, EventArgs e)
+        {
+            RedirectBack();
+        }
+
+        private void RedirectBack()
+        {
+            Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "vps_network",
+                "SpaceID=" + PanelSecurity.PackageId.ToString()));
+        }
+
+        private void ToggleControls()
+        {
+            // external network
+            ExternalAddressesNumberRow.Visible = radioExternalRandom.Checked;
+            ExternalAddressesListRow.Visible = radioExternalSelected.Checked;
+        }
+
+        protected void btnAdd_Click(object sender, EventArgs e)
+        {
+            int number = Utils.ParseInt(txtExternalAddressesNumber.Text.Trim(), 0);
+            List<int> addressIds = new List<int>();
+            foreach (ListItem li in listExternalAddresses.Items)
+                if (li.Selected)
+                    addressIds.Add(Utils.ParseInt(li.Value, 0));
+
+            try
+            {
+                ResultObject res = ES.Services.VPS2012.AddVirtualMachineExternalIPAddresses(PanelRequest.ItemID,
+                    radioExternalRandom.Checked, number, addressIds.ToArray());
+
+                if (res.IsSuccess)
+                {
+                    RedirectBack();
+                }
+                else
+                {
+                    messageBox.ShowMessage(res, "VPS_ERROR_ADDING_IP_ADDRESS", "VPS");
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_ERROR_ADDING_IP_ADDRESS", ex);
+            }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx.designer.cs
new file mode 100644
index 00000000..3608ce14
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddExternalAddress.ascx.designer.cs
@@ -0,0 +1,231 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VpsDetailsAddExternalAddress {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.ServerTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// validatorsSummary 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.ValidationSummary validatorsSummary;
+        
+        /// <summary>
+        /// locSubTitle 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 locSubTitle;
+        
+        /// <summary>
+        /// EmptyExternalAddressesMessage 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.HtmlGenericControl EmptyExternalAddressesMessage;
+        
+        /// <summary>
+        /// locNotEnoughExternalAddresses 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 locNotEnoughExternalAddresses;
+        
+        /// <summary>
+        /// ExternalAddressesTable 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.HtmlTable ExternalAddressesTable;
+        
+        /// <summary>
+        /// radioExternalRandom 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.RadioButton radioExternalRandom;
+        
+        /// <summary>
+        /// ExternalAddressesNumberRow 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 ExternalAddressesNumberRow;
+        
+        /// <summary>
+        /// locExternalAddresses 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 locExternalAddresses;
+        
+        /// <summary>
+        /// txtExternalAddressesNumber 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 txtExternalAddressesNumber;
+        
+        /// <summary>
+        /// ExternalAddressesValidator 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.RequiredFieldValidator ExternalAddressesValidator;
+        
+        /// <summary>
+        /// litMaxExternalAddresses 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.Literal litMaxExternalAddresses;
+        
+        /// <summary>
+        /// radioExternalSelected 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.RadioButton radioExternalSelected;
+        
+        /// <summary>
+        /// ExternalAddressesListRow 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 ExternalAddressesListRow;
+        
+        /// <summary>
+        /// listExternalAddresses 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.ListBox listExternalAddresses;
+        
+        /// <summary>
+        /// locHoldCtrl 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 locHoldCtrl;
+        
+        /// <summary>
+        /// btnAdd 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.Button btnAdd;
+        
+        /// <summary>
+        /// btnCancel 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.Button btnCancel;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx
new file mode 100644
index 00000000..868b526e
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx
@@ -0,0 +1,96 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VpsDetailsAddPrivateAddress.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VpsDetailsAddPrivateAddress" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/ServerTabs.ascx" TagName="ServerTabs" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/FormTitle.ascx" TagName="FormTitle" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="Image1" SkinID="Network48" runat="server" />
+				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Network" />
+			    </div>
+			    <div class="FormBody">
+			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_network" />
+			        	
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+                    <asp:ValidationSummary ID="validatorsSummary" runat="server" 
+                        ValidationGroup="AddAddress" ShowMessageBox="True" ShowSummary="False" />
+                    
+		            <p class="SubTitle">
+		                <asp:Localize ID="locSubTitle" runat="server" meta:resourcekey="locSubTitle"
+		                    Text="Add Private IP Addresses" />
+		            </p>
+                    
+                    <table id="tablePrivateNetwork" runat="server" cellspacing="5" style="width: 100%;">
+                        <tr>
+                            <td>
+                                <asp:RadioButton ID="radioPrivateRandom" runat="server" AutoPostBack="true"
+                                    meta:resourcekey="radioPrivateRandom" Text="Randomly select next available IP addresses to the addresses format" 
+                                    Checked="True" GroupName="PrivateAddress" />
+                            </td>
+                        </tr>
+                        <tr id="PrivateAddressesNumberRow" runat="server">
+                            <td style="padding-left: 30px;">
+                                <asp:Localize ID="locPrivateAddresses" runat="server"
+                                        meta:resourcekey="locPrivateAddresses" Text="Number of IP addresses:"></asp:Localize>
+
+                                <asp:TextBox ID="txtPrivateAddressesNumber" runat="server" CssClass="NormalTextBox" Width="50" Text="1"></asp:TextBox>
+                                
+                                <asp:RequiredFieldValidator ID="PrivateAddressesValidator" runat="server" Text="*" Display="Dynamic"
+                                        ControlToValidate="txtPrivateAddressesNumber" meta:resourcekey="PrivateAddressesValidator" SetFocusOnError="true"
+                                        ValidationGroup="AddAddress">*</asp:RequiredFieldValidator>
+                                        
+                                <asp:Literal ID="litMaxPrivateAddresses" runat="server"></asp:Literal>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <asp:RadioButton ID="radioPrivateSelected" runat="server" AutoPostBack="true"
+                                    meta:resourcekey="radioPrivateSelected" Text="Assign specified IP addresses" 
+                                    GroupName="PrivateAddress" />
+                            </td>
+                        </tr>
+                        <tr id="PrivateAddressesListRow" runat="server">
+                            <td style="padding-left: 30px;">
+                                <asp:TextBox ID="txtPrivateAddressesList" runat="server" TextMode="MultiLine"
+                                    CssClass="NormalTextBox" Width="170" Rows="5"></asp:TextBox>
+                                <br />
+                                <asp:Localize ID="locOnePerLine" runat="server"
+                                        meta:resourcekey="locOnePerLine" Text="* Type one IP address per line"></asp:Localize>
+                            </td>
+                        </tr>
+                    </table>
+                    
+                    <p>
+                        <asp:Button ID="btnAdd" runat="server" meta:resourcekey="btnAdd"
+                            ValidationGroup="AddAddress" Text="Add" CssClass="Button1" 
+                            onclick="btnAdd_Click" />
+                        <asp:Button ID="btnCancel" runat="server" meta:resourcekey="btnCancel"
+                            CausesValidation="false" Text="Cancel" CssClass="Button1" 
+                            onclick="btnCancel_Click" />
+                    </p>
+
+				    
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx.cs
new file mode 100644
index 00000000..76f01916
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx.cs
@@ -0,0 +1,118 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.Common;
+using WebsitePanel.EnterpriseServer;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VpsDetailsAddPrivateAddress : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BindControls();
+            }
+
+            ToggleControls();
+        }
+
+        private void BindControls()
+        {
+            // load adapter details
+            NetworkAdapterDetails nic = ES.Services.VPS2012.GetPrivateNetworkAdapterDetails(PanelRequest.ItemID);
+
+            // load package context
+            PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
+
+            if (cntx.Quotas.ContainsKey(Quotas.VPS2012_PRIVATE_IP_ADDRESSES_NUMBER))
+            {
+                // set max number
+                QuotaValueInfo privQuota = cntx.Quotas[Quotas.VPS2012_PRIVATE_IP_ADDRESSES_NUMBER];
+                int maxPrivate = privQuota.QuotaAllocatedValue;
+                if (maxPrivate == -1)
+                    maxPrivate = 10;
+
+                maxPrivate -= nic.IPAddresses.Length;
+
+                txtPrivateAddressesNumber.Text = maxPrivate.ToString();
+                litMaxPrivateAddresses.Text = String.Format(GetLocalizedString("litMaxPrivateAddresses.Text"), maxPrivate);
+                btnAdd.Enabled = maxPrivate > 0;
+            }
+        }
+
+        protected void btnAdd_Click(object sender, EventArgs e)
+        {
+            int number = Utils.ParseInt(txtPrivateAddressesNumber.Text.Trim(), 0);
+            string[] privIps = Utils.ParseDelimitedString(txtPrivateAddressesList.Text, '\n', '\r', ' ', '\t');
+
+            try
+            {
+                ResultObject res = ES.Services.VPS2012.AddVirtualMachinePrivateIPAddresses(PanelRequest.ItemID,
+                    radioPrivateRandom.Checked, number, privIps);
+
+                if (res.IsSuccess)
+                {
+                    RedirectBack();
+                }
+                else
+                {
+                    messageBox.ShowMessage(res, "VPS_ERROR_ADDING_IP_ADDRESS", "VPS");
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_ERROR_ADDING_IP_ADDRESS", ex);
+            }
+        }
+
+        protected void btnCancel_Click(object sender, EventArgs e)
+        {
+            RedirectBack();
+        }
+
+        private void RedirectBack()
+        {
+            Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "vps_network",
+                "SpaceID=" + PanelSecurity.PackageId.ToString()));
+        }
+
+        private void ToggleControls()
+        {
+            // private network
+            PrivateAddressesNumberRow.Visible = radioPrivateRandom.Checked;
+            PrivateAddressesListRow.Visible = radioPrivateSelected.Checked;
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx.designer.cs
new file mode 100644
index 00000000..3ebff9d0
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAddPrivateAddress.ascx.designer.cs
@@ -0,0 +1,213 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VpsDetailsAddPrivateAddress {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// Image1 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.Image Image1;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.ServerTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// validatorsSummary 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.ValidationSummary validatorsSummary;
+        
+        /// <summary>
+        /// locSubTitle 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 locSubTitle;
+        
+        /// <summary>
+        /// tablePrivateNetwork 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.HtmlTable tablePrivateNetwork;
+        
+        /// <summary>
+        /// radioPrivateRandom 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.RadioButton radioPrivateRandom;
+        
+        /// <summary>
+        /// PrivateAddressesNumberRow 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 PrivateAddressesNumberRow;
+        
+        /// <summary>
+        /// locPrivateAddresses 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 locPrivateAddresses;
+        
+        /// <summary>
+        /// txtPrivateAddressesNumber 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 txtPrivateAddressesNumber;
+        
+        /// <summary>
+        /// PrivateAddressesValidator 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.RequiredFieldValidator PrivateAddressesValidator;
+        
+        /// <summary>
+        /// litMaxPrivateAddresses 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.Literal litMaxPrivateAddresses;
+        
+        /// <summary>
+        /// radioPrivateSelected 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.RadioButton radioPrivateSelected;
+        
+        /// <summary>
+        /// PrivateAddressesListRow 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 PrivateAddressesListRow;
+        
+        /// <summary>
+        /// txtPrivateAddressesList 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 txtPrivateAddressesList;
+        
+        /// <summary>
+        /// locOnePerLine 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 locOnePerLine;
+        
+        /// <summary>
+        /// btnAdd 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.Button btnAdd;
+        
+        /// <summary>
+        /// btnCancel 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.Button btnCancel;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx
new file mode 100644
index 00000000..f5036c28
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx
@@ -0,0 +1,37 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VpsDetailsAuditLog.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VpsDetailsAuditLog" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/ServerTabs.ascx" TagName="ServerTabs" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/FormTitle.ascx" TagName="FormTitle" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/AuditLogControl.ascx" TagName="AuditLogControl" TagPrefix="wsp" %>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="AuditLog48" runat="server" />
+				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Audit Log" />
+			    </div>
+			    <div class="FormBody">
+			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_audit_log" />	
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+				    <wsp:AuditLogControl id="auditLog" runat="server" LogSource="VPS2012" />
+				    
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx.cs
new file mode 100644
index 00000000..47d49b34
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx.cs
@@ -0,0 +1,44 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VpsDetailsAuditLog : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx.designer.cs
new file mode 100644
index 00000000..d629a48c
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsAuditLog.ascx.designer.cs
@@ -0,0 +1,78 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VpsDetailsAuditLog {
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.ServerTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// auditLog control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.AuditLogControl auditLog;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx
new file mode 100644
index 00000000..39f25576
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx
@@ -0,0 +1,262 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VpsDetailsConfiguration.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VpsDetailsConfiguration" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CheckBoxOption.ascx" TagName="CheckBoxOption" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/ServerTabs.ascx" TagName="ServerTabs" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/FormTitle.ascx" TagName="FormTitle" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/PasswordControl.ascx" TagName="PasswordControl" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+<%@ Register TagPrefix="wsp" TagName="Generation" Src="UserControls/Generation.ascx" %>
+<%@ Register TagPrefix="wsp" TagName="DynamicMemoryControl" Src="UserControls/DynamicMemoryControl.ascx" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="ServerConfig48" runat="server" />
+				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Configuration" />
+			    </div>
+			    <div class="FormBody">
+			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_config" />	
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+                   
+                    <wsp:CollapsiblePanel id="secSoftware" runat="server"
+                        TargetControlID="SoftwarePanel" meta:resourcekey="secSoftware" Text="Software">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="SoftwarePanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                        <table cellspacing="5">
+                            <tr>
+                                <td><asp:Localize ID="locOperatingSystem" runat="server"
+                                    meta:resourcekey="locOperatingSystem" Text="Operating system:"></asp:Localize></td>
+                                <td>
+                                    <asp:Literal ID="litOperatingSystem" runat="server" Text="[OS]"></asp:Literal>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><asp:Localize ID="locAdministratorPassword" runat="server"
+                                    meta:resourcekey="locAdministratorPassword" Text="Administrator password:"></asp:Localize></td>
+                                <td>
+                                    ********
+                                    <asp:LinkButton ID="btnChangePasswordPopup" runat="server" CausesValidation="false"
+                                        Text="Change" meta:resourcekey="btnChangePasswordPopup"></asp:LinkButton>
+                                </td>
+                            </tr>
+                        </table>
+                    </asp:Panel>
+                    
+                    <wsp:Generation runat="server" ID="GenerationSetting" Mode="Display"/>
+
+                    <wsp:CollapsiblePanel id="secResources" runat="server"
+                        TargetControlID="ResourcesPanel" meta:resourcekey="secResources" Text="Resources">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="ResourcesPanel" runat="server" Height="0" style="overflow:hidden;padding:10px;width:400px;">
+                        <table cellspacing="5">
+                            <tr>
+                                <td class="Medium"><asp:Localize ID="lblCpu" runat="server"
+                                        meta:resourcekey="lblCpu" Text="CPU:" /></td>
+                                <td class="MediumBold">
+                                    <asp:Literal ID="litCpu" runat="server" Text="[cpu]"></asp:Literal>
+                                </td>
+                            </tr>
+                        </table>
+                        <table cellspacing="5">
+                            <tr>
+                                <td class="Medium"><asp:Localize ID="lblRam" runat="server"
+                                        meta:resourcekey="lblRam" Text="RAM:" /></td>
+                                <td class="MediumBold">
+                                    <asp:Literal ID="litRam" runat="server" Text="[ram]"></asp:Literal>
+                                </td>
+                            </tr>
+                        </table>
+                        <table cellspacing="5">
+                            <tr>
+                                <td class="Medium"><asp:Localize ID="lblHdd" runat="server"
+                                        meta:resourcekey="lblHdd" Text="HDD:" /></td>
+                                <td class="MediumBold">
+                                    <asp:Literal ID="litHdd" runat="server" Text="[hdd]"></asp:Literal>
+                                </td>
+                            </tr>
+                        </table>
+                    </asp:Panel>
+                    
+                    <wsp:DynamicMemoryControl runat="server" ID="DynamicMemorySetting" Mode="Display"/>
+
+                    <wsp:CollapsiblePanel id="secSnapshots" runat="server"
+                        TargetControlID="SnapshotsPanel" meta:resourcekey="secSnapshots" Text="Snapshots">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="SnapshotsPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                        <table cellspacing="5">
+                            <tr>
+                                <td><asp:Localize ID="locSnapshots" runat="server"
+                                    meta:resourcekey="locSnapshots" Text="Number of snapshots:"></asp:Localize></td>
+                                <td>
+                                    <asp:Literal ID="litSnapshots" runat="server" Text="[num]"></asp:Literal>
+                                </td>
+                            </tr>
+                        </table>
+                    </asp:Panel>
+                    
+                    <wsp:CollapsiblePanel id="secDvd" runat="server"
+                        TargetControlID="DvdPanel" meta:resourcekey="secDvd" Text="DVD">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="DvdPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                        <table cellspacing="5">
+                            <tr>
+                                <td>
+                                    <wsp:CheckBoxOption id="optionDvdInstalled" runat="server"
+                                        Text="DVD Drive installed" meta:resourcekey="optionDvdInstalled" Value="True" />
+                                </td>
+                            </tr>
+                        </table>
+                    </asp:Panel>
+                    
+                    <wsp:CollapsiblePanel id="secBios" runat="server"
+                        TargetControlID="BiosPanel" meta:resourcekey="secBios" Text="BIOS">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="BiosPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                        <table cellspacing="5">
+                            <tr>
+                                <td style="width:200px;">
+                                    <wsp:CheckBoxOption id="optionBootFromCD" runat="server"
+                                        Text="Boot from CD" meta:resourcekey="optionBootFromCD" Value="True" />
+                                </td>
+                                <td>
+                                    <wsp:CheckBoxOption id="optionNumLock" runat="server"
+                                        Text="Num Lock enabled" meta:resourcekey="optionNumLock" Value="False" />
+                                </td>
+                            </tr>
+                        </table>
+                    </asp:Panel>
+                    
+                    <wsp:CollapsiblePanel id="secActions" runat="server"
+                        TargetControlID="ActionsPanel" meta:resourcekey="secActions" Text="Allowed actions">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="ActionsPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                        <table style="width:400px;" cellspacing="5">
+                            <tr>
+                                <td style="width:200px;">
+                                    <wsp:CheckBoxOption id="optionStartShutdown" runat="server"
+                                        Text="Start, Turn off and Shutdown" meta:resourcekey="optionStartShutdown" Value="True" />
+                                </td>
+                                <td>
+                                    <wsp:CheckBoxOption id="optionReset" runat="server"
+                                        Text="Reset" meta:resourcekey="optionReset" Value="True" />
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <wsp:CheckBoxOption id="optionPauseResume" runat="server"
+                                        Text="Pause, Resume" meta:resourcekey="optionPauseResume" Value="False" />
+                                </td>
+                                <td>
+                                    <wsp:CheckBoxOption id="optionReinstall" runat="server"
+                                        Text="Re-install" meta:resourcekey="optionReinstall" Value="True" />
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <wsp:CheckBoxOption id="optionReboot" runat="server"
+                                        Text="Reboot" meta:resourcekey="optionReboot" Value="True" />
+                                </td>
+                                <td>
+                                    
+                                </td>
+                            </tr>
+                        </table>
+                    </asp:Panel>
+                    
+                    <wsp:CollapsiblePanel id="secNetwork" runat="server"
+                        TargetControlID="NetworkPanel" meta:resourcekey="secNetwork" Text="Network">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="NetworkPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                        <table cellspacing="5">
+                            <tr>
+                                <td><wsp:CheckBoxOption id="optionExternalNetwork" runat="server"
+                                        Text="External network enabled" meta:resourcekey="optionExternalNetwork" Value="True" />
+                                </td>
+                            </tr>
+                            <tr>
+                                <td><wsp:CheckBoxOption id="optionPrivateNetwork" runat="server"
+                                        Text="Private network enabled" meta:resourcekey="optionPrivateNetwork" Value="True" />
+                                </td>
+                            </tr>
+                        </table>
+                    </asp:Panel>
+                    
+                    <p style="padding: 5px;">
+                        <asp:Button ID="btnEdit" runat="server" CssClass="Button1"
+			                 meta:resourcekey="btnEdit" Text="Edit configuration" CausesValidation="false" 
+                            onclick="btnEdit_Click" />
+                    </p>
+
+
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
+
+<asp:Panel ID="ChangePasswordPanel" runat="server" CssClass="Popup" style="display:none;">
+	<table class="Popup-Header" cellpadding="0" cellspacing="0">
+		<tr>
+			<td class="Popup-HeaderLeft"></td>
+			<td class="Popup-HeaderTitle">
+				<asp:Localize ID="locChangePassword" runat="server" Text="Change Administrator Password"
+				    meta:resourcekey="locChangePassword"></asp:Localize>
+			</td>
+			<td class="Popup-HeaderRight"></td>
+		</tr>
+	</table>
+	<div class="Popup-Content">
+		<div class="Popup-Body">
+			<br />
+			
+			<table cellspacing="7" style="margin-left:20px;">
+			    <tr>
+			        <td>
+			            <asp:Localize ID="locNewPassword" runat="server" Text="Enter new password:"
+				            meta:resourcekey="locNewPassword"></asp:Localize>
+			        </td>
+			    </tr>
+			    <tr>
+			        <td>
+			            <wsp:PasswordControl id="password" runat="server"
+			                ValidationGroup="ChangePassword"></wsp:PasswordControl>
+			        </td>
+			    </tr>
+			</table>
+			
+                                                
+			<br />
+		</div>
+		
+		<div class="FormFooter">
+		    <asp:Button ID="btnChangePassword" runat="server" CssClass="Button1"
+		        meta:resourcekey="btnChangePassword" Text="Change password" 
+                ValidationGroup="ChangePassword" onclick="btnChangePassword_Click" />
+		        
+			<asp:Button ID="btnCancelChangePassword" runat="server" CssClass="Button1"
+			    meta:resourcekey="btnCancelChangePassword" Text="Cancel" CausesValidation="false" />
+		</div>
+	</div>
+</asp:Panel>
+
+<ajaxToolkit:ModalPopupExtender ID="ChangePasswordModal" runat="server" BehaviorID="PasswordModal"
+	TargetControlID="btnChangePasswordPopup" PopupControlID="ChangePasswordPanel"
+	BackgroundCssClass="modalBackground" DropShadow="false" CancelControlID="btnCancelChangePassword" />
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx.cs
new file mode 100644
index 00000000..6acbe292
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx.cs
@@ -0,0 +1,135 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.Virtualization;
+using WebsitePanel.Providers.Common;
+using WebsitePanel.EnterpriseServer;
+using WebsitePanel.Portal.Code.Helpers;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VpsDetailsConfiguration : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack && Request["action"] == "changed")
+                messageBox.ShowSuccessMessage("VPS_CHANGE_VM_CONFIGURATION");
+
+            if (!IsPostBack)
+            {
+                // config
+                BindConfiguration();
+
+                // bind password policy
+                password.SetPackagePolicy(PanelSecurity.PackageId, UserSettings.VPS_POLICY, "AdministratorPasswordPolicy");
+            }
+        }
+
+        private void BindConfiguration()
+        {
+            VirtualMachine vm = null;
+
+            try
+            {
+                // load machine
+                vm = ES.Services.VPS2012.GetVirtualMachineItem(PanelRequest.ItemID);
+
+                if (vm == null)
+                {
+                    messageBox.ShowErrorMessage("VPS_LOAD_VM_META_ITEM");
+                    return;
+                }
+
+                // bind item
+                litOperatingSystem.Text = vm.OperatingSystemTemplate;
+
+                litCpu.Text = String.Format(GetLocalizedString("CpuCores.Text"), vm.CpuCores);
+                litRam.Text = String.Format(GetLocalizedString("Ram.Text"), vm.RamSize);
+                litHdd.Text = String.Format(GetLocalizedString("Hdd.Text"), vm.HddSize);
+                litSnapshots.Text = vm.SnapshotsNumber.ToString();
+
+                optionDvdInstalled.Value = vm.DvdDriveInstalled;
+                optionBootFromCD.Value = vm.BootFromCD;
+                optionNumLock.Value = vm.NumLockEnabled;
+
+                optionStartShutdown.Value = vm.StartTurnOffAllowed;
+                optionPauseResume.Value = vm.PauseResumeAllowed;
+                optionReset.Value = vm.ResetAllowed;
+                optionReboot.Value = vm.RebootAllowed;
+                optionReinstall.Value = vm.ReinstallAllowed;
+
+                optionExternalNetwork.Value = vm.ExternalNetworkEnabled;
+                optionPrivateNetwork.Value = vm.PrivateNetworkEnabled;
+
+                // toggle buttons
+                bool manageAllowed = VirtualMachines2012Helper.IsVirtualMachineManagementAllowed(PanelSecurity.PackageId);
+                btnEdit.Visible = manageAllowed;
+
+                this.BindSettingsControls(vm);
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_LOAD_VM_META_ITEM", ex);
+            }
+        }
+
+        protected void btnChangePassword_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                ResultObject res = ES.Services.VPS2012.ChangeAdministratorPassword(PanelRequest.ItemID, password.Password);
+
+                if (res.IsSuccess)
+                {
+                    // show success message
+                    messageBox.ShowSuccessMessage("VPS_CHANGE_ADMIN_PASSWORD");
+                }
+                else
+                {
+                    // show error
+                    messageBox.ShowMessage(res, "VPS_CHANGE_ADMIN_PASSWORD", "VPS");
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_CHANGE_ADMIN_PASSWORD", ex);
+            }
+        }
+
+        protected void btnEdit_Click(object sender, EventArgs e)
+        {
+            Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "vps_edit_config",
+                "SpaceID=" + PanelSecurity.PackageId.ToString()));
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx.designer.cs
new file mode 100644
index 00000000..0e1944fa
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsConfiguration.ascx.designer.cs
@@ -0,0 +1,492 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VpsDetailsConfiguration {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.ServerTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// secSoftware control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secSoftware;
+        
+        /// <summary>
+        /// SoftwarePanel 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 SoftwarePanel;
+        
+        /// <summary>
+        /// locOperatingSystem 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 locOperatingSystem;
+        
+        /// <summary>
+        /// litOperatingSystem 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.Literal litOperatingSystem;
+        
+        /// <summary>
+        /// locAdministratorPassword 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 locAdministratorPassword;
+        
+        /// <summary>
+        /// btnChangePasswordPopup 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.LinkButton btnChangePasswordPopup;
+        
+        /// <summary>
+        /// GenerationSetting control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Generation GenerationSetting;
+        
+        /// <summary>
+        /// secResources control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secResources;
+        
+        /// <summary>
+        /// ResourcesPanel 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 ResourcesPanel;
+        
+        /// <summary>
+        /// lblCpu 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 lblCpu;
+        
+        /// <summary>
+        /// litCpu 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.Literal litCpu;
+        
+        /// <summary>
+        /// lblRam 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 lblRam;
+        
+        /// <summary>
+        /// litRam 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.Literal litRam;
+        
+        /// <summary>
+        /// lblHdd 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 lblHdd;
+        
+        /// <summary>
+        /// litHdd 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.Literal litHdd;
+        
+        /// <summary>
+        /// DynamicMemorySetting control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.DynamicMemoryControl DynamicMemorySetting;
+        
+        /// <summary>
+        /// secSnapshots control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secSnapshots;
+        
+        /// <summary>
+        /// SnapshotsPanel 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 SnapshotsPanel;
+        
+        /// <summary>
+        /// locSnapshots 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 locSnapshots;
+        
+        /// <summary>
+        /// litSnapshots 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.Literal litSnapshots;
+        
+        /// <summary>
+        /// secDvd control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secDvd;
+        
+        /// <summary>
+        /// DvdPanel 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 DvdPanel;
+        
+        /// <summary>
+        /// optionDvdInstalled control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionDvdInstalled;
+        
+        /// <summary>
+        /// secBios control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secBios;
+        
+        /// <summary>
+        /// BiosPanel 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 BiosPanel;
+        
+        /// <summary>
+        /// optionBootFromCD control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionBootFromCD;
+        
+        /// <summary>
+        /// optionNumLock control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionNumLock;
+        
+        /// <summary>
+        /// secActions control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secActions;
+        
+        /// <summary>
+        /// ActionsPanel 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 ActionsPanel;
+        
+        /// <summary>
+        /// optionStartShutdown control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionStartShutdown;
+        
+        /// <summary>
+        /// optionReset control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionReset;
+        
+        /// <summary>
+        /// optionPauseResume control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionPauseResume;
+        
+        /// <summary>
+        /// optionReinstall control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionReinstall;
+        
+        /// <summary>
+        /// optionReboot control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionReboot;
+        
+        /// <summary>
+        /// secNetwork control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secNetwork;
+        
+        /// <summary>
+        /// NetworkPanel 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 NetworkPanel;
+        
+        /// <summary>
+        /// optionExternalNetwork control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionExternalNetwork;
+        
+        /// <summary>
+        /// optionPrivateNetwork control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.CheckBoxOption optionPrivateNetwork;
+        
+        /// <summary>
+        /// btnEdit 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.Button btnEdit;
+        
+        /// <summary>
+        /// ChangePasswordPanel 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 ChangePasswordPanel;
+        
+        /// <summary>
+        /// locChangePassword 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 locChangePassword;
+        
+        /// <summary>
+        /// locNewPassword 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 locNewPassword;
+        
+        /// <summary>
+        /// password control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.PasswordControl password;
+        
+        /// <summary>
+        /// btnChangePassword 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.Button btnChangePassword;
+        
+        /// <summary>
+        /// btnCancelChangePassword 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.Button btnCancelChangePassword;
+        
+        /// <summary>
+        /// ChangePasswordModal control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::AjaxControlToolkit.ModalPopupExtender ChangePasswordModal;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsDvd.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsDvd.ascx
new file mode 100644
index 00000000..024aeec9
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsDvd.ascx
@@ -0,0 +1,62 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VpsDetailsDvd.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VpsDetailsDvd" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/ServerTabs.ascx" TagName="ServerTabs" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/FormTitle.ascx" TagName="FormTitle" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="DvdDrive48" runat="server" />
+				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="DVD" />
+			    </div>
+			    <div class="FormBody">
+			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_dvd" />
+	
+                        <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                        
+			            <table style="margin: 50px 0px 50px 50px">
+			                <tr>
+			                    <td><asp:Localize ID="locDvdDrive" runat="server" meta:resourcekey="locDvdDrive" Text="DVD Drive:"></asp:Localize></td>
+			                </tr>
+			                <tr>
+			                    <td>
+			                        <asp:TextBox ID="txtInsertedDisk" runat="server" Width="400px"
+			                            CssClass="NormalTextBox" ReadOnly="true"></asp:TextBox>
+			                    </td>
+			                </tr>
+			                <tr>
+			                    <td>
+			                        <br />
+			                        <br />
+			                        <asp:Button ID="btnInsertDisk" runat="server" CausesValidation="false"
+			                            Text="Insert Disk..." meta:resourcekey="btnInsertDisk" CssClass="Button1" 
+                                        onclick="btnInsertDisk_Click" />
+                                    <asp:Button ID="btnEjectDisk" runat="server" CausesValidation="false"
+			                            Text="Eject" meta:resourcekey="btnEjectDisk" CssClass="Button1" 
+                                        onclick="btnEjectDisk_Click" />
+			                    </td>
+			                </tr>
+			            </table>
+     
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsDvd.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsDvd.ascx.cs
new file mode 100644
index 00000000..d8be6bad
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsDvd.ascx.cs
@@ -0,0 +1,101 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.Virtualization;
+using WebsitePanel.Providers.Common;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VpsDetailsDvd : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack && Request["action"] == "inserted")
+                messageBox.ShowSuccessMessage("VPS_DVD_INSERTED");
+
+            if (!IsPostBack)
+            {
+                BindDvdDisk();
+            }
+        }
+
+        private void BindDvdDisk()
+        {
+            LibraryItem disk = ES.Services.VPS2012.GetInsertedDvdDisk(PanelRequest.ItemID);
+
+            if (disk != null)
+            {
+                txtInsertedDisk.Text = disk.Name;
+                btnInsertDisk.Enabled = false;
+                btnEjectDisk.Enabled = true;
+            }
+            else
+            {
+                txtInsertedDisk.Text = GetLocalizedString("NoDisk.Text");
+                btnInsertDisk.Enabled = true;
+                btnEjectDisk.Enabled = false;
+            }
+        }
+
+        protected void btnInsertDisk_Click(object sender, EventArgs e)
+        {
+            Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "vps_insert_dvd",
+                "SpaceID=" + PanelSecurity.PackageId.ToString()));
+        }
+
+        protected void btnEjectDisk_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                ResultObject res = ES.Services.VPS2012.EjectDvdDisk(PanelRequest.ItemID);
+
+                if (res.IsSuccess)
+                {
+                    // re-bind
+                    messageBox.ShowSuccessMessage("VPS_DVD_EJECTED");
+                    BindDvdDisk();
+                    return;
+                }
+                else
+                {
+                    // show error
+                    messageBox.ShowMessage(res, "VPS_ERROR_EJECT_DVD_DISK", "VPS");
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_ERROR_EJECT_DVD_DISK", ex);
+            }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsDvd.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsDvd.ascx.designer.cs
new file mode 100644
index 00000000..a53e046c
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsDvd.ascx.designer.cs
@@ -0,0 +1,114 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VpsDetailsDvd {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.ServerTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// locDvdDrive 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 locDvdDrive;
+        
+        /// <summary>
+        /// txtInsertedDisk 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 txtInsertedDisk;
+        
+        /// <summary>
+        /// btnInsertDisk 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.Button btnInsertDisk;
+        
+        /// <summary>
+        /// btnEjectDisk 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.Button btnEjectDisk;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx
new file mode 100644
index 00000000..1d0a2e75
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx
@@ -0,0 +1,201 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VpsDetailsEditConfiguration.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VpsDetailsEditConfiguration" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/ServerTabs.ascx" TagName="ServerTabs" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/FormTitle.ascx" TagName="FormTitle" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+<%@ Register TagPrefix="wsp" TagName="DynamicMemoryControl" Src="UserControls/DynamicMemoryControl.ascx" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="ServerConfig48" runat="server" />
+				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Edit Configuration" />
+			    </div>
+			    <div class="FormBody">
+			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_config" />	
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+		            <p class="SubTitle">
+		                <asp:Localize ID="locSubTitle" runat="server" meta:resourcekey="locSubTitle" Text="Edit Configuration" />
+		            </p>
+
+                    <asp:ValidationSummary ID="validatorsSummary" runat="server" 
+                        ValidationGroup="Vps" ShowMessageBox="True" ShowSummary="False" />
+                    
+                    <wsp:CollapsiblePanel id="secResources" runat="server"
+                        TargetControlID="ResourcesPanel" meta:resourcekey="secResources" Text="Resources">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="ResourcesPanel" runat="server" Height="0" style="overflow:hidden;padding:10px;width:400px;">
+                        <table cellpadding="3">
+                            <tr>
+                                <td style="width:60px;"><asp:Label ID="lblCpu" runat="server" AssociatedControlID="ddlCpu"
+                                        meta:resourcekey="lblCpu" Text="CPU:" CssClass="Medium" /></td>
+                                <td>
+                                    <asp:DropDownList ID="ddlCpu" runat="server" CssClass="HugeTextBox">
+                                    </asp:DropDownList>
+                                </td>
+                                <td><asp:Localize ID="locCores" runat="server" meta:resourcekey="locCores" Text="cores"/></td>
+                            </tr>
+                        </table>
+                        <table cellpadding="3">
+                            <tr>
+                                <td style="width:60px;"><asp:Label ID="lblRam" runat="server" AssociatedControlID="txtRam"
+                                        meta:resourcekey="lblRam" Text="RAM:" CssClass="Medium" /></td>
+                                <td>
+                                    <asp:TextBox ID="txtRam" runat="server" CssClass="HugeTextBox" Width="70"></asp:TextBox>
+                                    <asp:RequiredFieldValidator ID="RequireRamValidator" runat="server" Text="*" Display="Dynamic"
+                                        ControlToValidate="txtRam" meta:resourcekey="RequireRamValidator" SetFocusOnError="true"
+                                        ValidationGroup="Vps">*</asp:RequiredFieldValidator>
+                                </td>
+                                <td><asp:Localize ID="locMB" runat="server" meta:resourcekey="locMB" Text="MB"/></td>
+                            </tr>
+                        </table>
+                        <table cellpadding="3">
+                            <tr>
+                                <td style="width:60px;"><asp:Label ID="lblHdd" runat="server" AssociatedControlID="txtHdd"
+                                        meta:resourcekey="lblHdd" Text="HDD:" CssClass="Medium" /></td>
+                                <td>
+                                    <asp:TextBox ID="txtHdd" runat="server" CssClass="HugeTextBox" Width="70"></asp:TextBox>
+                                    <asp:RequiredFieldValidator ID="RequireHddValidator" runat="server" Text="*" Display="Dynamic"
+                                        ControlToValidate="txtHdd" meta:resourcekey="RequireHddValidator" SetFocusOnError="true"
+                                        ValidationGroup="Vps">*</asp:RequiredFieldValidator>
+                                </td>
+                                <td><asp:Localize ID="locGB" runat="server" meta:resourcekey="locGB" Text="GB"/></td>
+                            </tr>
+                        </table>
+                    </asp:Panel>
+                    
+                    <wsp:DynamicMemoryControl runat="server" ID="DynamicMemorySetting" Mode="Edit"/>
+                    
+                    <wsp:CollapsiblePanel id="secSnapshots" runat="server"
+                        TargetControlID="SnapshotsPanel" meta:resourcekey="secSnapshots" Text="Snapshots">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="SnapshotsPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                        <table>
+                            <tr>
+                                <td class="FormLabel150"><asp:Localize ID="locSnapshots" runat="server"
+                                    meta:resourcekey="locSnapshots" Text="Number of snapshots:"></asp:Localize></td>
+                                <td>
+                                    <asp:TextBox ID="txtSnapshots" runat="server" CssClass="NormalTextBox" Width="50"></asp:TextBox>
+                                    
+                                    <asp:RequiredFieldValidator ID="SnapshotsValidator" runat="server" Text="*" Display="Dynamic"
+                                        ControlToValidate="txtSnapshots" meta:resourcekey="SnapshotsValidator" SetFocusOnError="true"
+                                        ValidationGroup="Vps">*</asp:RequiredFieldValidator>
+                                </td>
+                            </tr>
+                        </table>
+                    </asp:Panel>
+                    
+                    <wsp:CollapsiblePanel id="secDvd" runat="server"
+                        TargetControlID="DvdPanel" meta:resourcekey="secDvd" Text="DVD">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="DvdPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                        <table>
+                            <tr>
+                                <td>
+                                    <asp:CheckBox ID="chkDvdInstalled" runat="server" Checked="true"
+                                        Text="DVD drive installed" meta:resourcekey="chkDvdInstalled" />
+                                </td>
+                            </tr>
+                        </table>
+                    </asp:Panel>
+                    
+                    <wsp:CollapsiblePanel id="secBios" runat="server"
+                        TargetControlID="BiosPanel" meta:resourcekey="secBios" Text="BIOS">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="BiosPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                        <table>
+                            <tr>
+                                <td style="width:200px;">
+                                    <asp:CheckBox ID="chkBootFromCd" runat="server" Text="Boot from CD" meta:resourcekey="chkBootFromCd" />
+                                </td>
+                                <td>
+                                    <asp:CheckBox ID="chkNumLock" runat="server" Text="Num Lock enabled" meta:resourcekey="chkNumLock" />
+                                </td>
+                            </tr>
+                        </table>
+                    </asp:Panel>
+                    
+                    <wsp:CollapsiblePanel id="secActions" runat="server"
+                        TargetControlID="ActionsPanel" meta:resourcekey="secActions" Text="Allowed actions">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="ActionsPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                        <table style="width:400px;">
+                            <tr>
+                                <td style="width:200px;">
+                                    <asp:CheckBox ID="chkStartShutdown" runat="server" Text="Start, Turn off and Shutdown" meta:resourcekey="chkStartShutdown" />
+                                </td>
+                                <td>
+                                    <asp:CheckBox ID="chkReset" runat="server" Text="Reset" meta:resourcekey="chkReset" />
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <asp:CheckBox ID="chkPauseResume" runat="server" Text="Pause, Resume" meta:resourcekey="chkPauseResume" />
+                                </td>
+                                <td>
+                                    <asp:CheckBox ID="chkReinstall" runat="server" Text="Re-install" meta:resourcekey="chkReinstall" />
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <asp:CheckBox ID="chkReboot" runat="server" Text="Reboot" meta:resourcekey="chkReboot" />
+                                </td>
+                                <td>
+                                    
+                                </td>
+                            </tr>
+                        </table>
+                    </asp:Panel>
+                    
+                    <wsp:CollapsiblePanel id="secNetwork" runat="server"
+                        TargetControlID="NetworkPanel" meta:resourcekey="secNetwork" Text="Network">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="NetworkPanel" runat="server" Height="0" style="overflow:hidden;padding:5px;">
+                        <table cellspacing="5">
+                            <tr>
+                                <td>
+                                    <asp:CheckBox ID="chkExternalNetworkEnabled" runat="server"
+                                             meta:resourcekey="chkExternalNetworkEnabled" Text="External network enabled" />
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <asp:CheckBox ID="chkPrivateNetworkEnabled" runat="server"
+                                                    meta:resourcekey="chkPrivateNetworkEnabled" Text="Private network enabled" />
+                                </td>
+                            </tr>
+                        </table>
+                    </asp:Panel>
+                    
+                    <p>
+                        <asp:Button ID="btnUpdate" runat="server" meta:resourcekey="btnUpdate"
+                            ValidationGroup="Vps" Text="Update" CssClass="Button1" 
+                            onclick="btnUpdate_Click" />
+                        <asp:Button ID="btnCancel" runat="server" meta:resourcekey="btnCancel"
+                            CausesValidation="false" Text="Cancel" CssClass="Button1" 
+                            onclick="btnCancel_Click" />
+                    </p>       
+
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx.cs
new file mode 100644
index 00000000..21ccc0c6
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx.cs
@@ -0,0 +1,191 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.Virtualization;
+using WebsitePanel.Providers.Common;
+using WebsitePanel.EnterpriseServer;
+using WebsitePanel.Portal.Code.Helpers;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VpsDetailsEditConfiguration : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BindConfiguration();
+            }
+        }
+
+        private void BindConfiguration()
+        {
+            VirtualMachine vm = null;
+
+            try
+            {
+                // load machine
+                vm = ES.Services.VPS2012.GetVirtualMachineItem(PanelRequest.ItemID);
+
+                if (vm == null)
+                {
+                    messageBox.ShowErrorMessage("VPS_LOAD_VM_META_ITEM");
+                    return;
+                }
+
+                // bind CPU cores
+                int maxCores = ES.Services.VPS2012.GetMaximumCpuCoresNumber(vm.PackageId);
+                PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
+                if (cntx.Quotas.ContainsKey(Quotas.VPS2012_CPU_NUMBER))
+                {
+                    QuotaValueInfo cpuQuota = cntx.Quotas[Quotas.VPS2012_CPU_NUMBER];
+
+                    if (cpuQuota.QuotaAllocatedValue != -1
+                        && maxCores > cpuQuota.QuotaAllocatedValue)
+                        maxCores = cpuQuota.QuotaAllocatedValue;
+                }
+
+                for (int i = 1; i < maxCores + 1; i++)
+                    ddlCpu.Items.Add(i.ToString());
+
+                // bind item
+                ddlCpu.SelectedValue = vm.CpuCores.ToString();
+                txtRam.Text = vm.RamSize.ToString();
+                txtHdd.Text = vm.HddSize.ToString();
+                txtSnapshots.Text = vm.SnapshotsNumber.ToString();
+
+                chkDvdInstalled.Checked = vm.DvdDriveInstalled;
+                chkBootFromCd.Checked = vm.BootFromCD;
+                chkNumLock.Checked = vm.NumLockEnabled;
+
+                chkStartShutdown.Checked = vm.StartTurnOffAllowed;
+                chkPauseResume.Checked = vm.PauseResumeAllowed;
+                chkReset.Checked = vm.ResetAllowed;
+                chkReboot.Checked = vm.RebootAllowed;
+                chkReinstall.Checked = vm.ReinstallAllowed;
+
+                chkExternalNetworkEnabled.Checked = vm.ExternalNetworkEnabled;
+                chkPrivateNetworkEnabled.Checked = vm.PrivateNetworkEnabled;
+
+                // other quotas
+                BindCheckboxOption(chkDvdInstalled, Quotas.VPS2012_DVD_ENABLED);
+                chkBootFromCd.Enabled = PackagesHelper.IsQuotaEnabled(PanelSecurity.PackageId, Quotas.VPS2012_BOOT_CD_ALLOWED);
+
+                BindCheckboxOption(chkStartShutdown, Quotas.VPS2012_START_SHUTDOWN_ALLOWED);
+                BindCheckboxOption(chkPauseResume, Quotas.VPS2012_PAUSE_RESUME_ALLOWED);
+                BindCheckboxOption(chkReset, Quotas.VPS2012_RESET_ALOWED);
+                BindCheckboxOption(chkReboot, Quotas.VPS2012_REBOOT_ALLOWED);
+                BindCheckboxOption(chkReinstall, Quotas.VPS2012_REINSTALL_ALLOWED);
+
+                BindCheckboxOption(chkExternalNetworkEnabled, Quotas.VPS2012_EXTERNAL_NETWORK_ENABLED);
+                BindCheckboxOption(chkPrivateNetworkEnabled, Quotas.VPS2012_PRIVATE_NETWORK_ENABLED);
+
+                this.BindSettingsControls(vm);
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_LOAD_VM_META_ITEM", ex);
+            }
+        }
+
+        private void BindCheckboxOption(CheckBox chk, string quotaName)
+        {
+            chk.Enabled = PackagesHelper.IsQuotaEnabled(PanelSecurity.PackageId, quotaName);
+        }
+
+        protected void btnCancel_Click(object sender, EventArgs e)
+        {
+            RedirectBack("cancel");
+        }
+
+        private void RedirectBack(string action)
+        {
+            Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "vps_config",
+                "SpaceID=" + PanelSecurity.PackageId.ToString(),
+                "action=" + action));
+        }
+
+        protected void btnUpdate_Click(object sender, EventArgs e)
+        {
+            if (!Page.IsValid)
+                return;
+            
+            try
+            {
+                // check rights
+                bool manageAllowed = VirtualMachines2012Helper.IsVirtualMachineManagementAllowed(PanelSecurity.PackageId);
+                if (!manageAllowed)
+                {
+                    return;
+                }
+
+                VirtualMachine virtualMachine = new VirtualMachine();
+
+                // the custom provider control
+                this.SaveSettingsControls(ref virtualMachine);
+
+                ResultObject res = ES.Services.VPS2012.UpdateVirtualMachineConfiguration(PanelRequest.ItemID,
+                    Utils.ParseInt(ddlCpu.SelectedValue),
+                    Utils.ParseInt(txtRam.Text.Trim()),
+                    Utils.ParseInt(txtHdd.Text.Trim()),
+                    Utils.ParseInt(txtSnapshots.Text.Trim()),
+                    chkDvdInstalled.Checked,
+                    chkBootFromCd.Checked,
+                    chkNumLock.Checked,
+                    chkStartShutdown.Checked,
+                    chkPauseResume.Checked,
+                    chkReboot.Checked,
+                    chkReset.Checked,
+                    chkReinstall.Checked,
+                    chkExternalNetworkEnabled.Checked,
+                    chkPrivateNetworkEnabled.Checked,
+                    virtualMachine);
+
+                if (res.IsSuccess)
+                {
+                    // redirect back
+                    RedirectBack("changed");
+                }
+                else
+                {
+                    // show error
+                    messageBox.ShowMessage(res, "VPS_CHANGE_VM_CONFIGURATION", "VPS");
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_CHANGE_VM_CONFIGURATION", ex);
+            }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx.designer.cs
new file mode 100644
index 00000000..b0942dc9
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsEditConfiguration.ascx.designer.cs
@@ -0,0 +1,447 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VpsDetailsEditConfiguration {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.ServerTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// locSubTitle 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 locSubTitle;
+        
+        /// <summary>
+        /// validatorsSummary 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.ValidationSummary validatorsSummary;
+        
+        /// <summary>
+        /// secResources control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secResources;
+        
+        /// <summary>
+        /// ResourcesPanel 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 ResourcesPanel;
+        
+        /// <summary>
+        /// lblCpu 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.Label lblCpu;
+        
+        /// <summary>
+        /// ddlCpu 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.DropDownList ddlCpu;
+        
+        /// <summary>
+        /// locCores 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 locCores;
+        
+        /// <summary>
+        /// lblRam 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.Label lblRam;
+        
+        /// <summary>
+        /// txtRam 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 txtRam;
+        
+        /// <summary>
+        /// RequireRamValidator 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.RequiredFieldValidator RequireRamValidator;
+        
+        /// <summary>
+        /// locMB 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 locMB;
+        
+        /// <summary>
+        /// lblHdd 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.Label lblHdd;
+        
+        /// <summary>
+        /// txtHdd 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 txtHdd;
+        
+        /// <summary>
+        /// RequireHddValidator 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.RequiredFieldValidator RequireHddValidator;
+        
+        /// <summary>
+        /// locGB 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 locGB;
+        
+        /// <summary>
+        /// DynamicMemorySetting control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.DynamicMemoryControl DynamicMemorySetting;
+        
+        /// <summary>
+        /// secSnapshots control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secSnapshots;
+        
+        /// <summary>
+        /// SnapshotsPanel 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 SnapshotsPanel;
+        
+        /// <summary>
+        /// locSnapshots 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 locSnapshots;
+        
+        /// <summary>
+        /// txtSnapshots 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 txtSnapshots;
+        
+        /// <summary>
+        /// SnapshotsValidator 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.RequiredFieldValidator SnapshotsValidator;
+        
+        /// <summary>
+        /// secDvd control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secDvd;
+        
+        /// <summary>
+        /// DvdPanel 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 DvdPanel;
+        
+        /// <summary>
+        /// chkDvdInstalled 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 chkDvdInstalled;
+        
+        /// <summary>
+        /// secBios control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secBios;
+        
+        /// <summary>
+        /// BiosPanel 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 BiosPanel;
+        
+        /// <summary>
+        /// chkBootFromCd 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 chkBootFromCd;
+        
+        /// <summary>
+        /// chkNumLock 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 chkNumLock;
+        
+        /// <summary>
+        /// secActions control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secActions;
+        
+        /// <summary>
+        /// ActionsPanel 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 ActionsPanel;
+        
+        /// <summary>
+        /// chkStartShutdown 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 chkStartShutdown;
+        
+        /// <summary>
+        /// chkReset 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 chkReset;
+        
+        /// <summary>
+        /// chkPauseResume 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 chkPauseResume;
+        
+        /// <summary>
+        /// chkReinstall 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 chkReinstall;
+        
+        /// <summary>
+        /// chkReboot 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 chkReboot;
+        
+        /// <summary>
+        /// secNetwork control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secNetwork;
+        
+        /// <summary>
+        /// NetworkPanel 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 NetworkPanel;
+        
+        /// <summary>
+        /// chkExternalNetworkEnabled 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 chkExternalNetworkEnabled;
+        
+        /// <summary>
+        /// chkPrivateNetworkEnabled 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 chkPrivateNetworkEnabled;
+        
+        /// <summary>
+        /// btnUpdate 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.Button btnUpdate;
+        
+        /// <summary>
+        /// btnCancel 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.Button btnCancel;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx
new file mode 100644
index 00000000..ef3ec791
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx
@@ -0,0 +1,295 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VpsDetailsGeneral.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VpsDetailsGeneral" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/ServerTabs.ascx" TagName="ServerTabs" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/FormTitle.ascx" TagName="FormTitle" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/Gauge.ascx" TagName="Gauge" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<asp:Timer runat="server" Interval="10000" ID="operationTimer" />
+
+<script language="JavaScript" type="text/javascript">
+function OpenRemoteDesktopWindow(resolution, width, height) {
+    $find("RdpPopup").hidePopup();
+    var rdpUrl = "<asp:literal id="litRdpPageUrl" runat="server" />";
+    var left = (screen.width - width) / 2;
+    var top = (screen.height - height) / 2;
+    my_window = window.open(rdpUrl + resolution, "RDP", "status=0,width=" + width + ",height=" + height + ",top=" + top + ",left=" + left); 
+}
+</script>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="Server48" runat="server" />
+				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="General" />
+			    </div>
+			    <div class="FormBody">
+			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_general" />	
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+				    <table id="DetailsTable" runat="server" style="width:100%;" cellspacing="10">
+				        <tr>
+				            <td valign="top" style="width:40%;">
+
+                                <table cellspacing="2">
+                                   <tr>
+                                        <td><asp:Localize ID="locHostname" runat="server"
+                                            meta:resourcekey="locHostname" Text="Host name:"/></td>
+                                        <td>
+                                            <b><asp:HyperLink ID="lnkHostname" runat="server" NavigateUrl="javascript:void(0);" Text="[hostname]"></asp:HyperLink><asp:Literal ID="litHostname" runat="server" Text="[hostname]"></asp:Literal></b>
+                                            &nbsp;<asp:LinkButton ID="btnChangeHostnamePopup" runat="server"
+                                                meta:resourcekey="btnChangeHostnamePopup" SkinID="EditSmall" Text="Edit"></asp:LinkButton>
+                                                
+                                            <asp:Panel ID="RdpPanel" runat="server" CssClass="PopupExtender" style="display:none;">
+                                                <div style="padding-bottom:3px;">
+                                                    <asp:Image ID="imgRdc" runat="server" SkinID="Rdc16" />&nbsp;
+                                                    <asp:Localize ID="locRdpText" runat="server" meta:resourcekey="locRdpText" Text="Remote desktop"></asp:Localize><br />
+                                                </div>
+                                                <asp:HyperLink ID="lnkRdpFull" runat="server" NavigateUrl="javascript:OpenRemoteDesktopWindow(1, 800, 600);"
+                                                    meta:resourcekey="lnkRdpFull" Text="Full screen"></asp:HyperLink><br />
+                                                <asp:HyperLink ID="lnkRdp800" runat="server" NavigateUrl="javascript:OpenRemoteDesktopWindow(2, 800, 600);"
+                                                    meta:resourcekey="lnkRdp800" Text="800 x 600"></asp:HyperLink><br />
+                                                <asp:HyperLink ID="lnkRdp1024" runat="server" NavigateUrl="javascript:OpenRemoteDesktopWindow(3, 1024 , 768);"
+                                                    meta:resourcekey="lnkRdp1024" Text="1024 x 768"></asp:HyperLink><br />
+                                                <asp:HyperLink ID="lnkRdp1280" runat="server" NavigateUrl="javascript:OpenRemoteDesktopWindow(4, 1280, 1024);"
+                                                    meta:resourcekey="lnkRdp1280" Text="1280 x 1024"></asp:HyperLink><br />
+                                            </asp:Panel>
+                                            
+                                            <ajaxToolkit:PopupControlExtender ID="RdpPopup" BehaviorID="RdpPopup" runat="server" TargetControlID="lnkHostname"
+                                                PopupControlID="RdpPanel" Position="Bottom" />
+                                            <ajaxToolkit:DropShadowExtender  ID="RdpShadow" runat="server" TargetControlID="RdpPanel" TrackPosition="true" Opacity="0.4" Width="3" />
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <asp:Localize ID="locDomainTop" runat="server" meta:resourcekey="locDomainTop" Text="Domain:"/>
+                                        </td>
+                                        <td>
+                                            <asp:Literal ID="litDomain" runat="server"></asp:Literal>
+                                        </td>
+                                    </tr>
+                                </table>
+                                
+				                <asp:UpdatePanel runat="server" ID="UpdatePanel2" UpdateMode="Conditional">
+                                    <Triggers>
+                                        <asp:AsyncPostBackTrigger ControlID="operationTimer" EventName="Tick" />
+                                    </Triggers>
+                                    <ContentTemplate>
+                                    
+                                <table cellspacing="2">
+                                    <tr>
+                                        <td><asp:Localize ID="locStatus" runat="server"
+                                            meta:resourcekey="locStatus" Text="Status:"/></td>
+                                        <td><asp:Literal ID="litStatus" runat="server" Text="[status]"/></td>
+                                    </tr>
+                                    <tr>
+                                        <td><asp:Localize ID="locUptime" runat="server"
+                                            meta:resourcekey="locUptime" Text="Uptime:"/></td>
+                                        <td><asp:Literal ID="litUptime" runat="server" Text="[uptime]"/></td>
+                                    </tr>
+                                    <tr>
+                                        <td><asp:Localize ID="locHeartbeat" runat="server"
+                                            meta:resourcekey="locHeartbeat" Text="Heartbeat:"/></td>
+                                        <td><asp:Literal ID="litHeartbeat" runat="server" Text="[value]"/></td>
+                                    </tr>
+                                    <tr>
+                                        <td><asp:Localize ID="locCreated" runat="server"
+                                            meta:resourcekey="locCreated" Text="Created:"/></td>
+                                        <td><asp:Literal ID="litCreated" runat="server" Text="[date]"/></td>
+                                    </tr>
+                                </table>
+				    				   </ContentTemplate>
+				                 </asp:UpdatePanel>
+				                 
+				            </td>
+				            <td valign="top" style="width:35%;">
+				                
+				                <asp:UpdatePanel runat="server" ID="UpdatePanel1" UpdateMode="Conditional">
+                                    <Triggers>
+                                        <asp:AsyncPostBackTrigger ControlID="operationTimer" EventName="Tick" />
+                                    </Triggers>
+                                    <ContentTemplate>                
+				                        <asp:Image ID="imgThumbnail" runat="server" Width="160" Height="120" style="border-style:ridge;border-width: 3px;border-color: #ffffff;" />
+				                    </ContentTemplate>
+				                 </asp:UpdatePanel>
+
+
+				            </td>
+				            <td rowspan="2" valign="top">
+				                <ul class="ActionButtons">
+				                    <asp:Repeater ID="repButtons" runat="server" 
+                                        onitemcommand="repButtons_ItemCommand">
+				                        <ItemTemplate>
+				                            <li>
+				                                <asp:LinkButton ID="btnAction" runat="server" CausesValidation="false"
+				                                    Text='<%# Eval("Text") %>'
+				                                    CommandName='<%# Eval("Command") %>'
+				                                    style='<%# Eval("Style") %>'
+				                                    OnClientClick='<%# Eval("OnClientClick") %>'
+				                                    CssClass="ActionButton"></asp:LinkButton>
+				                            </li>
+				                        </ItemTemplate>
+				                    </asp:Repeater>
+				                </ul>
+				            </td>
+				        </tr>
+				        <tr>
+				            <td colspan="2">
+				                <br />
+				                
+				                <asp:UpdatePanel runat="server" ID="UpdatePanel3" UpdateMode="Conditional">
+                                    <Triggers>
+                                        <asp:AsyncPostBackTrigger ControlID="operationTimer" EventName="Tick" />
+                                    </Triggers>
+                                    <ContentTemplate>
+                                    
+				                        <table cellspacing="5">
+                                            <tr>
+                                                <td class="NormalBold">
+                                                    <asp:Localize ID="locCpu" runat="server" meta:resourcekey="locCpu" Text="CPU:"/>
+                                                </td>
+				                                <td class="NormalBold" style="width:150px;">
+				                                    <wsp:Gauge ID="cpuGauge" runat="server" Progress="0" Total="100" />
+				                                    <asp:Literal ID="litCpuPercentage" runat="server" Text="0%"></asp:Literal>
+				                                </td>
+				                                <td>
+				                                    <asp:Literal ID="litCpuUsage" runat="server" Text=""></asp:Literal>
+				                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td class="NormalBold">
+                                                    <asp:Localize ID="locRam" runat="server" meta:resourcekey="locRam" Text="RAM:"/>
+                                                </td>
+				                                <td class="NormalBold">
+				                                    <wsp:Gauge ID="ramGauge" runat="server" Progress="0" Total="100" />
+				                                    <asp:Literal ID="litRamPercentage" runat="server" Text="0%"></asp:Literal>
+				                                </td>
+				                                <td>
+				                                    <asp:Literal ID="litRamUsage" runat="server" Text="Used: x MB, Total: x MB"></asp:Literal>
+				                                </td>
+                                            </tr>
+                                            <tr id="HddRow" runat="server" visible="false">
+                                                <td class="NormalBold">
+                                                    <asp:Localize ID="locHdd" runat="server" meta:resourcekey="locHdd" Text="HDD:"/>
+                                                </td>
+				                                <td class="NormalBold">
+				                                    <wsp:Gauge ID="hddGauge" runat="server" Progress="0" Total="100" />
+				                                    <asp:Literal ID="litHddPercentage" runat="server" Text="0%"></asp:Literal>
+				                                </td>
+				                                <td>
+				                                    <asp:Literal ID="litHddUsage" runat="server" Text="Free: x MB, Total: x MB on x drive(s)"></asp:Literal>
+				                                </td>
+                                            </tr>
+				                        </table>
+
+                                    </ContentTemplate>
+                                </asp:UpdatePanel>
+				            </td>
+				        </tr>
+				    </table>
+				    
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
+
+<asp:Panel ID="ChangeHostnamePanel" runat="server" CssClass="Popup" style="display:none;">
+	<table class="Popup-Header" cellpadding="0" cellspacing="0">
+		<tr>
+			<td class="Popup-HeaderLeft"></td>
+			<td class="Popup-HeaderTitle">
+				<asp:Localize ID="locChangeHostname" runat="server" Text="Change VPS host name"
+				    meta:resourcekey="locChangeHostname"></asp:Localize>
+			</td>
+			<td class="Popup-HeaderRight"></td>
+		</tr>
+	</table>
+	<div class="Popup-Content">
+		<div class="Popup-Body">
+			<br />
+			
+			<table cellspacing="5">
+			    <tr>
+			        <td colspan="2">
+			            <asp:ValidationSummary ID="validatorsSummary" runat="server" 
+                            ValidationGroup="ChangeHostname" />
+			        </td>
+			    </tr>
+			    <tr>
+			        <td>
+			            <asp:Localize ID="locHostname1" runat="server" Text="Host name:"
+				            meta:resourcekey="locHostname1"></asp:Localize>
+			        </td>
+			        <td>
+			            <asp:TextBox ID="txtHostname" runat="server" CssClass="NormalTextBox" Width="200"></asp:TextBox>
+			            
+			            <asp:RequiredFieldValidator ID="HostnameValidator" runat="server" Text="*" Display="Dynamic"
+                                ControlToValidate="txtHostname" meta:resourcekey="HostnameValidator" SetFocusOnError="true"
+                                ValidationGroup="ChangeHostname">*</asp:RequiredFieldValidator>
+                        <asp:RegularExpressionValidator id="valCorrectHostname" runat="server" Text="*" meta:resourcekey="valCorrectHostname"
+                                ValidationExpression="^[a-zA-Z]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?$"
+                                ControlToValidate="txtHostname" Display="Dynamic" SetFocusOnError="true" ValidationGroup="ChangeHostname">
+                            </asp:RegularExpressionValidator>
+			        </td>
+			    </tr>
+			    <tr>
+			        <td>
+			            <asp:Localize ID="locDomain" runat="server" Text="Domain:"
+				            meta:resourcekey="locDomain"></asp:Localize>
+			        </td>
+			        <td>
+			            <asp:TextBox ID="txtDomain" runat="server" CssClass="NormalTextBox" Width="200"></asp:TextBox>
+			            
+			            <asp:RequiredFieldValidator ID="DomainValidator" runat="server" Text="*" Display="Dynamic"
+                                ControlToValidate="txtDomain" meta:resourcekey="DomainValidator" SetFocusOnError="true"
+                                ValidationGroup="ChangeHostname">*</asp:RequiredFieldValidator>
+                        <asp:RegularExpressionValidator id="valNewDomainFormat" runat="server" Text="*" meta:resourcekey="valNewDomainFormat"
+                                ValidationExpression="^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.){1,10}[a-zA-Z]{2,6}$"
+                                ControlToValidate="txtDomain" Display="Dynamic" SetFocusOnError="true" ValidationGroup="ChangeHostname">
+                            </asp:RegularExpressionValidator>
+			        </td>
+			    </tr>
+			    <tr>
+			        <td></td>
+			        <td>
+			            <asp:CheckBox ID="chkUpdateComputerName" runat="server"
+			                meta:resourcekey="chkUpdateComputerName" Text="Update computer network name" />
+			        </td>
+			    </tr>
+			</table>
+			
+                                                
+			<br />
+		</div>
+		
+		<div class="FormFooter">
+		    <asp:Button ID="btnChangeHostname" runat="server" CssClass="Button1"
+		        meta:resourcekey="btnChangeHostname" Text="Change" 
+                ValidationGroup="ChangeHostname" onclick="btnChangeHostname_Click" />
+		        
+			<asp:Button ID="btnCancelHostname" runat="server" CssClass="Button1"
+			    meta:resourcekey="btnCancelHostname" Text="Cancel" CausesValidation="false" />
+		</div>
+	</div>
+</asp:Panel>
+
+<ajaxToolkit:ModalPopupExtender ID="ChangeHostnameModal" runat="server" BehaviorID="ChangeHostnameModal"
+	TargetControlID="btnChangeHostnamePopup" PopupControlID="ChangeHostnamePanel"
+	BackgroundCssClass="modalBackground" DropShadow="false" CancelControlID="btnCancelHostname" />
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx.cs
new file mode 100644
index 00000000..5f768272
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx.cs
@@ -0,0 +1,304 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using WebsitePanel.Providers.Common;
+using WebsitePanel.Providers.ResultObjects;
+using WebsitePanel.Providers.Virtualization;
+using System.Collections.Generic;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VpsDetailsGeneral : WebsitePanelModuleBase
+    {
+        private class ActionButton
+        {
+            public string Text { get; set; }
+            public string Command { get; set; }
+            public string Style { get; set; }
+            public string OnClientClick { get; set; }
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            BindGeneralDetails();
+        }
+
+        private void BindGeneralDetails()
+        {
+            VirtualMachine item = VirtualMachines2012Helper.GetCachedVirtualMachine(PanelRequest.ItemID);
+            if (!String.IsNullOrEmpty(item.CurrentTaskId)
+                || item.ProvisioningStatus == VirtualMachineProvisioningStatus.Error)
+            {
+                DetailsTable.Visible = false;
+                return;
+            }
+
+            VirtualMachine vm = null;
+            try
+            {
+                vm = ES.Services.VPS2012.GetVirtualMachineGeneralDetails(PanelRequest.ItemID);
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_ERROR_GET_VM_DETAILS", ex);
+            }
+
+            if (vm != null)
+            {
+                bool displayRDP = (Request.Browser.Browser == "IE"
+                    && Request.Browser.ActiveXControls
+                    && Request.Browser.VBScript
+                    && vm.State != VirtualMachineState.Off
+                    && vm.State != VirtualMachineState.Paused
+                    && vm.State != VirtualMachineState.Saved
+                    && item.RemoteDesktopEnabled);
+                lnkHostname.Text = item.Hostname.ToUpper();
+                lnkHostname.Visible = displayRDP;
+
+                litHostname.Text = item.Hostname.ToUpper();
+                litHostname.Visible = !displayRDP;
+
+                litDomain.Text = item.Domain;
+
+                if (!IsPostBack)
+                {
+                    // set host name change form
+                    txtHostname.Text = item.Hostname;
+                    txtDomain.Text = item.Domain;
+                }
+
+                litRdpPageUrl.Text = Page.ResolveUrl("~/DesktopModules/WebsitePanel/VPS2012/RemoteDesktop/Connect.aspx?ItemID=" + PanelRequest.ItemID + "&Resolution=");
+
+                TimeSpan uptime = TimeSpan.FromMilliseconds(vm.Uptime);
+                uptime = uptime.Subtract(TimeSpan.FromMilliseconds(uptime.Milliseconds));
+                litUptime.Text = uptime.ToString();
+                litStatus.Text = GetLocalizedString("State." + vm.State);
+                litCreated.Text = vm.CreatedDate.ToString();
+                litHeartbeat.Text = GetLocalizedString("Heartbeat." + vm.Heartbeat);
+
+                // CPU
+                cpuGauge.Progress = vm.CpuUsage;
+                litCpuPercentage.Text = String.Format(GetLocalizedString("CpuPercentage.Text"), vm.CpuUsage);
+
+                // RAM
+                if (vm.RamSize > 0)
+                {
+                    var totalRam = vm.RamSize;
+
+                    if (vm.DynamicMemory != null && vm.DynamicMemory.Enabled)
+                        totalRam = vm.DynamicMemory.Maximum;
+
+                    int ramPercent = Convert.ToInt32((float)vm.RamUsage / (float)totalRam * 100);
+                    ramGauge.Total = totalRam;
+                    ramGauge.Progress = vm.RamUsage;
+                    litRamPercentage.Text = String.Format(GetLocalizedString("MemoryPercentage.Text"), ramPercent);
+                    litRamUsage.Text = String.Format(GetLocalizedString("MemoryUsage.Text"), vm.RamUsage, totalRam);
+                }
+
+                // HDD
+                if (vm.HddLogicalDisks != null && vm.HddLogicalDisks.Length > 0)
+                {
+                    HddRow.Visible = true;
+
+                    int freeHdd = 0;
+                    int sizeHdd = 0;
+
+                    foreach (LogicalDisk disk in vm.HddLogicalDisks)
+                    {
+                        freeHdd += disk.FreeSpace;
+                        sizeHdd += disk.Size;
+                    }
+
+                    int usedHdd = sizeHdd - freeHdd;
+
+                    int hddPercent = Convert.ToInt32((float)usedHdd / (float)sizeHdd * 100);
+                    hddGauge.Total = sizeHdd;
+                    hddGauge.Progress = usedHdd;
+                    litHddPercentage.Text = String.Format(GetLocalizedString("HddPercentage.Text"), hddPercent);
+                    litHddUsage.Text = String.Format(GetLocalizedString("HddUsage.Text"), freeHdd, sizeHdd, vm.HddLogicalDisks.Length);
+                }
+
+                // update image
+                imgThumbnail.ImageUrl =
+                    String.Format("~/DesktopModules/WebsitePanel/VPS2012/VirtualMachineImage.ashx?ItemID={0}&rnd={1}",
+                    PanelRequest.ItemID, DateTime.Now.Ticks);
+
+                // load virtual machine meta item
+                VirtualMachine vmi = VirtualMachines2012Helper.GetCachedVirtualMachine(PanelRequest.ItemID);
+
+                // draw buttons
+                List<ActionButton> buttons = new List<ActionButton>();
+
+                if (vmi.StartTurnOffAllowed
+                    && (vm.State == VirtualMachineState.Off
+                    || vm.State == VirtualMachineState.Saved))
+                    buttons.Add(CreateActionButton("Start", "start.png"));
+
+                if (vm.State == VirtualMachineState.Running)
+                {
+                    if(vmi.RebootAllowed)
+                        buttons.Add(CreateActionButton("Reboot", "reboot.png"));
+
+                    if(vmi.StartTurnOffAllowed)
+                        buttons.Add(CreateActionButton("ShutDown", "shutdown.png"));
+                }
+
+                if (vmi.StartTurnOffAllowed
+                    && (vm.State == VirtualMachineState.Running
+                    || vm.State == VirtualMachineState.Paused))
+                    buttons.Add(CreateActionButton("TurnOff", "turnoff.png"));
+
+                if (vmi.PauseResumeAllowed
+                    && vm.State == VirtualMachineState.Running)
+                    buttons.Add(CreateActionButton("Pause", "pause.png"));
+
+                if (vmi.PauseResumeAllowed
+                    && vm.State == VirtualMachineState.Paused)
+                    buttons.Add(CreateActionButton("Resume", "start2.png"));
+
+                if (vmi.ResetAllowed
+                    && (vm.State == VirtualMachineState.Running
+                    || vm.State == VirtualMachineState.Paused))
+                    buttons.Add(CreateActionButton("Reset", "reset2.png"));
+
+                repButtons.DataSource = buttons;
+                repButtons.DataBind();
+
+                // other actions
+                bool manageAllowed = VirtualMachines2012Helper.IsVirtualMachineManagementAllowed(PanelSecurity.PackageId);
+                btnChangeHostnamePopup.Visible = manageAllowed;
+            }
+            else
+            {
+                DetailsTable.Visible = false;
+                messageBox.ShowErrorMessage("VPS_LOAD_VM_ITEM");
+            }
+        }
+
+        private ActionButton CreateActionButton(string command, string icon)
+        {
+            ActionButton btn = new ActionButton();
+            btn.Command = command;
+            btn.Style = String.Format(
+                "background: transparent url({0}) left center no-repeat;",
+                PortalUtils.GetThemedImage(String.Format("VPS/{0}", icon)));
+
+            string localizedText = GetLocalizedString("Command." + command);
+            btn.Text = localizedText != null ? localizedText : command;
+
+            btn.OnClientClick = GetLocalizedString("OnClientClick." + command);
+
+            return btn;
+        }
+
+        protected void repButtons_ItemCommand(object source, System.Web.UI.WebControls.RepeaterCommandEventArgs e)
+        {
+            try
+            {
+                ResultObject res = null;
+
+                string command = e.CommandName;
+                if (command == "Snapshot")
+                {
+                    res = ES.Services.VPS2012.CreateSnapshot(PanelRequest.ItemID);
+                }
+                else
+                {
+                    // parse command
+                    VirtualMachineRequestedState state = (VirtualMachineRequestedState)Enum.Parse(
+                        typeof(VirtualMachineRequestedState), command, true);
+
+                    // call services
+                    res = ES.Services.VPS2012.ChangeVirtualMachineState(PanelRequest.ItemID, state);
+                }
+
+                // check results
+                if (res.IsSuccess)
+                {
+                    if (command == "Snapshot")
+                    {
+                        // go to snapshots screen
+                        Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "vps_snapshots",
+                            "SpaceID=" + PanelSecurity.PackageId.ToString()));
+                    }
+                    else
+                    {
+                        // return
+                        BindGeneralDetails();
+                        return;
+                    }
+                }
+                else
+                {
+                    // show error
+                    messageBox.ShowMessage(res, "VPS_ERROR_CHANGE_VM_STATE", "VPS");
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_ERROR_CHANGE_VM_STATE", ex);
+            }
+        }
+
+        protected void btnChangeHostname_Click(object sender, EventArgs e)
+        {
+            if (!Page.IsValid)
+                return;
+
+            try
+            {
+                string hostname = String.Format("{0}.{1}", txtHostname.Text.Trim(), txtDomain.Text.Trim());
+
+                ResultObject res = ES.Services.VPS2012.UpdateVirtualMachineHostName(PanelRequest.ItemID,
+                    hostname, chkUpdateComputerName.Checked);
+
+                if (res.IsSuccess)
+                {
+                    // show success message
+                    messageBox.ShowSuccessMessage("VPS_CHANGE_VM_HOSTNAME");
+                    BindGeneralDetails();
+
+                    // clear fields
+                    //txtHostname.Text = "";
+                    //txtDomain.Text = "";
+                    chkUpdateComputerName.Checked = false;
+                }
+                else
+                {
+                    // show error
+                    messageBox.ShowMessage(res, "VPS_CHANGE_VM_HOSTNAME", "VPS");
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_CHANGE_VM_HOSTNAME", ex);
+            }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx.designer.cs
new file mode 100644
index 00000000..11517fb3
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsGeneral.ascx.designer.cs
@@ -0,0 +1,609 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VpsDetailsGeneral {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// operationTimer control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.Timer operationTimer;
+        
+        /// <summary>
+        /// litRdpPageUrl 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.Literal litRdpPageUrl;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.ServerTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// DetailsTable 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.HtmlTable DetailsTable;
+        
+        /// <summary>
+        /// locHostname 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 locHostname;
+        
+        /// <summary>
+        /// lnkHostname 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.HyperLink lnkHostname;
+        
+        /// <summary>
+        /// litHostname 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.Literal litHostname;
+        
+        /// <summary>
+        /// btnChangeHostnamePopup 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.LinkButton btnChangeHostnamePopup;
+        
+        /// <summary>
+        /// RdpPanel 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 RdpPanel;
+        
+        /// <summary>
+        /// imgRdc 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.Image imgRdc;
+        
+        /// <summary>
+        /// locRdpText 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 locRdpText;
+        
+        /// <summary>
+        /// lnkRdpFull 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.HyperLink lnkRdpFull;
+        
+        /// <summary>
+        /// lnkRdp800 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.HyperLink lnkRdp800;
+        
+        /// <summary>
+        /// lnkRdp1024 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.HyperLink lnkRdp1024;
+        
+        /// <summary>
+        /// lnkRdp1280 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.HyperLink lnkRdp1280;
+        
+        /// <summary>
+        /// RdpPopup control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::AjaxControlToolkit.PopupControlExtender RdpPopup;
+        
+        /// <summary>
+        /// RdpShadow control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::AjaxControlToolkit.DropShadowExtender RdpShadow;
+        
+        /// <summary>
+        /// locDomainTop 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 locDomainTop;
+        
+        /// <summary>
+        /// litDomain 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.Literal litDomain;
+        
+        /// <summary>
+        /// UpdatePanel2 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 UpdatePanel2;
+        
+        /// <summary>
+        /// locStatus 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 locStatus;
+        
+        /// <summary>
+        /// litStatus 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.Literal litStatus;
+        
+        /// <summary>
+        /// locUptime 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 locUptime;
+        
+        /// <summary>
+        /// litUptime 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.Literal litUptime;
+        
+        /// <summary>
+        /// locHeartbeat 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 locHeartbeat;
+        
+        /// <summary>
+        /// litHeartbeat 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.Literal litHeartbeat;
+        
+        /// <summary>
+        /// locCreated 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 locCreated;
+        
+        /// <summary>
+        /// litCreated 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.Literal litCreated;
+        
+        /// <summary>
+        /// UpdatePanel1 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 UpdatePanel1;
+        
+        /// <summary>
+        /// imgThumbnail 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.Image imgThumbnail;
+        
+        /// <summary>
+        /// repButtons 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.Repeater repButtons;
+        
+        /// <summary>
+        /// UpdatePanel3 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 UpdatePanel3;
+        
+        /// <summary>
+        /// locCpu 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 locCpu;
+        
+        /// <summary>
+        /// cpuGauge control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.Gauge cpuGauge;
+        
+        /// <summary>
+        /// litCpuPercentage 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.Literal litCpuPercentage;
+        
+        /// <summary>
+        /// litCpuUsage 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.Literal litCpuUsage;
+        
+        /// <summary>
+        /// locRam 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 locRam;
+        
+        /// <summary>
+        /// ramGauge control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.Gauge ramGauge;
+        
+        /// <summary>
+        /// litRamPercentage 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.Literal litRamPercentage;
+        
+        /// <summary>
+        /// litRamUsage 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.Literal litRamUsage;
+        
+        /// <summary>
+        /// HddRow 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 HddRow;
+        
+        /// <summary>
+        /// locHdd 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 locHdd;
+        
+        /// <summary>
+        /// hddGauge control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.Gauge hddGauge;
+        
+        /// <summary>
+        /// litHddPercentage 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.Literal litHddPercentage;
+        
+        /// <summary>
+        /// litHddUsage 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.Literal litHddUsage;
+        
+        /// <summary>
+        /// ChangeHostnamePanel 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 ChangeHostnamePanel;
+        
+        /// <summary>
+        /// locChangeHostname 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 locChangeHostname;
+        
+        /// <summary>
+        /// validatorsSummary 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.ValidationSummary validatorsSummary;
+        
+        /// <summary>
+        /// locHostname1 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 locHostname1;
+        
+        /// <summary>
+        /// txtHostname 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 txtHostname;
+        
+        /// <summary>
+        /// HostnameValidator 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.RequiredFieldValidator HostnameValidator;
+        
+        /// <summary>
+        /// valCorrectHostname 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.RegularExpressionValidator valCorrectHostname;
+        
+        /// <summary>
+        /// locDomain 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 locDomain;
+        
+        /// <summary>
+        /// txtDomain 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 txtDomain;
+        
+        /// <summary>
+        /// DomainValidator 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.RequiredFieldValidator DomainValidator;
+        
+        /// <summary>
+        /// valNewDomainFormat 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.RegularExpressionValidator valNewDomainFormat;
+        
+        /// <summary>
+        /// chkUpdateComputerName 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 chkUpdateComputerName;
+        
+        /// <summary>
+        /// btnChangeHostname 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.Button btnChangeHostname;
+        
+        /// <summary>
+        /// btnCancelHostname 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.Button btnCancelHostname;
+        
+        /// <summary>
+        /// ChangeHostnameModal control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::AjaxControlToolkit.ModalPopupExtender ChangeHostnameModal;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsHelp.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsHelp.ascx
new file mode 100644
index 00000000..096a9f3c
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsHelp.ascx
@@ -0,0 +1,76 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VpsDetailsHelp.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VpsDetailsHelp" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/ServerTabs.ascx" TagName="ServerTabs" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/FormTitle.ascx" TagName="FormTitle" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="Help48" runat="server" />
+				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Help" />
+			    </div>
+			    <div class="FormBody">
+			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_help" />	
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+                    <wsp:CollapsiblePanel id="secEmail" runat="server" IsCollapsed="true"
+                        TargetControlID="EmailPanel" meta:resourcekey="secEmail" Text="Send instructions by E-Mail">
+                    </wsp:CollapsiblePanel>
+	                <asp:Panel ID="EmailPanel" runat="server" Height="0" style="overflow:hidden;">
+                        <table id="tblEmail" runat="server" cellpadding="2">
+                            <tr>
+                                <td class="SubHead" width="30" nowrap>
+                                    <asp:Label ID="lblTo" runat="server" meta:resourcekey="lblTo" Text="To:"></asp:Label>
+                                </td>
+                                <td class="Normal">
+                                    <asp:TextBox ID="txtTo" runat="server" CssClass="NormalTextBox" Width="200px"></asp:TextBox>
+                                    <asp:RequiredFieldValidator ID="valRequireEmail" runat="server" ControlToValidate="txtTo" Display="Dynamic"
+                                        ErrorMessage="Enter e-mail" ValidationGroup="SendEmail" meta:resourcekey="valRequireEmail"></asp:RequiredFieldValidator>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="SubHead">
+                                    <asp:Label ID="lblBCC" runat="server" meta:resourcekey="lblBCC" Text="BCC:"></asp:Label>
+                                </td>
+                                <td class="Normal">
+                                    <asp:TextBox ID="txtBCC" runat="server" CssClass="NormalTextBox" Width="200px"></asp:TextBox></td>
+                            </tr>
+                            <tr>
+                                <td></td>
+                                <td>
+                                    <asp:Button ID="btnSend" runat="server" CssClass="Button2"
+                                        meta:resourcekey="btnSend" Text="Send" ValidationGroup="SendEmail" 
+                                        onclick="btnSend_Click" /></td>
+                            </tr>
+                        </table>
+                        <br />
+                    </asp:Panel>
+                    
+					
+                    <div class="PreviewArea">
+                        <asp:Literal ID="litContent" runat="server" Text="[content]"></asp:Literal>
+                    </div>
+                    
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsHelp.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsHelp.ascx.cs
new file mode 100644
index 00000000..1a91d5ee
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsHelp.ascx.cs
@@ -0,0 +1,93 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.EnterpriseServer;
+using WebsitePanel.Providers.Common;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VpsDetailsHelp : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BindSummaryInfo();
+            }
+        }
+
+        private void BindSummaryInfo()
+        {
+            // bind user details
+            PackageInfo package = ES.Services.Packages.GetPackage(PanelSecurity.PackageId);
+            if (package != null)
+            {
+                UserInfo user = ES.Services.Users.GetUserById(package.UserId);
+                if (user != null)
+                {
+                    txtTo.Text = user.Email;
+                }
+            }
+
+            // load template
+            string content = ES.Services.VPS2012.GetVirtualMachineSummaryText(PanelRequest.ItemID);
+            if (content != null)
+                litContent.Text = content;
+        }
+
+        protected void btnSend_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                ResultObject res = ES.Services.VPS2012.SendVirtualMachineSummaryLetter(
+                    PanelRequest.ItemID, txtTo.Text.Trim(), txtBCC.Text.Trim());
+
+                if (res.IsSuccess)
+                {
+                    // bind tree
+                    messageBox.ShowSuccessMessage("VPS_ERROR_SEND_SUMMARY_LETTER");
+                    return;
+                }
+                else
+                {
+                    // show error
+                    messageBox.ShowMessage(res, "ERROR_SEND_SUMMARY_LETTER", "VPS");
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_ERROR_SEND_SUMMARY_LETTER", ex);
+            }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsHelp.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsHelp.ascx.designer.cs
new file mode 100644
index 00000000..1016a4c5
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsHelp.ascx.designer.cs
@@ -0,0 +1,168 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VpsDetailsHelp {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.ServerTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// secEmail control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secEmail;
+        
+        /// <summary>
+        /// EmailPanel 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 EmailPanel;
+        
+        /// <summary>
+        /// tblEmail 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.HtmlTable tblEmail;
+        
+        /// <summary>
+        /// lblTo 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.Label lblTo;
+        
+        /// <summary>
+        /// txtTo 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 txtTo;
+        
+        /// <summary>
+        /// valRequireEmail 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.RequiredFieldValidator valRequireEmail;
+        
+        /// <summary>
+        /// lblBCC 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.Label lblBCC;
+        
+        /// <summary>
+        /// txtBCC 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 txtBCC;
+        
+        /// <summary>
+        /// btnSend 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.Button btnSend;
+        
+        /// <summary>
+        /// litContent 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.Literal litContent;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx
new file mode 100644
index 00000000..7e329730
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx
@@ -0,0 +1,71 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VpsDetailsInsertDvd.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VpsDetailsInsertDvd" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/ServerTabs.ascx" TagName="ServerTabs" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/FormTitle.ascx" TagName="FormTitle" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="DvdDrive48" runat="server" />
+				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="DVD" />
+			    </div>
+			    <div class="FormBody">
+			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_dvd" />
+	
+                        <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                        
+			            <p class="SubTitle">
+			                <asp:Localize ID="locSubTitle" runat="server" meta:resourcekey="locSubTitle" Text="Browse Media Library" />
+			            </p>
+			            
+			            <asp:GridView ID="gvDisks" runat="server" AutoGenerateColumns="False" EnableViewState="true"
+				            Width="100%" EmptyDataText="gvDisks" CssSelectorClass="NormalGridView"
+                            onrowcommand="gvDisks_RowCommand">
+				            <Columns>
+					            <asp:TemplateField HeaderText="gvTitle" meta:resourcekey="gvTitle">
+						            <ItemTemplate>
+						                <asp:Image ID="Image2" SkinID="Dvd48" runat="server" style="float: left;" />
+						                <div style="font-weight: bold;padding: 3px; margin-left: 50px;">
+						                    <%# Eval("Name") %>
+						                </div>
+						                <div style="padding: 3px; margin-left: 50px;">
+							                <%# Eval("Description") %>
+							            </div>
+						            </ItemTemplate>
+					            </asp:TemplateField>
+					            <asp:TemplateField>
+						            <ItemTemplate>
+							            <asp:Button ID="btnInsert" runat="server" Text="Insert" meta:resourcekey="btnInsert"
+							                CommandName="insert" CommandArgument='<%# Eval("Path") %>' CssClass="SmallButton">
+							            </asp:Button>
+						            </ItemTemplate>
+					            </asp:TemplateField>
+				            </Columns>
+			            </asp:GridView>
+			            <br />
+			            <asp:Button ID="btnCancel" runat="server" CausesValidation="false"
+			                      Text="Cancel" meta:resourcekey="btnCancel" CssClass="Button1" 
+                        onclick="btnCancel_Click" Width="60px" />
+     
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx.cs
new file mode 100644
index 00000000..ccb35e77
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx.cs
@@ -0,0 +1,95 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.Common;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VpsDetailsInsertDvd : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BindDisks();
+            }
+        }
+
+        private void BindDisks()
+        {
+            gvDisks.DataSource = ES.Services.VPS2012.GetLibraryDisks(PanelRequest.ItemID);
+            gvDisks.DataBind();
+        }
+
+        protected void btnCancel_Click(object sender, EventArgs e)
+        {
+            RedirectBack("cancel");
+        }
+
+        protected void gvDisks_RowCommand(object sender, GridViewCommandEventArgs e)
+        {
+            if (e.CommandName == "insert")
+            {
+                string path = e.CommandArgument.ToString();
+
+                try
+                {
+                    ResultObject res = ES.Services.VPS2012.InsertDvdDisk(PanelRequest.ItemID, path);
+
+                    if (res.IsSuccess)
+                    {
+                        // return
+                        RedirectBack("inserted");
+                        return;
+                    }
+                    else
+                    {
+                        // show error
+                        messageBox.ShowMessage(res, "VPS_ERROR_INSERT_DVD_DISK", "VPS");
+                    }
+                }
+                catch (Exception ex)
+                {
+                    messageBox.ShowErrorMessage("VPS_ERROR_INSERT_DVD_DISK", ex);
+                }
+            }
+        }
+
+        private void RedirectBack(string action)
+        {
+            Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "vps_dvd",
+                "SpaceID=" + PanelSecurity.PackageId.ToString(),
+                "action=" + action));
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx.designer.cs
new file mode 100644
index 00000000..52f9dfb6
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsInsertDvd.ascx.designer.cs
@@ -0,0 +1,105 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VpsDetailsInsertDvd {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.ServerTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// locSubTitle 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 locSubTitle;
+        
+        /// <summary>
+        /// gvDisks 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.GridView gvDisks;
+        
+        /// <summary>
+        /// btnCancel 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.Button btnCancel;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsNetwork.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsNetwork.ascx
new file mode 100644
index 00000000..83e4b413
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsNetwork.ascx
@@ -0,0 +1,200 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VpsDetailsNetwork.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VpsDetailsNetwork" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/ServerTabs.ascx" TagName="ServerTabs" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/FormTitle.ascx" TagName="FormTitle" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp"  %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<script language="javascript">
+    function SelectAllCheckboxes(box)
+    {
+		var state = box.checked;
+        var elm = box.parentElement.parentElement.parentElement.parentElement.getElementsByTagName("INPUT");
+        for(i = 0; i < elm.length; i++)
+            if(elm[i].type == "checkbox" && elm[i].id != box.id && elm[i].checked != state && !elm[i].disabled)
+		        elm[i].checked = state;
+    }
+</script>
+
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="Network48" runat="server" />
+				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Network" />
+			    </div>
+			    <div class="FormBody">
+			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_network" />	
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+				    
+				    <wsp:CollapsiblePanel id="secExternalNetwork" runat="server"
+                        TargetControlID="ExternalNetworkPanel" meta:resourcekey="secExternalNetwork" Text="External Network">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="ExternalNetworkPanel" runat="server" Height="0" style="overflow:hidden;">
+                    
+                        <table cellspacing="3">
+                            <tr>
+                                <td><asp:Localize ID="locExtAddress" runat="server"
+                                    meta:resourcekey="locExtAddress" Text="Server address:"/></td>
+                                <td class="NormalBold"><asp:Literal ID="litExtAddress" runat="server" Text=""/></td>
+                            </tr>
+                            <tr>
+                                <td><asp:Localize ID="locExtSubnet" runat="server"
+                                    meta:resourcekey="locExtSubnet" Text="Subnet mask:"/></td>
+                                <td class="NormalBold"><asp:Literal ID="litExtSubnet" runat="server" Text=""/></td>
+                            </tr>
+                            <tr>
+                                <td><asp:Localize ID="locExtGateway" runat="server"
+                                    meta:resourcekey="locExtGateway" Text="Default gateway:"/></td>
+                                <td class="NormalBold"><asp:Literal ID="litExtGateway" runat="server" Text=""/></td>
+                            </tr>
+                        </table>
+                    
+                        <div style="width:400px;">
+				            <asp:GridView ID="gvExternalAddresses" runat="server" AutoGenerateColumns="False"
+					                EmptyDataText="gvExternalAddresses" CssSelectorClass="NormalGridView"
+					                DataKeyNames="AddressID">
+					            <Columns>
+					                <asp:TemplateField>
+					                    <HeaderTemplate>
+					                        <asp:CheckBox ID="chkSelectAll" runat="server" onclick="javascript:SelectAllCheckboxes(this);" />
+					                    </HeaderTemplate>
+					                    <ItemTemplate>
+					                        <asp:CheckBox ID="chkSelect" runat="server" Enabled='<%# !(bool)Eval("IsPrimary") %>' />
+					                    </ItemTemplate>
+                                        <ItemStyle Width="10px" />
+					                </asp:TemplateField>
+						            <asp:BoundField DataField="IPAddress" HeaderText="gvIpAddress" meta:resourcekey="gvIpAddress" />
+						            <asp:BoundField DataField="SubnetMask" HeaderText="gvSubnetMask" meta:resourcekey="gvSubnetMask" />
+						            <asp:BoundField DataField="DefaultGateway" HeaderText="gvDefaultGateway" meta:resourcekey="gvDefaultGateway" />
+						            <asp:TemplateField HeaderText="gvPrimary" meta:resourcekey="gvPrimary" ItemStyle-Width="50">
+							            <ItemTemplate>
+							                <div style="text-align:center">
+							                    &nbsp;
+								                <asp:Image ID="Image2" runat="server" SkinID="Checkbox16" Visible='<%# Eval("IsPrimary") %>' />
+								            </div>
+							            </ItemTemplate>
+						            </asp:TemplateField>
+					            </Columns>
+				            </asp:GridView>
+				        </div>
+				        
+				        <div style="margin-top: 4px;">
+				            <asp:Button ID="btnAddExternalAddress" runat="server" meta:resourcekey="btnAddExternalAddress"
+                                Text="Add" CssClass="SmallButton" onclick="btnAddExternalAddress_Click" />
+				            <asp:Button id="btnSetPrimaryExternal" runat="server" Text="Set As Primary"
+				                meta:resourcekey="btnSetPrimaryExternal" CssClass="SmallButton" 
+                                CausesValidation="false" onclick="btnSetPrimaryExternal_Click"></asp:Button>
+				            <asp:Button id="btnDeleteExternal" runat="server" Text="Delete Selected"
+				                meta:resourcekey="btnDeleteExternal" CssClass="SmallButton" CausesValidation="false" 
+                                onclick="btnDeleteExternal_Click"></asp:Button>
+                        </div>
+
+				        <br />
+			            <asp:Localize ID="locTotalExternal" runat="server"
+			                meta:resourcekey="locTotalExternal" Text="IP addresses:"></asp:Localize>
+			            <asp:Label ID="lblTotalExternal" runat="server" CssClass="NormalBold">0</asp:Label>
+                        <br />
+                        <br />
+                        <br />
+                    </asp:Panel>
+				    
+				    
+				    <wsp:CollapsiblePanel id="secPrivateNetwork" runat="server"
+                        TargetControlID="PrivateNetworkPanel" meta:resourcekey="secPrivateNetwork" Text="Private Network">
+                    </wsp:CollapsiblePanel>
+                    <asp:Panel ID="PrivateNetworkPanel" runat="server" Height="0" style="overflow:hidden;">
+                    
+                        <table cellspacing="3">
+                            <tr>
+                                <td><asp:Localize ID="locPrivAddress" runat="server"
+                                    meta:resourcekey="locPrivAddress" Text="Server address:"/></td>
+                                <td class="NormalBold"><asp:Literal ID="litPrivAddress" runat="server" Text=""/></td>
+                            </tr>
+                            <tr>
+                                <td><asp:Localize ID="locPrivFormat" runat="server"
+                                    meta:resourcekey="locPrivFormat" Text="Network format:"/></td>
+                                <td class="NormalBold"><asp:Literal ID="litPrivFormat" runat="server" Text=""/></td>
+                            </tr>
+                            <tr>
+                                <td><asp:Localize ID="locPrivSubnet" runat="server"
+                                    meta:resourcekey="locPrivSubnet" Text="Subnet mask:"/></td>
+                                <td class="NormalBold"><asp:Literal ID="litPrivSubnet" runat="server" Text=""/></td>
+                            </tr>
+                        </table>
+                    
+                        <asp:Panel ID="PrivateAddressesPanel" runat="server">
+                        
+                            <div style="width:260px;">
+				                <asp:GridView ID="gvPrivateAddresses" runat="server" AutoGenerateColumns="False"
+					                    EmptyDataText="gvPrivateAddresses" CssSelectorClass="NormalGridView"
+					                    DataKeyNames="AddressID">
+					                <Columns>
+					                    <asp:TemplateField>
+					                        <HeaderTemplate>
+					                            <asp:CheckBox ID="chkSelectAll" runat="server" onclick="javascript:SelectAllCheckboxes(this);" />
+					                        </HeaderTemplate>
+					                        <ItemTemplate>
+					                            <asp:CheckBox ID="chkSelect" runat="server" Enabled='<%# !(bool)Eval("IsPrimary") %>' />
+					                        </ItemTemplate>
+                                            <ItemStyle Width="10px" />
+					                    </asp:TemplateField>
+						                <asp:TemplateField HeaderText="gvIpAddress" meta:resourcekey="gvIpAddress">
+							                <ItemTemplate>
+								                <%# Eval("IPAddress")%>
+							                </ItemTemplate>
+						                </asp:TemplateField>
+						                <asp:TemplateField HeaderText="gvPrimary" meta:resourcekey="gvPrimary" ItemStyle-Width="50">
+							                <ItemTemplate>
+							                    <div style="text-align:center">
+							                        &nbsp;
+								                    <asp:Image ID="Image2" runat="server" SkinID="Checkbox16" Visible='<%# Eval("IsPrimary") %>' />
+								                </div>
+							                </ItemTemplate>
+						                </asp:TemplateField>
+					                </Columns>
+				                </asp:GridView>
+				            </div>
+    				        
+				            <div style="margin-top: 4px;">
+                                <asp:Button ID="btnAddPrivateAddress" runat="server" meta:resourcekey="btnAddPrivateAddress"
+                                    Text="Add" CssClass="SmallButton" onclick="btnAddPrivateAddress_Click" />
+				                <asp:Button id="btnSetPrimaryPrivate" runat="server" Text="Set As Primary"
+				                    meta:resourcekey="btnSetPrimaryPrivate" CssClass="SmallButton" 
+                                    CausesValidation="false" onclick="btnSetPrimaryPrivate_Click"></asp:Button>
+				                <asp:Button id="btnDeletePrivate" runat="server" Text="Delete Selected"
+				                    meta:resourcekey="btnDeletePrivate" CssClass="SmallButton" CausesValidation="false" 
+                                    onclick="btnDeletePrivate_Click"></asp:Button>
+                            </div>
+                            
+				            <br />
+			                <asp:Localize ID="locTotalPrivate" runat="server"
+			                    meta:resourcekey="locTotalPrivate" Text="IP addresses:"></asp:Localize>
+			                <asp:Label ID="lblTotalPrivate" runat="server" CssClass="NormalBold">0</asp:Label>
+                        </asp:Panel>
+                    
+                        <br />
+                    </asp:Panel>
+				    
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsNetwork.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsNetwork.ascx.cs
new file mode 100644
index 00000000..c8b86a8e
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsNetwork.ascx.cs
@@ -0,0 +1,296 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.Virtualization;
+using WebsitePanel.EnterpriseServer;
+using WebsitePanel.Providers.Common;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VpsDetailsNetwork : WebsitePanelModuleBase
+    {
+        VirtualMachine vm = null;
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BindVirtualMachine();
+                BindExternalAddresses();
+                BindPrivateAddresses();
+                ToggleButtons();
+            }
+        }
+
+        private void BindVirtualMachine()
+        {
+            vm = ES.Services.VPS2012.GetVirtualMachineItem(PanelRequest.ItemID);
+
+            // external network
+            if (!vm.ExternalNetworkEnabled)
+            {
+                secExternalNetwork.Visible = false;
+                ExternalNetworkPanel.Visible = false;
+            }
+
+            // private network
+            if (!vm.PrivateNetworkEnabled)
+            {
+                secPrivateNetwork.Visible = false;
+                PrivateNetworkPanel.Visible = false;
+            }
+        }
+
+        private void BindExternalAddresses()
+        {
+            // load details
+            NetworkAdapterDetails nic = ES.Services.VPS2012.GetExternalNetworkAdapterDetails(PanelRequest.ItemID);
+
+            // bind details
+            foreach (NetworkAdapterIPAddress ip in nic.IPAddresses)
+            {
+                if (ip.IsPrimary)
+                {
+                    litExtAddress.Text = ip.IPAddress;
+                    litExtSubnet.Text = ip.SubnetMask;
+                    litExtGateway.Text = ip.DefaultGateway;
+                    break;
+                }
+            }
+            lblTotalExternal.Text = nic.IPAddresses.Length.ToString();
+
+            // bind IP addresses
+            gvExternalAddresses.DataSource = nic.IPAddresses;
+            gvExternalAddresses.DataBind();
+        }
+
+        private void BindPrivateAddresses()
+        {
+            // load details
+            NetworkAdapterDetails nic = ES.Services.VPS2012.GetPrivateNetworkAdapterDetails(PanelRequest.ItemID);
+
+            // bind details
+            foreach (NetworkAdapterIPAddress ip in nic.IPAddresses)
+            {
+                if (ip.IsPrimary)
+                {
+                    litPrivAddress.Text = ip.IPAddress;
+                    break;
+                }
+            }
+            litPrivSubnet.Text = nic.SubnetMask;
+            litPrivFormat.Text = nic.NetworkFormat;
+            lblTotalPrivate.Text = nic.IPAddresses.Length.ToString();
+
+            // bind IP addresses
+            gvPrivateAddresses.DataSource = nic.IPAddresses;
+            gvPrivateAddresses.DataBind();
+
+            if (nic.IsDHCP)
+            {
+                PrivateAddressesPanel.Visible = false;
+                litPrivAddress.Text = GetLocalizedString("Automatic.Text");
+            }
+        }
+
+        private void ToggleButtons()
+        {
+            bool manageAllowed = VirtualMachines2012Helper.IsVirtualMachineManagementAllowed(PanelSecurity.PackageId);
+
+            btnAddExternalAddress.Visible = manageAllowed;
+            btnSetPrimaryExternal.Visible = manageAllowed;
+            btnDeleteExternal.Visible = manageAllowed;
+            gvExternalAddresses.Columns[0].Visible = manageAllowed;
+
+            btnAddPrivateAddress.Visible = manageAllowed;
+            btnSetPrimaryPrivate.Visible = manageAllowed;
+            btnDeletePrivate.Visible = manageAllowed;
+            gvPrivateAddresses.Columns[0].Visible = manageAllowed;
+        }
+
+        protected void btnAddExternalAddress_Click(object sender, EventArgs e)
+        {
+            Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "vps_add_external_ip",
+                "SpaceID=" + PanelSecurity.PackageId.ToString()));
+        }
+
+        protected void btnAddPrivateAddress_Click(object sender, EventArgs e)
+        {
+            Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "vps_add_private_ip",
+                "SpaceID=" + PanelSecurity.PackageId.ToString()));
+        }
+
+        protected void btnSetPrimaryPrivate_Click(object sender, EventArgs e)
+        {
+            int[] addressIds = GetSelectedItems(gvPrivateAddresses);
+            
+            // check if at least one is selected
+            if (addressIds.Length == 0)
+            {
+                messageBox.ShowWarningMessage("IP_ADDRESS_NOT_SELECTED");
+                return;
+            }
+
+            try
+            {
+                ResultObject res = ES.Services.VPS2012.SetVirtualMachinePrimaryPrivateIPAddress(PanelRequest.ItemID, addressIds[0]);
+
+                if (res.IsSuccess)
+                {
+                    BindPrivateAddresses();
+                    return;
+                }
+                else
+                {
+                    messageBox.ShowMessage(res, "VPS_ERROR_SETTING_PRIMARY_IP", "VPS");
+                    return;
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_ERROR_SETTING_PRIMARY_IP", ex);
+            }
+        }
+
+        protected void btnDeletePrivate_Click(object sender, EventArgs e)
+        {
+            int[] addressIds = GetSelectedItems(gvPrivateAddresses);
+
+            // check if at least one is selected
+            if (addressIds.Length == 0)
+            {
+                messageBox.ShowWarningMessage("IP_ADDRESS_NOT_SELECTED");
+                return;
+            }
+
+            try
+            {
+                ResultObject res = ES.Services.VPS2012.DeleteVirtualMachinePrivateIPAddresses(PanelRequest.ItemID, addressIds);
+
+                if (res.IsSuccess)
+                {
+                    BindPrivateAddresses();
+                    return;
+                }
+                else
+                {
+                    messageBox.ShowMessage(res, "VPS_ERROR_DELETING_IP_ADDRESS", "VPS");
+                    return;
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_ERROR_DELETING_IP_ADDRESS", ex);
+            }
+        }
+
+        protected void btnSetPrimaryExternal_Click(object sender, EventArgs e)
+        {
+            int[] addressIds = GetSelectedItems(gvExternalAddresses);
+
+            // check if at least one is selected
+            if (addressIds.Length == 0)
+            {
+                messageBox.ShowWarningMessage("IP_ADDRESS_NOT_SELECTED");
+                return;
+            }
+
+            try
+            {
+                ResultObject res = ES.Services.VPS2012.SetVirtualMachinePrimaryExternalIPAddress(PanelRequest.ItemID, addressIds[0]);
+
+                if (res.IsSuccess)
+                {
+                    BindExternalAddresses();
+                    return;
+                }
+                else
+                {
+                    messageBox.ShowMessage(res, "VPS_ERROR_SETTING_PRIMARY_IP", "VPS");
+                    return;
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_ERROR_SETTING_PRIMARY_IP", ex);
+            }
+        }
+
+        protected void btnDeleteExternal_Click(object sender, EventArgs e)
+        {
+            int[] addressIds = GetSelectedItems(gvExternalAddresses);
+
+            // check if at least one is selected
+            if (addressIds.Length == 0)
+            {
+                messageBox.ShowWarningMessage("IP_ADDRESS_NOT_SELECTED");
+                return;
+            }
+
+            try
+            {
+                ResultObject res = ES.Services.VPS2012.DeleteVirtualMachineExternalIPAddresses(PanelRequest.ItemID, addressIds);
+
+                if (res.IsSuccess)
+                {
+                    BindExternalAddresses();
+                    return;
+                }
+                else
+                {
+                    messageBox.ShowMessage(res, "VPS_ERROR_DELETING_IP_ADDRESS", "VPS");
+                    return;
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_ERROR_DELETING_IP_ADDRESS", ex);
+            }
+        }
+
+        private int[] GetSelectedItems(GridView gv)
+        {
+            List<int> items = new List<int>();
+
+            for (int i = 0; i < gv.Rows.Count; i++)
+            {
+                GridViewRow row = gv.Rows[i];
+                CheckBox chkSelect = (CheckBox)row.FindControl("chkSelect");
+                if (chkSelect.Checked)
+                    items.Add((int)gv.DataKeys[i].Value);
+            }
+
+            return items.ToArray();
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsNetwork.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsNetwork.ascx.designer.cs
new file mode 100644
index 00000000..942ea529
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsNetwork.ascx.designer.cs
@@ -0,0 +1,339 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VpsDetailsNetwork {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.ServerTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// secExternalNetwork control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secExternalNetwork;
+        
+        /// <summary>
+        /// ExternalNetworkPanel 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 ExternalNetworkPanel;
+        
+        /// <summary>
+        /// locExtAddress 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 locExtAddress;
+        
+        /// <summary>
+        /// litExtAddress 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.Literal litExtAddress;
+        
+        /// <summary>
+        /// locExtSubnet 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 locExtSubnet;
+        
+        /// <summary>
+        /// litExtSubnet 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.Literal litExtSubnet;
+        
+        /// <summary>
+        /// locExtGateway 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 locExtGateway;
+        
+        /// <summary>
+        /// litExtGateway 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.Literal litExtGateway;
+        
+        /// <summary>
+        /// gvExternalAddresses 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.GridView gvExternalAddresses;
+        
+        /// <summary>
+        /// btnAddExternalAddress 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.Button btnAddExternalAddress;
+        
+        /// <summary>
+        /// btnSetPrimaryExternal 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.Button btnSetPrimaryExternal;
+        
+        /// <summary>
+        /// btnDeleteExternal 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.Button btnDeleteExternal;
+        
+        /// <summary>
+        /// locTotalExternal 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 locTotalExternal;
+        
+        /// <summary>
+        /// lblTotalExternal 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.Label lblTotalExternal;
+        
+        /// <summary>
+        /// secPrivateNetwork control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.CollapsiblePanel secPrivateNetwork;
+        
+        /// <summary>
+        /// PrivateNetworkPanel 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 PrivateNetworkPanel;
+        
+        /// <summary>
+        /// locPrivAddress 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 locPrivAddress;
+        
+        /// <summary>
+        /// litPrivAddress 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.Literal litPrivAddress;
+        
+        /// <summary>
+        /// locPrivFormat 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 locPrivFormat;
+        
+        /// <summary>
+        /// litPrivFormat 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.Literal litPrivFormat;
+        
+        /// <summary>
+        /// locPrivSubnet 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 locPrivSubnet;
+        
+        /// <summary>
+        /// litPrivSubnet 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.Literal litPrivSubnet;
+        
+        /// <summary>
+        /// PrivateAddressesPanel 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 PrivateAddressesPanel;
+        
+        /// <summary>
+        /// gvPrivateAddresses 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.GridView gvPrivateAddresses;
+        
+        /// <summary>
+        /// btnAddPrivateAddress 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.Button btnAddPrivateAddress;
+        
+        /// <summary>
+        /// btnSetPrimaryPrivate 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.Button btnSetPrimaryPrivate;
+        
+        /// <summary>
+        /// btnDeletePrivate 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.Button btnDeletePrivate;
+        
+        /// <summary>
+        /// locTotalPrivate 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 locTotalPrivate;
+        
+        /// <summary>
+        /// lblTotalPrivate 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.Label lblTotalPrivate;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsPermissions.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsPermissions.ascx
new file mode 100644
index 00000000..d95158a7
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsPermissions.ascx
@@ -0,0 +1,75 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VpsDetailsPermissions.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VpsDetailsPermissions" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/ServerTabs.ascx" TagName="ServerTabs" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/FormTitle.ascx" TagName="FormTitle" TagPrefix="wsp" %>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="Server48" runat="server" />
+				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Permissions" />
+			    </div>
+			    <div class="FormBody">
+			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_permissions" />	
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+                    <div class="FormButtonsBarClean">
+                        <asp:CheckBox ID="chkOverride" runat="server" meta:resourcekey="chkOverride"
+                                Text="Override space permissions" AutoPostBack="true" />
+                    </div>
+                    
+		            <asp:GridView ID="gvVpsPermissions" runat="server" AutoGenerateColumns="False"
+			            EmptyDataText="gvVpsPermissions" CssSelectorClass="NormalGridView">
+			            <Columns>
+				            <asp:BoundField HeaderText="columnUsername" DataField="Username" />
+				            <asp:TemplateField HeaderText="columnChangeState" ItemStyle-HorizontalAlign="Center">
+				                <ItemTemplate>
+				                    <asp:CheckBox ID="chkChangeState" runat="server" />
+				                </ItemTemplate>
+				            </asp:TemplateField>
+				            <asp:TemplateField HeaderText="columnChangeConfig" ItemStyle-HorizontalAlign="Center">
+				                <ItemTemplate>
+				                    <asp:CheckBox ID="chkChangeConfig" runat="server" />
+				                </ItemTemplate>
+				            </asp:TemplateField>
+				            <asp:TemplateField HeaderText="columnManageSnapshots" ItemStyle-HorizontalAlign="Center">
+				                <ItemTemplate>
+				                    <asp:CheckBox ID="chkManageSnapshots" runat="server" />
+				                </ItemTemplate>
+				            </asp:TemplateField>
+				            <asp:TemplateField HeaderText="columnDeleteVps" ItemStyle-HorizontalAlign="Center">
+				                <ItemTemplate>
+				                    <asp:CheckBox ID="chkDeleteVps" runat="server" />
+				                </ItemTemplate>
+				            </asp:TemplateField>
+				            <asp:TemplateField HeaderText="columnReinstallVps" ItemStyle-HorizontalAlign="Center">
+				                <ItemTemplate>
+				                    <asp:CheckBox ID="chkReinstallVps" runat="server" />
+				                </ItemTemplate>
+				            </asp:TemplateField>
+			            </Columns>
+		            </asp:GridView>
+		            <br />
+                    <asp:Button ID="btnUpdateVpsPermissions" runat="server" meta:resourcekey="btnUpdateVdcPermissions"
+                            CssClass="Button1" Text="Update" CausesValidation="false" />
+                    <br />
+				    
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsPermissions.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsPermissions.ascx.cs
new file mode 100644
index 00000000..56fd13fc
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsPermissions.ascx.cs
@@ -0,0 +1,44 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VpsDetailsPermissions : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsPermissions.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsPermissions.ascx.designer.cs
new file mode 100644
index 00000000..095004cc
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsPermissions.ascx.designer.cs
@@ -0,0 +1,96 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VpsDetailsPermissions {
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.ServerTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// chkOverride 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 chkOverride;
+        
+        /// <summary>
+        /// gvVpsPermissions 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.GridView gvVpsPermissions;
+        
+        /// <summary>
+        /// btnUpdateVpsPermissions 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.Button btnUpdateVpsPermissions;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx
new file mode 100644
index 00000000..c345ce97
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx
@@ -0,0 +1,146 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VpsDetailsSnapshots.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VpsDetailsSnapshots" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/ServerTabs.ascx" TagName="ServerTabs" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/FormTitle.ascx" TagName="FormTitle" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/QuotaViewer.ascx" TagName="QuotaViewer" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="Snapshot48" runat="server" />
+				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Snapshots" />
+			    </div>
+			    <div class="FormBody">
+			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_snapshots" />	
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+				    
+				    <table style="width:100%;">
+				        <tr>
+				            <td valign="top">
+				            
+                                <div class="FormButtonsBarClean">
+                                    <asp:Button ID="btnTakeSnapshot" runat="server" meta:resourcekey="btnTakeSnapshot"
+                                    Text="Take Snapshot" CssClass="Button1" onclick="btnTakeSnapshot_Click" />
+                                </div>
+                                <br />
+                                
+				                <asp:TreeView ID="SnapshotsTree" runat="server" 
+                                    onselectednodechanged="SnapshotsTree_SelectedNodeChanged" ShowLines="True">
+                                    <SelectedNodeStyle CssClass="SelectedTreeNode" />
+                                    <Nodes>
+                                    </Nodes>
+                                    <NodeStyle CssClass="TreeNode" />
+				                </asp:TreeView>
+				                
+				                <div id="NoSnapshotsPanel" runat="server" style="padding: 5px;">
+				                    <asp:Localize ID="locNoSnapshots" runat="server" meta:resourcekey="locNoSnapshots" Text="No snapshots"></asp:Localize>
+				                </div>
+                                
+                                <br />
+				                <br />
+				                <asp:Localize ID="locQuota" runat="server" meta:resourcekey="locQuota"
+				                    Text="Number of Snapshots:"></asp:Localize>
+				                &nbsp;&nbsp;&nbsp;
+				                <wsp:QuotaViewer ID="snapshotsQuota" runat="server" QuotaTypeId="2" />
+				    
+				            </td>
+				            <td valign="top" id="SnapshotDetailsPanel" runat="server">
+				                <asp:Image ID="imgThumbnail" runat="server" Width="160" Height="120" />
+				                <p>
+				                    <asp:Localize ID="locCreated" runat="server" meta:resourcekey="locCreated"
+				                        Text="Created:"></asp:Localize>
+				                    <asp:Literal ID="litCreated" runat="server"></asp:Literal>
+				                </p>
+				                <ul class="ActionButtons">
+				                    <li>
+				                        <asp:LinkButton ID="btnApply" runat="server" CausesValidation="false" CssClass="ActionButtonApplySnapshot"
+				                            meta:resourcekey="btnApply" Text="Apply" onclick="btnApply_Click"></asp:LinkButton>
+				                    </li>
+				                    <li>
+				                        <asp:LinkButton ID="btnRename" runat="server" CausesValidation="false" CssClass="ActionButtonRename"
+				                            meta:resourcekey="btnRename" Text="Rename"></asp:LinkButton>
+				                    </li>
+				                    <li>
+				                        <asp:LinkButton ID="btnDelete" runat="server" CausesValidation="false" CssClass="ActionButtonDeleteSnapshot"
+				                            meta:resourcekey="btnDelete" Text="Delete" onclick="btnDelete_Click"></asp:LinkButton>
+				                    </li>
+				                    <li>
+				                        <asp:LinkButton ID="btnDeleteSubtree" runat="server" CausesValidation="false" CssClass="ActionButtonDeleteSnapshotTree"
+				                            meta:resourcekey="btnDeleteSubtree" Text="Delete subtree" 
+                                            onclick="btnDeleteSubtree_Click"></asp:LinkButton>
+				                    </li>
+				                </ul>
+				            </td>
+				        </tr>
+				    </table>
+				    
+			    </div>
+		    </div>
+
+	    </div>
+    	
+    </div>
+</div>
+
+<asp:Panel ID="RenamePanel" runat="server" CssClass="Popup" style="display:none;">
+	<table class="Popup-Header" cellpadding="0" cellspacing="0">
+		<tr>
+			<td class="Popup-HeaderLeft"></td>
+			<td class="Popup-HeaderTitle">
+				<asp:Localize ID="locRenameSnapshot" runat="server" Text="Rename snapshot"
+				    meta:resourcekey="locRenameSnapshot"></asp:Localize>
+			</td>
+			<td class="Popup-HeaderRight"></td>
+		</tr>
+	</table>
+	<div class="Popup-Content">
+		<div class="Popup-Body">
+			<br />
+			
+			<table cellspacing="10">
+			    <tr>
+			        <td>
+			            <asp:TextBox ID="txtSnapshotName" runat="server" CssClass="NormalTextBox" Width="300"></asp:TextBox>
+			            
+			            <asp:RequiredFieldValidator ID="SnapshotNameValidator" runat="server" Text="*" Display="Dynamic"
+                                ControlToValidate="txtSnapshotName" meta:resourcekey="SnapshotNameValidator" SetFocusOnError="true"
+                                ValidationGroup="RenameSnapshot">*</asp:RequiredFieldValidator>
+			        </td>
+			    </tr>
+			</table>
+			
+                                                
+			<br />
+		</div>
+		
+		<div class="FormFooter">
+		    <asp:Button ID="btnRenameSnapshot" runat="server" CssClass="Button1"
+		        meta:resourcekey="btnRenameSnapshot" Text="Rename" onclick="btnRenameSnapshot_Click"
+                ValidationGroup="RenameSnapshot" />
+		        
+			<asp:Button ID="btnCancelRename" runat="server" CssClass="Button1"
+			    meta:resourcekey="btnCancelRename" Text="Cancel" CausesValidation="false" />
+		</div>
+	</div>
+</asp:Panel>
+
+<ajaxToolkit:ModalPopupExtender ID="RenameSnapshotModal" runat="server" BehaviorID="RenameSnapshotModal"
+	TargetControlID="btnRename" PopupControlID="RenamePanel"
+	BackgroundCssClass="modalBackground" DropShadow="false" CancelControlID="btnCancelRename" />
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx.cs
new file mode 100644
index 00000000..26a0cfae
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx.cs
@@ -0,0 +1,262 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.Common;
+using WebsitePanel.Providers.Virtualization;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VpsDetailsSnapshots : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BindSnapshotsTree();
+            }
+        }
+
+        private void BindSnapshotsTree()
+        {
+            VirtualMachineSnapshot[] snapshots = ES.Services.VPS2012.GetVirtualMachineSnapshots(PanelRequest.ItemID);
+            
+            // clear tree
+            SnapshotsTree.Nodes.Clear();
+
+            // fill tree by root nodes
+            AddChildNodes(SnapshotsTree.Nodes, null, snapshots);
+
+            // select first node
+            if (SnapshotsTree.Nodes.Count > 0)
+            {
+                SnapshotsTree.Nodes[0].Selected = true;
+            }
+
+            // refresh
+            BindSelectedNode();
+
+            // quotas
+            VirtualMachine vm = ES.Services.VPS2012.GetVirtualMachineItem(PanelRequest.ItemID);
+            snapshotsQuota.QuotaUsedValue = snapshots.Length;
+            snapshotsQuota.QuotaValue = vm.SnapshotsNumber;
+            btnTakeSnapshot.Enabled = snapshots.Length < vm.SnapshotsNumber;
+        }
+
+        private void BindSelectedNode()
+        {
+            TreeNode node = SnapshotsTree.SelectedNode;
+
+            btnApply.Enabled =
+                btnRename.Enabled =
+                btnDelete.Enabled =
+                btnDeleteSubtree.Enabled =
+                SnapshotDetailsPanel.Visible = (node != null);
+
+            NoSnapshotsPanel.Visible = (SnapshotsTree.Nodes.Count == 0);
+
+            if (node != null)
+            {
+                // set name
+                txtSnapshotName.Text = node.Text;
+
+                // load snapshot details
+                VirtualMachineSnapshot snapshot = ES.Services.VPS2012.GetSnapshot(PanelRequest.ItemID, node.Value);
+                if (snapshot != null)
+                    litCreated.Text = snapshot.Created.ToString();
+
+                // set image
+                imgThumbnail.ImageUrl =
+                    string.Format("~/DesktopModules/WebsitePanel/VPS2012/VirtualMachineSnapshotImage.ashx?ItemID={0}&SnapshotID={1}&rnd={2}",
+                    PanelRequest.ItemID, HttpUtility.UrlEncode(node.Value), DateTime.Now.Ticks);
+            }
+        }
+
+        private void AddChildNodes(TreeNodeCollection parent, string parentId, VirtualMachineSnapshot[] snapshots)
+        {
+            foreach (VirtualMachineSnapshot snapshot in snapshots)
+            {
+                if (snapshot.ParentId == parentId)
+                {
+                    // add node
+                    TreeNode node = new TreeNode(snapshot.Name, snapshot.Id);
+                    node.Expanded = true;
+                    node.ImageUrl = PortalUtils.GetThemedImage("VPS/snapshot.png");
+                    parent.Add(node);
+
+                    // check if the current
+                    if (snapshot.IsCurrent)
+                    {
+                        TreeNode nowNode = new TreeNode(GetLocalizedString("Now.Text"), "");
+                        nowNode.ImageUrl = PortalUtils.GetThemedImage("VPS/start2.png");
+                        nowNode.SelectAction = TreeNodeSelectAction.None;
+                        node.ChildNodes.Add(nowNode);
+                    }
+
+                    // fill children
+                    AddChildNodes(node.ChildNodes, snapshot.Id, snapshots);
+                }
+            }
+        }
+
+        protected void btnTakeSnapshot_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                ResultObject res = ES.Services.VPS2012.CreateSnapshot(PanelRequest.ItemID);
+
+                if (res.IsSuccess)
+                {
+                    // bind tree
+                    BindSnapshotsTree();
+                    return;
+                }
+                else
+                {
+                    // show error
+                    messageBox.ShowMessage(res, "VPS_ERROR_TAKE_SNAPSHOT", "VPS");
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_ERROR_TAKE_SNAPSHOT", ex);
+            }
+        }
+
+        protected void btnApply_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                ResultObject res = ES.Services.VPS2012.ApplySnapshot(PanelRequest.ItemID, GetSelectedSnapshot());
+
+                if (res.IsSuccess)
+                {
+                    // bind tree
+                    BindSnapshotsTree();
+                    return;
+                }
+                else
+                {
+                    // show error
+                    messageBox.ShowMessage(res, "VPS_ERROR_APPLY_SNAPSHOT", "VPS");
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_ERROR_APPLY_SNAPSHOT", ex);
+            }
+        }
+
+        protected void btnRenameSnapshot_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                string newName = txtSnapshotName.Text.Trim();
+                ResultObject res = ES.Services.VPS2012.RenameSnapshot(PanelRequest.ItemID, GetSelectedSnapshot(), newName);
+
+                if (res.IsSuccess)
+                {
+                    // bind tree
+                    SnapshotsTree.SelectedNode.Text = newName;
+                    return;
+                }
+                else
+                {
+                    // show error
+                    messageBox.ShowMessage(res, "VPS_ERROR_RENAME_SNAPSHOT", "VPS");
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_ERROR_RENAME_SNAPSHOT", ex);
+            }
+        }
+
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                ResultObject res = ES.Services.VPS2012.DeleteSnapshot(PanelRequest.ItemID, GetSelectedSnapshot());
+
+                if (res.IsSuccess)
+                {
+                    // bind tree
+                    BindSnapshotsTree();
+                    return;
+                }
+                else
+                {
+                    // show error
+                    messageBox.ShowMessage(res, "VPS_ERROR_DELETE_SNAPSHOT", "VPS");
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_ERROR_DELETE_SNAPSHOT", ex);
+            }
+        }
+
+        protected void btnDeleteSubtree_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                ResultObject res = ES.Services.VPS2012.DeleteSnapshotSubtree(PanelRequest.ItemID, GetSelectedSnapshot());
+
+                if (res.IsSuccess)
+                {
+                    // bind tree
+                    BindSnapshotsTree();
+                    return;
+                }
+                else
+                {
+                    // show error
+                    messageBox.ShowMessage(res, "VPS_ERROR_DELETE_SNAPSHOT_SUBTREE", "VPS");
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_ERROR_DELETE_SNAPSHOT_SUBTREE", ex);
+            }
+        }
+
+        private string GetSelectedSnapshot()
+        {
+            return SnapshotsTree.SelectedNode.Value;
+        }
+
+        protected void SnapshotsTree_SelectedNodeChanged(object sender, EventArgs e)
+        {
+            BindSelectedNode();
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx.designer.cs
new file mode 100644
index 00000000..7b57c599
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsSnapshots.ascx.designer.cs
@@ -0,0 +1,267 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VpsDetailsSnapshots {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.ServerTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// btnTakeSnapshot 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.Button btnTakeSnapshot;
+        
+        /// <summary>
+        /// SnapshotsTree 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.TreeView SnapshotsTree;
+        
+        /// <summary>
+        /// NoSnapshotsPanel 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.HtmlGenericControl NoSnapshotsPanel;
+        
+        /// <summary>
+        /// locNoSnapshots 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 locNoSnapshots;
+        
+        /// <summary>
+        /// locQuota 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 locQuota;
+        
+        /// <summary>
+        /// snapshotsQuota control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.QuotaViewer snapshotsQuota;
+        
+        /// <summary>
+        /// SnapshotDetailsPanel 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 SnapshotDetailsPanel;
+        
+        /// <summary>
+        /// imgThumbnail 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.Image imgThumbnail;
+        
+        /// <summary>
+        /// locCreated 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 locCreated;
+        
+        /// <summary>
+        /// litCreated 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.Literal litCreated;
+        
+        /// <summary>
+        /// btnApply 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.LinkButton btnApply;
+        
+        /// <summary>
+        /// btnRename 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.LinkButton btnRename;
+        
+        /// <summary>
+        /// btnDelete 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.LinkButton btnDelete;
+        
+        /// <summary>
+        /// btnDeleteSubtree 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.LinkButton btnDeleteSubtree;
+        
+        /// <summary>
+        /// RenamePanel 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 RenamePanel;
+        
+        /// <summary>
+        /// locRenameSnapshot 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 locRenameSnapshot;
+        
+        /// <summary>
+        /// txtSnapshotName 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 txtSnapshotName;
+        
+        /// <summary>
+        /// SnapshotNameValidator 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.RequiredFieldValidator SnapshotNameValidator;
+        
+        /// <summary>
+        /// btnRenameSnapshot 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.Button btnRenameSnapshot;
+        
+        /// <summary>
+        /// btnCancelRename 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.Button btnCancelRename;
+        
+        /// <summary>
+        /// RenameSnapshotModal control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::AjaxControlToolkit.ModalPopupExtender RenameSnapshotModal;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsTools.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsTools.ascx
new file mode 100644
index 00000000..3ec46195
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsTools.ascx
@@ -0,0 +1,56 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VpsDetailsTools.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VpsDetailsTools" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/ServerTabs.ascx" TagName="ServerTabs" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/FormTitle.ascx" TagName="FormTitle" TagPrefix="wsp" %>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="Server48" runat="server" />
+				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Tools" />
+			    </div>
+			    <div class="FormBody">
+			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_tools" />	
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+				    <table cellspacing="15">
+				        <%-- <tr>
+				            <td>
+				                <asp:Button ID="btnReinstall" runat="server" CssClass="Button1" Width="100"
+				                    Text="Re-install" meta:resourcekey="btnReinstall" CausesValidation="false" 
+                                    onclick="btnReinstall_Click" />
+				            </td>
+				            <td>
+				                <asp:Localize ID="locReinstall" runat="server" meta:resourcekey="locReinstall" Text="Performs..."></asp:Localize>
+				            </td>
+				        </tr>--%>
+				        <tr>
+				            <td>
+				                <asp:Button ID="btnDelete" runat="server" CssClass="Button1" Width="100"
+				                    Text="Delete" meta:resourcekey="btnDelete" CausesValidation="false" 
+                                    onclick="btnDelete_Click" />
+				            </td>
+				            <td>
+				                <asp:Localize ID="locDelete" runat="server" meta:resourcekey="locDelete" Text="Performs..."></asp:Localize>
+				            </td>
+				        </tr>
+				    </table>
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsTools.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsTools.ascx.cs
new file mode 100644
index 00000000..18d5fff1
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsTools.ascx.cs
@@ -0,0 +1,56 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VpsDetailsTools : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        protected void btnReinstall_Click(object sender, EventArgs e)
+        {
+            Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "vps_tools_reinstall",
+                "SpaceID=" + PanelSecurity.PackageId.ToString()));
+        }
+
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "vps_tools_delete",
+               "SpaceID=" + PanelSecurity.PackageId.ToString()));
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsTools.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsTools.ascx.designer.cs
new file mode 100644
index 00000000..bd6726f8
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsTools.ascx.designer.cs
@@ -0,0 +1,87 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VpsDetailsTools {
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.ServerTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// btnDelete 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.Button btnDelete;
+        
+        /// <summary>
+        /// locDelete 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 locDelete;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsMoveServer.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsMoveServer.ascx
new file mode 100644
index 00000000..88a8006a
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsMoveServer.ascx
@@ -0,0 +1,75 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VpsMoveServer.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VpsMoveServer" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/PasswordControl.ascx" TagName="PasswordControl" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CollapsiblePanel.ascx" TagName="CollapsiblePanel" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/CheckBoxOption.ascx" TagName="CheckBoxOption" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="Server48" runat="server" />
+				    <asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Move VPS"></asp:Localize>
+			    </div>
+			    <div class="FormBody">
+    			    	
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+                    <asp:ValidationSummary ID="validatorsSummary" runat="server" 
+                        ValidationGroup="MoveWizard" ShowMessageBox="True" ShowSummary="False" />
+                        
+                    
+                    <table cellpadding="3">
+                        <tr>
+                            <td class="FormLabel150">
+                                <asp:Localize ID="locSourceService" runat="server" meta:resourcekey="locSourceService" Text="Source Service:"></asp:Localize>
+                            </td>
+                            <td>
+                                <asp:Literal ID="SourceHyperVService" runat="server"></asp:Literal>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="FormLabel150">
+                                <asp:Localize ID="locDestinationService" runat="server" meta:resourcekey="locDestinationService" Text="Destination Service:"></asp:Localize>
+                            </td>
+                            <td>
+                                <asp:DropDownList ID="HyperVServices" runat="server" CssClass="NormalTextBox"
+                                    DataValueField="ServiceId" DataTextField="FullServiceName"></asp:DropDownList>
+                                <asp:RequiredFieldValidator ID="RequiredHyperVService" runat="server"
+                                    ControlToValidate="HyperVServices" ValidationGroup="MoveWizard" meta:resourcekey="RequiredHyperVService"
+                                    Display="Dynamic" SetFocusOnError="true" Text="*">
+                                </asp:RequiredFieldValidator>
+                            </td>
+                        </tr>
+                    </table>
+                    
+                    <p>
+                        <asp:Button ID="btnMove" runat="server" meta:resourcekey="btnMove"
+                            ValidationGroup="MoveWizard" Text="Move" CssClass="Button1" 
+                            onclick="btnMove_Click" />
+                        <asp:Button ID="btnCancel" runat="server" meta:resourcekey="btnCancel"
+                            CausesValidation="false" Text="Cancel" CssClass="Button1" 
+                            onclick="btnCancel_Click" />
+                    </p>
+                        
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsMoveServer.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsMoveServer.ascx.cs
new file mode 100644
index 00000000..a5a2b367
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsMoveServer.ascx.cs
@@ -0,0 +1,112 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Data;
+using WebsitePanel.EnterpriseServer;
+using WebsitePanel.Providers.Virtualization;
+using WebsitePanel.Providers.ResultObjects;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VpsMoveServer : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BindHyperVServices();
+                BindSourceService();
+            }
+        }
+
+        public void BindHyperVServices()
+        {
+            // bind
+            HyperVServices.DataSource = ES.Services.Servers.GetRawServicesByGroupName(ResourceGroups.VPS2012).Tables[0].DefaultView;
+            HyperVServices.DataBind();
+
+            // add select value
+            HyperVServices.Items.Insert(0, new ListItem(GetLocalizedString("SelectHyperVService.Text"), ""));
+        }
+
+        private void BindSourceService()
+        {
+            VirtualMachine vm = ES.Services.VPS2012.GetVirtualMachineItem(PanelRequest.ItemID);
+            if (vm == null)
+                ReturnBack();
+
+            ListItem sourceItem = null;
+            foreach (ListItem item in HyperVServices.Items)
+            {
+                if (item.Value == vm.ServiceId.ToString())
+                {
+                    sourceItem = item;
+                    SourceHyperVService.Text = item.Text;
+                    break;
+                }
+            }
+
+            if (sourceItem != null)
+                HyperVServices.Items.Remove(sourceItem);
+        }
+
+        protected void btnCancel_Click(object sender, EventArgs e)
+        {
+            ReturnBack();
+        }
+
+        private void ReturnBack()
+        {
+            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), ""));
+        }
+
+        protected void btnMove_Click(object sender, EventArgs e)
+        {
+            if (!Page.IsValid)
+                return;
+
+            // move item
+            int destinationServiceId = Utils.ParseInt(HyperVServices.SelectedValue);
+            int result = ES.Services.Packages.MovePackageItem(PanelRequest.ItemID, destinationServiceId);
+            if (result < 0)
+            {
+                ShowResultMessage(result);
+                return;
+            }
+
+            // redirect to properties screen
+            Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "vps_general",
+                "SpaceID=" + PanelSecurity.PackageId.ToString()));
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsMoveServer.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsMoveServer.ascx.designer.cs
new file mode 100644
index 00000000..9ce6aa99
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsMoveServer.ascx.designer.cs
@@ -0,0 +1,141 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VpsMoveServer {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle 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 locTitle;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// validatorsSummary 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.ValidationSummary validatorsSummary;
+        
+        /// <summary>
+        /// locSourceService 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 locSourceService;
+        
+        /// <summary>
+        /// SourceHyperVService 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.Literal SourceHyperVService;
+        
+        /// <summary>
+        /// locDestinationService 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 locDestinationService;
+        
+        /// <summary>
+        /// HyperVServices 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.DropDownList HyperVServices;
+        
+        /// <summary>
+        /// RequiredHyperVService 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.RequiredFieldValidator RequiredHyperVService;
+        
+        /// <summary>
+        /// btnMove 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.Button btnMove;
+        
+        /// <summary>
+        /// btnCancel 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.Button btnCancel;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx
new file mode 100644
index 00000000..b0ed67de
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx
@@ -0,0 +1,92 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VpsToolsDeleteServer.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VpsToolsDeleteServer" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/ServerTabs.ascx" TagName="ServerTabs" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/FormTitle.ascx" TagName="FormTitle" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="DeleteServer48" runat="server" />
+				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Delete Server" />
+			    </div>
+			    <div class="FormBody">
+			        <wsp:ServerTabs id="tabs" runat="server" />	
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+                    <asp:ValidationSummary ID="validatorsSummary" runat="server" 
+                        ValidationGroup="Tools" ShowMessageBox="True" ShowSummary="False" />
+                    
+		            <p class="SubTitle">
+		                <asp:Localize ID="locSubTitle" runat="server"
+		                    meta:resourcekey="locSubTitle" Text="Delete VPS Server" />
+		            </p>
+                    <p>
+                        <asp:Localize ID="locDescription" runat="server"
+		                    meta:resourcekey="locDescription" Text="This wizard will delete VPS and all its contents from the virtualization server." />
+                    </p>
+                    <p>
+                        <asp:CheckBox ID="chkConfirmDelete" runat="server" CssClass="NormalBold"
+				                    meta:resourcekey="chkConfirmDelete" Text="Yes, I confirm deletion of this VPS" />
+                    </p>
+				    
+                    <fieldset id="AdminOptionsPanel" runat="server">
+                        <legend>
+                            <asp:Localize ID="locAdminOptions" runat="server" meta:resourcekey="locAdminOptions" Text="Administrator options"></asp:Localize>
+                        </legend>
+
+                            <table cellspacing="5">
+				                <tr>
+				                    <td>
+				                        <asp:CheckBox ID="chkSaveFiles" runat="server"
+				                            meta:resourcekey="chkSaveFiles" Text="Do not delete VPS files (virtual hard disk, snapshots)" />
+				                    </td>
+				                </tr>
+				                <tr>
+				                    <td>
+				                        <asp:CheckBox ID="chkExport" runat="server" AutoPostBack="true"
+				                            meta:resourcekey="chkExport" Text="Export VPS before deletion to the following folder:" />
+				                    </td>
+				                </tr>
+				                <tr>
+				                    <td style="padding-left:20px;">
+				                        <asp:TextBox ID="txtExportPath" runat="server" Width="300px" CssClass="NormalTextBox"></asp:TextBox>
+        				                
+				                        <asp:RequiredFieldValidator ID="ExportPathValidator" runat="server" Text="*" Display="Dynamic"
+                                                ControlToValidate="txtExportPath" meta:resourcekey="ExportPathValidator" SetFocusOnError="true"
+                                                ValidationGroup="Tools">*</asp:RequiredFieldValidator>
+				                    </td>
+				                </tr>
+				            </table>
+				     </fieldset>
+				    
+                    <p>
+                        <asp:Button ID="btnDelete" runat="server" meta:resourcekey="btnDelete"
+                            ValidationGroup="Tools" Text="Delete" CssClass="Button1" 
+                            onclick="btnDelete_Click" />
+                        <asp:Button ID="btnCancel" runat="server" meta:resourcekey="btnCancel"
+                            CausesValidation="false" Text="Cancel" CssClass="Button1" 
+                            onclick="btnCancel_Click" />
+                    </p>
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx.cs
new file mode 100644
index 00000000..d8715d75
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx.cs
@@ -0,0 +1,116 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using WebsitePanel.Providers.Common;
+using WebsitePanel.Providers.Virtualization;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VpsToolsDeleteServer : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BindFormDetails();
+            }
+
+            ToogleControls();
+        }
+
+        private void ToogleControls()
+        {
+            txtExportPath.Visible = chkExport.Checked;
+            ExportPathValidator.Enabled = chkExport.Checked;
+        }
+
+        private void BindFormDetails()
+        {
+            // load VM item
+            VirtualMachine vm = VirtualMachines2012Helper.GetCachedVirtualMachine(PanelRequest.ItemID);
+            if (!String.IsNullOrEmpty(vm.CurrentTaskId))
+            {
+                messageBox.ShowWarningMessage("VPS_PROVISIONING_PROCESS");
+                btnDelete.Enabled = false;
+                return;
+            }
+
+            // load export settings
+            if (PanelSecurity.EffectiveUser.Role == WebsitePanel.EnterpriseServer.UserRole.Administrator)
+            {
+                txtExportPath.Text = ES.Services.VPS2012.GetDefaultExportPath(PanelRequest.ItemID);
+            }
+            else
+            {
+                AdminOptionsPanel.Visible = false;
+            }
+        }
+
+        protected void btnCancel_Click(object sender, EventArgs e)
+        {
+            Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), ""));
+        }
+
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            if (!chkConfirmDelete.Checked)
+            {
+                messageBox.ShowWarningMessage("VPS_DELETE_CONFIRM");
+                return;
+            }
+
+            // delete machine
+            try
+            {
+                ResultObject res = ES.Services.VPS2012.DeleteVirtualMachine(PanelRequest.ItemID,
+                    chkSaveFiles.Checked, chkExport.Checked, txtExportPath.Text.Trim());
+
+                if (res.IsSuccess)
+                {
+                    // return to the list
+                    Response.Redirect(EditUrl("SpaceID", PanelSecurity.PackageId.ToString(), ""));
+                    return;
+                }
+                else
+                {
+                    // show error
+                    messageBox.ShowMessage(res, "VPS_ERROR_DELETE", "VPS");
+                }
+            }
+            catch (Exception ex)
+            {
+                messageBox.ShowErrorMessage("VPS_ERROR_DELETE", ex);
+            }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx.designer.cs
new file mode 100644
index 00000000..4186b99a
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsDeleteServer.ascx.designer.cs
@@ -0,0 +1,186 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VpsToolsDeleteServer {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.ServerTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// validatorsSummary 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.ValidationSummary validatorsSummary;
+        
+        /// <summary>
+        /// locSubTitle 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 locSubTitle;
+        
+        /// <summary>
+        /// locDescription 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 locDescription;
+        
+        /// <summary>
+        /// chkConfirmDelete 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 chkConfirmDelete;
+        
+        /// <summary>
+        /// AdminOptionsPanel 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.HtmlGenericControl AdminOptionsPanel;
+        
+        /// <summary>
+        /// locAdminOptions 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 locAdminOptions;
+        
+        /// <summary>
+        /// chkSaveFiles 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 chkSaveFiles;
+        
+        /// <summary>
+        /// chkExport 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 chkExport;
+        
+        /// <summary>
+        /// txtExportPath 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 txtExportPath;
+        
+        /// <summary>
+        /// ExportPathValidator 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.RequiredFieldValidator ExportPathValidator;
+        
+        /// <summary>
+        /// btnDelete 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.Button btnDelete;
+        
+        /// <summary>
+        /// btnCancel 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.Button btnCancel;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx
new file mode 100644
index 00000000..fa853be3
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx
@@ -0,0 +1,109 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="VpsToolsReinstallServer.ascx.cs" Inherits="WebsitePanel.Portal.VPS2012.VpsToolsReinstallServer" %>
+<%@ Register Src="../UserControls/SimpleMessageBox.ascx" TagName="SimpleMessageBox" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/ServerTabs.ascx" TagName="ServerTabs" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Menu.ascx" TagName="Menu" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/Breadcrumb.ascx" TagName="Breadcrumb" TagPrefix="wsp" %>
+<%@ Register Src="UserControls/FormTitle.ascx" TagName="FormTitle" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/PasswordControl.ascx" TagName="PasswordControl" TagPrefix="wsp" %>
+<%@ Register Src="../UserControls/EnableAsyncTasksSupport.ascx" TagName="EnableAsyncTasksSupport" TagPrefix="wsp" %>
+
+<wsp:EnableAsyncTasksSupport id="asyncTasks" runat="server"/>
+
+<div id="VpsContainer">
+    <div class="Module">
+
+	    <div class="Header">
+		    <wsp:Breadcrumb id="breadcrumb" runat="server" />
+	    </div>
+    	
+	    <div class="Left">
+		    <wsp:Menu id="menu" runat="server" SelectedItem="" />
+	    </div>
+    	
+	    <div class="Content">
+		    <div class="Center">
+			    <div class="Title">
+				    <asp:Image ID="imgIcon" SkinID="Server48" runat="server" />
+				    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Re-install Server" />
+			    </div>
+			    <div class="FormBody">
+			        <wsp:ServerTabs id="tabs" runat="server" SelectedTab="vps_tools" />	
+                    <wsp:SimpleMessageBox id="messageBox" runat="server" />
+                    
+                    <asp:ValidationSummary ID="validatorsSummary" runat="server" 
+                        ValidationGroup="Reinstall" ShowMessageBox="True" ShowSummary="False" />
+                    
+		            <p class="SubTitle">
+		                <asp:Localize ID="locSubTitle" runat="server"
+		                    meta:resourcekey="locSubTitle" Text="Re-install VPS Server" />
+		            </p>
+                    <p>
+                        <asp:Localize ID="locDescription" runat="server"
+		                    meta:resourcekey="locDescription" Text="This wizard will re-create VPS with the same configuration settings from scratch and then apply current OS template." />
+                    </p>
+                    <p>
+                        <asp:CheckBox ID="chkConfirmReinstall" runat="server" CssClass="NormalBold"
+				                    meta:resourcekey="chkConfirmReinstall" Text="Yes, I confirm re-installation of this VPS" />
+                    </p>
+				    
+				    <table cellspacing="5">
+				        <tr>
+				            <td valign="top">
+				                <asp:Localize ID="locPassword" runat="server"
+		                            meta:resourcekey="locPassword" Text="New administrator password:" />
+				            </td>
+				            <td>
+				                 <wsp:PasswordControl id="password" runat="server"
+			                        ValidationGroup="Reinstall"></wsp:PasswordControl>
+				            </td>
+				        </tr>
+				        <tr>
+				            <td colspan="2">
+				                <asp:CheckBox ID="chkPreserveExistingFiles" runat="server" CssClass="NormalBold"
+				                    meta:resourcekey="chkPreserveExistingFiles" Text="Save existing VPS hard drive files" />
+				                <br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				                <asp:Localize ID="locPreserveHelp" runat="server"
+		                            meta:resourcekey="locPreserveHelp" Text="All files from existing hard drive will be copied to &quot;old&quot; disk folder on hard drive of new VPS." />
+				            </td>
+				        </tr>
+				    </table>
+				    <br />
+                    <table cellspacing="5" id="AdminOptionsPanel" runat="server">
+				        <tr>
+				            <td>
+				                <asp:CheckBox ID="chkSaveVhd" runat="server"
+				                    meta:resourcekey="chkSaveVhd" Text="Do not delete VPS virtual hard drive file" />
+				            </td>
+				        </tr>
+				        <tr>
+				            <td>
+				                <asp:CheckBox ID="chkExport" runat="server"
+				                    meta:resourcekey="chkExport" Text="Export VPS before re-installation to the following folder:" />
+				            </td>
+				        </tr>
+				        <tr>
+				            <td style="padding-left:20px;">
+				                <asp:TextBox ID="txtExportPath" runat="server" Width="300px" CssClass="NormalTextBox"></asp:TextBox>
+				                
+				                <asp:RequiredFieldValidator ID="ExportPathValidator" runat="server" Text="*" Display="Dynamic"
+                                        ControlToValidate="txtExportPath" meta:resourcekey="ExportPathValidator" SetFocusOnError="true"
+                                        ValidationGroup="Reinstall">*</asp:RequiredFieldValidator>
+				            </td>
+				        </tr>
+				    </table>
+				    
+                    <p>
+                        <asp:Button ID="btnReinstall" runat="server" meta:resourcekey="btnReinstall"
+                            ValidationGroup="Reinstall" Text="Re-install" CssClass="Button1" 
+                            onclick="btnUpdate_Click" />
+                            
+                        <asp:Button ID="btnCancel" runat="server" meta:resourcekey="btnCancel"
+                            CausesValidation="false" Text="Cancel" CssClass="Button1" 
+                            onclick="btnCancel_Click" />
+                    </p>
+			    </div>
+		    </div>
+	    </div>
+    	
+    </div>
+</div>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx.cs
new file mode 100644
index 00000000..c0efc5f2
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx.cs
@@ -0,0 +1,58 @@
+// Copyright (c) 2015, 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.
+
+using System;
+using System.Collections.Generic;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebsitePanel.Portal.VPS2012
+{
+    public partial class VpsToolsReinstallServer : WebsitePanelModuleBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        protected void btnCancel_Click(object sender, EventArgs e)
+        {
+            Response.Redirect(EditUrl("ItemID", PanelRequest.ItemID.ToString(), "vps_tools",
+                "SpaceID=" + PanelSecurity.PackageId.ToString()));
+        }
+
+        protected void btnUpdate_Click(object sender, EventArgs e)
+        {
+            if (!chkConfirmReinstall.Checked)
+            {
+                messageBox.ShowWarningMessage("VPS_REINSTALL_CONFIRM");
+            }
+        }
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx.designer.cs
new file mode 100644
index 00000000..2c8b35d1
--- /dev/null
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsToolsReinstallServer.ascx.designer.cs
@@ -0,0 +1,213 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebsitePanel.Portal.VPS2012 {
+    
+    
+    public partial class VpsToolsReinstallServer {
+        
+        /// <summary>
+        /// asyncTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
+        
+        /// <summary>
+        /// breadcrumb control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Breadcrumb breadcrumb;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.Menu menu;
+        
+        /// <summary>
+        /// imgIcon 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.Image imgIcon;
+        
+        /// <summary>
+        /// locTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
+        
+        /// <summary>
+        /// tabs control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.VPS2012.UserControls.ServerTabs tabs;
+        
+        /// <summary>
+        /// messageBox control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
+        
+        /// <summary>
+        /// validatorsSummary 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.ValidationSummary validatorsSummary;
+        
+        /// <summary>
+        /// locSubTitle 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 locSubTitle;
+        
+        /// <summary>
+        /// locDescription 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 locDescription;
+        
+        /// <summary>
+        /// chkConfirmReinstall 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 chkConfirmReinstall;
+        
+        /// <summary>
+        /// locPassword 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 locPassword;
+        
+        /// <summary>
+        /// password control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::WebsitePanel.Portal.PasswordControl password;
+        
+        /// <summary>
+        /// chkPreserveExistingFiles 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 chkPreserveExistingFiles;
+        
+        /// <summary>
+        /// locPreserveHelp 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 locPreserveHelp;
+        
+        /// <summary>
+        /// AdminOptionsPanel 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.HtmlTable AdminOptionsPanel;
+        
+        /// <summary>
+        /// chkSaveVhd 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 chkSaveVhd;
+        
+        /// <summary>
+        /// chkExport 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 chkExport;
+        
+        /// <summary>
+        /// txtExportPath 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 txtExportPath;
+        
+        /// <summary>
+        /// ExportPathValidator 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.RequiredFieldValidator ExportPathValidator;
+        
+        /// <summary>
+        /// btnReinstall 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.Button btnReinstall;
+        
+        /// <summary>
+        /// btnCancel 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.Button btnCancel;
+    }
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
index c9d9d90e..00fa7463 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
@@ -169,9 +169,11 @@
     <Compile Include="Code\Framework\Utils.cs" />
     <Compile Include="Code\Helpers\AuditLogHelper.cs" />
     <Compile Include="Code\Helpers\BlackBerryHelper.cs" />
+    <Compile Include="Code\Helpers\HostedSharePointEnterpriseSiteCollectionsHelper.cs" />
     <Compile Include="Code\Helpers\RDSHelper.cs" />
     <Compile Include="Code\Helpers\EnterpriseStorageHelper.cs" />
     <Compile Include="Code\Helpers\LyncHelper.cs" />
+    <Compile Include="Code\Helpers\VirtualMachineSettingExtensions.cs" />
     <Compile Include="Code\Helpers\VirtualMachinesForPCHelper.cs" />
     <Compile Include="Code\Helpers\CRMHelper.cs" />
     <Compile Include="Code\Helpers\ExchangeHelper.cs" />
@@ -189,13 +191,14 @@
     <Compile Include="Code\Helpers\ServiceItemsHelper.cs" />
     <Compile Include="Code\Helpers\TasksHelper.cs" />
     <Compile Include="Code\Helpers\UsersHelper.cs" />
+    <Compile Include="Code\Helpers\VirtualMachines2012Helper.cs" />
     <Compile Include="Code\Helpers\VirtualMachinesHelper.cs" />
     <Compile Include="Code\Helpers\WebAppGalleryHelpers.cs" />
     <Compile Include="Code\ProviderControls\IDatabaseEditDatabaseControl.cs" />
     <Compile Include="Code\ProviderControls\IDatabaseEditUserControl.cs" />
     <Compile Include="Code\ProviderControls\IFtpEditAccountControl.cs" />
     <Compile Include="Code\ProviderControls\IHostingServiceProviderSettings.cs" />
-    <Compile Include="Code\ProviderControls\IVirtualMachineCreateControl.cs" />
+    <Compile Include="Code\ProviderControls\IVirtualMachineSettingsControl.cs" />
     <Compile Include="Code\ProviderControls\IMailEditAccountControl.cs" />
     <Compile Include="Code\ProviderControls\IMailEditDomainControl.cs" />
     <Compile Include="Code\ProviderControls\IMailEditForwardingControl.cs" />
@@ -283,9 +286,51 @@
       <DependentUpon>OrganizationSettingsTabs.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="HostedSharePoint\HostedSharePointEnterpriseBackupSiteCollection.ascx.cs">
+      <DependentUpon>HostedSharePointEnterpriseBackupSiteCollection.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="ExchangeServer\UserControls\OrganizationSettingsTabs.ascx.designer.cs">
       <DependentUpon>OrganizationSettingsTabs.ascx</DependentUpon>
     </Compile>
+    <Compile Include="HostedSharePoint\HostedSharePointEnterpriseBackupSiteCollection.ascx.designer.cs">
+      <DependentUpon>HostedSharePointEnterpriseBackupSiteCollection.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="HostedSharePoint\HostedSharePointEnterpriseEditSiteCollection.ascx.cs">
+      <DependentUpon>HostedSharePointEnterpriseEditSiteCollection.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HostedSharePoint\HostedSharePointEnterpriseEditSiteCollection.ascx.designer.cs">
+      <DependentUpon>HostedSharePointEnterpriseEditSiteCollection.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="HostedSharePoint\HostedSharePointEnterpriseSiteCollections.ascx.cs">
+      <DependentUpon>HostedSharePointEnterpriseSiteCollections.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HostedSharePoint\HostedSharePointEnterpriseSiteCollections.ascx.designer.cs">
+      <DependentUpon>HostedSharePointEnterpriseSiteCollections.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="HostedSharePoint\HostedSharePointEnterpriseRestoreSiteCollection.ascx.cs">
+      <DependentUpon>HostedSharePointEnterpriseRestoreSiteCollection.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HostedSharePoint\HostedSharePointEnterpriseRestoreSiteCollection.ascx.designer.cs">
+      <DependentUpon>HostedSharePointEnterpriseRestoreSiteCollection.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="HostedSharePoint\HostedSharePointEnterpriseStorageSettings.ascx.cs">
+      <DependentUpon>HostedSharePointEnterpriseStorageSettings.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HostedSharePoint\HostedSharePointEnterpriseStorageSettings.ascx.designer.cs">
+      <DependentUpon>HostedSharePointEnterpriseStorageSettings.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="HostedSharePoint\HostedSharePointEnterpriseStorageUsage.ascx.cs">
+      <DependentUpon>HostedSharePointEnterpriseStorageUsage.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HostedSharePoint\HostedSharePointEnterpriseStorageUsage.ascx.designer.cs">
+      <DependentUpon>HostedSharePointEnterpriseStorageUsage.ascx</DependentUpon>
+    </Compile>
     <Compile Include="ProviderControls\HyperV2012R2_Settings.ascx.cs">
       <DependentUpon>HyperV2012R2_Settings.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -297,6 +342,10 @@
       <DependentUpon>UserPasswordExpirationNotificationView.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="VPS2012\RemoteDesktop\Connect.aspx.cs">
+      <DependentUpon>Connect.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="ScheduleTaskControls\UserPasswordExpirationNotificationView.ascx.designer.cs">
       <DependentUpon>UserPasswordExpirationNotificationView.ascx</DependentUpon>
     </Compile>
@@ -314,12 +363,240 @@
     <Compile Include="SettingsUserPasswordResetLetter.ascx.designer.cs">
       <DependentUpon>SettingsUserPasswordResetLetter.ascx</DependentUpon>
     </Compile>
-    <Compile Include="VPS\ProviderControls\HyperV2012R2_Create.ascx.cs">
-      <DependentUpon>HyperV2012R2_Create.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="VPS\ProviderControls\HyperV2012R2_Create.ascx.designer.cs">
-      <DependentUpon>HyperV2012R2_Create.ascx</DependentUpon>
+    <Compile Include="VPS2012\RemoteDesktop\Connect.aspx.designer.cs">
+      <DependentUpon>Connect.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\TestVirtualMachineTemplate.aspx.cs">
+      <DependentUpon>TestVirtualMachineTemplate.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\TestVirtualMachineTemplate.aspx.designer.cs">
+      <DependentUpon>TestVirtualMachineTemplate.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\UserControls\Breadcrumb.ascx.cs">
+      <DependentUpon>Breadcrumb.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\UserControls\Breadcrumb.ascx.designer.cs">
+      <DependentUpon>Breadcrumb.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\UserControls\DynamicMemoryControl.ascx.cs">
+      <DependentUpon>DynamicMemoryControl.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\UserControls\DynamicMemoryControl.ascx.designer.cs">
+      <DependentUpon>DynamicMemoryControl.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\UserControls\FormTitle.ascx.cs">
+      <DependentUpon>FormTitle.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\UserControls\FormTitle.ascx.designer.cs">
+      <DependentUpon>FormTitle.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\UserControls\Generation.ascx.cs">
+      <DependentUpon>Generation.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\UserControls\Generation.ascx.designer.cs">
+      <DependentUpon>Generation.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\UserControls\Menu.ascx.cs">
+      <DependentUpon>Menu.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\UserControls\Menu.ascx.designer.cs">
+      <DependentUpon>Menu.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\UserControls\ServerTabs.ascx.cs">
+      <DependentUpon>ServerTabs.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\UserControls\ServerTabs.ascx.designer.cs">
+      <DependentUpon>ServerTabs.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VdcAddExternalAddress.ascx.cs">
+      <DependentUpon>VdcAddExternalAddress.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VdcAddExternalAddress.ascx.designer.cs">
+      <DependentUpon>VdcAddExternalAddress.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VdcAuditLog.ascx.cs">
+      <DependentUpon>VdcAuditLog.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VdcAuditLog.ascx.designer.cs">
+      <DependentUpon>VdcAuditLog.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VdcCreateServer.ascx.cs">
+      <DependentUpon>VdcCreateServer.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VdcCreateServer.ascx.designer.cs">
+      <DependentUpon>VdcCreateServer.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VdcExternalNetwork.ascx.cs">
+      <DependentUpon>VdcExternalNetwork.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VdcExternalNetwork.ascx.designer.cs">
+      <DependentUpon>VdcExternalNetwork.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VdcHome.ascx.cs">
+      <DependentUpon>VdcHome.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VdcHome.ascx.designer.cs">
+      <DependentUpon>VdcHome.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VdcImportServer.ascx.cs">
+      <DependentUpon>VdcImportServer.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VdcImportServer.ascx.designer.cs">
+      <DependentUpon>VdcImportServer.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VdcManagementNetwork.ascx.cs">
+      <DependentUpon>VdcManagementNetwork.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VdcManagementNetwork.ascx.designer.cs">
+      <DependentUpon>VdcManagementNetwork.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VdcPermissions.ascx.cs">
+      <DependentUpon>VdcPermissions.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VdcPermissions.ascx.designer.cs">
+      <DependentUpon>VdcPermissions.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VdcPrivateNetwork.ascx.cs">
+      <DependentUpon>VdcPrivateNetwork.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VdcPrivateNetwork.ascx.designer.cs">
+      <DependentUpon>VdcPrivateNetwork.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VirtualMachineImage.ashx.cs">
+      <DependentUpon>VirtualMachineImage.ashx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VirtualMachineSnapshotImage.ashx.cs">
+      <DependentUpon>VirtualMachineSnapshotImage.ashx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsAddExternalAddress.ascx.cs">
+      <DependentUpon>VpsDetailsAddExternalAddress.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsAddExternalAddress.ascx.designer.cs">
+      <DependentUpon>VpsDetailsAddExternalAddress.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsAddPrivateAddress.ascx.cs">
+      <DependentUpon>VpsDetailsAddPrivateAddress.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsAddPrivateAddress.ascx.designer.cs">
+      <DependentUpon>VpsDetailsAddPrivateAddress.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsAuditLog.ascx.cs">
+      <DependentUpon>VpsDetailsAuditLog.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsAuditLog.ascx.designer.cs">
+      <DependentUpon>VpsDetailsAuditLog.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsConfiguration.ascx.cs">
+      <DependentUpon>VpsDetailsConfiguration.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsConfiguration.ascx.designer.cs">
+      <DependentUpon>VpsDetailsConfiguration.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsDvd.ascx.cs">
+      <DependentUpon>VpsDetailsDvd.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsDvd.ascx.designer.cs">
+      <DependentUpon>VpsDetailsDvd.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsEditConfiguration.ascx.cs">
+      <DependentUpon>VpsDetailsEditConfiguration.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsEditConfiguration.ascx.designer.cs">
+      <DependentUpon>VpsDetailsEditConfiguration.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsGeneral.ascx.cs">
+      <DependentUpon>VpsDetailsGeneral.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsGeneral.ascx.designer.cs">
+      <DependentUpon>VpsDetailsGeneral.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsHelp.ascx.cs">
+      <DependentUpon>VpsDetailsHelp.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsHelp.ascx.designer.cs">
+      <DependentUpon>VpsDetailsHelp.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsInsertDvd.ascx.cs">
+      <DependentUpon>VpsDetailsInsertDvd.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsInsertDvd.ascx.designer.cs">
+      <DependentUpon>VpsDetailsInsertDvd.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsNetwork.ascx.cs">
+      <DependentUpon>VpsDetailsNetwork.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsNetwork.ascx.designer.cs">
+      <DependentUpon>VpsDetailsNetwork.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsPermissions.ascx.cs">
+      <DependentUpon>VpsDetailsPermissions.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsPermissions.ascx.designer.cs">
+      <DependentUpon>VpsDetailsPermissions.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsSnapshots.ascx.cs">
+      <DependentUpon>VpsDetailsSnapshots.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsSnapshots.ascx.designer.cs">
+      <DependentUpon>VpsDetailsSnapshots.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsTools.ascx.cs">
+      <DependentUpon>VpsDetailsTools.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VpsDetailsTools.ascx.designer.cs">
+      <DependentUpon>VpsDetailsTools.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VpsMoveServer.ascx.cs">
+      <DependentUpon>VpsMoveServer.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VpsMoveServer.ascx.designer.cs">
+      <DependentUpon>VpsMoveServer.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VpsToolsDeleteServer.ascx.cs">
+      <DependentUpon>VpsToolsDeleteServer.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VpsToolsDeleteServer.ascx.designer.cs">
+      <DependentUpon>VpsToolsDeleteServer.ascx</DependentUpon>
+    </Compile>
+    <Compile Include="VPS2012\VpsToolsReinstallServer.ascx.cs">
+      <DependentUpon>VpsToolsReinstallServer.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="VPS2012\VpsToolsReinstallServer.ascx.designer.cs">
+      <DependentUpon>VpsToolsReinstallServer.ascx</DependentUpon>
     </Compile>
     <Compile Include="ProviderControls\SmarterMail100_EditAccount.ascx.cs">
       <DependentUpon>SmarterMail100_EditAccount.ascx</DependentUpon>
@@ -1527,46 +1804,46 @@
     <Compile Include="ExchangeServer\UserControls\UserSelector.ascx.designer.cs">
       <DependentUpon>UserSelector.ascx</DependentUpon>
     </Compile>
-    <Compile Include="HostedSharePointBackupSiteCollection.ascx.cs">
+    <Compile Include="HostedSharePoint\HostedSharePointBackupSiteCollection.ascx.cs">
       <DependentUpon>HostedSharePointBackupSiteCollection.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="HostedSharePointBackupSiteCollection.ascx.designer.cs">
+    <Compile Include="HostedSharePoint\HostedSharePointBackupSiteCollection.ascx.designer.cs">
       <DependentUpon>HostedSharePointBackupSiteCollection.ascx</DependentUpon>
     </Compile>
-    <Compile Include="HostedSharePointEditSiteCollection.ascx.cs">
+    <Compile Include="HostedSharePoint\HostedSharePointEditSiteCollection.ascx.cs">
       <DependentUpon>HostedSharePointEditSiteCollection.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="HostedSharePointEditSiteCollection.ascx.designer.cs">
+    <Compile Include="HostedSharePoint\HostedSharePointEditSiteCollection.ascx.designer.cs">
       <DependentUpon>HostedSharePointEditSiteCollection.ascx</DependentUpon>
     </Compile>
-    <Compile Include="HostedSharePointRestoreSiteCollection.ascx.cs">
+    <Compile Include="HostedSharePoint\HostedSharePointRestoreSiteCollection.ascx.cs">
       <DependentUpon>HostedSharePointRestoreSiteCollection.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="HostedSharePointRestoreSiteCollection.ascx.designer.cs">
+    <Compile Include="HostedSharePoint\HostedSharePointRestoreSiteCollection.ascx.designer.cs">
       <DependentUpon>HostedSharePointRestoreSiteCollection.ascx</DependentUpon>
     </Compile>
-    <Compile Include="HostedSharePointSiteCollections.ascx.cs">
+    <Compile Include="HostedSharePoint\HostedSharePointSiteCollections.ascx.cs">
       <DependentUpon>HostedSharePointSiteCollections.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="HostedSharePointSiteCollections.ascx.designer.cs">
+    <Compile Include="HostedSharePoint\HostedSharePointSiteCollections.ascx.designer.cs">
       <DependentUpon>HostedSharePointSiteCollections.ascx</DependentUpon>
     </Compile>
-    <Compile Include="HostedSharePointStorageSettings.ascx.cs">
+    <Compile Include="HostedSharePoint\HostedSharePointStorageSettings.ascx.cs">
       <DependentUpon>HostedSharePointStorageSettings.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="HostedSharePointStorageSettings.ascx.designer.cs">
+    <Compile Include="HostedSharePoint\HostedSharePointStorageSettings.ascx.designer.cs">
       <DependentUpon>HostedSharePointStorageSettings.ascx</DependentUpon>
     </Compile>
-    <Compile Include="HostedSharePointStorageUsage.ascx.cs">
+    <Compile Include="HostedSharePoint\HostedSharePointStorageUsage.ascx.cs">
       <DependentUpon>HostedSharePointStorageUsage.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="HostedSharePointStorageUsage.ascx.designer.cs">
+    <Compile Include="HostedSharePoint\HostedSharePointStorageUsage.ascx.designer.cs">
       <DependentUpon>HostedSharePointStorageUsage.ascx</DependentUpon>
     </Compile>
     <Compile Include="HostedSoluitonReportSummaryLetter.ascx.cs">
@@ -4591,11 +4868,50 @@
     <Content Include="ExchangeServer\UserControls\EnterpriseStorageEditFolderTabs.ascx" />
     <Content Include="ExchangeServer\UserControls\EnterpriseStorageOwaUsersList.ascx" />
     <Content Include="ExchangeServer\UserControls\OrganizationSettingsTabs.ascx" />
+    <Content Include="HostedSharePoint\HostedSharePointEnterpriseBackupSiteCollection.ascx" />
+    <Content Include="HostedSharePoint\HostedSharePointEnterpriseEditSiteCollection.ascx" />
+    <Content Include="HostedSharePoint\HostedSharePointEnterpriseSiteCollections.ascx" />
+    <Content Include="HostedSharePoint\HostedSharePointEnterpriseRestoreSiteCollection.ascx" />
+    <Content Include="HostedSharePoint\HostedSharePointEnterpriseStorageSettings.ascx" />
+    <Content Include="HostedSharePoint\HostedSharePointEnterpriseStorageUsage.ascx" />
     <Content Include="ProviderControls\HyperV2012R2_Settings.ascx" />
     <Content Include="ScheduleTaskControls\UserPasswordExpirationNotificationView.ascx" />
     <Content Include="SettingsUserPasswordExpirationLetter.ascx" />
     <Content Include="SettingsUserPasswordResetLetter.ascx" />
-    <Content Include="VPS\ProviderControls\HyperV2012R2_Create.ascx" />
+    <Content Include="VPS2012\RemoteDesktop\Connect.aspx" />
+    <Content Include="VPS2012\RemoteDesktop\msrdp.cab" />
+    <Content Include="VPS2012\TestVirtualMachineTemplate.aspx" />
+    <Content Include="VPS2012\UserControls\Breadcrumb.ascx" />
+    <Content Include="VPS2012\UserControls\DynamicMemoryControl.ascx" />
+    <Content Include="VPS2012\UserControls\FormTitle.ascx" />
+    <Content Include="VPS2012\UserControls\Generation.ascx" />
+    <Content Include="VPS2012\UserControls\Menu.ascx" />
+    <Content Include="VPS2012\UserControls\ServerTabs.ascx" />
+    <Content Include="VPS2012\VdcAddExternalAddress.ascx" />
+    <Content Include="VPS2012\VdcAuditLog.ascx" />
+    <Content Include="VPS2012\VdcCreateServer.ascx" />
+    <Content Include="VPS2012\VdcExternalNetwork.ascx" />
+    <Content Include="VPS2012\VdcHome.ascx" />
+    <Content Include="VPS2012\VdcImportServer.ascx" />
+    <Content Include="VPS2012\VdcManagementNetwork.ascx" />
+    <Content Include="VPS2012\VdcPermissions.ascx" />
+    <Content Include="VPS2012\VdcPrivateNetwork.ascx" />
+    <Content Include="VPS2012\VpsDetailsAddExternalAddress.ascx" />
+    <Content Include="VPS2012\VpsDetailsAddPrivateAddress.ascx" />
+    <Content Include="VPS2012\VpsDetailsAuditLog.ascx" />
+    <Content Include="VPS2012\VpsDetailsConfiguration.ascx" />
+    <Content Include="VPS2012\VpsDetailsDvd.ascx" />
+    <Content Include="VPS2012\VpsDetailsEditConfiguration.ascx" />
+    <Content Include="VPS2012\VpsDetailsGeneral.ascx" />
+    <Content Include="VPS2012\VpsDetailsHelp.ascx" />
+    <Content Include="VPS2012\VpsDetailsInsertDvd.ascx" />
+    <Content Include="VPS2012\VpsDetailsNetwork.ascx" />
+    <Content Include="VPS2012\VpsDetailsPermissions.ascx" />
+    <Content Include="VPS2012\VpsDetailsSnapshots.ascx" />
+    <Content Include="VPS2012\VpsDetailsTools.ascx" />
+    <Content Include="VPS2012\VpsMoveServer.ascx" />
+    <Content Include="VPS2012\VpsToolsDeleteServer.ascx" />
+    <Content Include="VPS2012\VpsToolsReinstallServer.ascx" />
     <Content Include="ProviderControls\SmarterMail100_EditAccount.ascx" />
     <Content Include="ProviderControls\SmarterMail100_EditDomain.ascx" />
     <Content Include="ProviderControls\SmarterMail100_EditDomain_Features.ascx" />
@@ -4646,10 +4962,25 @@
     <Content Include="ExchangeServer\UserControls\App_LocalResources\EnterpriseStorageOwaUsersList.ascx.resx" />
     <Content Include="ExchangeServer\App_LocalResources\EnterpriseStorageFolderSettingsOwaEditing.ascx.resx" />
     <Content Include="App_LocalResources\SettingsRdsPolicy.ascx.resx" />
-    <Content Include="VPS\ProviderControls\App_LocalResources\HyperV2012R2_Create.ascx.resx">
+    <Content Include="ProviderControls\App_LocalResources\HyperV2012R2_Settings.ascx.resx">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="ProviderControls\App_LocalResources\HyperV2012R2_Settings.ascx.resx">
+    <Content Include="HostedSharePoint\App_LocalResources\HostedSharePointEnterpriseSiteCollections.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="HostedSharePoint\App_LocalResources\HostedSharePointEnterpriseBackupSiteCollection.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="HostedSharePoint\App_LocalResources\HostedSharePointEnterpriseEditSiteCollection.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="HostedSharePoint\App_LocalResources\HostedSharePointEnterpriseRestoreSiteCollection.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="HostedSharePoint\App_LocalResources\HostedSharePointEnterpriseStorageSettings.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="HostedSharePoint\App_LocalResources\HostedSharePointEnterpriseStorageUsage.ascx.resx">
       <SubType>Designer</SubType>
     </Content>
     <Content Include="ExchangeServer\App_LocalResources\OrganizationUserResetPassword.ascx.resx" />
@@ -4857,6 +5188,105 @@
     <Content Include="UserControls\App_LocalResources\MailAccountActions.ascx.resx" />
     <Content Include="ScheduleTaskControls\App_LocalResources\UserPasswordExpirationNotificationView.ascx.resx" />
     <EmbeddedResource Include="UserControls\App_LocalResources\WebsiteActions.ascx.resx" />
+    <Content Include="VPS\UserControls\App_LocalResources\Generation.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS\UserControls\App_LocalResources\DynamicMemory.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VdcAddExternalAddress.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VdcAuditLog.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VdcCreateServer.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VdcExternalNetwork.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VdcHome.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VdcImportServer.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VdcManagementNetwork.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VdcPermissions.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VdcPrivateNetwork.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VpsDetailsAddExternalAddress.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VpsDetailsAddPrivateAddress.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VpsDetailsAuditLog.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VpsDetailsConfiguration.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VpsDetailsDvd.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VpsDetailsEditConfiguration.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VpsDetailsGeneral.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VpsDetailsHelp.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VpsDetailsInsertDvd.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VpsDetailsNetwork.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VpsDetailsPermissions.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VpsDetailsSnapshots.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VpsDetailsTools.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VpsMoveServer.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VpsToolsDeleteServer.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\App_LocalResources\VpsToolsReinstallServer.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\RemoteDesktop\App_LocalResources\Connect.aspx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\UserControls\App_LocalResources\Breadcrumb.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\UserControls\App_LocalResources\DynamicMemoryControl.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\UserControls\App_LocalResources\Generation.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\UserControls\App_LocalResources\Menu.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
+    <Content Include="VPS2012\UserControls\App_LocalResources\ServerTabs.ascx.resx">
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Content Include="App_LocalResources\BandwidthReport.ascx.resx">
@@ -5949,6 +6379,7 @@
     <Content Include="UserControls\App_LocalResources\ItemButtonPanel.ascx.resx">
       <SubType>Designer</SubType>
     </Content>
+    <None Include="Properties\PublishProfiles\Default Settings.pubxml" />
     <None Include="Resources\Windows2008_Settings.ascx.resx" />
     <Content Include="App_LocalResources\WebSitesHeliconZooControl.ascx.resx" />
     <Content Include="ExchangeServer\App_LocalResources\ExchangeDisclaimers.ascx.resx">
@@ -6203,12 +6634,12 @@
     <Content Include="ExchangeServer\OrganizationUsers.ascx" />
     <Content Include="ExchangeServer\UserControls\HoursBox.ascx" />
     <Content Include="ExchangeServer\UserControls\UserSelector.ascx" />
-    <Content Include="HostedSharePointBackupSiteCollection.ascx" />
-    <Content Include="HostedSharePointEditSiteCollection.ascx" />
-    <Content Include="HostedSharePointRestoreSiteCollection.ascx" />
-    <Content Include="HostedSharePointSiteCollections.ascx" />
-    <Content Include="HostedSharePointStorageSettings.ascx" />
-    <Content Include="HostedSharePointStorageUsage.ascx" />
+    <Content Include="HostedSharePoint\HostedSharePointBackupSiteCollection.ascx" />
+    <Content Include="HostedSharePoint\HostedSharePointEditSiteCollection.ascx" />
+    <Content Include="HostedSharePoint\HostedSharePointRestoreSiteCollection.ascx" />
+    <Content Include="HostedSharePoint\HostedSharePointSiteCollections.ascx" />
+    <Content Include="HostedSharePoint\HostedSharePointStorageSettings.ascx" />
+    <Content Include="HostedSharePoint\HostedSharePointStorageUsage.ascx" />
     <Content Include="HostedSoluitonReportSummaryLetter.ascx" />
     <Content Include="OverusageReport.ascx" />
     <Content Include="ProviderControls\CRM_Settings.ascx" />
@@ -6242,7 +6673,7 @@
     <Content Include="ScheduleTaskControls\SendFilesViaFtp.ascx" />
     <Content Include="ScheduleTaskControls\SuspendOverusedSpaces.ascx" />
     <Content Include="ScheduleTaskControls\ZipFiles.ascx" />
-    <Content Include="App_LocalResources\HostedSharePointStorageSettings.ascx.resx">
+    <Content Include="HostedSharePoint\App_LocalResources\HostedSharePointStorageSettings.ascx.resx">
       <SubType>Designer</SubType>
     </Content>
     <Content Include="App_LocalResources\OverusageReport.ascx.resx">
@@ -6250,7 +6681,7 @@
     </Content>
     <Content Include="Reports\HostingSpaceDiskspaceOverusageDetails.rdlc" />
     <Content Include="Reports\OverusageReport.rdlc" />
-    <Content Include="App_LocalResources\HostedSharePointStorageUsage.ascx.resx">
+    <Content Include="HostedSharePoint\App_LocalResources\HostedSharePointStorageUsage.ascx.resx">
       <SubType>Designer</SubType>
     </Content>
     <Content Include="CRM\App_LocalResources\CRMUsers.ascx.resx">
@@ -6676,16 +7107,16 @@
     <Content Include="ProviderControls\App_LocalResources\PowerDNS_Settings.ascx.resx">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="App_LocalResources\HostedSharePointBackupSiteCollection.ascx.resx">
+    <Content Include="HostedSharePoint\App_LocalResources\HostedSharePointBackupSiteCollection.ascx.resx">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="App_LocalResources\HostedSharePointEditSiteCollection.ascx.resx">
+    <Content Include="HostedSharePoint\App_LocalResources\HostedSharePointEditSiteCollection.ascx.resx">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="App_LocalResources\HostedSharePointRestoreSiteCollection.ascx.resx">
+    <Content Include="HostedSharePoint\App_LocalResources\HostedSharePointRestoreSiteCollection.ascx.resx">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="App_LocalResources\HostedSharePointSiteCollections.ascx.resx">
+    <Content Include="HostedSharePoint\App_LocalResources\HostedSharePointSiteCollections.ascx.resx">
       <SubType>Designer</SubType>
     </Content>
     <Content Include="ExchangeServer\App_LocalResources\OrganizationCreateOrganization.ascx.resx">
@@ -7004,6 +7435,8 @@
     <Content Include="ResizeImage.ashx" />
     <Content Include="VPSForPC\VirtualMachineImage.ashx" />
     <Content Include="VPSForPC\VirtualMachineSnapshotImage.ashx" />
+    <Content Include="VPS2012\VirtualMachineImage.ashx" />
+    <Content Include="VPS2012\VirtualMachineSnapshotImage.ashx" />
     <None Include="Web.config">
       <SubType>Designer</SubType>
     </None>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj b/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
index b375ef76..207bab8e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
@@ -105,6 +105,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="App_Containers\Default\VPS2012.ascx" />
     <Content Include="App_Containers\Default\VPSForPC.ascx" />
     <Content Include="App_Themes\Default\Icons\activesync_policy_48.png" />
     <Content Include="App_Themes\Default\Icons\advancedstatistics_48.png" />
@@ -154,19 +155,36 @@
     <Content Include="App_Themes\Default\Icons\webapplicationsgallery_48.png" />
     <Content Include="App_Themes\Default\Icons\webipaddresses_48.png" />
     <Content Include="App_Themes\Default\Icons\websites_48.png" />
+    <Content Include="App_Themes\Default\Images\apply_16.png" />
+    <Content Include="App_Themes\Default\Images\apply_24.png" />
     <Content Include="App_Themes\Default\Images\Exchange\blank16.gif" />
+    <Content Include="App_Themes\Default\Images\Exchange\bottom_bg_sh.gif" />
     <Content Include="App_Themes\Default\Images\Exchange\disabled.png" />
     <Content Include="App_Themes\Default\Images\Exchange\disabled_16.png" />
     <Content Include="App_Themes\Default\Images\Exchange\enabled.png" />
+    <Content Include="App_Themes\Default\Images\Exchange\home24.png" />
     <Content Include="App_Themes\Default\Images\Exchange\locked.png" />
     <Content Include="App_Themes\Default\Images\Exchange\lync16.png" />
+    <Content Include="App_Themes\Default\Images\Exchange\main_bg_sh.gif" />
+    <Content Include="App_Themes\Default\Images\Exchange\module_footer_sh.gif" />
+    <Content Include="App_Themes\Default\Images\Exchange\module_header_sh.gif" />
+    <Content Include="App_Themes\Default\Images\Exchange\net_drive16.png" />
+    <Content Include="App_Themes\Default\Images\Exchange\net_drive48.png" />
+    <Content Include="App_Themes\Default\Images\Exchange\shared_16.gif" />
+    <Content Include="App_Themes\Default\Images\Exchange\spaces16.png" />
+    <Content Include="App_Themes\Default\Images\Exchange\spaces48.png" />
+    <Content Include="App_Themes\Default\Images\Exchange\vip_user_16.png" />
     <Content Include="App_Themes\Default\Images\FileManager\vbhtml.png" />
+    <Content Include="App_Themes\Default\Images\home_16_blk.png" />
+    <Content Include="App_Themes\Default\Images\home_24.png" />
     <Content Include="App_Themes\Default\Images\lync16.png" />
     <Content Include="App_Themes\Default\Images\lync48.png" />
     <Content Include="App_Themes\Default\Images\lyncfederationdomains48.png" />
     <Content Include="App_Themes\Default\Images\lyncuser.png" />
     <Content Include="App_Themes\Default\Images\lyncuserplan48.png" />
     <Content Include="App_Themes\Default\Images\lyncuserplanadd48.png" />
+    <Content Include="App_Themes\Default\Images\restart_24.png" />
+    <Content Include="App_Themes\Default\Images\signout_24.png" />
     <Content Include="App_Themes\Default\Images\spaces16.png" />
     <Content Include="App_Themes\Default\Images\spaces48.png" />
     <Content Include="App_Themes\Default\Images\VPSForPC\vlan_icon.png" />
@@ -176,7 +194,9 @@
     <Content Include="App_Themes\Default\Images\VPS\event_log_icon.png" />
     <Content Include="App_Themes\Default\Images\VPS\icon-home-botbar-cloud.png" />
     <Content Include="App_Themes\Default\Images\VPS\monitoring_icon.png" />
+    <Content Include="App_Themes\Default\Styles\chosen.min.css" />
     <Content Include="App_Themes\Default\Styles\images\buttons.gif" />
+    <Content Include="App_Themes\Default\Styles\images\chosen-sprite.png" />
     <Content Include="App_Themes\Default\Styles\images\header_bg.gif" />
     <Content Include="App_Themes\Default\Images\shield.png" />
     <Content Include="App_Themes\Default\Styles\images\loading.gif" />
@@ -196,6 +216,24 @@
     <Content Include="App_Themes\Default\Styles\images\ui-icons_ffffff_256x240.png" />
     <Content Include="App_Themes\Default\Styles\jquery-ui-1.8.9.css" />
     <Content Include="App_Themes\Default\Styles\jquery.window.css" />
+    <Content Include="bin\AjaxControlToolkit.dll" />
+    <Content Include="bin\AntiXssLibrary.dll" />
+    <Content Include="bin\Microsoft.ReportViewer.Common.dll" />
+    <Content Include="bin\Microsoft.ReportViewer.ProcessingObjectModel.dll" />
+    <Content Include="bin\Microsoft.ReportViewer.WebForms.dll" />
+    <Content Include="bin\Microsoft.Web.Services3.dll" />
+    <Content Include="bin\WebsitePanel.EnterpriseServer.Base.dll" />
+    <Content Include="bin\WebsitePanel.EnterpriseServer.Base.pdb" />
+    <Content Include="bin\WebsitePanel.EnterpriseServer.Client.dll" />
+    <Content Include="bin\WebsitePanel.EnterpriseServer.Client.pdb" />
+    <Content Include="bin\WebsitePanel.Portal.Ecommerce.Modules.dll" />
+    <Content Include="bin\WebsitePanel.Portal.Ecommerce.Modules.pdb" />
+    <Content Include="bin\WebsitePanel.Portal.Modules.dll" />
+    <Content Include="bin\WebsitePanel.Portal.Modules.pdb" />
+    <Content Include="bin\WebsitePanel.Providers.Base.dll" />
+    <Content Include="bin\WebsitePanel.Providers.Base.pdb" />
+    <Content Include="bin\WebsitePanel.WebPortal.dll" />
+    <Content Include="bin\WebsitePanel.WebPortal.pdb" />
     <Content Include="Error.htm" />
     <Content Include="JavaScript\jquery-1.4.4.min.js" />
     <Content Include="JavaScript\jquery-ui-1.8.9.min.js" />
@@ -276,7 +314,9 @@
     <Content Include="App_Data\SiteSettings.config">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="App_Data\ESModule_ControlsHierarchy.config" />
+    <Content Include="App_Data\ESModule_ControlsHierarchy.config">
+      <SubType>Designer</SubType>
+    </Content>
     <None Include="App_Data\SupportedThemes.config" />
     <None Include="App_Data\Countries.config" />
     <None Include="App_Data\CountryStates.config" />
@@ -295,6 +335,10 @@
     <Content Include="App_Themes\Default\Common.skin" />
     <Content Include="App_Themes\Default\DataBoundControls.skin" />
     <Content Include="App_Themes\Default\Icons.skin" />
+    <Content Include="bin\WebsitePanel.Portal.Ecommerce.Modules.dll.config" />
+    <Content Include="bin\WebsitePanel.Portal.Modules.dll.config" />
+    <Content Include="bin\WebsitePanel.WebPortal.dll.config" />
+    <None Include="Properties\PublishProfiles\Default Settings.pubxml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="App_Containers\Default\TopPane.ascx" />
diff --git a/WebsitePanel/Sources/generate_es_proxies.bat b/WebsitePanel/Sources/generate_es_proxies.bat
index 4f45afb7..ec152a55 100644
--- a/WebsitePanel/Sources/generate_es_proxies.bat
+++ b/WebsitePanel/Sources/generate_es_proxies.bat
@@ -35,8 +35,8 @@ REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ecStorefrontProxy.cs
 REM %WSDL% %SERVER_URL%/ecStorehouse.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ecStorehouseProxy.cs /namespace:WebsitePanel.Ecommerce.EnterpriseServer /type:webClient
 REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ecStorehouseProxy.cs
 
-%WSDL% %SERVER_URL%/esExchangeServer.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ExchangeServerProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
-%WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ExchangeServerProxy.cs
+REM %WSDL% %SERVER_URL%/esExchangeServer.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ExchangeServerProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
+REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ExchangeServerProxy.cs
 
 REM %WSDL% %SERVER_URL%/esExchangeHostedEdition.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ExchangeHostedEditionProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
 REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ExchangeHostedEditionProxy.cs
@@ -47,6 +47,9 @@ REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\FilesProxy.cs
 REM %WSDL% %SERVER_URL%/esHostedSharePointServers.asmx /out:.\WebsitePanel.EnterpriseServer.Client\HostedSharePointServersProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
 REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\HostedSharePointServersProxy.cs
 
+REM %WSDL% %SERVER_URL%/esHostedSharePointServersEnt.asmx /out:.\WebsitePanel.EnterpriseServer.Client\HostedSharePointServersEntProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
+REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\HostedSharePointServersEntProxy.cs
+
 REM %WSDL% %SERVER_URL%/esImport.asmx /out:.\WebsitePanel.EnterpriseServer.Client\ImportProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
 REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\ImportProxy.cs
 
@@ -56,8 +59,8 @@ REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\OCSProxy.cs
 REM %WSDL% %SERVER_URL%/esOperatingSystems.asmx /out:.\WebsitePanel.EnterpriseServer.Client\OperatingSystemsProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
 REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\OperatingSystemsProxy.cs
 
-%WSDL% %SERVER_URL%/esOrganizations.asmx /out:.\WebsitePanel.EnterpriseServer.Client\OrganizationProxy.cs /namespace:WebsitePanel.EnterpriseServer.HostedSolution /type:webClient
-%WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\OrganizationProxy.cs
+REM %WSDL% %SERVER_URL%/esOrganizations.asmx /out:.\WebsitePanel.EnterpriseServer.Client\OrganizationProxy.cs /namespace:WebsitePanel.EnterpriseServer.HostedSolution /type:webClient
+REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\OrganizationProxy.cs
 
 REM %WSDL% %SERVER_URL%/esPackages.asmx /out:.\WebsitePanel.EnterpriseServer.Client\PackagesProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
 REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\PackagesProxy.cs
@@ -83,6 +86,9 @@ REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\UsersProxy.cs
 REM %WSDL% %SERVER_URL%/esVirtualizationServer.asmx /out:.\WebsitePanel.EnterpriseServer.Client\VirtualizationServerProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
 REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\VirtualizationServerProxy.cs
 
+REM %WSDL% %SERVER_URL%/esVirtualizationServer2012.asmx /out:.\WebsitePanel.EnterpriseServer.Client\VirtualizationServerProxy2012.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
+REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\VirtualizationServerProxy2012.cs
+
 REM %WSDL% %SERVER_URL%/esWebApplicationGallery.asmx /out:.\WebsitePanel.EnterpriseServer.Client\WebApplicationGalleryProxy.cs /namespace:WebsitePanel.EnterpriseServer /type:webClient
 REM %WSE_CLEAN% .\WebsitePanel.EnterpriseServer.Client\WebApplicationGalleryProxy.cs
 
diff --git a/WebsitePanel/Sources/generate_server_proxies.bat b/WebsitePanel/Sources/generate_server_proxies.bat
index 1ed0de0e..cd4f2b8a 100644
--- a/WebsitePanel/Sources/generate_server_proxies.bat
+++ b/WebsitePanel/Sources/generate_server_proxies.bat
@@ -17,8 +17,8 @@ REM %WSE_CLEAN% .\WebsitePanel.Server.Client\DatabaseServerProxy.cs
 REM %WSDL% %SERVER_URL%/DNSServer.asmx /out:.\WebsitePanel.Server.Client\DnsServerProxy.cs /namespace:WebsitePanel.Providers.DNS /type:webClient /fields
 REM %WSE_CLEAN% .\WebsitePanel.Server.Client\DnsServerProxy.cs
 
-%WSDL% %SERVER_URL%/ExchangeServer.asmx /out:.\WebsitePanel.Server.Client\ExchangeServerProxy.cs /namespace:WebsitePanel.Providers.Exchange /type:webClient /fields
-%WSE_CLEAN% .\WebsitePanel.Server.Client\ExchangeServerProxy.cs
+REM %WSDL% %SERVER_URL%/ExchangeServer.asmx /out:.\WebsitePanel.Server.Client\ExchangeServerProxy.cs /namespace:WebsitePanel.Providers.Exchange /type:webClient /fields
+REM %WSE_CLEAN% .\WebsitePanel.Server.Client\ExchangeServerProxy.cs
 
 REM %WSDL% %SERVER_URL%/ExchangeServerHostedEdition.asmx /out:.\WebsitePanel.Server.Client\ExchangeServerHostedEditionProxy.cs /namespace:WebsitePanel.Providers.ExchangeHostedEdition /type:webClient /fields
 REM %WSE_CLEAN% .\WebsitePanel.Server.Client\ExchangeServerHostedEditionProxy.cs
@@ -26,6 +26,9 @@ REM %WSE_CLEAN% .\WebsitePanel.Server.Client\ExchangeServerHostedEditionProxy.cs
 REM %WSDL% %SERVER_URL%/HostedSharePointServer.asmx /out:.\WebsitePanel.Server.Client\HostedSharePointServerProxy.cs /namespace:WebsitePanel.Providers.HostedSolution /type:webClient /fields
 REM %WSE_CLEAN% .\WebsitePanel.Server.Client\HostedSharePointServerProxy.cs
 
+%WSDL% %SERVER_URL%/HostedSharePointServerEnt.asmx /out:.\WebsitePanel.Server.Client\HostedSharePointServerEntProxy.cs /namespace:WebsitePanel.Providers.HostedSolution /type:webClient /fields
+%WSE_CLEAN% .\WebsitePanel.Server.Client\HostedSharePointServerEntProxy.cs
+
 REM %WSDL% %SERVER_URL%/OCSEdgeServer.asmx /out:.\WebsitePanel.Server.Client\OCSEdgeServerProxy.cs /namespace:WebsitePanel.Providers.OCS /type:webClient /fields
 REM %WSE_CLEAN% .\WebsitePanel.Server.Client\OCSEdgeServerProxy.cs
 
@@ -35,8 +38,8 @@ REM %WSE_CLEAN% .\WebsitePanel.Server.Client\OCSServerProxy.cs
 REM %WSDL% %SERVER_URL%/OperatingSystem.asmx /out:.\WebsitePanel.Server.Client\OperatingSystemProxy.cs /namespace:WebsitePanel.Providers.OS /type:webClient /fields
 REM %WSE_CLEAN% .\WebsitePanel.Server.Client\OperatingSystemProxy.cs
 
-%WSDL% %SERVER_URL%/Organizations.asmx /out:.\WebsitePanel.Server.Client\OrganizationProxy.cs /namespace:WebsitePanel.Providers.HostedSolution /type:webClient /fields
-%WSE_CLEAN% .\WebsitePanel.Server.Client\OrganizationProxy.cs
+REM %WSDL% %SERVER_URL%/Organizations.asmx /out:.\WebsitePanel.Server.Client\OrganizationProxy.cs /namespace:WebsitePanel.Providers.HostedSolution /type:webClient /fields
+REM %WSE_CLEAN% .\WebsitePanel.Server.Client\OrganizationProxy.cs
 
 REM %WSDL% %SERVER_URL%/ServiceProvider.asmx /out:.\WebsitePanel.Server.Client\ServiceProviderProxy.cs /namespace:WebsitePanel.Providers /type:webClient /fields
 REM %WSE_CLEAN% .\WebsitePanel.Server.Client\ServiceProviderProxy.cs