Data/reporting improvements