Proxy improvements