This should probably be optional, defaulting to the current tenant.