Add client-server code