Updated report structure