Refactored SfData except Submission