Improved the way in which reporting works