Added handling of the reports