Enhancements for reporting