Added report structure (again)