Moved single-proxy to proxy