Added Clien and Server Proxy