Add Proxy support