More changes for the proxy