Move client init to proxy