Updated the metric class defaults