Improved metrics.