Ongoing refactor to support new style aggregators and messaging