Update to add additional vars.