Added an update_on parameter
values based in are now copied before extra keys are removed