Some fields will now only be included if action 'edit' selected