Added Client Proxy and Common Proxy