Refactor FormSubmissionResource