Update Metrics to R7