Add reply_to for client