Added more info to generated report