Improve MultiTenantGenerator