Refactor createSubmissionData
Update bundle