Second version of the report builder