Feature/fix metric data