Refactor to add table containers

Handy for a PMT analysis with multiple programs.