Merge 'add-field' and 'update' commands into a single 'edit' command