Minor commit.
Changed default ProxyClient, ProxyServer and ProxyFactory accordingly to changes in API.