Added severity message
Cleanup comment
Template fixes
Added composite reports argument
Cleanup comment