Add client and server