Improve Reporting generation (Draft WIP)