Updated to new report types