diff --git a/DotCMIS/DotCMIS.csproj b/DotCMIS/DotCMIS.csproj
index 7cc68e6..4e34276 100644
--- a/DotCMIS/DotCMIS.csproj
+++ b/DotCMIS/DotCMIS.csproj
@@ -12,6 +12,7 @@
     <AssemblyName>DotCMIS</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -45,7 +46,6 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
diff --git a/DotCMIS/Service References/CMISWebServicesReference/Reference.cs b/DotCMIS/Service References/CMISWebServicesReference/Reference.cs
index 355de0d..e47ff65 100644
--- a/DotCMIS/Service References/CMISWebServicesReference/Reference.cs
+++ b/DotCMIS/Service References/CMISWebServicesReference/Reference.cs
@@ -1,7 +1,7 @@
 ﻿//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.1
+//     Runtime Version:4.0.30319.225
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/DotCMIS/Service References/CMISWebServicesReference/Reference.svcmap b/DotCMIS/Service References/CMISWebServicesReference/Reference.svcmap
index 48d6a68..cb88d26 100644
--- a/DotCMIS/Service References/CMISWebServicesReference/Reference.svcmap
+++ b/DotCMIS/Service References/CMISWebServicesReference/Reference.svcmap
@@ -18,12 +18,12 @@
     <ServiceContractMappings />
   </ClientOptions>
   <MetadataSources>
-    <MetadataSource Address="C:\projects\opencmis\DotCMIS\DotCMIS\wsdl\CMISWS-Service.wsdl" Protocol="file" SourceId="1" />
+    <MetadataSource Address="C:\projects\chemistry\dotcmis\trunk\DotCMIS\wsdl\CMISWS-Service.wsdl" Protocol="file" SourceId="1" />
   </MetadataSources>
   <Metadata>
-    <MetadataFile FileName="CMIS-Messaging.xsd" MetadataType="Schema" ID="a67cdce6-4ed5-4a16-9a77-3681a58e7436" SourceId="1" SourceUrl="file:///C:/projects/opencmis/DotCMIS/DotCMIS/wsdl/CMIS-Messaging.xsd" />
-    <MetadataFile FileName="CMIS-Core.xsd" MetadataType="Schema" ID="308bb947-3023-485c-aa3d-1b44b4f62b3e" SourceId="1" SourceUrl="file:///C:/projects/opencmis/DotCMIS/DotCMIS/wsdl/CMIS-Core.xsd" />
-    <MetadataFile FileName="CMISWebServices.wsdl" MetadataType="Wsdl" ID="51836210-8920-4bad-af93-ce566d98ae3a" SourceId="1" SourceUrl="file:///C:/projects/opencmis/DotCMIS/DotCMIS/wsdl/CMISWS-Service.wsdl" />
+    <MetadataFile FileName="CMIS-Core.xsd" MetadataType="Schema" ID="1ce69293-969b-477e-b7ed-e15f0e0e0599" SourceId="1" SourceUrl="file:///C:/projects/chemistry/dotcmis/trunk/DotCMIS/wsdl/CMIS-Core.xsd" />
+    <MetadataFile FileName="CMISWebServices.wsdl" MetadataType="Wsdl" ID="2cf0a7f6-98fb-46d6-bd81-99177e4e2be7" SourceId="1" SourceUrl="file:///C:/projects/chemistry/dotcmis/trunk/DotCMIS/wsdl/CMISWS-Service.wsdl" />
+    <MetadataFile FileName="CMIS-Messaging.xsd" MetadataType="Schema" ID="d1d8296f-df93-4ac6-8bf7-cf4db4f1e405" SourceId="1" SourceUrl="file:///C:/projects/chemistry/dotcmis/trunk/DotCMIS/wsdl/CMIS-Messaging.xsd" />
   </Metadata>
   <Extensions>
     <ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />
