diff --git a/Modules/VMware.vSphere.SsoAdmin/VMware.vSphere.SsoAdmin.psd1 b/Modules/VMware.vSphere.SsoAdmin/VMware.vSphere.SsoAdmin.psd1
index 610cf04..ea4df80 100644
--- a/Modules/VMware.vSphere.SsoAdmin/VMware.vSphere.SsoAdmin.psd1
+++ b/Modules/VMware.vSphere.SsoAdmin/VMware.vSphere.SsoAdmin.psd1
@@ -40,7 +40,7 @@ FunctionsToExport = @('Connect-SsoAdminServer', 'Disconnect-SsoAdminServer', 'Ne
 CmdletsToExport = @()
 
 # Variables to export from this module
-VariablesToExport = '$global:DefaultSsoAdminServers'
+VariablesToExport = ''
 
 # Aliases to export from this module
 AliasesToExport = '*'
diff --git a/Modules/VMware.vSphere.SsoAdmin/VMware.vSphere.SsoAdmin.psm1 b/Modules/VMware.vSphere.SsoAdmin/VMware.vSphere.SsoAdmin.psm1
index 2748b09..e278fdb 100644
--- a/Modules/VMware.vSphere.SsoAdmin/VMware.vSphere.SsoAdmin.psm1
+++ b/Modules/VMware.vSphere.SsoAdmin/VMware.vSphere.SsoAdmin.psm1
@@ -51,7 +51,7 @@ param(
 }
 
 # Global variables
-$global:DefaultSsoAdminServers = New-Object System.Collections.ArrayList
+$global:DefaultSsoAdminServers = New-Object System.Collections.Generic.List[VMware.vSphere.SsoAdminClient.DataTypes.SsoAdminServer]
 
 # Module Advanced Functions Implementation
 
@@ -173,7 +173,7 @@ function Disconnect-SsoAdminServer {
 
    Process {
       if ($global:DefaultSsoAdminServers.Contains($Server)) {
-         $global:DefaultSsoAdminServers.Remove($Server)
+         $global:DefaultSsoAdminServers.Remove($Server) | Out-Null
       }
 
       if ($Server.IsConnected) {
diff --git a/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdminClient.dll b/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdminClient.dll
index f8c8d14..1f0f287 100644
Binary files a/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdminClient.dll and b/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdminClient.dll differ
diff --git a/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdminClient.dll b/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdminClient.dll
index 764d165..7f8dcbf 100644
Binary files a/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdminClient.dll and b/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdminClient.dll differ