Include Reporter component and update submitter component.