support multiple tables per mod in report
Refactoring for naming consistency