Update to include the proxy system