Reports generation improved