Feature/metrics support multi tenancy