Enhanced preset_form_fields