Fixed the reporting and ESS integration