Re-added tenants module