diff --git a/DotCMIS/app.config b/DotCMIS/app.config
index 92ec810..05b5975 100644
--- a/DotCMIS/app.config
+++ b/DotCMIS/app.config
@@ -1,169 +1,83 @@
-﻿<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0"?>
 <configuration>
     <system.serviceModel>
         <bindings>
             <basicHttpBinding>
-                <binding name="DiscoveryServicePortBinding" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered"
-                    useDefaultWebProxy="true">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+                <binding name="DiscoveryServicePortBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
+                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
                     <security mode="None">
-                        <transport clientCredentialType="None" proxyCredentialType="None"
-                            realm="" />
-                        <message clientCredentialType="UserName" algorithmSuite="Default" />
+                        <transport clientCredentialType="None" proxyCredentialType="None" realm=""/>
+                        <message clientCredentialType="UserName" algorithmSuite="Default"/>
                     </security>
                 </binding>
-                <binding name="MultiFilingServicePortBinding" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered"
-                    useDefaultWebProxy="true">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+                <binding name="MultiFilingServicePortBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
+                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
                     <security mode="None">
-                        <transport clientCredentialType="None" proxyCredentialType="None"
-                            realm="" />
-                        <message clientCredentialType="UserName" algorithmSuite="Default" />
+                        <transport clientCredentialType="None" proxyCredentialType="None" realm=""/>
+                        <message clientCredentialType="UserName" algorithmSuite="Default"/>
                     </security>
                 </binding>
-                <binding name="NavigationServicePortBinding" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered"
-                    useDefaultWebProxy="true">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+                <binding name="NavigationServicePortBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
+                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
                     <security mode="None">
-                        <transport clientCredentialType="None" proxyCredentialType="None"
-                            realm="" />
-                        <message clientCredentialType="UserName" algorithmSuite="Default" />
+                        <transport clientCredentialType="None" proxyCredentialType="None" realm=""/>
+                        <message clientCredentialType="UserName" algorithmSuite="Default"/>
                     </security>
                 </binding>
-                <binding name="ObjectServicePortBinding" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered"
-                    useDefaultWebProxy="true">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+                <binding name="ObjectServicePortBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
+                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
                     <security mode="None">
-                        <transport clientCredentialType="None" proxyCredentialType="None"
-                            realm="" />
-                        <message clientCredentialType="UserName" algorithmSuite="Default" />
+                        <transport clientCredentialType="None" proxyCredentialType="None" realm=""/>
+                        <message clientCredentialType="UserName" algorithmSuite="Default"/>
                     </security>
                 </binding>
-                <binding name="PolicyServicePortBinding" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered"
-                    useDefaultWebProxy="true">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+                <binding name="PolicyServicePortBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
+                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
                     <security mode="None">
-                        <transport clientCredentialType="None" proxyCredentialType="None"
-                            realm="" />
-                        <message clientCredentialType="UserName" algorithmSuite="Default" />
+                        <transport clientCredentialType="None" proxyCredentialType="None" realm=""/>
+                        <message clientCredentialType="UserName" algorithmSuite="Default"/>
                     </security>
                 </binding>
-                <binding name="RelationshipServicePortBinding" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered"
-                    useDefaultWebProxy="true">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+                <binding name="RelationshipServicePortBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
+                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
                     <security mode="None">
-                        <transport clientCredentialType="None" proxyCredentialType="None"
-                            realm="" />
-                        <message clientCredentialType="UserName" algorithmSuite="Default" />
+                        <transport clientCredentialType="None" proxyCredentialType="None" realm=""/>
+                        <message clientCredentialType="UserName" algorithmSuite="Default"/>
                     </security>
                 </binding>
-                <binding name="RepositoryServicePortBinding" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered"
-                    useDefaultWebProxy="true">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+                <binding name="RepositoryServicePortBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
+                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
                     <security mode="None">
