diff --git a/keys.json b/keys.json
index ef0fd5e..b25a613 100644
--- a/keys.json
+++ b/keys.json
@@ -1,22 +1,62 @@
 {
   "Products": {
-    "Windows CE Platform Builder 3": ["00", "01", "0E", "0D", "0F"],
-    "Windows CE .Net Platform Builder 4": ["00", "01"],
-    "Windows 98": ["02","03"],
-    "Office 2000": ["04","05"],
-    "Windows Embedded POSReady 2009": ["0D", "0D"],
-    "Windows CE .Net Platform Builder 5": ["0D", "0D"],
-    "Windows 2000": ["12","13"],
-    "Windows ME": ["1C","1D"],
-    "Visual Studio .Net / .Net 2003": ["24", "25"],
-    "Windows XP Home": ["2A", "2B"],
-    "Windows XP Pro": ["2C","2D"],
-    "Windows XP Pro VLK": ["2E","2F"],
-    "Windows XP Starter Edition": ["32", "33"],
-    "Halo: Combat Evolved": ["50","51"],
-    "Visual Studio 2005": ["52", "53"],
-    "Windows XP Pro 64 Bit Edition VLK": ["64","65"],
-    "Windows XP Pro 64 Bit Edition": ["66","67"]
+    "Windows CE Platform Builder 3": {
+      "BINK": ["00", "01", "0E", "0D", "0F"]
+    },
+    "Windows CE .Net Platform Builder 4": {
+      "BINK": ["00", "01"]
+    },
+    "Windows 98 (all)": {
+      "BINK": ["02","03"]
+    },
+    "Office 2000": {
+      "BINK": ["04","05"]
+    },
+    "Windows 2000 Server (all)": {
+      "BINK": ["0A", "13"]
+    },
+    "Windows Embedded POSReady 2009": {
+      "BINK": ["0D", "0D"]
+    },
+    "Windows CE .Net Platform Builder 5": {
+      "BINK": ["0D", "0D"]
+    },
+    "Windows 2000 Professional": {
+      "BINK": ["12","13"]
+    },
+    "Windows ME": {
+      "BINK": ["1C","1D"]
+    },
+    "Visual Studio .Net / .Net 2003": {
+      "BINK": ["24", "25"]
+    },
+    "Windows XP Home": {
+      "BINK": ["2A", "2B"]
+    },
+    "Windows XP Pro": {
+      "BINK": ["2C","2D"]
+    },
+    "Windows XP Pro VLK": {
+      "BINK": ["2E","2F"]
+    },
+    "Windows XP Starter Edition": {
+      "BINK": ["32", "33"]
+    },
+    "Halo: Combat Evolved": {
+      "BINK": ["50","51"]
+    },
+    "Visual Studio 2005": {
+      "BINK": ["52", "53"]
+    },
+    "Windows Server 2003": {
+      "BINK": ["5A"]
+    },
+    "Windows XP Pro 64 Bit Edition VLK": {
+      "BINK": ["64","65"]
+    },
+    "Windows XP Pro 64 Bit Edition": {
+      "BINK": ["66","67"]
+    }
   },
   "BINK": {
     "00": {
@@ -484,6 +524,36 @@
         "y": "11135232968162438329449039042851302679976903318047276891184960732245822185866013956710495287987401311857788873227422869430044705095334454666338599981024663"
       }
     },
+    "54": {
+      "a": "1",
+      "b": "0",
+      "g": {
+        "x": "8059057663701168311917532277618827622978515614146963913097592614451721430413021070395782723330339842826599481063797559797462512297834269467666807971588275",
+        "y": "12239303830174753191779705979220378623394732267536997115625979632402312087683644927405756146495100825573682155171145924668759419114616275413724686284123408"
+      },
+      "n": "5622613991231344109",
+      "p": "12509642519697332596114311053544618620747009389814652225369521188710171926174976419995384745134703589248167610052719613586668754176591418831031596093374569",
+      "priv": "1285511085175426271",
+      "pub": {
+        "x": "4895832170509729140211911021638266775170167022247175324972987673313207244495397975379010973250279668424167408883454560376269866102669741515127286188717976",
+        "y": "5846013328426281815512452704859777850382010968846722453046994319336479079120767834777937190955827245502389471872759584209649693396095099112777776298051208"
+      }
+    },
+    "5A": {
+      "a": "1",
+      "b": "0",
+      "g": {
+        "x": "7001153264502603531568809091006890066238093206490706740054133060198019760090859987689015805782317128823647585142349315457499198272662472818714043462452903",
+        "y": "5379780378477219053711555876878459214243674711784518156355184015695786277532464885846858297098947964642836892714492422913471742703229817151186461774623684"
+      },
+      "n": "5532044755580494717",
+      "priv": "2739897280441110808",
+      "p": "10562920556476600174223203553624763158759224241690200395609486946570543757980521851146458516500451409335864053457189473296570712977858859585999979839497081",
+      "pub": {
+        "x": "7581054250900465100241221249174490036171686256743764922844514529943814922537182958165791392786846977936233032863941877071806567396668766127251287523822606",
+        "y": "5631831699091940711241625425017356833183657380411816572111689187965538416134562629982530928101557014697032032310481274355673900378431834102530761513288622"
+      }
+    },
     "64": {
       "a": "1",
       "b": "0",
@@ -544,21 +614,6 @@
         "y": "1531615552769437372403026851115800774961251901795490190286680044124146107960174759313522242631208697837075037127449543341158979848323485793132900943144563"
       }
     },
-    "windows-server-2003": {
-      "a": "1",
-      "b": "0",
-      "g": {
-        "x": "7001153264502603531568809091006890066238093206490706740054133060198019760090859987689015805782317128823647585142349315457499198272662472818714043462452903",
-        "y": "5379780378477219053711555876878459214243674711784518156355184015695786277532464885846858297098947964642836892714492422913471742703229817151186461774623684"
-      },
-      "n": "5532044755580494717",
-      "priv": "2739897280441110808",
-      "p": "10562920556476600174223203553624763158759224241690200395609486946570543757980521851146458516500451409335864053457189473296570712977858859585999979839497081",
-      "pub": {
-        "x": "7581054250900465100241221249174490036171686256743764922844514529943814922537182958165791392786846977936233032863941877071806567396668766127251287523822606",
-        "y": "5631831699091940711241625425017356833183657380411816572111689187965538416134562629982530928101557014697032032310481274355673900378431834102530761513288622"
-      }
-    },
     "office-xp": {
       "a": "1",
       "b": "0",
diff --git a/src/main.cpp b/src/main.cpp
index 88b052a..6e75e99 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -34,11 +34,11 @@ int main(int argc, char *argv[]) {
     if (options.list) {
         for (auto el : keys["Products"].items()) {
             int id;
-            sscanf((el.value()[0]).get<std::string>().c_str(), "%x", &id);
+            sscanf((el.value()["BINK"][0]).get<std::string>().c_str(), "%x", &id);
             if (id >= 0x50) {
                 continue;
             }
-            std::cout << el.key() << ": " << el.value() << std::endl;
+            std::cout << el.key() << ": " << el.value()["BINK"] << std::endl;
         }
 
         std::cout << std::endl << std::endl