Feature/fix metric data flow