Add client and server codes