Added more metrics.