Move some stuff into the proxy