Added two more reports

As previous pull request, but without the code duplication.