I'm not really convinced about this: I think it's not that bad to always have the tenant id field in the mapping but happy to have other opinions.