Refactor for raw and processed aggregators