Stat collection improved