Feature/metrics