Also capture any possible "tenant_" fields to support multitenancy