Improved internal metrics.