Course export fields - Need Campus available with Buildings/Rooms in same report.

The two common course export options (Schedule and Course List) have sets of available fields that should be combined.  In the schedule export, the Campus field is not available, but buildings are.  In the Course List export, Campus is available, but the building and rooms are not.