Added Proxy support