Total WBL Hours Report

It would be great if I could add a “Sending School” and “Company Name” field when running reports for end of year. I can get that when I run any Student-Based experience report, but I am trying to produce a comprehensive report that includes all student-based and event-based data, including the student’s home district and employer (if student-based).