Added support for Proxy servers