Updated for proxy

Proxy support