diff --git a/src/formats/GitHubContext.Format.ps1xml b/src/formats/GitHubContext.Format.ps1xml
index 638e3d673..5897f2b75 100644
--- a/src/formats/GitHubContext.Format.ps1xml
+++ b/src/formats/GitHubContext.Format.ps1xml
@@ -53,6 +53,9 @@
                 <ListEntries>
                     <ListEntry>
                         <ListItems>
+                            <ListItem>
+                                <PropertyName>Name</PropertyName>
+                            </ListItem>
                             <ListItem>
                                 <PropertyName>HostName</PropertyName>
                             </ListItem>
@@ -95,9 +98,6 @@
                             <ListItem>
                                 <PropertyName>DatabaseID</PropertyName>
                             </ListItem>
-                            <ListItem>
-                                <PropertyName>ID</PropertyName>
-                            </ListItem>
                             <ListItem>
                                 <PropertyName>Owner</PropertyName>
                             </ListItem>
diff --git a/src/functions/private/Commands/ConvertFrom-GitHubOutput.ps1 b/src/functions/private/Commands/ConvertFrom-GitHubOutput.ps1
index 3e74ee36c..c89a6cc91 100644
--- a/src/functions/private/Commands/ConvertFrom-GitHubOutput.ps1
+++ b/src/functions/private/Commands/ConvertFrom-GitHubOutput.ps1
@@ -20,7 +20,7 @@
         Numbers=12345
         '@
 
-        $content | ConvertFrom-GitHubOutput
+        ConvertFrom-GitHubOutput -OutputContent $content
 
         zen      : something else
         result   : @{MyOutput=Hello, World!; Status=Success}
