Added upstream_proxy option to proxy creation