Support providing a tenant_name also