Improved performance of stats