Improved performance metrics