Add code to remember to reuse the generic form
Add extra_form_params to support file uploads