Switch organization stats to aggregate model