Adding Proxy support