Changes to the Proxy Setup