Refactored tenant_set?