Fixed AbstractMetric class back to its current implementation