[OEM-224] updates to new reporting system