diff --git a/bucket/old/7zip/16.04.json b/bucket/old/7zip/16.04.json
new file mode 100644
index 00000000..9494bbf6
--- /dev/null
+++ b/bucket/old/7zip/16.04.json
@@ -0,0 +1,29 @@
+{
+    "##": "TODO: Associations, context menu",
+    "version": "16.04",
+    "description": "File archiver with a high compression ratio",
+    "homepage": "https://www.7-zip.org",
+    "license": {
+        "identifier": "Freeware,LGPL-2.0-only,BSD-3-Clause",
+        "url": "https://www.7-zip.org/license.txt"
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://stor.shovel.ash258.com/7zip/7z1604-x64.zip",
+            "hash": "ded5d8351cc601c6407587aa9d53fc619bd796ed9adfe991ee561adbf29843ae",
+            "extract_dir": "7z1604-x64"
+        },
+        "32bit": {
+            "url": "https://stor.shovel.ash258.com/7zip/7z1604.zip",
+            "hash": "5535542f808f0fd86b7719f4836a226b86adbdb98b70f9e3add2a2f8553b7793",
+            "extract_dir": "7z1604"
+        }
+    },
+    "bin": "7z.exe",
+    "shortcuts": [
+        [
+            "7zFM.exe",
+            "7-Zip"
+        ]
+    ]
+}
diff --git a/bucket/old/7zip/19.00.json b/bucket/old/7zip/19.00.json
new file mode 100644
index 00000000..d9087897
--- /dev/null
+++ b/bucket/old/7zip/19.00.json
@@ -0,0 +1,29 @@
+{
+    "##": "TODO: Associations, context menu",
+    "version": "19.00",
+    "description": "File archiver with a high compression ratio",
+    "homepage": "https://www.7-zip.org",
+    "license": {
+        "identifier": "Freeware,LGPL-2.0-only,BSD-3-Clause",
+        "url": "https://www.7-zip.org/license.txt"
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://stor.shovel.ash258.com/7zip/7z1900-x64.zip",
+            "hash": "8f047e4a7762d7f8f51361de3ea8fa8d2c7ca22220b63c3914a488e1d15c022c",
+            "extract_dir": "7z1900-x64"
+        },
+        "32bit": {
+            "url": "https://stor.shovel.ash258.com/7zip/7z1900.zip",
+            "hash": "9979fb1a42586799fea562aeb719d78abeb5edb9053f9cda2756b26167cf86c7",
+            "extract_dir": "7z1900"
+        }
+    },
+    "bin": "7z.exe",
+    "shortcuts": [
+        [
+            "7zFM.exe",
+            "7-Zip"
+        ]
+    ]
+}
diff --git a/bucket/old/7zip/21.06.json b/bucket/old/7zip/21.06.json
new file mode 100644
index 00000000..74e3fe01
--- /dev/null
+++ b/bucket/old/7zip/21.06.json
@@ -0,0 +1,34 @@
+{
+    "##": "TODO: Associations, context menu",
+    "version": "21.06",
+    "description": "File archiver with a high compression ratio",
+    "homepage": "https://www.7-zip.org",
+    "license": {
+        "identifier": "Freeware,LGPL-2.0-only,BSD-3-Clause",
+        "url": "https://www.7-zip.org/license.txt"
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://stor.shovel.ash258.com/7zip/7z2106-x64.zip",
+            "hash": "bd3c29d43e3311393085623a17dc242391289cf2064ebadac70a27aae858a73d",
+            "extract_dir": "7z2106-x64"
+        },
+        "32bit": {
+            "url": "https://stor.shovel.ash258.com/7zip/7z2106.zip",
+            "hash": "ad7ac37f73ceb9b3dba689357a23bb536f639589d94c30f602200c1408c18db7",
+            "extract_dir": "7z2106"
+        },
+        "arm64": {
+            "url": "https://stor.shovel.ash258.com/7zip/7z2106-arm64.zip",
+            "hash": "77e3e97ff0cb672781f80596d599a7b0411165514b6e987e4677822e65868df4",
+            "extract_dir": "7z2106-arm64"
+        }
+    },
+    "bin": "7z.exe",
+    "shortcuts": [
+        [
+            "7zFM.exe",
+            "7-Zip"
+        ]
+    ]
+}
diff --git a/bucket/old/7zip/9.20.json b/bucket/old/7zip/9.20.json
new file mode 100644
index 00000000..7bad8746
--- /dev/null
+++ b/bucket/old/7zip/9.20.json
@@ -0,0 +1,28 @@
+{
+    "##": "TODO: Associations, context menu",
+    "version": "9.20",
+    "description": "File archiver with a high compression ratio",
+    "homepage": "https://www.7-zip.org",
+    "license": {
+        "identifier": "Freeware,LGPL-2.0-only,BSD-3-Clause",
+        "url": "https://www.7-zip.org/license.txt"
+    },
+    "architecture": {
+        "64bit": {
+            "url": "https://downloads.sourceforge.net/project/sevenzip/7-Zip/9.20/7z920-x64.msi",
+            "hash": "sha1:4173fea2af9a595fa0be1ef8251f412229687be1"
+        },
+        "32bit": {
+            "url": "https://downloads.sourceforge.net/project/sevenzip/7-Zip/9.20/7z920.msi",
+            "hash": "sha1:c67d3f611ea3eb3336cf92f6ffcafdb14f8b12af"
+        }
+    },
+    "extract_dir": "Files\\7-Zip",
+    "bin": "7z.exe",
+    "shortcuts": [
+        [
+            "7zFM.exe",
+            "7-Zip"
+        ]
+    ]
+}
diff --git a/cosi.ps1 b/cosi.ps1
index bd97d1c8..d44a75c3 100644
--- a/cosi.ps1
+++ b/cosi.ps1
@@ -1,3 +1,5 @@
+Join-Path $env:SCOOP_HOME 'supporting\yaml\bin\powershell-yaml.psd1' | Import-Module
+
 $urls = @()
 
 $implemented = Get-ChildItem './bucket/' -File | Select-Object -ExpandProperty 'BaseName'
@@ -11,8 +13,13 @@ $excludes = @(
 )
 
 # Get all URLS
-foreach ($f in Get-ChildItem '../Extras/bucket/', '../Main/bucket/', '../Ash258/bucket' -File | Where-Object -Property 'BaseName' -NotIn @($excludes + $implemented) ) {
-    $json = Get-Content $f.FullName -Raw | ConvertFrom-Json
+foreach ($f in Get-ChildItem '../Extras/bucket/', '../Main/bucket/', '../ash258.ash258/bucket' -File | Where-Object -Property 'BaseName' -NotIn @($excludes + $implemented) ) {
+    $json = Get-Content -Raw $f.FullName
+    if ($f.Extension -eq '.json') {
+        $json = $json | ConvertFrom-Json
+    } else {
+        $json = $json | ConvertFrom-Yaml
+    }
 
     if ($json.architecture.'arm64') { continue }