Rename to metric to metric-values. Add metrics.