diff --git a/ADFSToolbox.psd1 b/ADFSToolbox.psd1
index 5d6ddb1..04241e9 100644
Binary files a/ADFSToolbox.psd1 and b/ADFSToolbox.psd1 differ
diff --git a/ADFSToolbox.psm1 b/ADFSToolbox.psm1
index 684f54a..dede6aa 100644
--- a/ADFSToolbox.psm1
+++ b/ADFSToolbox.psm1
@@ -20,7 +20,7 @@
     Copyright (c) Microsoft Corporation. All rights reserved.
 #>
 
-New-Variable -Name ModuleVersion -Value "1.0.11"
+New-Variable -Name ModuleVersion -Value "1.0.12"
 
 $url = "https://api.github.com/repos/Microsoft/adfsToolbox/releases/latest"
 $oldProtocol = [Net.ServicePointManager]::SecurityProtocol
diff --git a/diagnosticsModule/Private/HelperUtilities.ps1 b/diagnosticsModule/Private/HelperUtilities.ps1
index c81e83e..9db0111 100644
--- a/diagnosticsModule/Private/HelperUtilities.ps1
+++ b/diagnosticsModule/Private/HelperUtilities.ps1
@@ -685,11 +685,15 @@ function GenerateDiagnosticData()
 
     # create aggregate object to store diagnostic output from each cmdlet run
     $diagnosticData = New-Object -TypeName PSObject
-    $testAdfsServerHealth = New-Object -TypeName PSObject 
+    $testAdfsServerHealth = New-Object -TypeName PSObject
 
     # Add ADFS configuration information to the diagnostics json
     $adfsConfiguration = New-Object -TypeName PSObject
     $adfsConfiguration =  AdfsConfiguration
+    $metadata = New-Object -TypeName PSObject
+    $metadata | Add-Member -MemberType NoteProperty -Name 'Run Id' -Value (New-Guid).Guid
+    $metadata | Add-Member -MemberType NoteProperty -Name 'Timestamp' -Value (Get-Date).ToUniversalTime()
+    $metadata | Add-Member -MemberType NoteProperty -Name 'Version' -Value $outputVersion
 
     foreach($module in $modules.keys)
     {
@@ -723,8 +727,8 @@ function GenerateDiagnosticData()
     # add the AD FS Configuration information to the output
     Add-Member -InputObject $moduleData -MemberType NoteProperty -Name "Adfs-Configuration" -Value $adfsConfiguration
 
-    # add the cmdlet version to the output
-    Add-Member -InputObject $diagnosticData -MemberType NoteProperty -Name "Version" -Value $outputVersion
+    # add metadata
+    Add-Member -InputObject $moduleData -MemberType NoteProperty -Name "Metadata" -Value $metadata
 
     return $diagnosticData
 }
diff --git a/diagnosticsModule/Public/Test-AdfsServerToken.ps1 b/diagnosticsModule/Public/Test-AdfsServerToken.ps1
index 9c3df60..334f921 100644
--- a/diagnosticsModule/Public/Test-AdfsServerToken.ps1
+++ b/diagnosticsModule/Public/Test-AdfsServerToken.ps1
@@ -77,6 +77,7 @@ Function Test-AdfsServerToken
 
     $rst = $null
     $endpoint = $null
+    [Net.ServicePointManager]::ServerCertificateValidationCallback = {$true}
 
     if ($credential -ne $null)
     {
@@ -129,5 +130,8 @@ Function Test-AdfsServerToken
 
     [Net.ServicePointManager]::SecurityProtocol = $oldProtocol
     $tokenXml = [xml]$webresp.Content
+
+    [System.Net.ServicePointManager]::ServerCertificateValidationCallback = $null;
+
     return $tokenXml.OuterXml
 }