Increased MetricsSupport coverage