diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/WebsitePanel.Providers.HostedSolution.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/WebsitePanel.Providers.HostedSolution.csproj
index 20a414bf..3515364c 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/WebsitePanel.Providers.HostedSolution.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.HostedSolution/WebsitePanel.Providers.HostedSolution.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -63,6 +63,9 @@
       <HintPath>..\..\Lib\References\Microsoft\Microsoft.Crm.Admin.AdminService.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="microsoft.crm.sdk.proxy">
+      <HintPath>..\..\..\..\..\Projects\websitepanel_v2.0.0.CRM2011.Patch\WebsitePanel\Sources\WebsitePanel.Server\bin\microsoft.crm.sdk.proxy.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Crm.Setup.Common">
       <HintPath>..\..\Lib\References\Microsoft\Microsoft.Crm.Setup.Common.dll</HintPath>
     </Reference>
@@ -119,6 +122,27 @@
       <HintPath>..\..\Lib\References\Microsoft\Microsoft.SharePoint.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="microsoft.xrm.client">
+      <HintPath>..\..\..\..\..\Projects\websitepanel_v2.0.0.CRM2011.Patch\WebsitePanel\Sources\WebsitePanel.Server\bin\microsoft.xrm.client.dll</HintPath>
+    </Reference>
+    <Reference Include="microsoft.xrm.client.codegeneration">
+      <HintPath>..\..\..\..\..\Projects\websitepanel_v2.0.0.CRM2011.Patch\WebsitePanel\Sources\WebsitePanel.Server\bin\microsoft.xrm.client.codegeneration.dll</HintPath>
+    </Reference>
+    <Reference Include="microsoft.xrm.portal">
+      <HintPath>..\..\..\..\..\Projects\websitepanel_v2.0.0.CRM2011.Patch\WebsitePanel\Sources\WebsitePanel.Server\bin\microsoft.xrm.portal.dll</HintPath>
+    </Reference>
+    <Reference Include="microsoft.xrm.portal.files">
+      <HintPath>..\..\..\..\..\Projects\websitepanel_v2.0.0.CRM2011.Patch\WebsitePanel\Sources\WebsitePanel.Server\bin\microsoft.xrm.portal.files.dll</HintPath>
+    </Reference>
+    <Reference Include="microsoft.xrm.sdk">
+      <HintPath>..\..\..\..\..\Projects\websitepanel_v2.0.0.CRM2011.Patch\WebsitePanel\Sources\WebsitePanel.Server\bin\microsoft.xrm.sdk.dll</HintPath>
+    </Reference>
+    <Reference Include="microsoft.xrm.sdk.deployment">
+      <HintPath>..\..\..\..\..\Projects\websitepanel_v2.0.0.CRM2011.Patch\WebsitePanel\Sources\WebsitePanel.Server\bin\microsoft.xrm.sdk.deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="microsoft.xrm.sdk.workflow">
+      <HintPath>..\..\..\..\..\Projects\websitepanel_v2.0.0.CRM2011.Patch\WebsitePanel\Sources\WebsitePanel.Server\bin\microsoft.xrm.sdk.workflow.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/Web.config b/WebsitePanel/Sources/WebsitePanel.Server/Web.config
index 48568b3a..70dca78e 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.Server/Web.config
@@ -1,125 +1,108 @@
 <?xml version="1.0"?>
 <configuration>
-	<!-- Custom configuration sections -->
-	<configSections>
-		<section name="microsoft.web.services3" type="Microsoft.Web.Services3.Configuration.WebServicesConfiguration, Microsoft.Web.Services3"/>
-		<section name="websitepanel.server" type="WebsitePanel.Server.ServerConfiguration, WebsitePanel.Server"/>
-		<section name="cachingConfiguration" type="Microsoft.Practices.EnterpriseLibrary.Caching.Configuration.CacheManagerSettings,Microsoft.Practices.EnterpriseLibrary.Caching"/>
-	</configSections>
-	<appSettings>
-		<add key="WebsitePanel.HyperV.UseDiskPartClearReadOnlyFlag" value="false"/>
-    <add key="WebsitePanel.Exchange.ClearQueryBaseDN" value="false" />
-    <add key="WebsitePanel.Exchange.enableSP2abp" value="false" />
-		<add key="SCVMMServerName" value=""/>
-		<add key="SCVMMServerPort" value=""/>
-	</appSettings>
-	<system.diagnostics>
-		<switches>
-			<add name="Log" value="2"/>
-			<!-- 0 - Off, 1 - Error, 2 - Warning, 3 - Info, 4 - Verbose -->
-		</switches>
-		<trace autoflush="true">
-			<listeners>
-				<add name="DefaultListener" type="WebsitePanel.Server.Utils.EventLogTraceListener, WebsitePanel.Server.Utils" initializeData="WebsitePanel"/>
-				<!-- Writes log to the file
+  <!-- Custom configuration sections -->
+  <configSections>
+    <section name="microsoft.web.services3" type="Microsoft.Web.Services3.Configuration.WebServicesConfiguration, Microsoft.Web.Services3"/>
+    <section name="websitepanel.server" type="WebsitePanel.Server.ServerConfiguration, WebsitePanel.Server"/>
+    <section name="cachingConfiguration" type="Microsoft.Practices.EnterpriseLibrary.Caching.Configuration.CacheManagerSettings,Microsoft.Practices.EnterpriseLibrary.Caching"/>
+  </configSections>
+  <appSettings>
+    <add key="WebsitePanel.HyperV.UseDiskPartClearReadOnlyFlag" value="false"/>
+    <add key="WebsitePanel.Exchange.ClearQueryBaseDN" value="false"/>
+    <add key="WebsitePanel.Exchange.enableSP2abp" value="false"/>
+    <add key="SCVMMServerName" value=""/>
+    <add key="SCVMMServerPort" value=""/>
+  </appSettings>
+  <system.diagnostics>
+    <switches>
+      <add name="Log" value="2"/>
+      <!-- 0 - Off, 1 - Error, 2 - Warning, 3 - Info, 4 - Verbose -->
+    </switches>
+    <trace autoflush="true">
+      <listeners>
+        <add name="DefaultListener" type="WebsitePanel.Server.Utils.EventLogTraceListener, WebsitePanel.Server.Utils" initializeData="WebsitePanel"/>
+        <!-- Writes log to the file
         <add name="DefaultListener" type="System.Diagnostics.TextWriterTraceListener" initializeData="WebsitePanel.Server.log" />
         -->
