Adds better web proxy support