Add/adapt reports

See Add/adapt reports.