Proxy support (clean PR this time)