Added handling for proxies