REPORTS-94 - Improve report definition