Changed metrics from List to Dictionary in MetricGroup