Improve reporting support