Change TenantId setter to be private