Update to report generation service - multiple components per trigger is now allowed