Refactor setup of aggregated models in Submission

See commit message for details.