Add stat-aggregator
Fix incorrect order