Switch to separate generate and save lock file tasks. Add override properties.