Switch to client-server