Switched to modular stat collection