Add fields to provider and update form
Merged changes