-                        <transport clientCredentialType="None" proxyCredentialType="None"
-                            realm="" />
-                        <message clientCredentialType="UserName" algorithmSuite="Default" />
+                        <transport clientCredentialType="None" proxyCredentialType="None" realm=""/>
+                        <message clientCredentialType="UserName" algorithmSuite="Default"/>
                     </security>
                 </binding>
-                <binding name="VersioningServicePortBinding" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered"
-                    useDefaultWebProxy="true">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+                <binding name="VersioningServicePortBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
+                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
                     <security mode="None">
-                        <transport clientCredentialType="None" proxyCredentialType="None"
-                            realm="" />
-                        <message clientCredentialType="UserName" algorithmSuite="Default" />
+                        <transport clientCredentialType="None" proxyCredentialType="None" realm=""/>
+                        <message clientCredentialType="UserName" algorithmSuite="Default"/>
                     </security>
                 </binding>
-                <binding name="ACLServicePortBinding" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered"
-                    useDefaultWebProxy="true">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+                <binding name="ACLServicePortBinding" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true">
+                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
                     <security mode="None">
-                        <transport clientCredentialType="None" proxyCredentialType="None"
-                            realm="" />
-                        <message clientCredentialType="UserName" algorithmSuite="Default" />
+                        <transport clientCredentialType="None" proxyCredentialType="None" realm=""/>
+                        <message clientCredentialType="UserName" algorithmSuite="Default"/>
                     </security>
                 </binding>
             </basicHttpBinding>
         </bindings>
         <client>
