Add option for a different destination address in the client.