Adding support for proxies