I meant like one method will be `remarshal(BasicMetrics, tenantId)` for single tenant and 
```
remarshal(BasicMetrics) {
// for each basic metric extract tenantID and call remarshal(BasicMetric, tenantID)
}
``` 
for multi tenants. So like multi tenant method wrapping the single tenant one, and calling the single tenant method for each method. Possible benefit is we avoid the `tenantId == null` check for every metric. Would it be worth doing?