Improved the controller metrics.