This is the right place to transform the Annotations from the SubmissionStatus to the Annotations that go into the query tables.  The primary transformation is the addition of the Submission and Submission Status properties as Annotations.