Pull router and l1 data collection out of main