change TenantInfo to BasicTenant