-				<remove name="Default"/>
-			</listeners>
-		</trace>
-	</system.diagnostics>
-	<!-- Caching Configuration -->
-	<cachingConfiguration defaultCacheManager="Default Cache Manager">
-		<backingStores>
-			<add name="inMemory" type="Microsoft.Practices.EnterpriseLibrary.Caching.BackingStoreImplementations.NullBackingStore, Microsoft.Practices.EnterpriseLibrary.Caching"/>
-		</backingStores>
-		<cacheManagers>
-			<add name="Default Cache Manager" expirationPollFrequencyInSeconds="43200" maximumElementsInCacheBeforeScavenging="1000" numberToRemoveWhenScavenging="10" backingStoreName="inMemory"/>
-		</cacheManagers>
-	</cachingConfiguration>
-	<!-- WebsitePanel Configuration -->
-	<websitepanel.server>
-		<!-- Security settings -->
-		<security>
-			<!-- Perform security check -->
-			<enabled value="true"/>
-			<!-- Server password -->
-			<password value="W6ph5Mm5Pz8GgiULbPgzG37mj9g="/>
-		</security>
-	</websitepanel.server>
-	<system.web>
-		<!-- Disable any authentication -->
-		<authentication mode="None"/>
-		<!-- Correct HTTP runtime settings -->
-		<httpRuntime executionTimeout="3600" maxRequestLength="16384"/>
-		<!-- Set globalization settings -->
-		<globalization culture="en-US" uiCulture="en" requestEncoding="UTF-8" responseEncoding="UTF-8" fileEncoding="UTF-8"/>
-		<!-- Web Services settings -->
-		<webServices>
-			<protocols>
-				<remove name="HttpPost"/>
-				<remove name="HttpPostLocalhost"/>
-				<remove name="HttpGet"/>
-			</protocols>
-			<soapServerProtocolFactory type="Microsoft.Web.Services3.WseProtocolFactory, Microsoft.Web.Services3"/>
-		</webServices>
-		<compilation debug="true" />
-	</system.web>
-	<!-- WSE 3.0 settings -->
-	<microsoft.web.services3>
-		<diagnostics>
-			<trace enabled="false" input="InputTrace.webinfo" output="OutputTrace.webinfo"/>
-		</diagnostics>
-		<messaging>
-			<maxMessageLength value="-1"/>
-			<mtom serverMode="optional" clientMode="On"/>
-		</messaging>
-		<security>
-			<securityTokenManager>
-				<add type="WebsitePanel.Server.ServerUsernameTokenManager, WebsitePanel.Server" namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" localName="UsernameToken"/>
-			</securityTokenManager>
-			<timeToleranceInSeconds value="86400"/>
-		</security>
-		<policy fileName="WsePolicyCache.Config"/>
-	</microsoft.web.services3>
-	<system.serviceModel>
-		<bindings>
-			<wsHttpBinding>
-				<binding name="WSHttpBinding_IVirtualMachineManagementService"
-					closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00"
-					sendTimeout="00:01:00" bypassProxyOnLocal="false" transactionFlow="false"
-					hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288"
-					maxReceivedMessageSize="10485760" messageEncoding="Text" textEncoding="utf-8"
-					useDefaultWebProxy="true" allowCookies="false">
-					<readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-						maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-					<reliableSession ordered="true" inactivityTimeout="00:10:00"
-						enabled="false" />
-					<security mode="Message">
-						<transport clientCredentialType="Windows" proxyCredentialType="None"
-							realm="" />
-						<message clientCredentialType="Windows" negotiateServiceCredential="true"
-							algorithmSuite="Default" />
-					</security>
-				</binding>
-				<binding name="WSHttpBinding_IMonitoringService" closeTimeout="00:01:00"
-					openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-					bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
-					maxBufferPoolSize="524288" maxReceivedMessageSize="10485760"
-					messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
-					allowCookies="false">
-					<readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-						maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-					<reliableSession ordered="true" inactivityTimeout="00:10:00"
-						enabled="false" />
-					<security mode="Message">
-						<transport clientCredentialType="Windows" proxyCredentialType="None"
-							realm="" />
-						<message clientCredentialType="Windows" negotiateServiceCredential="true"
-							algorithmSuite="Default" />
-					</security>
-				</binding>
-        </wsHttpBinding>
+        <remove name="Default"/>
+      </listeners>
+    </trace>
+  </system.diagnostics>
+  <!-- Caching Configuration -->
+  <cachingConfiguration defaultCacheManager="Default Cache Manager">
+    <backingStores>
+      <add name="inMemory" type="Microsoft.Practices.EnterpriseLibrary.Caching.BackingStoreImplementations.NullBackingStore, Microsoft.Practices.EnterpriseLibrary.Caching"/>
+    </backingStores>
+    <cacheManagers>
+      <add name="Default Cache Manager" expirationPollFrequencyInSeconds="43200" maximumElementsInCacheBeforeScavenging="1000" numberToRemoveWhenScavenging="10" backingStoreName="inMemory"/>
+    </cacheManagers>
+  </cachingConfiguration>
+  <!-- WebsitePanel Configuration -->
+  <websitepanel.server>
+    <!-- Security settings -->
+    <security>
+      <!-- Perform security check -->
+      <enabled value="true"/>
+      <!-- Server password -->
+      <password value="W6ph5Mm5Pz8GgiULbPgzG37mj9g="/>
+    </security>
+  </websitepanel.server>
+  <system.web>
+    <!-- Disable any authentication -->
+    <authentication mode="None"/>
+    <!-- Correct HTTP runtime settings -->
+    <httpRuntime executionTimeout="3600" maxRequestLength="16384"/>
+    <!-- Set globalization settings -->
+    <globalization culture="en-US" uiCulture="en" requestEncoding="UTF-8" responseEncoding="UTF-8" fileEncoding="UTF-8"/>
+    <!-- Web Services settings -->
+    <webServices>
+      <protocols>
+        <remove name="HttpPost"/>
+        <remove name="HttpPostLocalhost"/>
+        <remove name="HttpGet"/>
+      </protocols>
+      <soapServerProtocolFactory type="Microsoft.Web.Services3.WseProtocolFactory, Microsoft.Web.Services3"/>
+    </webServices>
+    <compilation debug="true" targetFramework="4.0"/>
+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
+  </system.web>
+  <!-- WSE 3.0 settings -->
+  <microsoft.web.services3>
+    <diagnostics>
+      <trace enabled="false" input="InputTrace.webinfo" output="OutputTrace.webinfo"/>
+    </diagnostics>
+    <messaging>
+      <maxMessageLength value="-1"/>
+      <mtom serverMode="optional" clientMode="On"/>
+    </messaging>
+    <security>
+      <securityTokenManager>
+        <add type="WebsitePanel.Server.ServerUsernameTokenManager, WebsitePanel.Server" namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" localName="UsernameToken"/>
+      </securityTokenManager>
+      <timeToleranceInSeconds value="86400"/>
+    </security>
+    <policy fileName="WsePolicyCache.Config"/>
+  </microsoft.web.services3>
+  <system.serviceModel>
+    <bindings>
+      <wsHttpBinding>
+        <binding name="WSHttpBinding_IVirtualMachineManagementService" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="10485760" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
+          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
+          <security mode="Message">
+            <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
+            <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Default"/>
+          </security>
+        </binding>
+        <binding name="WSHttpBinding_IMonitoringService" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="10485760" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
+          <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false"/>
+          <security mode="Message">
+            <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
+            <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Default"/>
+          </security>
+        </binding>
+      </wsHttpBinding>
     </bindings>
-	</system.serviceModel>
-</configuration>
+  </system.serviceModel>
+</configuration>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj b/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj
index 890ebc21..3896a4a6 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj
@@ -17,7 +17,7 @@
     <OldToolsVersion>4.0</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <UseIISExpress>false</UseIISExpress>
   </PropertyGroup>
@@ -53,11 +53,6 @@
       <HintPath>..\..\Lib\References\Microsoft\Microsoft.Web.PlatformInstaller.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Web.PlatformInstaller.WebDeployShim, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\Lib\References\Microsoft\Microsoft.Web.PlatformInstaller.WebDeployShim.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Microsoft.Web.Services3, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Lib\Microsoft.Web.Services3.dll</HintPath>
@@ -72,6 +67,7 @@
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.Extensions" />