Updated reports generation