Update for new targets.