Update the self.instance_metrics to store dicts

instead of lists