Add options for validators and defaults on update
More complete tests for #860