Added support for proxies