-            <endpoint address="http://cmis/services/DiscoveryService.DiscoveryServicePort"
-                binding="basicHttpBinding" bindingConfiguration="DiscoveryServicePortBinding"
-                contract="CMISWebServicesReference.DiscoveryServicePort" name="DiscoveryServicePort" />
-            <endpoint address="http://cmis/services/MultiFilingService.MultiFilingServicePort"
-                binding="basicHttpBinding" bindingConfiguration="MultiFilingServicePortBinding"
-                contract="CMISWebServicesReference.MultiFilingServicePort"
-                name="MultiFilingServicePort" />
-            <endpoint address="http://cmis/services/NavigationService.NavigationServicePort"
-                binding="basicHttpBinding" bindingConfiguration="NavigationServicePortBinding"
-                contract="CMISWebServicesReference.NavigationServicePort"
-                name="NavigationServicePort" />
-            <endpoint address="http://cmis/services/ObjectService.ObjectServicePort"
-                binding="basicHttpBinding" bindingConfiguration="ObjectServicePortBinding"
-                contract="CMISWebServicesReference.ObjectServicePort" name="ObjectServicePort" />
-            <endpoint address="http://cmis/services/PolicyService.PolicyServicePort"
-                binding="basicHttpBinding" bindingConfiguration="PolicyServicePortBinding"
-                contract="CMISWebServicesReference.PolicyServicePort" name="PolicyServicePort" />
-            <endpoint address="http://cmis/services/RelationshipService.RelationshipServicePort"
-                binding="basicHttpBinding" bindingConfiguration="RelationshipServicePortBinding"
-                contract="CMISWebServicesReference.RelationshipServicePort"
-                name="RelationshipServicePort" />
-            <endpoint address="http://cmis/services/RepositoryService.RepositoryServicePort"
-                binding="basicHttpBinding" bindingConfiguration="RepositoryServicePortBinding"
-                contract="CMISWebServicesReference.RepositoryServicePort"
-                name="RepositoryServicePort" />
-            <endpoint address="http://cmis/services/VersioningService.VersioningServicePort"
-                binding="basicHttpBinding" bindingConfiguration="VersioningServicePortBinding"
-                contract="CMISWebServicesReference.VersioningServicePort"
-                name="VersioningServicePort" />
-            <endpoint address="http://cmis/services/ACLService.ACLServicePort"
-                binding="basicHttpBinding" bindingConfiguration="ACLServicePortBinding"
-                contract="CMISWebServicesReference.ACLServicePort" name="ACLServicePort" />
+            <endpoint address="http://cmis/services/DiscoveryService.DiscoveryServicePort" binding="basicHttpBinding" bindingConfiguration="DiscoveryServicePortBinding" contract="CMISWebServicesReference.DiscoveryServicePort" name="DiscoveryServicePort"/>
+            <endpoint address="http://cmis/services/MultiFilingService.MultiFilingServicePort" binding="basicHttpBinding" bindingConfiguration="MultiFilingServicePortBinding" contract="CMISWebServicesReference.MultiFilingServicePort" name="MultiFilingServicePort"/>
+            <endpoint address="http://cmis/services/NavigationService.NavigationServicePort" binding="basicHttpBinding" bindingConfiguration="NavigationServicePortBinding" contract="CMISWebServicesReference.NavigationServicePort" name="NavigationServicePort"/>
+            <endpoint address="http://cmis/services/ObjectService.ObjectServicePort" binding="basicHttpBinding" bindingConfiguration="ObjectServicePortBinding" contract="CMISWebServicesReference.ObjectServicePort" name="ObjectServicePort"/>
+            <endpoint address="http://cmis/services/PolicyService.PolicyServicePort" binding="basicHttpBinding" bindingConfiguration="PolicyServicePortBinding" contract="CMISWebServicesReference.PolicyServicePort" name="PolicyServicePort"/>
+            <endpoint address="http://cmis/services/RelationshipService.RelationshipServicePort" binding="basicHttpBinding" bindingConfiguration="RelationshipServicePortBinding" contract="CMISWebServicesReference.RelationshipServicePort" name="RelationshipServicePort"/>
+            <endpoint address="http://cmis/services/RepositoryService.RepositoryServicePort" binding="basicHttpBinding" bindingConfiguration="RepositoryServicePortBinding" contract="CMISWebServicesReference.RepositoryServicePort" name="RepositoryServicePort"/>
+            <endpoint address="http://cmis/services/VersioningService.VersioningServicePort" binding="basicHttpBinding" bindingConfiguration="VersioningServicePortBinding" contract="CMISWebServicesReference.VersioningServicePort" name="VersioningServicePort"/>
+            <endpoint address="http://cmis/services/ACLService.ACLServicePort" binding="basicHttpBinding" bindingConfiguration="ACLServicePortBinding" contract="CMISWebServicesReference.ACLServicePort" name="ACLServicePort"/>
         </client>
     </system.serviceModel>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v2.0.50727" sku="Client"/></startup></configuration>
diff --git a/DotCMIS/binding/atompub/atompub-linkcache.cs b/DotCMIS/binding/atompub/atompub-linkcache.cs
index 53b803c..e40688d 100644
--- a/DotCMIS/binding/atompub/atompub-linkcache.cs
+++ b/DotCMIS/binding/atompub/atompub-linkcache.cs
@@ -224,7 +224,7 @@
                         object paramValue;
                         if (parameters.TryGetValue(param.ToString(), out paramValue))
                         {
-                            result.Append(HttpUtility.UrlEncode(UrlBuilder.NormalizeParameter(paramValue)));
+                            result.Append(paramValue == null ? "" : Uri.EscapeDataString(UrlBuilder.NormalizeParameter(paramValue)));
                         }
 
                         param = new StringBuilder();
diff --git a/DotCMIS/binding/http.cs b/DotCMIS/binding/http.cs
index 8c2e8e1..c2d1ade 100644
--- a/DotCMIS/binding/http.cs
+++ b/DotCMIS/binding/http.cs
@@ -259,7 +259,7 @@
                 return this;
             }
 
-            string valueStr = HttpUtility.UrlEncode(NormalizeParameter(value));
+            string valueStr = Uri.EscapeDataString(UrlBuilder.NormalizeParameter(value));
 
             if (uri.Query != null && uri.Query.Length > 1)
             {