Update to include fieldsets