Remove TimeReportStorage to use more dedicated classes