diff --git a/README.md b/README.md
index e50d652..39fb9fe 100644
--- a/README.md
+++ b/README.md
@@ -19,22 +19,26 @@ This project is still in development and more features will be added in the futu
 
 ## Instances
 
-| URL                                                               | Provided by                                     | Country       | Comments |
-| ----------------------------------------------------------------- | ----------------------------------------------- | ------------- | -------- |
-| [wikimore.private.coffee](https://wikimore.private.coffee/)       | [Private.coffee](https://private.coffee/)       | Austria 🇦🇹 🇪🇺 |          |
-| [wm.bloat.cat](https://wm.bloat.cat/)                             | [bloat.cat](https://bloat.cat/)                 | Germany 🇩🇪 🇪🇺 |          |
-| [wm2.bloat.cat](https://wm2.bloat.cat/)                           | [bloat.cat](https://bloat.cat/)                 | Germany 🇩🇪 🇪🇺 |          |
-| [wikimore.blitzw.in](https://wikimore.blitzw.in/)                 | [blitzw.in](https://blitzw.in/)                 | Denmark 🇩🇰 🇪🇺 |          |
-| [wikimore.lumaeris.com](https://wikimore.lumaeris.com/)           | [Lumaeris](https://lumaeris.com/)               | Germany 🇩🇪 🇪🇺 |          |
-| [wikimore.darkness.services](https://wikimore.darkness.services/) | [Darkness.services](https://darkness.services/) | USA 🇺🇸        |          |
-| [wp.dc09.ru](https://wp.dc09.ru)                                  | [dc09.ru](https://dc09.ru/)                     | Russia 🇷🇺     |          |
+<!-- START_INSTANCE_LIST type:eq=clearnet -->
+| URL                                                              | Provided by                                    | Country               | Notes         |
+| ---------------------------------------------------------------- | ---------------------------------------------- | --------------------- | ------------- |
+| [wikimore.private.coffee](https://wikimore.private.coffee) | [Private.coffee](https://private.coffee) | Austria 🇦🇹 🇪🇺 | Main instance |
+| [wm.bloat.cat](https://wm.bloat.cat) | [Bloat.cat](https://bloat.cat) | Germany 🇩🇪 🇪🇺 |  |
+| [wm2.bloat.cat](https://wm2.bloat.cat) | [Bloat.cat](https://bloat.cat) | Germany 🇩🇪 🇪🇺 |  |
+| [wikimore.blitzw.in](https://wikimore.blitzw.in) | [Blitzw.in](https://blitzw.in) | Denmark 🇩🇰 🇪🇺 |  |
+| [wikimore.lumaeris.com](https://wikimore.lumaeris.com) | [Lumaeris](https://lumaeris.com) | Germany 🇩🇪 🇪🇺 |  |
+| [wikimore.darkness.services](https://wikimore.darkness.services) | [Darkness.services](https://darkness.services) | United States 🇺🇸 |  |
+| [wp.dc09.ru](https://wp.dc09.ru) | [dc09.ru](https://dc09.ru) | Russian Federation 🇷🇺 |  |
+<!-- END_INSTANCE_LIST -->
 
 ### Tor Hidden Services
 
-| URL                                                                                                                                                        | Provided by                                     | Country       | Comments |
-| ---------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------- | ------------- | -------- |
-| [wikimore.coffee2m3bjsrrqqycx6ghkxrnejl2q6nl7pjw2j4clchjj6uk5zozad.onion](http://wikimore.coffee2m3bjsrrqqycx6ghkxrnejl2q6nl7pjw2j4clchjj6uk5zozad.onion/) | [Private.coffee](https://private.coffee/)       | Austria 🇦🇹 🇪🇺 |          |
-| [wikimore.darknessrdor43qkl2ngwitj72zdavfz2cead4t5ed72bybgauww5lyd.onion](http://wikimore.darknessrdor43qkl2ngwitj72zdavfz2cead4t5ed72bybgauww5lyd.onion/) | [Darkness.services](https://darkness.services/) | USA 🇺🇸        |          |
+<!-- START_INSTANCE_LIST type:eq=onion -->
+| URL                                                                                                                                                       | Provided by                                    | Country          | Notes |
+| --------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------- | ---------------- |  |
+| [wikimore.coffee2m3bjsrrqqycx6ghkxrnejl2q6nl7pjw2j4clchjj6uk5zozad.onion](http://wikimore.coffee2m3bjsrrqqycx6ghkxrnejl2q6nl7pjw2j4clchjj6uk5zozad.onion) | [Private.coffee](https://private.coffee) | Austria 🇦🇹 🇪🇺 |  |
+| [wikimore.darknessrdor43qkl2ngwitj72zdavfz2cead4t5ed72bybgauww5lyd.onion](http://wikimore.darknessrdor43qkl2ngwitj72zdavfz2cead4t5ed72bybgauww5lyd.onion) | [Darkness.services](https://darkness.services) | United States 🇺🇸 |  |
+<!-- END_INSTANCE_LIST -->
 
 ### Adding Your Instance
 
diff --git a/instances.json b/instances.json
new file mode 100644
index 0000000..50e59e6
--- /dev/null
+++ b/instances.json
@@ -0,0 +1,93 @@
+[
+    {
+        "name": "wikimore.private.coffee",
+        "url": "https://wikimore.private.coffee",
+        "type": "clearnet",
+        "provider": {
+            "name": "Private.coffee",
+            "url": "https://private.coffee"
+        },
+        "location": "AT",
+        "notes": "Main instance"
+    },
+    {
+        "name": "wikimore.coffee2m3bjsrrqqycx6ghkxrnejl2q6nl7pjw2j4clchjj6uk5zozad.onion",
+        "url": "http://wikimore.coffee2m3bjsrrqqycx6ghkxrnejl2q6nl7pjw2j4clchjj6uk5zozad.onion",
+        "type": "onion",
+        "provider": {
+            "name": "Private.coffee",
+            "url": "https://private.coffee"
+        },
+        "location": "AT"
+    },
+    {
+        "name": "wm.bloat.cat",
+        "url": "https://wm.bloat.cat",
+        "type": "clearnet",
+        "provider": {
+            "name": "Bloat.cat",
+            "url": "https://bloat.cat"
+        },
+        "location": "DE"
+    },
+    {
+        "name": "wm2.bloat.cat",
+        "url": "https://wm2.bloat.cat",
+        "type": "clearnet",
+        "provider": {
+            "name": "Bloat.cat",
+            "url": "https://bloat.cat"
+        },
+        "location": "DE"
+    },
+    {
+        "name": "wikimore.blitzw.in",
+        "url": "https://wikimore.blitzw.in",
+        "type": "clearnet",
+        "provider": {
+            "name": "Blitzw.in",
+            "url": "https://blitzw.in"
+        },
+        "location": "DK"
+    },
+    {
+        "name": "wikimore.lumaeris.com",
+        "url": "https://wikimore.lumaeris.com",
+        "type": "clearnet",
+        "provider": {
+            "name": "Lumaeris",
+            "url": "https://lumaeris.com"
+        },
+        "location": "DE"
+    },
+    {
+        "name": "wikimore.darkness.services",
+        "url": "https://wikimore.darkness.services",
+        "type": "clearnet",
+        "provider": {
+            "name": "Darkness.services",
+            "url": "https://darkness.services"
+        },
+        "location": "US"
+    },
+    {
+        "name": "wikimore.darknessrdor43qkl2ngwitj72zdavfz2cead4t5ed72bybgauww5lyd.onion",
+        "url": "http://wikimore.darknessrdor43qkl2ngwitj72zdavfz2cead4t5ed72bybgauww5lyd.onion",
+        "type": "onion",
+        "provider": {
+            "name": "Darkness.services",
+            "url": "https://darkness.services"
+        },
+        "location": "US"
+    },
+    {
+        "name": "wp.dc09.ru",
+        "url": "https://wp.dc09.ru",
+        "type": "clearnet",
+        "provider": {
+            "name": "dc09.ru",
+            "url": "https://dc09.ru"
+        },
+        "location": "RU"
+    }
+]
\ No newline at end of file