diff --git a/Modules/Private/0.MainFunctions/Start-ARIExtractionOrchestration.ps1 b/Modules/Private/0.MainFunctions/Start-ARIExtractionOrchestration.ps1
index 4860aed2..ae7a22a5 100644
--- a/Modules/Private/0.MainFunctions/Start-ARIExtractionOrchestration.ps1
+++ b/Modules/Private/0.MainFunctions/Start-ARIExtractionOrchestration.ps1
@@ -12,15 +12,15 @@ https://github.com/microsoft/ARI/Modules/Private/0.MainFunctions/Start-ARIExtrac
 This PowerShell Module is part of Azure Resource Inventory (ARI)
 
 .NOTES
-Version: 3.6.0
+Version: 3.6.11
 First Release Date: 15th Oct, 2024
 Authors: Claudio Merola
 
 #>
 function Start-ARIExtractionOrchestration {
-    Param($ManagementGroup, $Subscriptions, $SubscriptionID, $SkipPolicy, $ResourceGroup, $SecurityCenter, $SkipAdvisory, $IncludeTags, $TagKey, $TagValue, $SkipAPIs, $SkipVMDetails, $IncludeCosts, $Automation)
+    Param($ManagementGroup, $Subscriptions, $SubscriptionID, $SkipPolicy, $ResourceGroup, $SecurityCenter, $SkipAdvisory, $IncludeTags, $TagKey, $TagValue, $SkipAPIs, $SkipVMDetails, $IncludeCosts, $Automation, $AzureEnvironment)
 
-    $GraphData = Start-ARIGraphExtraction -ManagementGroup $ManagementGroup -Subscriptions $Subscriptions -SubscriptionID $SubscriptionID -ResourceGroup $ResourceGroup -SecurityCenter $SecurityCenter -SkipAdvisory $SkipAdvisory -IncludeTags $IncludeTags -TagKey $TagKey -TagValue $TagValue
+    $GraphData = Start-ARIGraphExtraction -ManagementGroup $ManagementGroup -Subscriptions $Subscriptions -SubscriptionID $SubscriptionID -ResourceGroup $ResourceGroup -SecurityCenter $SecurityCenter -SkipAdvisory $SkipAdvisory -IncludeTags $IncludeTags -TagKey $TagKey -TagValue $TagValue -AzureEnvironment $AzureEnvironment
 
     $Resources = $GraphData.Resources
     $ResourceContainers = $GraphData.ResourceContainers
diff --git a/Modules/Private/1.ExtractionFunctions/Get-ARIManagementGroups.ps1 b/Modules/Private/1.ExtractionFunctions/Get-ARIManagementGroups.ps1
index a7d14bd5..5de192b9 100644
--- a/Modules/Private/1.ExtractionFunctions/Get-ARIManagementGroups.ps1
+++ b/Modules/Private/1.ExtractionFunctions/Get-ARIManagementGroups.ps1
@@ -12,46 +12,36 @@ https://github.com/microsoft/ARI/Modules/Private/1.ExtractionFunctions/Get-ARIMa
 This PowerShell Module is part of Azure Resource Inventory (ARI).
 
 .NOTES
-Version: 3.6.0
+Version: 3.6.11
 First Release Date: 15th Oct, 2024
 Authors: Claudio Merola
 #>
 function Get-ARIManagementGroups {
-    Param ($ManagementGroup)
+    Param ($ManagementGroup,$Subscriptions)
 
-    Write-Debug ((get-date -Format 'yyyy-MM-dd_HH_mm_ss')+' - '+'Management group name supplied: ' + $ManagmentGroupName)
-    $ReportCounter = 1
-    $LocalResults = @()
+    Write-Debug ((get-date -Format 'yyyy-MM-dd_HH_mm_ss')+' - '+'Management group name: ' + $ManagementGroup)
 
-    $group = Get-AzManagementGroupEntity
-    $group = $group | Where-Object { $_.DisplayName -eq $ManagementGroup }
-    if ($group.Count -lt 1)
-    {
+    $GraphQuery = "resourcecontainers | where type == 'microsoft.resources/subscriptions' | mv-expand managementGroupParent = properties.managementGroupAncestorsChain | where managementGroupParent.name =~ '$($ManagementGroup)'"
+    $QueryResult = Search-AzGraph -Query $GraphQuery -first 1000 -Debug:$false
+    $LocalResults = $QueryResult
+
+    if ($LocalResults.Count -lt 1) {
         Write-Host "ERROR:" -NoNewline -ForegroundColor Red
-        Write-Host "Management Group $ManagementGroup not found!"
+        Write-Host "No Subscriptions found for Management Group: $ManagementGroup!"
         Write-Host ""
         Write-Host "Please check the Management Group name and try again."
         Write-Host ""
         Exit
     }
-    else
-    {
-        Write-Debug ((get-date -Format 'yyyy-MM-dd_HH_mm_ss')+' - '+'Management groups found: ' + $group.count)
-        foreach ($item in $group)
-        {
-            $GraphQuery = "resourcecontainers | where type == 'microsoft.resources/subscriptions' | mv-expand managementGroupParent = properties.managementGroupAncestorsChain | where managementGroupParent.name =~ '$($item.DisplayName)'"
-            $QueryResult = Search-AzGraph -Query $GraphQuery -first 1000
-            $LocalResults += $QueryResult
-
-            while ($QueryResult.SkipToken) {
-                $ReportCounterVar = [string]$ReportCounter
-                Write-Debug ((get-date -Format 'yyyy-MM-dd_HH_mm_ss')+' - '+'Extracting Next 1000 Subscriptions. Loop Number: ' + $ReportCounterVar)
-                $QueryResult = Search-AzGraph -Query $GraphQuery -SkipToken $QueryResult.SkipToken -Subscription $FSubscri -first 1000
-                $LocalResults += $QueryResult
-                $ReportCounter ++
+    else {
+        Write-Debug ((get-date -Format 'yyyy-MM-dd_HH_mm_ss')+' - '+'Subscriptions found for Management Group: ' + $LocalResults.Count)
+        $FinalSubscriptions = foreach ($Sub in $Subscriptions)
+            {
+                if ($Sub.name -in $LocalResults.name)
+                    {
+                        $Sub
+                    }
             }
-            Write-Progress -Id 1 -activity "Running Subscription Inventory Job" -Status "$Looper / $Loop of Subscription Jobs" -Completed
-        }
     }
-    return $LocalResults
+    return $FinalSubscriptions
 }
\ No newline at end of file
diff --git a/Modules/Private/1.ExtractionFunctions/Start-ARIGraphExtraction.ps1 b/Modules/Private/1.ExtractionFunctions/Start-ARIGraphExtraction.ps1
index 210df9f4..b5e51959 100644
--- a/Modules/Private/1.ExtractionFunctions/Start-ARIGraphExtraction.ps1
+++ b/Modules/Private/1.ExtractionFunctions/Start-ARIGraphExtraction.ps1
@@ -12,13 +12,13 @@ https://github.com/microsoft/ARI/Modules/Private/1.ExtractionFunctions/Start-ARI
 This powershell Module is part of Azure Resource Inventory (ARI)
 
 .NOTES
-Version: 3.6.5
+Version: 3.6.11
 First Release Date: 15th Oct, 2024
 Authors: Claudio Merola
 
 #>
 Function Start-ARIGraphExtraction {
-    Param($ManagementGroup, $Subscriptions, $SubscriptionID, $ResourceGroup, $SecurityCenter, $SkipAdvisory, $IncludeTags, $TagKey, $TagValue)
+    Param($ManagementGroup, $Subscriptions, $SubscriptionID, $ResourceGroup, $SecurityCenter, $SkipAdvisory, $IncludeTags, $TagKey, $TagValue, $AzureEnvironment)
 
     Write-Debug ((get-date -Format 'yyyy-MM-dd_HH_mm_ss')+' - '+'Starting Extractor function')
 
@@ -40,7 +40,7 @@ Function Start-ARIGraphExtraction {
 
     if (![string]::IsNullOrEmpty($ManagementGroup))
         {
-            $Subscriptions = Get-ARIManagementGroups -ManagementGroup $ManagementGroup
+            $Subscriptions = Get-ARIManagementGroups -ManagementGroup $ManagementGroup -Subscriptions $Subscriptions
         }
 
     $SubCount = [string]$Subscriptions.id.count
@@ -104,10 +104,13 @@ Function Start-ARIGraphExtraction {
             Write-Debug ((get-date -Format 'yyyy-MM-dd_HH_mm_ss')+' - '+'Invoking Inventory Loop for Network Resources')
             $Resources += Invoke-ARIInventoryLoop -GraphQuery $GraphQuery -FSubscri $Subscri -LoopName 'Network Resources'
 
-            $GraphQuery = "SupportResources $RGQueryExtension $TagQueryExtension $MGQueryExtension | project id,name,type,tenantId,kind,location,resourceGroup,subscriptionId,managedBy,sku,plan,properties,identity,zones,extendedLocation$($GraphQueryTags) | order by id asc"
+            if ($AzureEnvironment -ne 'AzureUSGovernment')
+                {
+                    $GraphQuery = "SupportResources $RGQueryExtension $TagQueryExtension $MGQueryExtension | project id,name,type,tenantId,kind,location,resourceGroup,subscriptionId,managedBy,sku,plan,properties,identity,zones,extendedLocation$($GraphQueryTags) | order by id asc"
 
-            Write-Debug ((get-date -Format 'yyyy-MM-dd_HH_mm_ss')+' - '+'Invoking Inventory Loop for Support Tickets')
-            $Resources += Invoke-ARIInventoryLoop -GraphQuery $GraphQuery -FSubscri $Subscri -LoopName 'SupportTickets'
+                    Write-Debug ((get-date -Format 'yyyy-MM-dd_HH_mm_ss')+' - '+'Invoking Inventory Loop for Support Tickets')
+                    $Resources += Invoke-ARIInventoryLoop -GraphQuery $GraphQuery -FSubscri $Subscri -LoopName 'SupportTickets'
+                }
 
             $GraphQuery = "recoveryservicesresources $RGQueryExtension $TagQueryExtension | where type =~ 'microsoft.recoveryservices/vaults/backupfabrics/protectioncontainers/protecteditems' or type =~ 'microsoft.recoveryservices/vaults/backuppolicies' $MGQueryExtension  | project id,name,type,tenantId,kind,location,resourceGroup,subscriptionId,managedBy,sku,plan,properties,identity,zones,extendedLocation$($GraphQueryTags) | order by id asc"
 
diff --git a/Modules/Public/InventoryModules/AI/AzureAI.ps1 b/Modules/Public/InventoryModules/AI/AzureAI.ps1
index e462e769..01e93965 100644
--- a/Modules/Public/InventoryModules/AI/AzureAI.ps1
+++ b/Modules/Public/InventoryModules/AI/AzureAI.ps1
@@ -114,7 +114,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('AzureAITable_'+($SmaResources.'Resource U').count)
+        $TableName = ('AzureAITable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -143,6 +143,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
             [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/AI/ComputerVision.ps1 b/Modules/Public/InventoryModules/AI/ComputerVision.ps1
index 6581737c..e2f6c241 100644
--- a/Modules/Public/InventoryModules/AI/ComputerVision.ps1
+++ b/Modules/Public/InventoryModules/AI/ComputerVision.ps1
@@ -113,7 +113,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('VisionTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('VisionTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -143,6 +143,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
             [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/AI/ContentModerator.ps1 b/Modules/Public/InventoryModules/AI/ContentModerator.ps1
index 452a54c4..ba693a78 100644
--- a/Modules/Public/InventoryModules/AI/ContentModerator.ps1
+++ b/Modules/Public/InventoryModules/AI/ContentModerator.ps1
@@ -112,7 +112,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('ContentModTb_'+($SmaResources.'Resource U').count)
+        $TableName = ('ContentModTb_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -142,6 +142,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
             [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/AI/ContentSafety.ps1 b/Modules/Public/InventoryModules/AI/ContentSafety.ps1
index d39d0efe..956c2169 100644
--- a/Modules/Public/InventoryModules/AI/ContentSafety.ps1
+++ b/Modules/Public/InventoryModules/AI/ContentSafety.ps1
@@ -113,7 +113,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('ContSafTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('ContSafTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -143,6 +143,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
             [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/AI/CustomVision.ps1 b/Modules/Public/InventoryModules/AI/CustomVision.ps1
index 750f6f64..234a4943 100644
--- a/Modules/Public/InventoryModules/AI/CustomVision.ps1
+++ b/Modules/Public/InventoryModules/AI/CustomVision.ps1
@@ -114,7 +114,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('CustomViTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('CustomViTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -145,6 +145,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
             [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/AI/FaceAPI.ps1 b/Modules/Public/InventoryModules/AI/FaceAPI.ps1
index b453a124..5b250c8d 100644
--- a/Modules/Public/InventoryModules/AI/FaceAPI.ps1
+++ b/Modules/Public/InventoryModules/AI/FaceAPI.ps1
@@ -113,7 +113,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('FaceAPITable_'+($SmaResources.'Resource U').count)
+        $TableName = ('FaceAPITable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -143,9 +143,10 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'Face API' -AutoSize -MaxAutoSizeRows 100 -ConditionalText $condtxt -TableName $TableName -TableStyle $tableStyle -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/AI/FormRecognizer.ps1 b/Modules/Public/InventoryModules/AI/FormRecognizer.ps1
index 2ebce150..37c4c9a0 100644
--- a/Modules/Public/InventoryModules/AI/FormRecognizer.ps1
+++ b/Modules/Public/InventoryModules/AI/FormRecognizer.ps1
@@ -113,7 +113,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('DocIntTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('DocIntTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -143,9 +143,10 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'Doc Intelligence' -AutoSize -MaxAutoSizeRows 100 -ConditionalText $condtxt -TableName $TableName -TableStyle $tableStyle -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/AI/HealthInsights.ps1 b/Modules/Public/InventoryModules/AI/HealthInsights.ps1
index 12ae3b34..dd495aa5 100644
--- a/Modules/Public/InventoryModules/AI/HealthInsights.ps1
+++ b/Modules/Public/InventoryModules/AI/HealthInsights.ps1
@@ -117,7 +117,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('HealthInsTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('HealthInsTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -148,9 +148,10 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'Health Insights' -AutoSize -MaxAutoSizeRows 100 -ConditionalText $condtxt -TableName $TableName -TableStyle $tableStyle -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/AI/ImmersiveReader.ps1 b/Modules/Public/InventoryModules/AI/ImmersiveReader.ps1
index 35a3a0a9..3148f7a7 100644
--- a/Modules/Public/InventoryModules/AI/ImmersiveReader.ps1
+++ b/Modules/Public/InventoryModules/AI/ImmersiveReader.ps1
@@ -114,7 +114,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('ImmersiveRTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('ImmersiveRTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -143,9 +143,10 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'Immersive Reader' -AutoSize -MaxAutoSizeRows 100 -ConditionalText $condtxt -TableName $TableName -TableStyle $tableStyle -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/AI/MachineLearning.ps1 b/Modules/Public/InventoryModules/AI/MachineLearning.ps1
index 1d3b27fc..21d7bc54 100644
--- a/Modules/Public/InventoryModules/AI/MachineLearning.ps1
+++ b/Modules/Public/InventoryModules/AI/MachineLearning.ps1
@@ -110,7 +110,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('AzureMLTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('AzureMLTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -143,9 +143,10 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'Machine Learning' -AutoSize -MaxAutoSizeRows 100 -TableName $TableName -TableStyle $tableStyle -ConditionalText $condtxt -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/AI/SearchServices.ps1 b/Modules/Public/InventoryModules/AI/SearchServices.ps1
index fb372de4..b594b233 100644
--- a/Modules/Public/InventoryModules/AI/SearchServices.ps1
+++ b/Modules/Public/InventoryModules/AI/SearchServices.ps1
@@ -112,7 +112,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('SearchTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('SearchTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -144,9 +144,10 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'Search Services' -AutoSize -MaxAutoSizeRows 100 -ConditionalText $condtxt -TableName $TableName -TableStyle $tableStyle -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/AI/SpeechService.ps1 b/Modules/Public/InventoryModules/AI/SpeechService.ps1
index 6019a577..5075ce3b 100644
--- a/Modules/Public/InventoryModules/AI/SpeechService.ps1
+++ b/Modules/Public/InventoryModules/AI/SpeechService.ps1
@@ -113,7 +113,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('SpeechTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('SpeechTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -143,9 +143,10 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'Speech Service' -AutoSize -MaxAutoSizeRows 100 -ConditionalText $condtxt -TableName $TableName -TableStyle $tableStyle -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/AI/TextAnalytics.ps1 b/Modules/Public/InventoryModules/AI/TextAnalytics.ps1
index a1ce6ce0..82a38c6f 100644
--- a/Modules/Public/InventoryModules/AI/TextAnalytics.ps1
+++ b/Modules/Public/InventoryModules/AI/TextAnalytics.ps1
@@ -111,7 +111,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('LanguTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('LanguTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -142,9 +142,10 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'Language' -AutoSize -MaxAutoSizeRows 100 -ConditionalText $condtxt -TableName $TableName -TableStyle $tableStyle -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/AI/Translator.ps1 b/Modules/Public/InventoryModules/AI/Translator.ps1
index 771acaae..5b17e9a0 100644
--- a/Modules/Public/InventoryModules/AI/Translator.ps1
+++ b/Modules/Public/InventoryModules/AI/Translator.ps1
@@ -110,7 +110,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('TranslaTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('TranslaTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -140,9 +140,10 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'Translator' -AutoSize -MaxAutoSizeRows 100 -ConditionalText $condtxt -TableName $TableName -TableStyle $tableStyle -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/Analytics/DataExplorerCluster.ps1 b/Modules/Public/InventoryModules/Analytics/DataExplorerCluster.ps1
index e673649a..4e65f290 100644
--- a/Modules/Public/InventoryModules/Analytics/DataExplorerCluster.ps1
+++ b/Modules/Public/InventoryModules/Analytics/DataExplorerCluster.ps1
@@ -109,7 +109,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('DTExplTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('DTExplTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -148,9 +148,10 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'Data Explorer Clusters' -AutoSize -MaxAutoSizeRows 100 -TableName $TableName -TableStyle $tableStyle -ConditionalText $condtxt -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/Analytics/Databricks.ps1 b/Modules/Public/InventoryModules/Analytics/Databricks.ps1
index 3a430f91..14cdf036 100644
--- a/Modules/Public/InventoryModules/Analytics/Databricks.ps1
+++ b/Modules/Public/InventoryModules/Analytics/Databricks.ps1
@@ -109,7 +109,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('DBricksTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('DBricksTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -144,9 +144,10 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'Databricks' -AutoSize -MaxAutoSizeRows 100 -TableName $TableName -TableStyle $tableStyle -ConditionalText $condtxt -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/Analytics/EvtHub.ps1 b/Modules/Public/InventoryModules/Analytics/EvtHub.ps1
index 70dd842f..b0d0836c 100644
--- a/Modules/Public/InventoryModules/Analytics/EvtHub.ps1
+++ b/Modules/Public/InventoryModules/Analytics/EvtHub.ps1
@@ -111,7 +111,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('EvtHubTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('EvtHubTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $SheetName = 'Event Hubs'
@@ -145,6 +145,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         $noNumberConversion = @()
         $noNumberConversion += 'Minimum TLS Version'
diff --git a/Modules/Public/InventoryModules/Analytics/Purview.ps1 b/Modules/Public/InventoryModules/Analytics/Purview.ps1
index 2481b3d3..9c733f03 100644
--- a/Modules/Public/InventoryModules/Analytics/Purview.ps1
+++ b/Modules/Public/InventoryModules/Analytics/Purview.ps1
@@ -106,7 +106,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('PurviewATable_'+($SmaResources.'Resource U').count)
+        $TableName = ('PurviewATable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -136,9 +136,10 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value')
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'Purview' -AutoSize -MaxAutoSizeRows 100 -TableName $TableName -ConditionalText $condtxt -TableStyle $tableStyle -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/Analytics/Streamanalytics.ps1 b/Modules/Public/InventoryModules/Analytics/Streamanalytics.ps1
index 90692957..ec200d48 100644
--- a/Modules/Public/InventoryModules/Analytics/Streamanalytics.ps1
+++ b/Modules/Public/InventoryModules/Analytics/Streamanalytics.ps1
@@ -120,7 +120,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('StreamsATable_'+($SmaResources.'Resource U').count)
+        $TableName = ('StreamsATable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -163,13 +163,14 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         $noNumberConversion = @()
         $noNumberConversion += 'Compatibility Level'
 
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'Stream Analytics Jobs' -AutoSize -MaxAutoSizeRows 100 -TableName $TableName -TableStyle $tableStyle -ConditionalText $condtxt -Style $Style -NoNumberConversion $noNumberConversion
 
     }
diff --git a/Modules/Public/InventoryModules/Analytics/Synapse.ps1 b/Modules/Public/InventoryModules/Analytics/Synapse.ps1
index 4cb56510..39d9b9a4 100644
--- a/Modules/Public/InventoryModules/Analytics/Synapse.ps1
+++ b/Modules/Public/InventoryModules/Analytics/Synapse.ps1
@@ -99,7 +99,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('SynapseTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('SynapseTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
         
         $condtxt = @()
@@ -128,9 +128,10 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'Synapse' -AutoSize -MaxAutoSizeRows 100 -TableName $TableName -TableStyle $tableStyle -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/Compute/AVD.ps1 b/Modules/Public/InventoryModules/Compute/AVD.ps1
index 66679b3c..a0582051 100644
--- a/Modules/Public/InventoryModules/Compute/AVD.ps1
+++ b/Modules/Public/InventoryModules/Compute/AVD.ps1
@@ -127,7 +127,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('AVD_'+($SmaResources.'Resource U').count)
+        $TableName = ('AVD_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -164,9 +164,10 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'AVD' -AutoSize -TableName $TableName -MaxAutoSizeRows 100 -TableStyle $tableStyle -ConditionalText $condtxt -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/Compute/AvailabilitySets.ps1 b/Modules/Public/InventoryModules/Compute/AvailabilitySets.ps1
index 079d814d..915cebac 100644
--- a/Modules/Public/InventoryModules/Compute/AvailabilitySets.ps1
+++ b/Modules/Public/InventoryModules/Compute/AvailabilitySets.ps1
@@ -101,7 +101,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('AvSetTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('AvSetTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -125,9 +125,10 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'Availability Sets' -AutoSize -MaxAutoSizeRows 100 -TableName $TableName -TableStyle $tableStyle -ConditionalText $condtxt -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/Compute/CloudServices.ps1 b/Modules/Public/InventoryModules/Compute/CloudServices.ps1
index 460ca5c9..f4864f25 100644
--- a/Modules/Public/InventoryModules/Compute/CloudServices.ps1
+++ b/Modules/Public/InventoryModules/Compute/CloudServices.ps1
@@ -98,7 +98,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('CloudServicesTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('CloudServicesTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -120,9 +120,10 @@ Else {
             $Exc.Add('Tag Name')
             $Exc.Add('Tag Value') 
         }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'CloudServices' -AutoSize -TableName $TableName -MaxAutoSizeRows 100 -TableStyle $tableStyle -ConditionalText $condtxt -Numberformat '0' -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/Compute/VMDisk.ps1 b/Modules/Public/InventoryModules/Compute/VMDisk.ps1
index d61a9517..fd297e77 100644
--- a/Modules/Public/InventoryModules/Compute/VMDisk.ps1
+++ b/Modules/Public/InventoryModules/Compute/VMDisk.ps1
@@ -121,7 +121,7 @@ Else
 
         $SheetName = 'Disks'
 
-        $TableName = ('VMDiskT_'+($SmaResources.'Resource U').count)
+        $TableName = ('VMDiskT_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
 
         $condtxt = @()
         $condtxt += New-ConditionalText Unattached -Range F:F
@@ -159,6 +159,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Compute/VMWare.ps1 b/Modules/Public/InventoryModules/Compute/VMWare.ps1
index a4f92ecb..ec1b68db 100644
--- a/Modules/Public/InventoryModules/Compute/VMWare.ps1
+++ b/Modules/Public/InventoryModules/Compute/VMWare.ps1
@@ -107,7 +107,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('VMWareTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('VMWareTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -142,9 +142,10 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'VMWare' -AutoSize -MaxAutoSizeRows 100 -TableName $TableName -ConditionalText $condtxt -TableStyle $tableStyle -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/Compute/VirtualMachine.ps1 b/Modules/Public/InventoryModules/Compute/VirtualMachine.ps1
index aa9d22ed..d84b9423 100644
--- a/Modules/Public/InventoryModules/Compute/VirtualMachine.ps1
+++ b/Modules/Public/InventoryModules/Compute/VirtualMachine.ps1
@@ -336,7 +336,7 @@ else
     If($SmaResources)
         {
 
-            $TableName = ('VMTable_'+($SmaResources.'Resource U').count)
+            $TableName = ('VMTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
             $Style = @()
             $Style += New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0' -VerticalAlignment Center
             $Style += New-ExcelStyle -HorizontalAlignment Left -Range AW:AW -Width 60 -WrapText
diff --git a/Modules/Public/InventoryModules/Compute/VirtualMachineScaleSet.ps1 b/Modules/Public/InventoryModules/Compute/VirtualMachineScaleSet.ps1
index b54fd33d..a89737fa 100644
--- a/Modules/Public/InventoryModules/Compute/VirtualMachineScaleSet.ps1
+++ b/Modules/Public/InventoryModules/Compute/VirtualMachineScaleSet.ps1
@@ -171,7 +171,7 @@ Else
     {
         $SheetName = 'Virtual Machine Scale Sets'
 
-        $TableName = ('VMSSTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('VMSSTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = @()        
         $Style += New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0' -Range A:W
         $Style += New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0.0' -Range Y:AA
@@ -226,9 +226,10 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName $SheetName -AutoSize -MaxAutoSizeRows 50 -TableName $TableName -TableStyle $tableStyle -ConditionalText $condtxt -Style $Style
 
 
diff --git a/Modules/Public/InventoryModules/Container/AKS.ps1 b/Modules/Public/InventoryModules/Container/AKS.ps1
index 0c65df08..9ad04a86 100644
--- a/Modules/Public/InventoryModules/Container/AKS.ps1
+++ b/Modules/Public/InventoryModules/Container/AKS.ps1
@@ -188,7 +188,7 @@ Else
     {
         $SheetName = 'AKS'
 
-        $TableName = ('AKSTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('AKSTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
 
         $Style = @()
         $Style += New-ExcelStyle -HorizontalAlignment Center -AutoSize
@@ -253,6 +253,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         $noNumberConversion = @()
         $noNumberConversion += 'Kubernetes Version'
diff --git a/Modules/Public/InventoryModules/Container/ARO.ps1 b/Modules/Public/InventoryModules/Container/ARO.ps1
index 85773d4c..7528d118 100644
--- a/Modules/Public/InventoryModules/Container/ARO.ps1
+++ b/Modules/Public/InventoryModules/Container/ARO.ps1
@@ -114,7 +114,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('AROTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('AROTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -153,6 +153,7 @@ Else {
             $Exc.Add('Tag Name')
             $Exc.Add('Tag Value') 
         }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Container/ContainerApp.ps1 b/Modules/Public/InventoryModules/Container/ContainerApp.ps1
index 30dc550d..f7f93513 100644
--- a/Modules/Public/InventoryModules/Container/ContainerApp.ps1
+++ b/Modules/Public/InventoryModules/Container/ContainerApp.ps1
@@ -116,7 +116,7 @@ Else
 
     if($SmaResources)
     {
-        $TableName = ('ContsTb_'+($SmaResources.'Resource U').count)
+        $TableName = ('ContsTb_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -154,6 +154,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Container/ContainerAppEnv.ps1 b/Modules/Public/InventoryModules/Container/ContainerAppEnv.ps1
index 5ba8894d..0f95d8e3 100644
--- a/Modules/Public/InventoryModules/Container/ContainerAppEnv.ps1
+++ b/Modules/Public/InventoryModules/Container/ContainerAppEnv.ps1
@@ -107,7 +107,7 @@ Else
 
     if($SmaResources)
     {
-        $TableName = ('ContEnvTb_'+($SmaResources.'Resource U').count)
+        $TableName = ('ContEnvTb_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -141,9 +141,10 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'Container App Env' -AutoSize -MaxAutoSizeRows 100 -TableName $TableName -ConditionalText $condtxt -TableStyle $tableStyle -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/Container/ContainerGroups.ps1 b/Modules/Public/InventoryModules/Container/ContainerGroups.ps1
index 769a00cb..6f6970ee 100644
--- a/Modules/Public/InventoryModules/Container/ContainerGroups.ps1
+++ b/Modules/Public/InventoryModules/Container/ContainerGroups.ps1
@@ -107,7 +107,7 @@ Else
 
     if($SmaResources)
     {
-        $TableName = ('ContsTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('ContsTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -138,9 +138,10 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'Containers' -AutoSize -MaxAutoSizeRows 100 -TableName $TableName -ConditionalText $condtxt -TableStyle $tableStyle -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/Container/ContainerRegistries.ps1 b/Modules/Public/InventoryModules/Container/ContainerRegistries.ps1
index 326571b4..b8f9e840 100644
--- a/Modules/Public/InventoryModules/Container/ContainerRegistries.ps1
+++ b/Modules/Public/InventoryModules/Container/ContainerRegistries.ps1
@@ -106,7 +106,7 @@ Else
 
     if($SmaResources)
     {
-        $TableName = ('ContsTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('ContsTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -148,9 +148,10 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
-        [PSCustomObject]$SmaResources | 
-        ForEach-Object { $_ } | Select-Object $Exc | 
+        $SmaResources | 
+        ForEach-Object { [PSCustomObject]$_ } | Select-Object $Exc | 
         Export-Excel -Path $File -WorksheetName 'Registries' -AutoSize -ConditionalText $condtxt -MaxAutoSizeRows 100 -TableName $TableName -TableStyle $tableStyle -Style $Style
 
     }
diff --git a/Modules/Public/InventoryModules/Database/CosmosDB.ps1 b/Modules/Public/InventoryModules/Database/CosmosDB.ps1
index 399c7c93..c30bcb6b 100644
--- a/Modules/Public/InventoryModules/Database/CosmosDB.ps1
+++ b/Modules/Public/InventoryModules/Database/CosmosDB.ps1
@@ -113,7 +113,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('CosmosTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('CosmosTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -152,6 +152,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Database/MariaDB.ps1 b/Modules/Public/InventoryModules/Database/MariaDB.ps1
index 1ad2c01a..b518df61 100644
--- a/Modules/Public/InventoryModules/Database/MariaDB.ps1
+++ b/Modules/Public/InventoryModules/Database/MariaDB.ps1
@@ -107,7 +107,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('MariaDBTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('MariaDBTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0.0
 
         $condtxt = @()
@@ -150,6 +150,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Database/MySQL.ps1 b/Modules/Public/InventoryModules/Database/MySQL.ps1
index dd1c7efd..fa686954 100644
--- a/Modules/Public/InventoryModules/Database/MySQL.ps1
+++ b/Modules/Public/InventoryModules/Database/MySQL.ps1
@@ -107,7 +107,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('MySQLTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('MySQLTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0.0
 
         $SheetName = 'MySQL'
@@ -152,6 +152,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Database/MySQLflexible.ps1 b/Modules/Public/InventoryModules/Database/MySQLflexible.ps1
index b3fb2f8a..76c70a2d 100644
--- a/Modules/Public/InventoryModules/Database/MySQLflexible.ps1
+++ b/Modules/Public/InventoryModules/Database/MySQLflexible.ps1
@@ -105,7 +105,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('MySQLFlexTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('MySQLFlexTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -142,6 +142,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Database/POSTGRE.ps1 b/Modules/Public/InventoryModules/Database/POSTGRE.ps1
index 2237cb2a..1acb7d16 100644
--- a/Modules/Public/InventoryModules/Database/POSTGRE.ps1
+++ b/Modules/Public/InventoryModules/Database/POSTGRE.ps1
@@ -107,7 +107,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('POSTGRETable_'+($SmaResources.'Resource U').count)
+        $TableName = ('POSTGRETable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $SheetName = 'PostgreSQL'
@@ -153,6 +153,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Database/POSTGREFlexible.ps1 b/Modules/Public/InventoryModules/Database/POSTGREFlexible.ps1
index 62af0995..6822bae4 100644
--- a/Modules/Public/InventoryModules/Database/POSTGREFlexible.ps1
+++ b/Modules/Public/InventoryModules/Database/POSTGREFlexible.ps1
@@ -109,7 +109,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('POSTGFlex_'+($SmaResources.'Resource U').count)
+        $TableName = ('POSTGFlex_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -149,6 +149,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Database/RedisCache.ps1 b/Modules/Public/InventoryModules/Database/RedisCache.ps1
index 360e1f71..0b4ef007 100644
--- a/Modules/Public/InventoryModules/Database/RedisCache.ps1
+++ b/Modules/Public/InventoryModules/Database/RedisCache.ps1
@@ -111,7 +111,7 @@ Else {
 
         $SheetName = 'Redis Cache'
 
-        $TableName = ('RedisCacheTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('RedisCacheTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $condtxt = @()
         $condtxt += New-ConditionalText "Not Configured" -Range E:E
         $condtxt += New-ConditionalText Default -Range M:M
@@ -154,6 +154,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Database/SQLDB.ps1 b/Modules/Public/InventoryModules/Database/SQLDB.ps1
index 2f644c87..ddb4c5f0 100644
--- a/Modules/Public/InventoryModules/Database/SQLDB.ps1
+++ b/Modules/Public/InventoryModules/Database/SQLDB.ps1
@@ -106,7 +106,7 @@ if ($Task -eq 'Processing') {
 else {
     if ($SmaResources) {
 
-        $TableName = ('SQLDBTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('SQLDBTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -133,12 +133,12 @@ else {
         $Exc.Add('Catalog Collation')
         $Exc.Add('Read Replica Count')
         $Exc.Add('ElasticPool ID')
-        
         if($InTag)
             {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Database/SQLMI.ps1 b/Modules/Public/InventoryModules/Database/SQLMI.ps1
index ce7ab1f6..0db3c39f 100644
--- a/Modules/Public/InventoryModules/Database/SQLMI.ps1
+++ b/Modules/Public/InventoryModules/Database/SQLMI.ps1
@@ -97,7 +97,7 @@ if ($Task -eq 'Processing') {
 else {
     if ($SmaResources) {
 
-        $TableName = ('SQLMITable_'+($SmaResources.'Resource U').count)
+        $TableName = ('SQLMITable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -132,6 +132,7 @@ else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Database/SQLMIDB.ps1 b/Modules/Public/InventoryModules/Database/SQLMIDB.ps1
index c69c5e1f..da4e4871 100644
--- a/Modules/Public/InventoryModules/Database/SQLMIDB.ps1
+++ b/Modules/Public/InventoryModules/Database/SQLMIDB.ps1
@@ -90,7 +90,7 @@ if ($Task -eq 'Processing') {
 else {
     if ($SmaResources) {
 
-        $TableName = ('SQLMIDBTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('SQLMIDBTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -113,6 +113,7 @@ else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Database/SQLPOOL.ps1 b/Modules/Public/InventoryModules/Database/SQLPOOL.ps1
index bd71ebf7..32186847 100644
--- a/Modules/Public/InventoryModules/Database/SQLPOOL.ps1
+++ b/Modules/Public/InventoryModules/Database/SQLPOOL.ps1
@@ -91,7 +91,7 @@ if ($Task -eq 'Processing') {
 else {
     if ($SmaResources) {
 
-        $TableName = ('SqlPoolTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('SqlPoolTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -113,12 +113,12 @@ else {
         $Exc.Add('DB Max DTU')
         $Exc.Add('Max Size (GB)')
         $Exc.Add('Zone Redundant')        
-        
         if($InTag)
             {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Database/SQLSERVER.ps1 b/Modules/Public/InventoryModules/Database/SQLSERVER.ps1
index 497d98a1..e2e418cc 100644
--- a/Modules/Public/InventoryModules/Database/SQLSERVER.ps1
+++ b/Modules/Public/InventoryModules/Database/SQLSERVER.ps1
@@ -96,7 +96,7 @@ if ($Task -eq 'Processing') {
 else {
     if ($SmaResources) {
 
-        $TableName = ('SQLSERVERTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('SQLSERVERTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -125,6 +125,7 @@ else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Database/SQLVM.ps1 b/Modules/Public/InventoryModules/Database/SQLVM.ps1
index 355cf7d5..bf4d3483 100644
--- a/Modules/Public/InventoryModules/Database/SQLVM.ps1
+++ b/Modules/Public/InventoryModules/Database/SQLVM.ps1
@@ -93,7 +93,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('SQLVMTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('SQLVMTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -117,6 +117,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Hybrid/ARCServers.ps1 b/Modules/Public/InventoryModules/Hybrid/ARCServers.ps1
index 1ae20813..347f9fdc 100644
--- a/Modules/Public/InventoryModules/Hybrid/ARCServers.ps1
+++ b/Modules/Public/InventoryModules/Hybrid/ARCServers.ps1
@@ -169,7 +169,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('ARCServer_'+($SmaResources.'Resource U').count)
+        $TableName = ('ARCServer_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -213,6 +213,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Integration/APIM.ps1 b/Modules/Public/InventoryModules/Integration/APIM.ps1
index 63ed0892..83fa9e19 100644
--- a/Modules/Public/InventoryModules/Integration/APIM.ps1
+++ b/Modules/Public/InventoryModules/Integration/APIM.ps1
@@ -111,7 +111,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('APIMTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('APIMTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -143,6 +143,7 @@ Else
             $Exc.Add('Tag Name')
             $Exc.Add('Tag Value') 
         }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Integration/ServiceBUS.ps1 b/Modules/Public/InventoryModules/Integration/ServiceBUS.ps1
index 23bd9f64..94242a01 100644
--- a/Modules/Public/InventoryModules/Integration/ServiceBUS.ps1
+++ b/Modules/Public/InventoryModules/Integration/ServiceBUS.ps1
@@ -102,7 +102,7 @@ Else
 
     if($SmaResources)
     {
-        $TableName = ('ServiceBUSTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('ServiceBUSTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -128,6 +128,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/IoT/IOTHubs.ps1 b/Modules/Public/InventoryModules/IoT/IOTHubs.ps1
index 05e44835..a81d331f 100644
--- a/Modules/Public/InventoryModules/IoT/IOTHubs.ps1
+++ b/Modules/Public/InventoryModules/IoT/IOTHubs.ps1
@@ -102,7 +102,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('IOTHubsTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('IOTHubsTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -131,6 +131,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Management/AutomationAccounts.ps1 b/Modules/Public/InventoryModules/Management/AutomationAccounts.ps1
index d5d98e6f..dbf0c29d 100644
--- a/Modules/Public/InventoryModules/Management/AutomationAccounts.ps1
+++ b/Modules/Public/InventoryModules/Management/AutomationAccounts.ps1
@@ -136,7 +136,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('AutAccTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('AutAccTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
         $StyleExt = New-ExcelStyle -HorizontalAlignment Left -Range K:K -Width 80 -WrapText 
 
@@ -164,6 +164,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Management/Backup.ps1 b/Modules/Public/InventoryModules/Management/Backup.ps1
index d04e486f..d3025cf8 100644
--- a/Modules/Public/InventoryModules/Management/Backup.ps1
+++ b/Modules/Public/InventoryModules/Management/Backup.ps1
@@ -117,7 +117,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('BackupTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('BackupTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -160,6 +160,7 @@ Else
             $Exc.Add('Tag Name')
             $Exc.Add('Tag Value') 
         }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Management/RecoveryVault.ps1 b/Modules/Public/InventoryModules/Management/RecoveryVault.ps1
index 35878812..90016158 100644
--- a/Modules/Public/InventoryModules/Management/RecoveryVault.ps1
+++ b/Modules/Public/InventoryModules/Management/RecoveryVault.ps1
@@ -97,7 +97,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('RecoveryVaultTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('RecoveryVaultTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -120,6 +120,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Monitoring/AppInsights.ps1 b/Modules/Public/InventoryModules/Monitoring/AppInsights.ps1
index a31fe21b..83594e57 100644
--- a/Modules/Public/InventoryModules/Monitoring/AppInsights.ps1
+++ b/Modules/Public/InventoryModules/Monitoring/AppInsights.ps1
@@ -104,7 +104,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('AppInsightsTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('AppInsightsTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -136,6 +136,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Monitoring/Workspaces.ps1 b/Modules/Public/InventoryModules/Monitoring/Workspaces.ps1
index dff92f66..0130f707 100644
--- a/Modules/Public/InventoryModules/Monitoring/Workspaces.ps1
+++ b/Modules/Public/InventoryModules/Monitoring/Workspaces.ps1
@@ -102,7 +102,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('WorkSpaceTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('WorkSpaceTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0.0'
 
         $condtxt = @()
@@ -130,6 +130,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         $noNumberConversion = @()
         $noNumberConversion += 'Daily Cap (GB)'
diff --git a/Modules/Public/InventoryModules/Network_1/BastionHosts.ps1 b/Modules/Public/InventoryModules/Network_1/BastionHosts.ps1
index f7d1174e..175d96e6 100644
--- a/Modules/Public/InventoryModules/Network_1/BastionHosts.ps1
+++ b/Modules/Public/InventoryModules/Network_1/BastionHosts.ps1
@@ -100,7 +100,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('BASTIONTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('BASTIONTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -124,6 +124,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Network_1/Connections.ps1 b/Modules/Public/InventoryModules/Network_1/Connections.ps1
index 738cdbd3..2e74dd67 100644
--- a/Modules/Public/InventoryModules/Network_1/Connections.ps1
+++ b/Modules/Public/InventoryModules/Network_1/Connections.ps1
@@ -97,7 +97,7 @@ Else
 
     if($SmaResources)
     {
-        $TableName = ('Connections_'+($SmaResources.'Resource U').count)
+        $TableName = ('Connections_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -121,6 +121,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Network_1/ExpressRoute.ps1 b/Modules/Public/InventoryModules/Network_1/ExpressRoute.ps1
index 3caecb2e..0e764bee 100644
--- a/Modules/Public/InventoryModules/Network_1/ExpressRoute.ps1
+++ b/Modules/Public/InventoryModules/Network_1/ExpressRoute.ps1
@@ -106,7 +106,7 @@ Else
 
     if($SmaResources)
     {
-        $TableName = ('ERs_'+($SmaResources.'Resource U').count)
+        $TableName = ('ERs_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -134,6 +134,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Network_1/LoadBalancer.ps1 b/Modules/Public/InventoryModules/Network_1/LoadBalancer.ps1
index a45be526..4ee0e0a4 100644
--- a/Modules/Public/InventoryModules/Network_1/LoadBalancer.ps1
+++ b/Modules/Public/InventoryModules/Network_1/LoadBalancer.ps1
@@ -130,7 +130,7 @@ Else {
 
         $SheetName = 'Load Balancers'
 
-        $TableName = ('LBTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('LBTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
 
         $condtxt = @()
         #Retirement
@@ -162,6 +162,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Network_1/NATGateway.ps1 b/Modules/Public/InventoryModules/Network_1/NATGateway.ps1
index e3b4418b..7a90f39f 100644
--- a/Modules/Public/InventoryModules/Network_1/NATGateway.ps1
+++ b/Modules/Public/InventoryModules/Network_1/NATGateway.ps1
@@ -104,7 +104,7 @@ If ($Task -eq 'Processing') {
 Else {
     if ($SmaResources) {
 
-        $TableName = ('NATGtwTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('NATGtwTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -129,6 +129,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Network_1/PublicDNS.ps1 b/Modules/Public/InventoryModules/Network_1/PublicDNS.ps1
index 859c9cff..4b18becd 100644
--- a/Modules/Public/InventoryModules/Network_1/PublicDNS.ps1
+++ b/Modules/Public/InventoryModules/Network_1/PublicDNS.ps1
@@ -85,7 +85,7 @@ If ($Task -eq 'Processing') {
 Else {
     if ($SmaResources) {
 
-        $TableName = ('PubDNSTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('PubDNSTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -108,6 +108,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Network_1/RouteTables.ps1 b/Modules/Public/InventoryModules/Network_1/RouteTables.ps1
index 187b7954..49d52b85 100644
--- a/Modules/Public/InventoryModules/Network_1/RouteTables.ps1
+++ b/Modules/Public/InventoryModules/Network_1/RouteTables.ps1
@@ -92,7 +92,7 @@ If ($Task -eq 'Processing') {
 Else {
     if ($SmaResources) {
 
-        $TableName = ('RouteTbTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('RouteTbTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -119,6 +119,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
 
         [PSCustomObject]$SmaResources | 
diff --git a/Modules/Public/InventoryModules/Network_1/TrafficManager.ps1 b/Modules/Public/InventoryModules/Network_1/TrafficManager.ps1
index 93dd8c36..6560115a 100644
--- a/Modules/Public/InventoryModules/Network_1/TrafficManager.ps1
+++ b/Modules/Public/InventoryModules/Network_1/TrafficManager.ps1
@@ -92,7 +92,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('TrafficManagerTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('TrafficManagerTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         
         $condtxt = @()
         $condtxt += New-ConditionalText inactive -Range J:J
@@ -118,6 +118,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Network_1/VirtualNetwork.ps1 b/Modules/Public/InventoryModules/Network_1/VirtualNetwork.ps1
index 41f74572..bf5ce693 100644
--- a/Modules/Public/InventoryModules/Network_1/VirtualNetwork.ps1
+++ b/Modules/Public/InventoryModules/Network_1/VirtualNetwork.ps1
@@ -155,7 +155,7 @@ If ($Task -eq 'Processing') {
 Else {
     if ($SmaResources) {
 
-        $TableName = ('VNETTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('VNETTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
 
         $SheetName = 'Virtual Networks'
 
@@ -194,7 +194,8 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
-        
+        $Exc.Add('Resource U')
+
         $noNumberConversion = @()
         $noNumberConversion += 'DNS Servers'
         $noNumberConversion += 'Address Space'
diff --git a/Modules/Public/InventoryModules/Network_1/vNETPeering.ps1 b/Modules/Public/InventoryModules/Network_1/vNETPeering.ps1
index af1511d2..28ef9513 100644
--- a/Modules/Public/InventoryModules/Network_1/vNETPeering.ps1
+++ b/Modules/Public/InventoryModules/Network_1/vNETPeering.ps1
@@ -73,7 +73,7 @@ If ($Task -eq 'Processing') {
 Else {
     if ($SmaResources) {
 
-        $TableName = ('PeeringsTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('PeeringsTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -100,6 +100,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Network_2/ApplicationGateways.ps1 b/Modules/Public/InventoryModules/Network_2/ApplicationGateways.ps1
index 304cf35c..d075e755 100644
--- a/Modules/Public/InventoryModules/Network_2/ApplicationGateways.ps1
+++ b/Modules/Public/InventoryModules/Network_2/ApplicationGateways.ps1
@@ -105,7 +105,7 @@ Else {
 
         $SheetName = 'App Gateway'
 
-        $TableName = ('APPGWTb_'+($SmaResources.'Resource U').count)
+        $TableName = ('APPGWTb_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -150,6 +150,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Network_2/AzureFirewall.ps1 b/Modules/Public/InventoryModules/Network_2/AzureFirewall.ps1
index 82843e8b..8c84f184 100644
--- a/Modules/Public/InventoryModules/Network_2/AzureFirewall.ps1
+++ b/Modules/Public/InventoryModules/Network_2/AzureFirewall.ps1
@@ -199,7 +199,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('AzFirewallTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('AzFirewallTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
 
         $condtxt = @()
         #Retirement
@@ -241,6 +241,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Network_2/Frontdoor.ps1 b/Modules/Public/InventoryModules/Network_2/Frontdoor.ps1
index c55ccf82..041cf2f0 100644
--- a/Modules/Public/InventoryModules/Network_2/Frontdoor.ps1
+++ b/Modules/Public/InventoryModules/Network_2/Frontdoor.ps1
@@ -94,7 +94,7 @@ If ($Task -eq 'Processing') {
 Else {
     if ($SmaResources) {
 
-        $TableName = ('FRONTDOORTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('FRONTDOORTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -123,6 +123,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Network_2/NetworkInterface.ps1 b/Modules/Public/InventoryModules/Network_2/NetworkInterface.ps1
index 0e8ffb0f..12c780d8 100644
--- a/Modules/Public/InventoryModules/Network_2/NetworkInterface.ps1
+++ b/Modules/Public/InventoryModules/Network_2/NetworkInterface.ps1
@@ -137,7 +137,7 @@ If ($Task -eq 'Processing') {
 Else {
     if ($SmaResources) {
 
-        $TableName = ('NICTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('NICTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = @()
         $Style += New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
@@ -176,6 +176,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         $noNumberConversion = @()
         $noNumberConversion += 'DNS Servers'
diff --git a/Modules/Public/InventoryModules/Network_2/NetworkSecurityGroup.ps1 b/Modules/Public/InventoryModules/Network_2/NetworkSecurityGroup.ps1
index f6b13f5a..75160c9c 100644
--- a/Modules/Public/InventoryModules/Network_2/NetworkSecurityGroup.ps1
+++ b/Modules/Public/InventoryModules/Network_2/NetworkSecurityGroup.ps1
@@ -221,8 +221,8 @@ If ($Task -eq 'Processing') {
                         'Tag Name'                     = [string]$Tag.Name;
                         'Tag Value'                    = [string]$Tag.Value
                     }
-                    $obj
                     if ($ResUCount -eq 1) { $ResUCount = 0 }
+                    $obj
                 }
             }    
         }
@@ -231,7 +231,7 @@ If ($Task -eq 'Processing') {
 } Else {
     if ($SmaResources) {
 
-        $TableName = ('NSGTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('NSGTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = @()
         $Style += New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
         $Style += New-ExcelStyle -HorizontalAlignment Center -WrapText -NumberFormat 0 -Range "M:M" -Width 70
@@ -267,11 +267,11 @@ If ($Task -eq 'Processing') {
         $Exc.Add('Flow Logs Enabled')
         $Exc.Add('Flow Logs Retention Days')
         $Exc.Add('Flow Logs Storage Account')
-
         if ($InTag) {
             $Exc.Add('Tag Name')
             $Exc.Add('Tag Value')
         }
+        $Exc.Add('Resource U')
 
         $noNumberConversion = @()
         $noNumberConversion += 'Source'
diff --git a/Modules/Public/InventoryModules/Network_2/PrivateDNS.ps1 b/Modules/Public/InventoryModules/Network_2/PrivateDNS.ps1
index 1fe46963..7e11535c 100644
--- a/Modules/Public/InventoryModules/Network_2/PrivateDNS.ps1
+++ b/Modules/Public/InventoryModules/Network_2/PrivateDNS.ps1
@@ -94,7 +94,7 @@ If ($Task -eq 'Processing') {
 Else {
     if ($SmaResources) {
 
-        $TableName = ('PrivDNSTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('PrivDNSTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -118,6 +118,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Network_2/PrivateEndpoint.ps1 b/Modules/Public/InventoryModules/Network_2/PrivateEndpoint.ps1
index 0c8afa3d..e6c5e583 100644
--- a/Modules/Public/InventoryModules/Network_2/PrivateEndpoint.ps1
+++ b/Modules/Public/InventoryModules/Network_2/PrivateEndpoint.ps1
@@ -117,7 +117,7 @@ If ($Task -eq 'Processing') {
 Else {
     if ($SmaResources) {
 
-        $TableName = ('PvtEndpointTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('PvtEndpointTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = @()
         $Style += New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
@@ -145,6 +145,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
 
         [PSCustomObject]$SmaResources | 
diff --git a/Modules/Public/InventoryModules/Network_2/PublicIP.ps1 b/Modules/Public/InventoryModules/Network_2/PublicIP.ps1
index f0f321f7..2612cd3c 100644
--- a/Modules/Public/InventoryModules/Network_2/PublicIP.ps1
+++ b/Modules/Public/InventoryModules/Network_2/PublicIP.ps1
@@ -126,7 +126,7 @@ Else {
 
         $SheetName = 'Public IPs'
 
-        $TableName = ('PIPTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('PIPTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -154,6 +154,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         $noNumberConversion = @()
         $noNumberConversion += 'IP Address'
diff --git a/Modules/Public/InventoryModules/Network_2/VirtualNetworkGateways.ps1 b/Modules/Public/InventoryModules/Network_2/VirtualNetworkGateways.ps1
index 7715912e..70009d4c 100644
--- a/Modules/Public/InventoryModules/Network_2/VirtualNetworkGateways.ps1
+++ b/Modules/Public/InventoryModules/Network_2/VirtualNetworkGateways.ps1
@@ -95,7 +95,7 @@ If ($Task -eq 'Processing') {
 Else {
     if ($SmaResources) {
 
-        $TableName = ('VNETGTWTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('VNETGTWTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -140,6 +140,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Network_2/VirtualWAN.ps1 b/Modules/Public/InventoryModules/Network_2/VirtualWAN.ps1
index ba94cd5b..00790b73 100644
--- a/Modules/Public/InventoryModules/Network_2/VirtualWAN.ps1
+++ b/Modules/Public/InventoryModules/Network_2/VirtualWAN.ps1
@@ -144,7 +144,7 @@ If ($Task -eq 'Processing') {
 Else {
     if ($SmaResources) {
 
-        $TableName = ('VWANTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('VWANTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -178,6 +178,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Security/Vault.ps1 b/Modules/Public/InventoryModules/Security/Vault.ps1
index ba1fe5a8..bff9f9c1 100644
--- a/Modules/Public/InventoryModules/Security/Vault.ps1
+++ b/Modules/Public/InventoryModules/Security/Vault.ps1
@@ -123,7 +123,7 @@ Else
     if($SmaResources)
     {
 
-        $TableName = ('VaultTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('VaultTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -156,6 +156,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Storage/NetApp.ps1 b/Modules/Public/InventoryModules/Storage/NetApp.ps1
index 123c7fd2..74cdac5b 100644
--- a/Modules/Public/InventoryModules/Storage/NetApp.ps1
+++ b/Modules/Public/InventoryModules/Storage/NetApp.ps1
@@ -111,7 +111,7 @@ Else {
 
     if ($SmaResources) {
 
-        $TableName = ('NetAppATable_'+($SmaResources.'Resource U').count)
+        $TableName = ('NetAppATable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat 0
 
         $condtxt = @()
@@ -146,6 +146,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Storage/StorageAccounts.ps1 b/Modules/Public/InventoryModules/Storage/StorageAccounts.ps1
index 36e4c41a..cdfbffaf 100644
--- a/Modules/Public/InventoryModules/Storage/StorageAccounts.ps1
+++ b/Modules/Public/InventoryModules/Storage/StorageAccounts.ps1
@@ -199,7 +199,7 @@ Else {
 
         $SheetName = 'Storage Accounts'
 
-        $TableName = ('StorAccTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('StorAccTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = @(
         New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
         New-ExcelStyle -HorizontalAlignment Center -Width 80 -WrapText -NumberFormat '0' -Range "X:X"
@@ -261,6 +261,7 @@ Else {
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value')
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources |
         ForEach-Object { $_ } | Select-Object $Exc |
diff --git a/Modules/Public/InventoryModules/Web/APPServicePlan.ps1 b/Modules/Public/InventoryModules/Web/APPServicePlan.ps1
index 5f3e6f1a..df470aec 100644
--- a/Modules/Public/InventoryModules/Web/APPServicePlan.ps1
+++ b/Modules/Public/InventoryModules/Web/APPServicePlan.ps1
@@ -113,7 +113,7 @@ Else
 
     if($SmaResources)
     {
-        $TableName = ('AppSvcPlanTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('AppSvcPlanTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -149,6 +149,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value') 
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/InventoryModules/Web/APPServices.ps1 b/Modules/Public/InventoryModules/Web/APPServices.ps1
index c6dc5ce6..394bb5fb 100644
--- a/Modules/Public/InventoryModules/Web/APPServices.ps1
+++ b/Modules/Public/InventoryModules/Web/APPServices.ps1
@@ -130,7 +130,7 @@ Else
 
     if($SmaResources)
     {
-        $TableName = ('AppSvcsTable_'+($SmaResources.'Resource U').count)
+        $TableName = ('AppSvcsTable_'+(($SmaResources.'Resource U' | Measure-Object -Sum).Sum))
         $Style = New-ExcelStyle -HorizontalAlignment Center -AutoSize -NumberFormat '0'
 
         $condtxt = @()
@@ -180,6 +180,7 @@ Else
                 $Exc.Add('Tag Name')
                 $Exc.Add('Tag Value')
             }
+        $Exc.Add('Resource U')
 
         [PSCustomObject]$SmaResources | 
         ForEach-Object { $_ } | Select-Object $Exc | 
diff --git a/Modules/Public/PublicFunctions/Invoke-ARI.ps1 b/Modules/Public/PublicFunctions/Invoke-ARI.ps1
index 31f12d02..9da4dab5 100644
--- a/Modules/Public/PublicFunctions/Invoke-ARI.ps1
+++ b/Modules/Public/PublicFunctions/Invoke-ARI.ps1
@@ -316,7 +316,7 @@ Function Invoke-ARI {
 
     $ExtractionRuntime = [System.Diagnostics.Stopwatch]::StartNew()
 
-        $ExtractionData = Start-ARIExtractionOrchestration -ManagementGroup $ManagementGroup -Subscriptions $Subscriptions -SubscriptionID $SubscriptionID -ResourceGroup $ResourceGroup -SecurityCenter $SecurityCenter -SkipAdvisory $SkipAdvisory -SkipPolicy $SkipPolicy -IncludeTags $IncludeTags -TagKey $TagKey -TagValue $TagValue -SkipAPIs $SkipAPIs -SkipVMDetails $SkipVMDetails -IncludeCosts $IncludeCosts -Automation $Automation
+        $ExtractionData = Start-ARIExtractionOrchestration -ManagementGroup $ManagementGroup -Subscriptions $Subscriptions -SubscriptionID $SubscriptionID -ResourceGroup $ResourceGroup -SecurityCenter $SecurityCenter -SkipAdvisory $SkipAdvisory -SkipPolicy $SkipPolicy -IncludeTags $IncludeTags -TagKey $TagKey -TagValue $TagValue -SkipAPIs $SkipAPIs -SkipVMDetails $SkipVMDetails -IncludeCosts $IncludeCosts -Automation $Automation -AzureEnvironment $AzureEnvironment
 
     $ExtractionRuntime.Stop()
 
diff --git a/README.md b/README.md
index 5423cd9c..77b960ef 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ Azure Resource Inventory (ARI) is a comprehensive PowerShell module that generat
 
 ### Prerequisites
 
-- PowerShell 7.0+ (recommended) or PowerShell 5.1
+- PowerShell 7.0+ (required)
 - Azure Account with read access to resources you want to inventory
 - Administrator privileges during script execution (for module installation)
 
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
index fc632427..d5bc8d1e 100644
--- a/docs/getting-started/installation.md
+++ b/docs/getting-started/installation.md
@@ -7,8 +7,7 @@ Azure Resource Inventory (ARI) is a PowerShell module that can be installed dire
 Before installing ARI, ensure you have the following prerequisites:
 
 - **PowerShell Version**:
-  - PowerShell 7.0 or newer (recommended)
-  - PowerShell 5.1 (minimum requirement)
+  - PowerShell 7.0 or newer (Required)
 
 - **Azure Account**:
   - An Azure account with read access to the resources you want to inventory