Removed the parameter dictionaries from the metrics. Now passing their parameters directly to the init