Use new metrics package