Improved stats reporting