Enhance reporting