@@ -38,12 +38,9 @@
     [CmdletBinding()]
     param(
         # The input data to convert
-        [Parameter(
-            Mandatory,
-            ValueFromPipeline
-        )]
-        [AllowNull()]
-        [string[]] $InputData,
+        [Parameter(Mandatory)]
+        [AllowEmptyString()]
+        [string] $OutputContent,
 
         # Whether to convert the input data to a hashtable
         [switch] $AsHashtable
@@ -52,37 +49,34 @@
     begin {
         $stackPath = Get-PSCallStackPath
         Write-Debug "[$stackPath] - Start"
-        $lines = @()
     }
 
     process {
         Write-Debug "[$stackPath] - Process - Start"
-        if (-not $InputData) {
-            $InputData = ''
+        $lines = $OutputContent -split [System.Environment]::NewLine
+        Write-Debug "[$stackPath] - Output lines: $($lines.Count)"
+        if ($lines.count -eq 0) {
+            return @{}
         }
-        foreach ($line in $InputData) {
-            Write-Debug "Line: $line"
-            $lines += $line -split "`n"
-        }
-        Write-Debug "[$stackPath] - End - Start"
-        # Initialize variables
+
         $result = @{}
         $i = 0
-
-        Write-Debug "Lines: $($lines.Count)"
-        $lines | ForEach-Object { Write-Debug "[$_]" }
-
+        $pad = $lines.count.ToString().Length
         while ($i -lt $lines.Count) {
+            $lineNumber = ($i + 1).ToString().PadLeft($pad)
             $line = $lines[$i].Trim()
-            Write-Debug "[$line]"
+            Write-Debug "[$lineNumber]: [$line]"
 
-            # Check for key=value pattern
+            # Check for key=value pattern (single-line)
             if ($line -match '^([^=]+)=(.*)$') {
-                Write-Debug ' - key=value pattern'
+                Write-Debug ' - Single-line pattern'
                 $key = $Matches[1].Trim()
                 $value = $Matches[2]
 
-                if ([string]::IsNullOrWhiteSpace($value) -or [string]::IsNullOrEmpty($value)) {
+                Write-Debug " - Single-line pattern - [$key] = [$value]"
+                # Check for empty value
+                if ([string]::IsNullOrWhiteSpace($value) -or [string]::IsNullOrEmpty($value) -or $value.Length -eq 0) {
+                    Write-Debug ' - Single-line pattern - Empty value'
                     $result[$key] = ''
                     $i++
                     continue
@@ -90,7 +84,7 @@
 
                 # Attempt to parse JSON
                 if (Test-Json $value -ErrorAction SilentlyContinue) {
-                    Write-Debug "[$key] - value is JSON"
+                    Write-Debug " - Single-line pattern - value is JSON"
                     $value = ConvertFrom-Json $value -AsHashtable:$AsHashtable
                 }
 
@@ -99,38 +93,42 @@
                 continue
             }
 
-            # Check for key<<EOF pattern
+            # Check for key<<EOF pattern (multi-line)
             if ($line -match '^([^<]+)<<(\S+)$') {
-                Write-Debug ' - key<<EOF pattern'
+                Write-Debug ' - Multi-line pattern'
                 $key = $Matches[1].Trim()
+                Write-Debug " - Multi-line pattern' - [$key]"
                 $eof_marker = $Matches[2]
-                Write-Debug " - key<<EOF pattern - [$eof_marker] - Start"
+                Write-Debug " - Multi-line pattern' - [$key] - [$eof_marker] - Start"
                 $i++
                 $value_lines = @()
 
                 # Read lines until the EOF marker
                 while ($i -lt $lines.Count -and $lines[$i] -ne $eof_marker) {
                     $valueItem = $lines[$i].Trim()
-                    Write-Debug "   [$valueItem]"
+                    Write-Debug " [$key] <- [$valueItem]"
                     $value_lines += $valueItem
                     $i++
                 }
 
                 # Skip the EOF marker
                 if ($i -lt $lines.Count -and $lines[$i] -eq $eof_marker) {
-                    Write-Debug " - key<<EOF pattern - [$eof_marker] - End"
+                    Write-Debug " - Multi-line pattern' - [$key] - [$eof_marker] - End"
                     $i++
                 }
 
-                $value = $value_lines -join "`n"
+                $value = $value_lines -join [System.Environment]::NewLine
 
-                if ([string]::IsNullOrWhiteSpace($value) -or [string]::IsNullOrEmpty($value)) {
+                # Check for empty value
+                if ([string]::IsNullOrWhiteSpace($value) -or [string]::IsNullOrEmpty($value) -or $value.Length -eq 0) {
+                    Write-Debug " - key<<EOF pattern - [$key] - Empty value"
                     $result[$key] = ''
                     continue
                 }
 
+                # Attempt to parse JSON
                 if (Test-Json $value -ErrorAction SilentlyContinue) {
-                    Write-Debug ' - key<<EOF pattern - value is JSON'
+                    Write-Debug " - key<<EOF pattern - [$key] - value is JSON"
                     $value = ConvertFrom-Json $value -AsHashtable:$AsHashtable
                 }
 
@@ -139,7 +137,7 @@
             }
 
             # Unexpected line type
-            Write-Debug ' - Skipping empty line'
+            Write-Debug ' - No pattern match - Skipping line'
             $i++
             continue
         }
@@ -147,6 +145,7 @@
     }
 
     end {
+        Write-Debug "[$stackPath] - End - Start"
         if ($AsHashtable) {
             $result
         } else {
diff --git a/src/functions/public/Commands/Get-GitHubOutput.ps1 b/src/functions/public/Commands/Get-GitHubOutput.ps1
index 28d3cf772..166423781 100644
--- a/src/functions/public/Commands/Get-GitHubOutput.ps1
+++ b/src/functions/public/Commands/Get-GitHubOutput.ps1
@@ -56,23 +56,8 @@
                 throw "File not found: $Path"
             }
 
-            $outputContent = Get-Content -Path $Path
-            Write-Debug "[$stackPath] - Output lines: $($outputContent.Count)"
-            if ($outputContent.count -eq 0) {
-                return @{}
-            }
-
-            $content = @()
-            foreach ($line in $outputContent) {
-                if ([string]::IsNullOrWhiteSpace($line) -or [string]::IsNullOrEmpty($line)) {
-                    $content += ''
-                    continue
-                }
-                $content += $line
-            }
-            Write-Debug "[$stackPath] - Output content"
-            Write-Debug ($content | Out-String)
-            $content | ConvertFrom-GitHubOutput -AsHashtable:$AsHashtable
+            $outputContent = Get-Content -Path $Path -Raw
+            ConvertFrom-GitHubOutput -OutputContent $outputContent -AsHashtable:$AsHashtable
         } catch {
             throw $_
         }
diff --git a/src/functions/public/Commands/Set-GitHubLogGroup.ps1 b/src/functions/public/Commands/Set-GitHubLogGroup.ps1
index 4e1c48653..5ac4e0845 100644
--- a/src/functions/public/Commands/Set-GitHubLogGroup.ps1
+++ b/src/functions/public/Commands/Set-GitHubLogGroup.ps1
@@ -29,6 +29,10 @@
         'PSUseShouldProcessForStateChangingFunctions', '', Scope = 'Function',
         Justification = 'Does not change state'
     )]
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute(
+        'PSAvoidUsingWriteHost', '', Scope = 'Function',
+        Justification = 'Intended for logging in Github Runners which does support Write-Host'
+    )]
     [CmdletBinding()]
     param(
         # The name of the log group
@@ -40,22 +44,12 @@
         [scriptblock] $ScriptBlock
     )
 
-    begin {
-        $stackPath = Get-PSCallStackPath
-        Write-Debug "[$stackPath] - Start"
-    }
-
-    process {
-        Start-GitHubLogGroup -Name $Name
-        try {
-            . $ScriptBlock
-        } catch {
-            throw $_
-        }
-        Stop-GitHubLogGroup
+    Write-Host "::group::$Name"
+    try {
+        . $ScriptBlock
+    } catch {
+        throw $_
     }
+    Write-Host '::endgroup::'
 
-    end {
-        Write-Debug "[$stackPath] - End"
-    }
 }
diff --git a/src/functions/public/Commands/Start-GitHubLogGroup.ps1 b/src/functions/public/Commands/Start-GitHubLogGroup.ps1
index 00f4f00a8..5ff0d15a4 100644
--- a/src/functions/public/Commands/Start-GitHubLogGroup.ps1
+++ b/src/functions/public/Commands/Start-GitHubLogGroup.ps1
@@ -27,20 +27,6 @@
         [string] $Name
     )
 
-    begin {
-        $stackPath = Get-PSCallStackPath
-        Write-Debug "[$stackPath] - Start"
-    }
+    Write-Host "::group::$Name"
 
-    process {
-        try {
-            Write-Host "::group::$Name"
-        } catch {
-            throw $_
-        }
-    }
-
-    end {
-        Write-Debug "[$stackPath] - End"
-    }
 }
diff --git a/src/functions/public/Commands/Stop-GitHubLogGroup.ps1 b/src/functions/public/Commands/Stop-GitHubLogGroup.ps1
index 2d5b8220c..ad04e838f 100644
--- a/src/functions/public/Commands/Stop-GitHubLogGroup.ps1
+++ b/src/functions/public/Commands/Stop-GitHubLogGroup.ps1
@@ -23,20 +23,6 @@
     [Alias('Stop-LogGroup')]
     param()
 
-    begin {
-        $stackPath = Get-PSCallStackPath
-        Write-Debug "[$stackPath] - Start"
-    }
+    Write-Host '::endgroup::'
 
-    process {
-        try {
-            Write-Host '::endgroup::'
-        } catch {
-            throw $_
-        }
-    }
-
-    end {
-        Write-Debug "[$stackPath] - End"
-    }
 }