diff --git a/genius/genius.cpp b/genius/genius.cpp
index 81907fdd..11983347 100644
--- a/genius/genius.cpp
+++ b/genius/genius.cpp
@@ -63,7 +63,6 @@ ListWindow::ListWindow() {
   reloadList();
   updateWindow();
   setCentered();
-  setVisible();
 }
 
 auto ListWindow::quit() -> void {
@@ -127,12 +126,12 @@ auto ListWindow::loadDatabase(string location) -> void {
       if(object.name() == "memory") {
         component.type = Component::Type::Memory;
         component.memory.type = object["type"].text();
-        component.memory.battery = (bool)object["type/battery"];
         component.memory.size = object["size"].text();
         component.memory.content = object["content"].text();
         component.memory.manufacturer = object["manufacturer"].text();
         component.memory.architecture = object["architecture"].text();
         component.memory.identifier = object["identifier"].text();
+        component.memory.Volatile = (bool)object["volatile"];
       }
       if(object.name() == "oscillator") {
         component.type = Component::Type::Oscillator;
@@ -184,8 +183,6 @@ auto ListWindow::saveDatabase(string location) -> void {
       if(component.type == Component::Type::Memory) {
         fp.print("    memory\n");
         fp.print("      type: ", component.memory.type, "\n");
-      if(component.memory.battery)
-        fp.print("        battery\n");
         fp.print("      size: ", component.memory.size, "\n");
         fp.print("      content: ", component.memory.content, "\n");
       if(component.memory.manufacturer)
@@ -194,6 +191,8 @@ auto ListWindow::saveDatabase(string location) -> void {
         fp.print("      architecture: ", component.memory.architecture, "\n");
       if(component.memory.identifier)
         fp.print("      identifier: ", component.memory.identifier, "\n");
+      if(component.memory.Volatile)
+        fp.print("      volatile\n");
       }
 
       if(component.type == Component::Type::Oscillator) {
@@ -367,7 +366,7 @@ auto GameWindow::reloadList() -> void {
     string index = {"[", counter++, "] "};
     if(component.type == Component::Type::Memory) {
       item.setText({index, "Memory"});
-      item.append(TreeViewItem().setText({"Type: ", component.memory.type, component.memory.battery ? " + Battery" : ""}));
+      item.append(TreeViewItem().setText({"Type: ", component.memory.type}));
       item.append(TreeViewItem().setText({"Size: ", component.memory.size}));
       item.append(TreeViewItem().setText({"Content: ", component.memory.content}));
     if(component.memory.manufacturer)
@@ -376,6 +375,8 @@ auto GameWindow::reloadList() -> void {
       item.append(TreeViewItem().setText({"Architecture: ", component.memory.architecture}));
     if(component.memory.identifier)
       item.append(TreeViewItem().setText({"Identifier: ", component.memory.identifier}));
+    if(component.memory.Volatile)
+      item.append(TreeViewItem().setText({"Volatile"}));
     }
 
     if(component.type == Component::Type::Oscillator) {
@@ -473,7 +474,7 @@ MemoryWindow::MemoryWindow() {
   architectureEdit.onChange([&] { modified = true, updateWindow(); });
   identifierLabel.setText("Identifier:").setAlignment(1.0);
   identifierEdit.onChange([&] { modified = true, updateWindow(); });
-  batteryOption.setText("Battery").onToggle([&] { modified = true, updateWindow(); });
+  volatileOption.setText("Volatile").onToggle([&] { modified = true, updateWindow(); });
   acceptButton.setText("Accept").onActivate([&] { accept(); });
   cancelButton.setText("Cancel").onActivate([&] { cancel(); });
 
@@ -494,7 +495,7 @@ auto MemoryWindow::show(Memory memory) -> void {
   manufacturerEdit.setText(memory.manufacturer);
   architectureEdit.setText(memory.architecture);
   identifierEdit.setText(memory.identifier);
-  batteryOption.setChecked(memory.battery);
+  volatileOption.setChecked(memory.Volatile);
 
   updateWindow();
   setCentered(*gameWindow);
@@ -510,7 +511,7 @@ auto MemoryWindow::accept() -> void {
   memory.manufacturer = manufacturerEdit.text().strip();
   memory.architecture = architectureEdit.text().strip();
   memory.identifier = identifierEdit.text().strip();
-  memory.battery = batteryOption.checked() && (memory.type == "RAM" || memory.type == "RTC");
+  memory.Volatile = volatileOption.checked() && (memory.type == "RAM" || memory.type == "RTC");
 
   Component component{Component::Type::Memory};
   component.memory = memory;
@@ -543,7 +544,7 @@ auto MemoryWindow::updateWindow() -> void {
   manufacturerEdit.setBackgroundColor(manufacturerEdit.text().strip() ? Color{} : (Color{255, 255, 240}));
   architectureEdit.setBackgroundColor(architectureEdit.text().strip() ? Color{} : (Color{255, 255, 240}));
   identifierEdit.setBackgroundColor(identifierEdit.text().strip() ? Color{} : (Color{255, 255, 240}));
-  batteryOption.setEnabled(typeEdit.text().strip() == "RAM" || typeEdit.text().strip() == "RTC");
+  volatileOption.setEnabled(typeEdit.text().strip() == "RAM" || typeEdit.text().strip() == "RTC");
   acceptButton.setEnabled(valid);
   setTitle({modified ? "*" : "", create ? "Add New Memory" : "Modify Memory Details"});
 }
@@ -615,11 +616,25 @@ auto OscillatorWindow::updateWindow() -> void {
 //
 
 #include <nall/main.hpp>
-auto nall::main(string_vector) -> void {
+auto nall::main(string_vector args) -> void {
   Application::setName("genius");
   new ListWindow;
   new GameWindow;
   new MemoryWindow;
   new OscillatorWindow;
+
+  //internal command used to synchronize all genius databases from an old format to a new format
+  //if enabled, use with extreme caution and make backups first
+/*if(args.size() == 3 && args[1] == "--sync") {
+    for(auto& filename : directory::contents(args[2], "*.bml")) {
+      if(filename.beginsWith("Boards")) continue;
+      print(filename, "\n");
+      listWindow->loadDatabase({args[2], filename});
+      listWindow->saveDatabase({args[2], filename});
+    }
+    return print("[Done]\n");
+  }*/
+
+  listWindow->setVisible();
   Application::run();
 }
diff --git a/genius/genius.hpp b/genius/genius.hpp
index 8e8d76b2..43ec1b46 100644
--- a/genius/genius.hpp
+++ b/genius/genius.hpp
@@ -1,11 +1,11 @@
 struct Memory {
   string type;
-  boolean battery;
   string size;
   string content;
   string manufacturer;
   string architecture;
   string identifier;
+  boolean Volatile;
 };
 
 struct Oscillator {
@@ -150,7 +150,7 @@ private:
       LineEdit identifierEdit{&identifierLayout, Size{~0, 0}};
     HorizontalLayout controlLayout{&layout, Size{~0, 0}};
       Widget controlSpacer{&controlLayout, Size{~0, 0}};
-      CheckLabel batteryOption{&controlLayout, Size{0, 0}};
+      CheckLabel volatileOption{&controlLayout, Size{0, 0}};
       Button acceptButton{&controlLayout, Size{80, 0}};
       Button cancelButton{&controlLayout, Size{80, 0}};
 };
diff --git a/higan/emulator/emulator.hpp b/higan/emulator/emulator.hpp
index 66432af1..9e8fdbee 100644
--- a/higan/emulator/emulator.hpp
+++ b/higan/emulator/emulator.hpp
@@ -12,7 +12,7 @@ using namespace nall;
 
 namespace Emulator {
   static const string Name    = "higan";
-  static const string Version = "106.13";
+  static const string Version = "106.14";
   static const string Author  = "byuu";
   static const string License = "GPLv3";
   static const string Website = "https://byuu.org/";
diff --git a/higan/emulator/game.hpp b/higan/emulator/game.hpp
index bb2cb777..15d16d89 100644
--- a/higan/emulator/game.hpp
+++ b/higan/emulator/game.hpp
@@ -11,19 +11,23 @@ struct Game {
   inline auto oscillator(natural = 0) -> maybe<Oscillator>;
 
   struct Memory {
+    Memory() = default;
+    inline Memory(Markup::Node);
     explicit operator bool() const { return type; }
     inline auto name() const -> string;
 
     string type;
-    boolean battery;
     natural size;
     string content;
     string manufacturer;
     string architecture;
     string identifier;
+    boolean nonVolatile;
   };
 
   struct Oscillator {
+    Oscillator() = default;
+    inline Oscillator(Markup::Node);
     explicit operator bool() const { return frequency; }
 
     natural frequency;
@@ -51,21 +55,11 @@ auto Game::load(string_view text) -> void {
   board = document["game/board"].text();
 
   for(auto node : document.find("game/board/memory")) {
-    Memory memory;
-    memory.type = node["type"].text();
-    memory.battery = (bool)node["type/battery"];
-    memory.size = node["size"].natural();
-    memory.content = node["content"].text();
-    memory.manufacturer = node["manufacturer"].text();
-    memory.architecture = node["architecture"].text();
-    memory.identifier = node["identifier"].text();
-    memoryList.append(memory);
+    memoryList.append(Memory{node});
   }
 
   for(auto node : document.find("game/board/oscillator")) {
-    Oscillator oscillator;
-    oscillator.frequency = node["frequency"].natural();
-    oscillatorList.append(oscillator);
+    oscillatorList.append(Oscillator{node});
   }
 }
 
@@ -94,9 +88,23 @@ auto Game::oscillator(natural index) -> maybe<Oscillator> {
   return nothing;
 }
 
+Game::Memory::Memory(Markup::Node node) {
+  type = node["type"].text();
+  size = node["size"].natural();
+  content = node["content"].text();
+  manufacturer = node["manufacturer"].text();
+  architecture = node["architecture"].text();
+  identifier = node["identifier"].text();
+  nonVolatile = !(bool)node["volatile"];
+}
+
 auto Game::Memory::name() const -> string {
-  if(manufacturer) return string{manufacturer, ".", content, ".", type}.downcase();
+  if(architecture) return string{architecture, ".", content, ".", type}.downcase();
   return string{content, ".", type}.downcase();
 }
 
+Game::Oscillator::Oscillator(Markup::Node node) {
+  frequency = node["frequency"].natural();
+}
+
 }
diff --git a/higan/fc/cartridge/board/board.cpp b/higan/fc/cartridge/board/board.cpp
index 32d09292..9c1a0a23 100644
--- a/higan/fc/cartridge/board/board.cpp
+++ b/higan/fc/cartridge/board/board.cpp
@@ -21,63 +21,57 @@
 
 Board::Board(Markup::Node& document) {
   cartridge.board = this;
-  auto board = document["board"];
+  information.type = document["game/board"].text();
 
-  information.type = board["id"].text();
-  information.battery = (bool)board["prg/ram/name"];
-
-  auto prom = board["prg/rom"];
-  auto pram = board["prg/ram"];
-  auto crom = board["chr/rom"];
-  auto cram = board["chr/ram"];
-
-  prgrom.size = prom["size"].natural();
-  prgram.size = pram["size"].natural();
-  chrrom.size = crom["size"].natural();
-  chrram.size = cram["size"].natural();
-
-  if(prgrom.size) prgrom.data = new uint8_t[prgrom.size]();
-  if(prgram.size) prgram.data = new uint8_t[prgram.size]();
-  if(chrrom.size) chrrom.data = new uint8_t[chrrom.size]();
-  if(chrram.size) chrram.data = new uint8_t[chrram.size]();
-
-  if(prgrom.name = prom["name"].text()) {
-    if(auto fp = platform->open(cartridge.pathID(), prgrom.name, File::Read, File::Required)) {
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=ROM,content=Program)"]}) {
+    if(prgrom.size = memory.size) prgrom.data = new uint8_t[prgrom.size]();
+    if(auto fp = platform->open(cartridge.pathID(), memory.name(), File::Read, File::Required)) {
       fp->read(prgrom.data, min(prgrom.size, fp->size()));
     }
   }
-  if(prgram.name = pram["name"].text()) {
-    if(auto fp = platform->open(cartridge.pathID(), prgram.name, File::Read)) {
-      fp->read(prgram.data, min(prgram.size, fp->size()));
-    }
-  }
-  if(chrrom.name = crom["name"].text()) {
-    if(auto fp = platform->open(cartridge.pathID(), chrrom.name, File::Read, File::Required)) {
-      fp->read(chrrom.data, min(chrrom.size, fp->size()));
-    }
-  }
-  if(chrram.name = cram["name"].text()) {
-    if(auto fp = platform->open(cartridge.pathID(), chrram.name, File::Read)) {
-      fp->read(chrram.data, min(chrram.size, fp->size()));
+
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=RAM,content=Save)"]}) {
+    if(prgram.size = memory.size) prgram.data = new uint8_t[prgram.size](), prgram.writable = true;
+    if(memory.nonVolatile) {
+      if(auto fp = platform->open(cartridge.pathID(), memory.name(), File::Read)) {
+        fp->read(prgram.data, min(prgram.size, fp->size()));
+      }
     }
   }
 
-  prgram.writable = true;
-  chrram.writable = true;
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=ROM,content=Character)"]}) {
+    if(chrrom.size = memory.size) chrrom.data = new uint8_t[chrrom.size]();
+    if(auto fp = platform->open(cartridge.pathID(), memory.name(), File::Read, File::Required)) {
+      fp->read(chrrom.data, min(chrrom.size, fp->size()));
+    }
+  }
+
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=RAM,content=Character)"]}) {
+    if(chrram.size = memory.size) chrram.data = new uint8_t[chrram.size](), chrram.writable = true;
+    if(memory.nonVolatile) {
+      if(auto fp = platform->open(cartridge.pathID(), memory.name(), File::Read)) {
+        fp->read(chrram.data, min(chrram.size, fp->size()));
+      }
+    }
+  }
 }
 
 auto Board::save() -> void {
   auto document = BML::unserialize(cartridge.manifest());
 
-  if(auto name = document["board/prg/ram/name"].text()) {
-    if(auto fp = platform->open(cartridge.pathID(), name, File::Write)) {
-      fp->write(prgram.data, prgram.size);
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=RAM,content=Save)"]}) {
+    if(memory.nonVolatile) {
+      if(auto fp = platform->open(cartridge.pathID(), memory.name(), File::Write)) {
+        fp->write(prgram.data, prgram.size);
+      }
     }
   }
 
-  if(auto name = document["board/chr/ram/name"].text()) {
-    if(auto fp = platform->open(cartridge.pathID(), name, File::Write)) {
-      fp->write(chrram.data, chrram.size);
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=RAM,content=Character)"]}) {
+    if(memory.nonVolatile) {
+      if(auto fp = platform->open(cartridge.pathID(), memory.name(), File::Write)) {
+        fp->write(chrram.data, chrram.size);
+      }
     }
   }
 }
@@ -138,9 +132,9 @@ auto Board::serialize(serializer& s) -> void {
 
 auto Board::load(string manifest) -> Board* {
   auto document = BML::unserialize(manifest);
-  cartridge.information.title = document["information/title"].text();
+  cartridge.information.title = document["game/label"].text();
 
-  string type = document["board/id"].text();
+  string type = document["game/board"].text();
 
   if(type == "BANDAI-FCG"  ) return new BandaiFCG(document);
 
diff --git a/higan/fc/cartridge/board/board.hpp b/higan/fc/cartridge/board/board.hpp
index 4f24f4ae..169f3305 100644
--- a/higan/fc/cartridge/board/board.hpp
+++ b/higan/fc/cartridge/board/board.hpp
@@ -39,7 +39,6 @@ struct Board {
 
   struct Information {
     string type;
-    bool battery;
   } information;
 
   Memory prgrom;
diff --git a/higan/gb/cartridge/cartridge.cpp b/higan/gb/cartridge/cartridge.cpp
index 2cfcc95d..4295d6e9 100644
--- a/higan/gb/cartridge/cartridge.cpp
+++ b/higan/gb/cartridge/cartridge.cpp
@@ -48,8 +48,7 @@ auto Cartridge::load() -> bool {
     information.manifest = fp->reads();
   } else return false;
 
-  //todo: temporary hack so (type=) node lookup works; replace with a proper game/memory parser
-  auto document = BML::unserialize(string{information.manifest}.replace("type: ", "type:"));
+  auto document = BML::unserialize(information.manifest);
   information.title = document["game/label"].text();
 
   auto mapperID = document["game/board"].text();
@@ -69,31 +68,29 @@ auto Cartridge::load() -> bool {
   accelerometer = (bool)document["game/board/accelerometer"];
   rumble = (bool)document["game/board/rumble"];
 
-  if(auto node = document["game/memory(type=ROM)"]) {
-    rom.size = max(0x4000, node["size"].natural());
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=ROM,content=Program)"]}) {
+    rom.size = max(0x4000, (uint)memory.size);
     rom.data = (uint8*)memory::allocate(rom.size, 0xff);
-    if(auto name = node["name"].text()) {
-      if(auto fp = platform->open(pathID(), name, File::Read, File::Required)) {
-        fp->read(rom.data, min(rom.size, fp->size()));
-      }
+    if(auto fp = platform->open(pathID(), memory.name(), File::Read, File::Required)) {
+      fp->read(rom.data, min(rom.size, fp->size()));
     }
   }
 
-  if(auto node = document["game/memory(type=NVRAM)"]) {
-    ram.size = node["size"].natural();
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=RAM,content=Save)"]}) {
+    ram.size = memory.size;
     ram.data = (uint8*)memory::allocate(ram.size, 0xff);
-    if(auto name = node["name"].text()) {
-      if(auto fp = platform->open(pathID(), name, File::Read, File::Optional)) {
+    if(memory.nonVolatile) {
+      if(auto fp = platform->open(pathID(), memory.name(), File::Read, File::Optional)) {
         fp->read(ram.data, min(ram.size, fp->size()));
       }
     }
   }
 
-  if(auto node = document["game/memory(type=RTC)"]) {
-    rtc.size = node["size"].natural();
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=RTC,content=Time)"]}) {
+    rtc.size = memory.size;
     rtc.data = (uint8*)memory::allocate(rtc.size, 0xff);
-    if(auto name = node["name"].text()) {
-      if(auto fp = platform->open(pathID(), name, File::Read, File::Optional)) {
+    if(memory.nonVolatile) {
+      if(auto fp = platform->open(pathID(), memory.name(), File::Read, File::Optional)) {
         fp->read(rtc.data, min(rtc.size, fp->size()));
       }
     }
@@ -104,19 +101,19 @@ auto Cartridge::load() -> bool {
 }
 
 auto Cartridge::save() -> void {
-  auto document = BML::unserialize(string{information.manifest}.replace("type: ", "type:"));
+  auto document = BML::unserialize(information.manifest);
 
-  if(auto node = document["game/memory(type=NVRAM)"]) {
-    if(auto name = node["name"].text()) {
-      if(auto fp = platform->open(pathID(), name, File::Write)) {
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=RAM,content=Save)"]}) {
+    if(memory.nonVolatile) {
+      if(auto fp = platform->open(pathID(), memory.name(), File::Write)) {
         fp->write(ram.data, ram.size);
       }
     }
   }
 
-  if(auto node = document["game/memory(type=RTC)"]) {
-    if(auto name = node["name"].text()) {
-      if(auto fp = platform->open(pathID(), name, File::Write)) {
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=RTC,content=Time)"]}) {
+    if(memory.nonVolatile) {
+      if(auto fp = platform->open(pathID(), memory.name(), File::Write)) {
         fp->write(rtc.data, rtc.size);
       }
     }
diff --git a/higan/gba/cartridge/cartridge.cpp b/higan/gba/cartridge/cartridge.cpp
index 1ac46302..2186d052 100644
--- a/higan/gba/cartridge/cartridge.cpp
+++ b/higan/gba/cartridge/cartridge.cpp
@@ -35,59 +35,62 @@ auto Cartridge::load() -> bool {
   } else return false;
 
   auto document = BML::unserialize(information.manifest);
-  information.title = document["information/title"].text();
+  information.title = document["game/label"].text();
 
   hasSRAM   = false;
   hasEEPROM = false;
   hasFLASH  = false;
 
-  if(auto node = document["board/rom"]) {
-    mrom.size = min(32 * 1024 * 1024, node["size"].natural());
-    if(auto fp = platform->open(pathID(), node["name"].text(), File::Read, File::Required)) {
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=ROM,content=Program)"]}) {
+    mrom.size = min(32 * 1024 * 1024, (uint)memory.size);
+    if(auto fp = platform->open(pathID(), memory.name(), File::Read, File::Required)) {
       fp->read(mrom.data, mrom.size);
     }
   }
 
-  if(auto node = document["board/ram"]) {
-    if(node["type"].text() == "sram") {
-      hasSRAM = true;
-      sram.size = min(32 * 1024, node["size"].natural());
-      sram.mask = sram.size - 1;
-      for(auto n : range(sram.size)) sram.data[n] = 0xff;
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=RAM,content=Save)"]}) {
+    hasSRAM = true;
+    sram.size = min(32 * 1024, (uint)memory.size);
+    sram.mask = sram.size - 1;
+    for(auto n : range(sram.size)) sram.data[n] = 0xff;
 
-      if(auto fp = platform->open(pathID(), node["name"].text(), File::Read)) {
+    if(memory.nonVolatile) {
+      if(auto fp = platform->open(pathID(), memory.name(), File::Read)) {
         fp->read(sram.data, sram.size);
       }
     }
+  }
 
-    if(node["type"].text() == "eeprom") {
-      hasEEPROM = true;
-      eeprom.size = min(8 * 1024, node["size"].natural());
-      eeprom.bits = eeprom.size <= 512 ? 6 : 14;
-      if(eeprom.size == 0) eeprom.size = 8192, eeprom.bits = 0;  //auto-detect size
-      eeprom.mask = mrom.size > 16 * 1024 * 1024 ? 0x0fffff00 : 0x0f000000;
-      eeprom.test = mrom.size > 16 * 1024 * 1024 ? 0x0dffff00 : 0x0d000000;
-      for(auto n : range(eeprom.size)) eeprom.data[n] = 0xff;
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=EEPROM,content=Save)"]}) {
+    hasEEPROM = true;
+    eeprom.size = min(8 * 1024, (uint)memory.size);
+    eeprom.bits = eeprom.size <= 512 ? 6 : 14;
+    if(eeprom.size == 0) eeprom.size = 8192, eeprom.bits = 0;  //auto-detect size
+    eeprom.mask = mrom.size > 16 * 1024 * 1024 ? 0x0fffff00 : 0x0f000000;
+    eeprom.test = mrom.size > 16 * 1024 * 1024 ? 0x0dffff00 : 0x0d000000;
+    for(auto n : range(eeprom.size)) eeprom.data[n] = 0xff;
 
-      if(auto fp = platform->open(pathID(), node["name"].text(), File::Read)) {
-        fp->read(eeprom.data, eeprom.size);
-      }
+    if(auto fp = platform->open(pathID(), memory.name(), File::Read)) {
+      fp->read(eeprom.data, eeprom.size);
     }
+  }
 
-    if(node["type"].text() == "flash") {
-      hasFLASH = true;
-      flash.id = node["id"].natural();
-      flash.size = min(128 * 1024, node["size"].natural());
-      for(auto n : range(flash.size)) flash.data[n] = 0xff;
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=Flash,content=Save)"]}) {
+    hasFLASH = true;
+    flash.size = min(128 * 1024, (uint)memory.size);
+    flash.manufacturer = memory.manufacturer;
+    for(auto n : range(flash.size)) flash.data[n] = 0xff;
 
-      //if flash ID not provided; guess that it's a Macronix chip
-      //this will not work for all games; in which case, the ID must be specified manually
-      if(!flash.id && flash.size ==  64 * 1024) flash.id = 0x1cc2;
-      if(!flash.id && flash.size == 128 * 1024) flash.id = 0x09c2;
+    flash.id = 0;
+    if(flash.manufacturer == "Atmel"     && flash.size ==  64 * 1024) flash.id = 0x3d1f;
+    if(flash.manufacturer == "Macronix"  && flash.size ==  64 * 1024) flash.id = 0x1cc2;
+    if(flash.manufacturer == "Macronix"  && flash.size == 128 * 1024) flash.id = 0x09c2;
+    if(flash.manufacturer == "Panasonic" && flash.size ==  64 * 1024) flash.id = 0x1b32;
+    if(flash.manufacturer == "Sanyo"     && flash.size == 128 * 1024) flash.id = 0x1362;
+    if(flash.manufacturer == "SST"       && flash.size ==  64 * 1024) flash.id = 0xd4bf;
 
-      if(auto fp = platform->open(pathID(), node["name"].text(), File::Read)) {
-        fp->read(flash.data, flash.size);
-      }
+    if(auto fp = platform->open(pathID(), memory.name(), File::Read)) {
+      fp->read(flash.data, flash.size);
     }
   }
 
@@ -97,11 +100,24 @@ auto Cartridge::load() -> bool {
 
 auto Cartridge::save() -> void {
   auto document = BML::unserialize(information.manifest);
-  if(auto node = document["board/ram"]) {
-    if(auto fp = platform->open(pathID(), node["name"].text(), File::Write)) {
-      if(node["type"].text() == "sram") fp->write(sram.data, sram.size);
-      if(node["type"].text() == "eeprom") fp->write(eeprom.data, eeprom.size);
-      if(node["type"].text() == "flash") fp->write(flash.data, flash.size);
+
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=RAM,content=Save)"]}) {
+    if(memory.nonVolatile) {
+      if(auto fp = platform->open(pathID(), memory.name(), File::Write)) {
+        fp->write(sram.data, sram.size);
+      }
+    }
+  }
+
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=EEPROM,content=Save)"]}) {
+    if(auto fp = platform->open(pathID(), memory.name(), File::Write)) {
+      fp->write(eeprom.data, eeprom.size);
+    }
+  }
+
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=Flash,content=Save)"]}) {
+    if(auto fp = platform->open(pathID(), memory.name(), File::Write)) {
+      fp->write(flash.data, flash.size);
     }
   }
 }
diff --git a/higan/gba/cartridge/memory.hpp b/higan/gba/cartridge/memory.hpp
index 308bc177..7e6750fd 100644
--- a/higan/gba/cartridge/memory.hpp
+++ b/higan/gba/cartridge/memory.hpp
@@ -46,6 +46,8 @@ struct EEPROM {
 struct FLASH {
   uint8* data;
   uint size;
+  string manufacturer;
+
   uint16 id;
 
   bool unlockhi;
diff --git a/higan/md/cartridge/cartridge.cpp b/higan/md/cartridge/cartridge.cpp
index 65894d1d..2e21c2e5 100644
--- a/higan/md/cartridge/cartridge.cpp
+++ b/higan/md/cartridge/cartridge.cpp
@@ -18,45 +18,40 @@ auto Cartridge::load() -> bool {
   } else return false;
 
   auto document = BML::unserialize(information.manifest);
-  information.title = document["information/title"].text();
+  information.title = document["game/label"].text();
 
   if(information.region == "Auto") {
-    if(auto region = document["board/region"].text()) {
+    if(auto region = document["game/region"].text()) {
       information.region = region.upcase();
     } else {
       information.region = "NTSC-J";
     }
   }
 
-  if(auto node = document["board/rom"]) {
-    rom.size = node["size"].natural() >> 1;
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=ROM,content=Program)"]}) {
+    rom.size = memory.size >> 1;
     rom.mask = bit::round(rom.size) - 1;
-    if(rom.size) {
-      rom.data = new uint16[rom.mask + 1]();
-      if(auto name = node["name"].text()) {
-        if(auto fp = platform->open(pathID(), name, File::Read, File::Required)) {
-          for(uint n : range(rom.size)) rom.data[n] = fp->readm(2);
-        }
-      }
+    rom.data = new uint16[rom.mask + 1]();
+    if(auto fp = platform->open(pathID(), memory.name(), File::Read, File::Required)) {
+      for(uint n : range(rom.size)) rom.data[n] = fp->readm(2);
     }
   }
 
-  if(auto node = document["board/ram"]) {
-    if(auto mode = node["mode"].text()) {
+  //todo: handle mode, offset in Emulator::Game::Memory
+  if(auto memory = document["game/board/memory(type=RAM,content=Save)"]) {
+    if(auto mode = memory["mode"].text()) {
       if(mode == "lo"  ) ram.bits = 0x00ff;
       if(mode == "hi"  ) ram.bits = 0xff00;
       if(mode == "word") ram.bits = 0xffff;
     }
-    ram.size = node["size"].natural() >> (ram.bits == 0xffff);
+    ram.size = memory["size"].natural() >> (ram.bits == 0xffff);
     ram.mask = bit::round(ram.size) - 1;
-    if(ram.size) {
-      ram.data = new uint16[ram.mask + 1]();
-      if(auto name = node["name"].text()) {
-        if(auto fp = platform->open(pathID(), name, File::Read)) {
-          for(uint n : range(ram.size)) {
-            if(ram.bits != 0xffff) ram.data[n] = fp->readm(1) * 0x0101;
-            if(ram.bits == 0xffff) ram.data[n] = fp->readm(2);
-          }
+    ram.data = new uint16[ram.mask + 1]();
+    if(!(bool)memory["volatile"]) {
+      if(auto fp = platform->open(pathID(), "save.ram", File::Read)) {
+        for(uint n : range(ram.size)) {
+          if(ram.bits != 0xffff) ram.data[n] = fp->readm(1) * 0x0101;
+          if(ram.bits == 0xffff) ram.data[n] = fp->readm(2);
         }
       }
     }
@@ -68,11 +63,13 @@ auto Cartridge::load() -> bool {
 auto Cartridge::save() -> void {
   auto document = BML::unserialize(information.manifest);
 
-  if(auto name = document["board/ram/name"].text()) {
-    if(auto fp = platform->open(pathID(), name, File::Write)) {
-      for(uint n : range(ram.size)) {
-        if(ram.bits != 0xffff) fp->writem(ram.data[n], 1);
-        if(ram.bits == 0xffff) fp->writem(ram.data[n], 2);
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=RAM,content=Save)"]}) {
+    if(memory.nonVolatile) {
+      if(auto fp = platform->open(pathID(), memory.name(), File::Write)) {
+        for(uint n : range(ram.size)) {
+          if(ram.bits != 0xffff) fp->writem(ram.data[n], 1);
+          if(ram.bits == 0xffff) fp->writem(ram.data[n], 2);
+        }
       }
     }
   }
diff --git a/higan/ms/cartridge/cartridge.cpp b/higan/ms/cartridge/cartridge.cpp
index 8cff8acd..e855cf9f 100644
--- a/higan/ms/cartridge/cartridge.cpp
+++ b/higan/ms/cartridge/cartridge.cpp
@@ -27,30 +27,24 @@ auto Cartridge::load() -> bool {
   } else return false;
 
   auto document = BML::unserialize(information.manifest);
-  information.title = document["information/title"].text();
+  information.title = document["game/label"].text();
 
-  if(auto node = document["board/rom"]) {
-    rom.size = node["size"].natural();
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=ROM,content=Program)"]}) {
+    rom.size = memory.size;
     rom.mask = bit::round(rom.size) - 1;
-    if(rom.size) {
-      rom.data = new uint8[rom.mask + 1];
-      if(auto name = node["name"].text()) {
-        if(auto fp = platform->open(pathID(), name, File::Read, File::Required)) {
-          fp->read(rom.data, rom.size);
-        }
-      }
+    rom.data = new uint8[rom.mask + 1];
+    if(auto fp = platform->open(pathID(), memory.name(), File::Read, File::Required)) {
+      fp->read(rom.data, rom.size);
     }
   }
 
-  if(auto node = document["board/ram"]) {
-    ram.size = node["size"].natural();
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=RAM,content=Save)"]}) {
+    ram.size = memory.size;
     ram.mask = bit::round(ram.size) - 1;
-    if(ram.size) {
-      ram.data = new uint8[ram.mask + 1];
-      if(auto name = node["name"].text()) {
-        if(auto fp = platform->open(pathID(), name, File::Read)) {
-          fp->read(ram.data, ram.size);
-        }
+    ram.data = new uint8[ram.mask + 1];
+    if(memory.nonVolatile) {
+      if(auto fp = platform->open(pathID(), memory.name(), File::Read)) {
+        fp->read(ram.data, ram.size);
       }
     }
   }
@@ -61,9 +55,11 @@ auto Cartridge::load() -> bool {
 auto Cartridge::save() -> void {
   auto document = BML::unserialize(information.manifest);
 
-  if(auto name = document["board/ram/name"].text()) {
-    if(auto fp = platform->open(pathID(), name, File::Write)) {
-      fp->write(ram.data, ram.size);
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=RAM,content=Save)"]}) {
+    if(memory.nonVolatile) {
+      if(auto fp = platform->open(pathID(), memory.name(), File::Write)) {
+        fp->write(ram.data, ram.size);
+      }
     }
   }
 }
diff --git a/higan/pce/cartridge/cartridge.cpp b/higan/pce/cartridge/cartridge.cpp
index d74730a6..6dfa3d44 100644
--- a/higan/pce/cartridge/cartridge.cpp
+++ b/higan/pce/cartridge/cartridge.cpp
@@ -24,17 +24,13 @@ auto Cartridge::load() -> bool {
   } else return false;
 
   auto document = BML::unserialize(information.manifest);
-  information.title = document["information/title"].text();
+  information.title = document["game/label"].text();
 
-  if(auto node = document["board/rom"]) {
-    rom.size = node["size"].natural();
-    if(rom.size) {
-      rom.data = new uint8[rom.size]();
-      if(auto name = node["name"].text()) {
-        if(auto fp = platform->open(pathID(), name, File::Read, File::Required)) {
-          fp->read(rom.data, rom.size);
-        }
-      }
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=ROM,content=Program)"]}) {
+    rom.size = memory.size;
+    rom.data = new uint8[rom.size]();
+    if(auto fp = platform->open(pathID(), memory.name(), File::Read, File::Required)) {
+      fp->read(rom.data, rom.size);
     }
   }
 
diff --git a/higan/sfc/cartridge/load.cpp b/higan/sfc/cartridge/load.cpp
index 126350f7..e525ed5e 100644
--- a/higan/sfc/cartridge/load.cpp
+++ b/higan/sfc/cartridge/load.cpp
@@ -223,17 +223,23 @@ auto Cartridge::loadSuperFX(Markup::Node node) -> void {
 auto Cartridge::loadARMDSP(Markup::Node node) -> void {
   has.ARMDSP = true;
 
-  if(auto memory = game.memory(node["memory(type=ROM,category=Program)"])) {
+  if(auto oscillator = game.oscillator()) {
+    armdsp.Frequency = oscillator->frequency;
+  } else {
+    armdsp.Frequency = 21'440'000;
+  }
+
+  if(auto memory = game.memory(node["memory(type=ROM,content=Program)"])) {
     if(auto fp = platform->open(ID::SuperFamicom, memory->name(), File::Read, File::Required)) {
       for(auto n : range(128 * 1024)) armdsp.programROM[n] = fp->read();
     }
   }
-  if(auto memory = game.memory(node["memory(type=ROM,category=Data)"])) {
+  if(auto memory = game.memory(node["memory(type=ROM,content=Data)"])) {
     if(auto fp = platform->open(ID::SuperFamicom, memory->name(), File::Read, File::Required)) {
       for(auto n : range( 32 * 1024)) armdsp.dataROM[n] = fp->read();
     }
   }
-  if(auto memory = game.memory(node["memory(type=RAM,category=Data)"])) {
+  if(auto memory = game.memory(node["memory(type=RAM,content=Data)"])) {
     if(auto fp = platform->open(ID::SuperFamicom, memory->name(), File::Read)) {
       for(auto n : range( 16 * 1024)) armdsp.programRAM[n] = fp->read();
     }
@@ -245,8 +251,11 @@ auto Cartridge::loadARMDSP(Markup::Node node) -> void {
 auto Cartridge::loadHitachiDSP(Markup::Node node, uint roms) -> void {
   has.HitachiDSP = true;
 
-  hitachidsp.Frequency = node["frequency"].natural();
-  if(hitachidsp.Frequency == 0) hitachidsp.Frequency = 20'000'000;
+  if(auto oscillator = game.oscillator()) {
+    hitachidsp.Frequency = oscillator->frequency;
+  } else {
+    hitachidsp.Frequency = 20'000'000;
+  }
   hitachidsp.Roms = roms;  //1 or 2
 
   loadMemory(hitachidsp.rom, node["rom"], File::Required);
@@ -255,12 +264,12 @@ auto Cartridge::loadHitachiDSP(Markup::Node node, uint roms) -> void {
   for(auto& word : hitachidsp.dataROM) word = 0x000000;
   for(auto& word : hitachidsp.dataRAM) word = 0x00;
 
-  if(auto memory = game.memory(node["memory(type=ROM,category=Data)"])) {
+  if(auto memory = game.memory(node["memory(type=ROM,content=Data)"])) {
     if(auto fp = platform->open(ID::SuperFamicom, memory->name(), File::Read, File::Required)) {
       for(auto n : range(1 * 1024)) hitachidsp.dataROM[n] = fp->readl(3);
     }
   }
-  if(auto memory = game.memory(node["memory(type=RAM,category=Data)"])) {
+  if(auto memory = game.memory(node["memory(type=RAM,content=Data)"])) {
     if(auto fp = platform->open(ID::SuperFamicom, memory->name(), File::Read)) {
       for(auto n : range(3 * 1024)) hitachidsp.dataRAM[n] = fp->readl(1);
     }
@@ -275,8 +284,12 @@ auto Cartridge::loadHitachiDSP(Markup::Node node, uint roms) -> void {
 auto Cartridge::loadNECDSP(Markup::Node node) -> void {
   has.NECDSP = true;
 
-  necdsp.Frequency = node["frequency"].natural();
-  if(necdsp.Frequency == 0) necdsp.Frequency = 8000000;
+  if(auto oscillator = game.oscillator()) {
+    necdsp.Frequency = oscillator->frequency;
+  } else {
+    necdsp.Frequency = 7'600'000;
+  }
+
   necdsp.revision
   = node["model"].text() == "uPD7725"  ? NECDSP::Revision::uPD7725
   : node["model"].text() == "uPD96050" ? NECDSP::Revision::uPD96050
@@ -290,18 +303,18 @@ auto Cartridge::loadNECDSP(Markup::Node node) -> void {
   if(necdsp.revision == NECDSP::Revision::uPD7725 ) memory::assign(size,  2048, 1024,  256);
   if(necdsp.revision == NECDSP::Revision::uPD96050) memory::assign(size, 16384, 2048, 2048);
 
-  if(auto memory = game.memory(node["memory(type=ROM,category=Program)"])) {
+  if(auto memory = game.memory(node["memory(type=ROM,content=Program)"])) {
     if(auto fp = platform->open(ID::SuperFamicom, memory->name(), File::Read, File::Required)) {
       for(auto n : range(size[0])) necdsp.programROM[n] = fp->readl(3);
     }
   }
-  if(auto memory = game.memory(node["memory(type=ROM,category=Data)"])) {
-    if(auto fp = platform->open(ID::SuperFamicom, memory->name(), File::Read, File::Required)) {
+  if(auto memory = Emulator::Game::Memory{node["memory(type=ROM,content=Data)"]}) {
+    if(auto fp = platform->open(ID::SuperFamicom, memory.name(), File::Read, File::Required)) {
       for(auto n : range(size[1])) necdsp.dataROM[n] = fp->readl(2);
     }
   }
-  if(auto memory = game.memory(node["memory(type=RAM,category=Data"])) {
-    if(auto fp = platform->open(ID::SuperFamicom, memory->name(), File::Read)) {
+  if(auto memory = Emulator::Game::Memory{node["memory(type=RAM,content=Data)"]}) {
+    if(auto fp = platform->open(ID::SuperFamicom, memory.name(), File::Read)) {
       for(auto n : range(size[2])) necdsp.dataRAM[n] = fp->readl(2);
     }
   }
@@ -314,7 +327,7 @@ auto Cartridge::loadEpsonRTC(Markup::Node node) -> void {
   has.EpsonRTC = true;
 
   epsonrtc.initialize();
-  if(auto memory = game.memory(node["memory(type=RTC)"])) {
+  if(auto memory = game.memory(node["memory(type=RTC,content=Time)"])) {
     if(auto fp = platform->open(ID::SuperFamicom, memory->name(), File::Read)) {
       uint8 data[16] = {0};
       for(auto& byte : data) byte = fp->read();
@@ -329,7 +342,7 @@ auto Cartridge::loadSharpRTC(Markup::Node node) -> void {
   has.SharpRTC = true;
 
   sharprtc.initialize();
-  if(auto memory = game.memory(node["memory(type=RTC)"])) {
+  if(auto memory = game.memory(node["memory(type=RTC,content=Time)"])) {
     if(auto fp = platform->open(ID::SuperFamicom, memory->name(), File::Read)) {
       uint8 data[16] = {0};
       for(auto& byte : data) byte = fp->read();
@@ -384,8 +397,8 @@ auto Cartridge::loadMemory(MappedRAM& ram, Markup::Node node, bool required, may
   if(!id) id = pathID();
   if(auto memory = game.memory(node)) {
     ram.allocate(memory->size);
-    if(memory->type == "RAM" && !memory->battery) return;
-    if(memory->type == "RTC" && !memory->battery) return;
+    if(memory->type == "RAM" && !memory->nonVolatile) return;
+    if(memory->type == "RTC" && !memory->nonVolatile) return;
     if(auto fp = platform->open(id(), memory->name(), File::Read, required)) {
       fp->read(ram.data(), ram.size());
     }
diff --git a/higan/sfc/cartridge/save.cpp b/higan/sfc/cartridge/save.cpp
index c7b17be9..41970feb 100644
--- a/higan/sfc/cartridge/save.cpp
+++ b/higan/sfc/cartridge/save.cpp
@@ -52,8 +52,8 @@ auto Cartridge::saveSuperFX(Markup::Node node) -> void {
 }
 
 auto Cartridge::saveARMDSP(Markup::Node node) -> void {
-  if(auto memory = game.memory(node["memory(type=RAM,category=Data)"])) {
-    if(memory->battery) {
+  if(auto memory = game.memory(node["memory(type=RAM,content=Data)"])) {
+    if(memory->nonVolatile) {
       if(auto fp = platform->open(ID::SuperFamicom, memory->name(), File::Write)) {
         for(auto n : range(16 * 1024)) fp->write(armdsp.programRAM[n]);
       }
@@ -64,8 +64,8 @@ auto Cartridge::saveARMDSP(Markup::Node node) -> void {
 auto Cartridge::saveHitachiDSP(Markup::Node node) -> void {
   saveMemory(hitachidsp.ram, node["ram"]);
 
-  if(auto memory = game.memory(node["memory(type=RAM,category=Data)"])) {
-    if(memory->battery) {
+  if(auto memory = game.memory(node["memory(type=RAM,content=Data)"])) {
+    if(memory->nonVolatile) {
       if(auto fp = platform->open(ID::SuperFamicom, memory->name(), File::Write)) {
         for(auto n : range(3 * 1024)) fp->write(hitachidsp.dataRAM[n]);
       }
@@ -75,9 +75,9 @@ auto Cartridge::saveHitachiDSP(Markup::Node node) -> void {
 
 auto Cartridge::saveNECDSP(Markup::Node node) -> void {
   uint size = necdsp.revision == NECDSP::Revision::uPD7725 ? 256 : 2048;
-  if(auto memory = game.memory(node["memory(type=RAM,category=Data)"])) {
-    if(memory->battery) {
-      if(auto fp = platform->open(ID::SuperFamicom, memory->name(), File::Write)) {
+  if(auto memory = Emulator::Game::Memory{node["memory(type=RAM,content=Data)"]}) {
+    if(memory.nonVolatile) {
+      if(auto fp = platform->open(ID::SuperFamicom, memory.name(), File::Write)) {
         for(auto n : range(size)) fp->writel(necdsp.dataRAM[n], 2);
       }
     }
@@ -85,8 +85,8 @@ auto Cartridge::saveNECDSP(Markup::Node node) -> void {
 }
 
 auto Cartridge::saveEpsonRTC(Markup::Node node) -> void {
-  if(auto memory = game.memory(node["memory(type=RTC)"])) {
-    if(memory->battery) {
+  if(auto memory = game.memory(node["memory(type=RTC,content=Time)"])) {
+    if(memory->nonVolatile) {
       if(auto fp = platform->open(ID::SuperFamicom, memory->name(), File::Write)) {
         uint8 data[16] = {0};
         epsonrtc.save(data);
@@ -97,8 +97,8 @@ auto Cartridge::saveEpsonRTC(Markup::Node node) -> void {
 }
 
 auto Cartridge::saveSharpRTC(Markup::Node node) -> void {
-  if(auto memory = game.memory(node["memory(type=RTC)"])) {
-    if(memory->battery) {
+  if(auto memory = game.memory(node["memory(type=RTC,content=Time)"])) {
+    if(memory->nonVolatile) {
       if(auto fp = platform->open(ID::SuperFamicom, memory->name(), File::Write)) {
         uint8 data[16] = {0};
         sharprtc.save(data);
@@ -125,8 +125,8 @@ auto Cartridge::saveOBC1(Markup::Node node) -> void {
 auto Cartridge::saveMemory(MappedRAM& ram, Markup::Node node, maybe<uint> id) -> void {
   if(!id) id = pathID();
   if(auto memory = game.memory(node)) {
-    if(memory->type == "RAM" && !memory->battery) return;
-    if(memory->type == "RTC" && !memory->battery) return;
+    if(memory->type == "RAM" && !memory->nonVolatile) return;
+    if(memory->type == "RTC" && !memory->nonVolatile) return;
     if(auto fp = platform->open(id(), memory->name(), File::Write)) {
       fp->write(ram.data(), ram.size());
     }
diff --git a/higan/sfc/coprocessor/armdsp/armdsp.cpp b/higan/sfc/coprocessor/armdsp/armdsp.cpp
index a9ecec77..67c38a83 100644
--- a/higan/sfc/coprocessor/armdsp/armdsp.cpp
+++ b/higan/sfc/coprocessor/armdsp/armdsp.cpp
@@ -89,7 +89,7 @@ auto ArmDSP::power() -> void {
 
 auto ArmDSP::reset() -> void {
   ARM7TDMI::power();
-  create(ArmDSP::Enter, 21'477'272);
+  create(ArmDSP::Enter, Frequency);
 
   bridge.ready = false;
   bridge.signal = false;
diff --git a/higan/sfc/coprocessor/armdsp/armdsp.hpp b/higan/sfc/coprocessor/armdsp/armdsp.hpp
index 7f9b270a..9108c04a 100644
--- a/higan/sfc/coprocessor/armdsp/armdsp.hpp
+++ b/higan/sfc/coprocessor/armdsp/armdsp.hpp
@@ -25,6 +25,8 @@ struct ArmDSP : Processor::ARM7TDMI, Thread {
   auto firmware() const -> nall::vector<uint8>;
   auto serialize(serializer&) -> void;
 
+  uint Frequency;
+
   uint8 programROM[128 * 1024];
   uint8 dataROM[32 * 1024];
   uint8 programRAM[16 * 1024];
diff --git a/higan/systems/Super Famicom.sys/boards.bml b/higan/systems/Super Famicom.sys/boards.bml
index a0fea984..ecf42662 100644
--- a/higan/systems/Super Famicom.sys/boards.bml	
+++ b/higan/systems/Super Famicom.sys/boards.bml	
@@ -1,490 +1,498 @@
 database
-  revision: 2018-04-08
+  revision: 2018-04-15
 
 //Boards (Production)
 
 database
-  revision: 2018-02-27
+  revision: 2018-04-10
 
 board: BANDAI-PT-923
-  rom
+  memory type=ROM content=Program
     map address=00-1f,80-9f:8000-ffff mask=0x8000
-  sufamiturbo
+  slot type=SufamiTurbo
     rom
       map address=20-3f,a0-bf:8000-ffff mask=0x8000
     ram
       map address=60-6f,e0-ef:0000-ffff
-  sufamiturbo
+  slot type=SufamiTurbo
     rom
       map address=40-5f,c0-df:0000-ffff mask=0x8000
     ram
       map address=70-7d,f0-ff:0000-ffff
 
 board: BSC-1A5M-02
-  rom
+  memory type=ROM content=Program
     map address=00-1f:8000-ffff mask=0x8000 base=0x000000
     map address=20-3f:8000-ffff mask=0x8000 base=0x100000
     map address=80-9f:8000-ffff mask=0x8000 base=0x200000
     map address=a0-bf:8000-ffff mask=0x8000 base=0x100000
-  ram
+  memory type=RAM content=Save
     map address=70-7d,f0-ff:0000-7fff mask=0x8000
-  bsmemory
+  slot type=BSMemory
     map address=c0-ef:0000-ffff
 
 board: BSC-1A7M-01
-  rom
+  memory type=ROM content=Program
     map address=00-1f:8000-ffff mask=0x8000 base=0x000000
     map address=20-3f:8000-ffff mask=0x8000 base=0x100000
     map address=80-9f:8000-ffff mask=0x8000 base=0x200000
     map address=a0-bf:8000-ffff mask=0x8000 base=0x100000
-  ram
+  memory type=RAM content=Save
     map address=70-7d,f0-ff:0000-7fff mask=0x8000
-  bsmemory
+  slot type=BSMemory
     map address=c0-ef:0000-ffff
 
 board: BSC-1J3M-01
-  rom
+  memory type=ROM content=Program
     map address=00-1f,80-9f:8000-ffff
     map address=40-5f,c0-df:0000-ffff
-  ram
+  memory type=RAM content=Save
     map address=20-3f,a0-bf:6000-7fff mask=0xe000
-  bsmemory
+  slot type=BSMemory
     map address=20-3f,a0-bf:8000-ffff
     map address=60-7d,e0-ff:0000-ffff
 
 board: BSC-1J5M-01
-  rom
+  memory type=ROM content=Program
     map address=00-1f,80-9f:8000-ffff
     map address=40-5f,c0-df:0000-ffff
-  ram
+  memory type=RAM content=Save
     map address=20-3f,a0-bf:6000-7fff mask=0xe000
-  bsmemory
+  slot type=BSMemory
     map address=20-3f,a0-bf:8000-ffff
     map address=60-7d,e0-ff:0000-ffff
 
 board: BSC-1L3B-01
   sa1
     map address=00-3f,80-bf:2200-23ff
-    rom
+    memory type=ROM content=Program
       map address=00-3f,80-bf:8000-ffff mask=0x408000
       map address=c0-ff:0000-ffff
-    bwram
+    memory type=RAM content=Save
       map address=00-3f,80-bf:6000-7fff size=0x2000
       map address=40-4f:0000-ffff
-    iram
+    memory type=RAM content=Internal
       map address=00-3f,80-bf:3000-37ff size=0x800
-    bsmemory
+    slot type=BSMemory
 
 board: BSC-1L5B-01
   sa1
     map address=00-3f,80-bf:2200-23ff
-    rom
+    memory type=ROM content=Program
       map address=00-3f,80-bf:8000-ffff mask=0x408000
       map address=c0-ff:0000-ffff
-    bwram
+    memory type=RAM content=Save
       map address=00-3f,80-bf:6000-7fff size=0x2000
       map address=40-4f:0000-ffff
-    iram
+    memory type=RAM content=Internal
       map address=00-3f,80-bf:3000-37ff size=0x800
-    bsmemory
+    slot type=BSMemory
 
 board: SGB-R-10
-  rom
+  memory type=ROM content=Program
     map address=00-7d,80-ff:8000-ffff mask=0x8000
     map address=40-7d,c0-ff:0000-7fff mask=0x8000
   icd revision=2
     map address=00-3f,80-bf:6000-67ff,7000-7fff
-    rom
-    gameboy
+    memory type=ROM content=Boot architecture=LR35902
+    slot type=GameBoy
 
 board: SHVC-1A0N-(01,02,10,20,30)
-  rom
+  memory type=ROM content=Program
     map address=00-7d,80-ff:8000-ffff mask=0x8000
     map address=40-7d,c0-ff:0000-7fff mask=0x8000
 
 board: SHVC-1A1B-(04,05,06)
-  rom
+  memory type=ROM content=Program
     map address=00-1f,80-9f:8000-ffff mask=0x8000
-  ram
+  memory type=RAM content=Save
     map address=70-7d,f0-ff:0000-ffff
 
 board: SHVC-1A1M-(01,10,11,20)
-  rom
+  memory type=ROM content=Program
     map address=00-7d,80-ff:8000-ffff mask=0x8000
-  ram
+  memory type=RAM content=Save
     map address=70-7d,f0-ff:0000-7fff mask=0x8000
 
 board: SHVC-1A3B-(11,12,13)
-  rom
+  memory type=ROM content=Program
     map address=00-1f,80-9f:8000-ffff mask=0x8000
-  ram
+  memory type=RAM content=Save
     map address=70-7d,f0-ff:0000-ffff
 
 board: SHVC-1A3B-20
-  rom
+  memory type=ROM content=Program
     map address=00-7d,80-ff:8000-ffff mask=0x8000
-  ram
+  memory type=RAM content=Save
     map address=70-7d,f0-ff:0000-7fff mask=0x8000
 
 board: SHVC-1A3M-(10,20,21,30)
-  rom
+  memory type=ROM content=Program
     map address=00-7d,80-ff:8000-ffff mask=0x8000
-  ram
+  memory type=RAM content=Save
     map address=70-7d,f0-ff:0000-7fff mask=0x8000
 
 board: SHVC-1A5B-(02,04)
-  rom
+  memory type=ROM content=Program
     map address=00-1f,80-9f:8000-ffff mask=0x8000
-  ram
+  memory type=RAM content=Save
     map address=70-7d,f0-ff:0000-ffff
 
 board: SHVC-1A5M-(01,11,20)
-  rom
+  memory type=ROM content=Program
     map address=00-7d,80-ff:8000-ffff mask=0x8000
-  ram
+  memory type=RAM content=Save
     map address=70-7d,f0-ff:0000-7fff mask=0x8000
 
 board: SHVC-1B0N-(02,03,10)
-  rom
+  memory type=ROM content=Program
     map address=00-1f,80-9f:8000-ffff mask=0x8000
-  necdsp model=uPD7725 frequency=8000000
+  necdsp model=uPD7725
     map address=30-3f,b0-bf:8000-ffff mask=0x3fff
-    prom
-    drom
-    dram
+    memory type=ROM content=Program architecture=uPD7725
+    memory type=ROM content=Data architecture=uPD7725
+    memory type=RAM content=Data architecture=uPD7725
+    oscillator
 
 board: SHVC-1B5B-02
-  rom
+  memory type=ROM content=Program
     map address=00-1f,80-9f:8000-ffff mask=0x8000
-  ram
+  memory type=RAM content=Save
     map address=70-7d,f0-ff:0000-ffff
-  necdsp model=uPD7725 frequency=8000000
+  necdsp model=uPD7725
     map address=20-3f,a0-bf:8000-ffff mask=0x3fff
-    prom
-    drom
-    dram
+    memory type=ROM content=Program architecture=uPD7725
+    memory type=ROM content=Data architecture=uPD7725
+    memory type=RAM content=Data architecture=uPD7725
+    oscillator
 
 board: SHVC-1C0N
   superfx
     map address=00-3f,80-bf:3000-34ff
-    rom
+    memory type=ROM content=Program
       map address=00-1f,80-9f:8000-ffff mask=0x8000
-    ram
+    memory type=RAM content=Save
       map address=60-7d,e0-ff:0000-ffff
 
 board: SHVC-1C0N5S-01
   superfx
     map address=00-3f,80-bf:3000-34ff
-    rom
+    memory type=ROM content=Program
       map address=00-1f,80-9f:8000-ffff mask=0x8000
-    ram
+    memory type=RAM content=Save
       map address=60-7d,e0-ff:0000-ffff
 
 board: SHVC-1CA0N5S-01
   superfx
     map address=00-3f,80-bf:3000-34ff
-    rom
+    memory type=ROM content=Program
       map address=00-3f,80-bf:8000-ffff mask=0x8000
       map address=40-5f,c0-df:0000-ffff
-    ram
+    memory type=RAM content=Save
       map address=00-3f,80-bf:6000-7fff size=0x2000
       map address=70-71,f0-f1:0000-ffff
 
 board: SHVC-1CA0N6S-01
   superfx
     map address=00-3f,80-bf:3000-34ff
-    rom
+    memory type=ROM content=Program
       map address=00-3f,80-bf:8000-ffff mask=0x8000
       map address=40-5f,c0-df:0000-ffff
-    ram
+    memory type=RAM content=Save
       map address=00-3f,80-bf:6000-7fff size=0x2000
       map address=70-71,f0-f1:0000-ffff
 
 board: SHVC-1CA6B-01
   superfx
     map address=00-3f,80-bf:3000-34ff
-    rom
+    memory type=ROM content=Program
       map address=00-3f,80-bf:8000-ffff mask=0x8000
       map address=40-5f,c0-df:0000-ffff
-    ram
+    memory type=RAM content=Save
       map address=00-3f,80-bf:6000-7fff size=0x2000
       map address=70-71,f0-f1:0000-ffff
 
 board: SHVC-1CB0N7S-01
   superfx
     map address=00-3f,80-bf:3000-34ff
-    rom
+    memory type=ROM content=Program
       map address=00-3f:8000-ffff mask=0x8000
       map address=40-5f:0000-ffff
-    ram
+    memory type=RAM content=Save
       map address=00-3f,80-bf:6000-7fff size=0x2000
       map address=70-71:0000-ffff
 
 board: SHVC-1CB5B-20
   superfx
     map address=00-3f,80-bf:3000-34ff
-    rom
+    memory type=ROM content=Program
       map address=00-3f:8000-ffff mask=0x8000
       map address=40-5f:0000-ffff
-    ram
+    memory type=RAM content=Save
       map address=00-3f,80-bf:6000-7fff size=0x2000
       map address=70-71:0000-ffff
 
 board: SHVC-1CB7B-01
   superfx
     map address=00-3f,80-bf:3000-34ff
-    rom
+    memory type=ROM content=Program
       map address=00-3f:8000-ffff mask=0x8000
       map address=40-5f:0000-ffff
-    ram
+    memory type=RAM content=Save
       map address=00-3f,80-bf:6000-7fff size=0x2000
       map address=70-71:0000-ffff
 
 board: SHVC-1DC0N-01
-  hitachidsp model=HG51B169 frequency=20000000
+  hitachidsp model=HG51BS169
     map address=00-3f,80-bf:6c00-6fff,7c00-7fff
     map address=70-77:0000-7fff
-    rom
+    memory type=ROM content=Program
       map address=00-3f,80-bf:8000-ffff mask=0x8000
-    drom
-    dram
+    memory type=ROM content=Data architecture=HG51BS169
+    memory type=RAM content=Data architecture=HG51BS169
       map address=00-3f,80-bf:6000-6bff,7000-7bff mask=0xf000
+    oscillator
 
 board: SHVC-1DS0B-20
-  rom
+  memory type=ROM content=Program
     map address=00-7d,80-ff:8000-ffff mask=0x8000
-  necdsp model=uPD96050 frequency=11000000
+  necdsp model=uPD96050
     map address=60-67,e0-e7:0000-3fff
-    prom
-    drom
-    dram
+    memory type=ROM content=Program architecture=uPD96050
+    memory type=ROM content=Data architecture=uPD96050
+    memory type=RAM content=Data architecture=uPD96050
       map address=68-6f,e8-ef:0000-7fff mask=0x8000
+    oscillator
 
 board: SHVC-1J0N-(01,10,20)
-  rom
+  memory type=ROM content=Program
     map address=00-3f,80-bf:8000-ffff
     map address=40-7d,c0-ff:0000-ffff
 
 board: SHVC-1J1M-(11,20)
-  rom
+  memory type=ROM content=Program
     map address=00-3f,80-bf:8000-ffff
     map address=40-7d,c0-ff:0000-ffff
-  ram
+  memory type=RAM content=Save
     map address=20-3f,a0-bf:6000-7fff mask=0xe000
 
 board: SHVC-1J3B-01
-  rom
+  memory type=ROM content=Program
     map address=00-3f,80-bf:8000-ffff
     map address=40-7d,c0-ff:0000-ffff
-  ram
+  memory type=RAM content=Save
     map address=20-3f,a0-bf:6000-7fff mask=0xe000
 
 board: SHVC-1J3M-(01,11,20)
-  rom
+  memory type=ROM content=Program
     map address=00-3f,80-bf:8000-ffff
     map address=40-7d,c0-ff:0000-ffff
-  ram
+  memory type=RAM content=Save
     map address=20-3f,a0-bf:6000-7fff mask=0xe000
 
 board: SHVC-1J5M-(01,11,20)
-  rom
+  memory type=ROM content=Program
     map address=00-3f,80-bf:8000-ffff
     map address=40-7d,c0-ff:0000-ffff
-  ram
+  memory type=RAM content=Save
     map address=20-3f,a0-bf:6000-7fff mask=0xe000
 
 board: SHVC-1K0N-01
-  rom
+  memory type=ROM content=Program
     map address=00-3f,80-bf:8000-ffff
     map address=40-7d,c0-ff:0000-ffff
-  necdsp model=uPD7725 frequency=8000000
+  necdsp model=uPD7725
     map address=00-1f,80-9f:6000-7fff mask=0xfff
-    prom
-    drom
-    dram
+    memory type=ROM content=Program architecture=uPD7725
+    memory type=ROM content=Data architecture=uPD7725
+    memory type=RAM content=Data architecture=uPD7725
+    oscillator
 
 board: SHVC-1K1B-01
-  rom
+  memory type=ROM content=Program
     map address=00-3f,80-bf:8000-ffff
     map address=40-7d,c0-ff:0000-ffff
-  ram
+  memory type=RAM content=Save
     map address=20-3f,a0-bf:6000-7fff mask=0xe000
-  necdsp model=uPD7725 frequency=8000000
+  necdsp model=uPD7725
     map address=00-1f,80-9f:6000-7fff mask=0xfff
-    prom
-    drom
-    dram
+    memory type=ROM content=Program architecture=uPD7725
+    memory type=ROM content=Data architecture=uPD7725
+    memory type=RAM content=Data architecture=uPD7725
+    oscillator
 
 board: SHVC-1L0N3S-01
   sa1
     map address=00-3f,80-bf:2200-23ff
-    rom
+    memory type=ROM content=Program
       map address=00-3f,80-bf:8000-ffff mask=0x408000
       map address=c0-ff:0000-ffff
-    bwram
+    memory type=RAM content=Save
       map address=00-3f,80-bf:6000-7fff size=0x2000
       map address=40-4f:0000-ffff
-    iram
+    memory type=RAM content=Internal
       map address=00-3f,80-bf:3000-37ff size=0x800
 
 board: SHVC-1L3B-(02,11)
   sa1
     map address=00-3f,80-bf:2200-23ff
-    rom
+    memory type=ROM content=Program
       map address=00-3f,80-bf:8000-ffff mask=0x408000
       map address=c0-ff:0000-ffff
-    bwram
+    memory type=RAM content=Save
       map address=00-3f,80-bf:6000-7fff size=0x2000
       map address=40-4f:0000-ffff
-    iram
+    memory type=RAM content=Internal
       map address=00-3f,80-bf:3000-37ff size=0x800
 
 board: SHVC-1L5B-(11,20)
   sa1
     map address=00-3f,80-bf:2200-23ff
-    rom
+    memory type=ROM content=Program
       map address=00-3f,80-bf:8000-ffff mask=0x408000
       map address=c0-ff:0000-ffff
-    bwram
+    memory type=RAM content=Save
       map address=00-3f,80-bf:6000-7fff size=0x2000
       map address=40-4f:0000-ffff
-    iram
+    memory type=RAM content=Internal
       map address=00-3f,80-bf:3000-37ff size=0x800
 
 board: SHVC-1N0N-(01,10)
   sdd1
     map address=00-3f,80-bf:4800-480f
-    rom
+    memory type=ROM content=Program
       map address=00-3f,80-bf:8000-ffff
       map address=c0-ff:0000-ffff
 
-board: SHVC-2A0N-01#R
-  rom
+board: SHVC-2A0N-01#A
+  memory type=ROM content=Program
     map address=00-2f,80-af:8000-ffff mask=0x8000
     map address=40-6f,c0-ef:0000-ffff mask=0x8000
 
 board: SHVC-2A0N-(01,10,11,20)
-  rom
+  memory type=ROM content=Program
     map address=00-7d,80-ff:8000-ffff mask=0x8000
     map address=40-7d,c0-ff:0000-7fff mask=0x8000
 
 board: SHVC-2A1M-01
-  rom
+  memory type=ROM content=Program
     map address=00-7d,80-ff:8000-ffff mask=0x8000
-  ram
+  memory type=RAM content=Save
     map address=70-7d,f0-ff:0000-7fff mask=0x8000
 
 board: SHVC-2A3B-01
-  rom
+  memory type=ROM content=Program
     map address=00-3f,80-bf:8000-ffff mask=0x8000
-  ram
+  memory type=RAM content=Save
     map address=70-7d,f0-ff:0000-7fff mask=0x8000
 
-board: SHVC-2A3M-01#R
-  rom
+board: SHVC-2A3M-01#A
+  memory type=ROM content=Program
     map address=00-3f,80-bf:8000-ffff mask=0x8000
-  ram
+  memory type=RAM content=Save
     map address=70-7d,f0-ff:0000-7fff mask=0x8000
 
 board: SHVC-2A3M-(01,11,20)
-  rom
+  memory type=ROM content=Program
     map address=00-7d,80-ff:8000-ffff mask=0x8000
-  ram
+  memory type=RAM content=Save
     map address=70-7d,f0-ff:0000-7fff mask=0x8000
 
 board: SHVC-2A5M-01
-  rom
+  memory type=ROM content=Program
     map address=00-7d,80-ff:8000-ffff mask=0x8000
-  ram
+  memory type=RAM content=Save
     map address=70-7d,f0-ff:0000-7fff mask=0x8000
 
 board: SHVC-2B3B-01
-  rom
+  memory type=ROM content=Program
     map address=00-3f,80-bf:8000-ffff mask=0x8000
-  ram
+  memory type=RAM content=Save
     map address=70-7d,f0-ff:0000-7fff mask=0x8000
-  necdsp model=uPD7725 frequency=8000000
+  necdsp model=uPD7725
     map address=60-6f,e0-ef:0000-7fff mask=0x3fff
-    prom
-    drom
-    dram
+    memory type=ROM content=Program architecture=uPD7725
+    memory type=ROM content=Data architecture=uPD7725
+    memory type=RAM content=Data architecture=uPD7725
+    oscillator
 
 board: SHVC-2DC0N-01
-  hitachidsp model=HG51B169 frequency=20000000
+  hitachidsp model=HG51BS169
     map address=00-3f,80-bf:6c00-6fff,7c00-7fff
     map address=70-77:0000-7fff
-    rom
+    memory type=ROM content=Program
       map address=00-3f,80-bf:8000-ffff mask=0x8000
-    drom
-    dram
+    memory type=ROM content=Data architecture=HG51BS169
+    memory type=RAM content=Data architecture=HG51BS169
       map address=00-3f,80-bf:6000-6bff,7000-7bff mask=0xf000
+    oscillator
 
 board: SHVC-2E3M-01
-  rom
+  memory type=ROM content=Program
     map address=00-3f,80-bf:8000-ffff mask=0x8000
   obc1
     map address=00-3f,80-bf:6000-7fff mask=0xe000
     map address=70-71,f0-f1:6000-7fff,e000-ffff mask=0xe000
-    ram
+    memory type=RAM content=Save
 
 board: SHVC-2J0N-(01,10,11,20)
-  rom
+  memory type=ROM content=Program
     map address=00-3f,80-bf:8000-ffff
     map address=40-7d,c0-ff:0000-ffff
 
 board: SHVC-2J3M-(01,11,20)
-  rom
+  memory type=ROM content=Program
     map address=00-3f,80-bf:8000-ffff
     map address=40-7d,c0-ff:0000-ffff
-  ram
+  memory type=RAM content=Save
     map address=10-1f,30-3f,90-9f,b0-bf:6000-7fff mask=0xe000
 
 board: SHVC-2J5M-01
-  rom
+  memory type=ROM content=Program
     map address=00-3f,80-bf:8000-ffff
     map address=40-7d,c0-ff:0000-ffff
-  ram
+  memory type=RAM content=Save
     map address=10-1f,30-3f,90-9f,b0-bf:6000-7fff mask=0xe000
 
 board: SHVC-3J0N-01
-  rom
+  memory type=ROM content=Program
     map address=00-2f,80-af:8000-ffff
     map address=40-6f,c0-ef:0000-ffff
 
 board: SHVC-BA0N-(01,10)
-  rom
+  memory type=ROM content=Program
     map address=00-7d,80-ff:8000-ffff mask=0x8000
     map address=40-7d,c0-ff:0000-7fff mask=0x8000
 
 board: SHVC-BA1M-01
-  rom
+  memory type=ROM content=Program
     map address=00-7d,80-ff:8000-ffff mask=0x8000
-  ram
+  memory type=RAM content=Save
     map address=70-7d,f0-ff:0000-7fff mask=0x8000
 
 board: SHVC-BA3M-(01,10)
-  rom
+  memory type=ROM content=Program
     map address=00-7d,80-ff:8000-ffff mask=0x8000
-  ram
+  memory type=RAM content=Save
     map address=70-7d,f0-ff:0000-7fff mask=0x8000
 
 board: SHVC-BJ0N-(01,20)
-  rom
+  memory type=ROM content=Program
     map address=00-3f,80-bf:8000-ffff
     map address=40-7d,c0-ff:0000-ffff
 
 board: SHVC-BJ1M-(10,20)
-  rom
+  memory type=ROM content=Program
     map address=00-3f,80-bf:8000-ffff
     map address=40-7d,c0-ff:0000-ffff
-  ram
+  memory type=RAM content=Save
     map address=20-3f,a0-bf:6000-7fff mask=0xe000
 
 board: SHVC-BJ3M-10
-  rom
+  memory type=ROM content=Program
     map address=00-3f,80-bf:8000-ffff
     map address=40-7d,c0-ff:0000-ffff
-  ram
+  memory type=RAM content=Save
     map address=20-3f,a0-bf:6000-7fff mask=0xe000
 
 board: SHVC-LDH3C-01
@@ -493,40 +501,41 @@ board: SHVC-LDH3C-01
     map address=50,58:0000-ffff
     map=mcu address=00-3f,80-bf:8000-ffff mask=0x800000
     map=mcu address=c0-ff:0000-ffff mask=0xc00000
-    prom
-    drom
-    ram
+    memory type=ROM content=Program
+    memory type=ROM content=Data
+    memory type=RAM content=Save
       map address=00-3f,80-bf:6000-7fff mask=0xe000
   epsonrtc
     map address=00-3f,80-bf:4840-4842
-    ram
+    memory type=RTC content=Time manufacturer=Epson
 
 board: SHVC-LN3B-01
   sdd1
     map address=00-3f,80-bf:4800-480f
-    rom
+    memory type=ROM content=Program
       map address=00-3f,80-bf:8000-ffff
       map address=c0-ff:0000-ffff
-    ram
+    memory type=RAM content=Save
       map address=00-3f,80-bf:6000-7fff mask=0xe000
       map address=70-73:0000-ffff
 
 board: SHVC-SGB2-01
-  rom
+  memory type=ROM content=Program
     map address=00-7d,80-ff:8000-ffff mask=0x8000
     map address=40-7d,c0-ff:0000-7fff mask=0x8000
-  icd revision=2 frequency=20971520
+  icd revision=2
     map address=00-3f,80-bf:6000-67ff,7000-7fff
-    rom
-    gameboy
+    memory type=ROM content=Boot architecture=LR35902
+    oscillator
+    slot type=GameBoy
 
 board: SHVC-YA0N-01
-  rom
+  memory type=ROM content=Program
     map address=00-7d,80-ff:8000-ffff mask=0x8000
     map address=40-7d,c0-ff:0000-7fff mask=0x8000
 
 board: SHVC-YJ0N-01
-  rom
+  memory type=ROM content=Program
     map address=00-3f,80-bf:8000-ffff
     map address=40-7d,c0-ff:0000-ffff
 
diff --git a/higan/ws/cartridge/cartridge.cpp b/higan/ws/cartridge/cartridge.cpp
index db041159..3ee6d967 100644
--- a/higan/ws/cartridge/cartridge.cpp
+++ b/higan/ws/cartridge/cartridge.cpp
@@ -62,60 +62,50 @@ auto Cartridge::load() -> bool {
 
   auto document = BML::unserialize(information.manifest);
 
-  if(auto node = document["board/rom"]) {
-    rom.name = node["name"].text();
-    rom.size = node["size"].natural();
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=ROM,content=Program)"]}) {
+    rom.size = memory.size;
     rom.mask = bit::round(rom.size) - 1;
-    if(rom.size) {
-      rom.data = new uint8[rom.mask + 1];
-      memory::fill(rom.data, rom.mask + 1, 0xff);
-      if(rom.name) if(auto fp = platform->open(pathID(), rom.name, File::Read, File::Required)) {
-        fp->read(rom.data, rom.size);
+    rom.data = new uint8[rom.mask + 1];
+    memory::fill(rom.data, rom.mask + 1, 0xff);
+    if(auto fp = platform->open(pathID(), memory.name(), File::Read, File::Required)) {
+      fp->read(rom.data, rom.size);
+    }
+  }
+
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=RAM,content=Save)"]}) {
+    ram.size = memory.size;
+    ram.mask = bit::round(ram.size) - 1;
+    ram.data = new uint8[ram.mask + 1];
+    memory::fill(ram.data, ram.mask + 1, 0xff);
+    if(memory.nonVolatile) {
+      if(auto fp = platform->open(pathID(), memory.name(), File::Read)) {
+        fp->read(ram.data, ram.size);
       }
     }
   }
 
-  if(auto node = document["board/ram"]) {
-    if(node["type"].text() == "sram") {
-      ram.name = node["name"].text();
-      ram.size = node["size"].natural();
-      ram.mask = bit::round(ram.size) - 1;
-      if(ram.size) {
-        ram.data = new uint8[ram.mask + 1];
-        memory::fill(ram.data, ram.mask + 1, 0xff);
-        if(ram.name) if(auto fp = platform->open(pathID(), ram.name, File::Read)) {
-          fp->read(ram.data, ram.size);
-        }
-      }
-    }
-
-    if(node["type"].text() == "eeprom") {
-      eeprom.setName(node["name"].text());
-      eeprom.setSize(node["size"].natural() / sizeof(uint16));
-      if(eeprom.size()) {
-        eeprom.erase();
-        if(eeprom.name()) if(auto fp = platform->open(pathID(), eeprom.name(), File::Read)) {
-          fp->read(eeprom.data(), eeprom.size());
-        }
-      }
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=EEPROM,content=Save)"]}) {
+    eeprom.setSize(memory.size / sizeof(uint16));
+    eeprom.erase();
+    if(auto fp = platform->open(pathID(), memory.name(), File::Read)) {
+      fp->read(eeprom.data(), eeprom.size());
     }
   }
 
-  if(auto node = document["board/rtc"]) {
-    rtc.name = node["name"].text();
-    rtc.size = node["size"].natural();
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=RTC,content=Time)"]}) {
+    rtc.size = memory.size;
     rtc.mask = bit::round(rtc.size) - 1;
-    if(rtc.size) {
-      rtc.data = new uint8[rtc.mask + 1];
-      memory::fill(rtc.data, rtc.mask + 1, 0x00);
-      if(rtc.name) if(auto fp = platform->open(pathID(), rtc.name, File::Read)) {
+    rtc.data = new uint8[rtc.mask + 1];
+    memory::fill(rtc.data, rtc.mask + 1, 0x00);
+    if(memory.nonVolatile) {
+      if(auto fp = platform->open(pathID(), memory.name(), File::Read)) {
         fp->read(rtc.data, rtc.size);
       }
     }
   }
 
-  information.title = document["information/title"].text();
-  information.orientation = document["information/orientation"].text() == "vertical";
+  information.title = document["game/label"].text();
+  information.orientation = document["game/orientation"].text() == "vertical";
   information.sha256 = Hash::SHA256(rom.data, rom.size).digest();
   return true;
 }
@@ -123,21 +113,25 @@ auto Cartridge::load() -> bool {
 auto Cartridge::save() -> void {
   auto document = BML::unserialize(information.manifest);
 
-  if(auto name = document["board/ram/name"].text()) {
-    if(auto fp = platform->open(pathID(), name, File::Write)) {
-      fp->write(ram.data, ram.size);
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=RAM,content=Save)"]}) {
+    if(memory.nonVolatile) {
+      if(auto fp = platform->open(pathID(), memory.name(), File::Write)) {
+        fp->write(ram.data, ram.size);
+      }
     }
   }
 
-  if(auto name = document["board/eeprom/name"].text()) {
-    if(auto fp = platform->open(pathID(), name, File::Write)) {
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=EEPROM,content=Save)"]}) {
+    if(auto fp = platform->open(pathID(), memory.name(), File::Write)) {
       fp->write(eeprom.data(), eeprom.size());
     }
   }
 
-  if(auto name = document["board/rtc/name"].text()) {
-    if(auto fp = platform->open(pathID(), name, File::Write)) {
-      fp->write(rtc.data, rtc.size);
+  if(auto memory = Emulator::Game::Memory{document["game/board/memory(type=RTC,content=Time)"]}) {
+    if(memory.nonVolatile) {
+      if(auto fp = platform->open(pathID(), memory.name(), File::Write)) {
+        fp->write(rtc.data, rtc.size);
+      }
     }
   }
 }
@@ -147,19 +141,16 @@ auto Cartridge::unload() -> void {
   rom.data = nullptr;
   rom.size = 0;
   rom.mask = 0;
-  rom.name = "";
 
   delete[] ram.data;
   ram.data = nullptr;
   ram.size = 0;
   ram.mask = 0;
-  ram.name = "";
 
   delete[] rtc.data;
   rtc.data = nullptr;
   rtc.size = 0;
   rtc.mask = 0;
-  rtc.name = "";
 }
 
 }
diff --git a/higan/ws/cartridge/cartridge.hpp b/higan/ws/cartridge/cartridge.hpp
index d4e9b60f..b3814b1a 100644
--- a/higan/ws/cartridge/cartridge.hpp
+++ b/higan/ws/cartridge/cartridge.hpp
@@ -66,7 +66,6 @@ struct Cartridge : Thread, IO {
     uint8* data = nullptr;
     uint size = 0;
     uint mask = 0;
-    string name;
   };
 
   struct RTC : Memory {
diff --git a/higan/ws/eeprom/eeprom.cpp b/higan/ws/eeprom/eeprom.cpp
index 6d6ad4f6..6d10641b 100644
--- a/higan/ws/eeprom/eeprom.cpp
+++ b/higan/ws/eeprom/eeprom.cpp
@@ -4,14 +4,9 @@ namespace WonderSwan {
 
 #include "serialization.cpp"
 
-auto EEPROM::name() const -> string { return _name; }
 auto EEPROM::data() -> uint16* { return _data; }
 auto EEPROM::size() const -> uint { return _size; }
 
-auto EEPROM::setName(string name) -> void {
-  _name = name;
-}
-
 auto EEPROM::setSize(uint size) -> void {
   _size = bit::round(size);
 }
diff --git a/higan/ws/eeprom/eeprom.hpp b/higan/ws/eeprom/eeprom.hpp
index 182774e9..4e55c40f 100644
--- a/higan/ws/eeprom/eeprom.hpp
+++ b/higan/ws/eeprom/eeprom.hpp
@@ -14,7 +14,6 @@ struct EEPROM {
     Command = Status,
   };
 
-  auto name() const -> string;
   auto data() -> uint16*;
   auto size() const -> uint;
 
@@ -34,7 +33,6 @@ struct EEPROM {
 private:
   auto execute() -> void;
 
-  string _name;
   uint16 _data[1024];
   uint _size = 0;  //in words
 
diff --git a/higan/ws/system/system.cpp b/higan/ws/system/system.cpp
index 865615a3..60a80561 100644
--- a/higan/ws/system/system.cpp
+++ b/higan/ws/system/system.cpp
@@ -28,12 +28,11 @@ auto System::load(Emulator::Interface* interface, Model model) -> bool {
   //note: IPLROM is currently undumped; otherwise we'd load it here ...
 
   if(auto node = document["system/eeprom"]) {
-    eeprom.setName(node["name"].text());
     eeprom.setSize(node["size"].natural() / sizeof(uint16));
     eeprom.erase();
     //initialize user-data section
     for(uint addr = 0x0030; addr <= 0x003a; addr++) eeprom[addr] = 0x0000;
-    if(auto fp = platform->open(ID::System, eeprom.name(), File::Read)) {
+    if(auto fp = platform->open(ID::System, node["name"].text(), File::Read)) {
       fp->read(eeprom.data(), eeprom.size());
     }
   }
@@ -55,7 +54,6 @@ auto System::save() -> void {
 auto System::unload() -> void {
   if(!loaded()) return;
 
-  eeprom.setName("");
   eeprom.setSize(0);
 
   cartridge.unload();
diff --git a/icarus/Database/BS Memory.bml b/icarus/Database/BS Memory.bml
index 7de2ec1b..87cbd3fd 100644
--- a/icarus/Database/BS Memory.bml	
+++ b/icarus/Database/BS Memory.bml	
@@ -1,10 +1,10 @@
 database
-  revision: 2018-03-13
+  revision: 2018-04-15
 
 //BS Memory (JPN)
 
 database
-  revision: 2018-02-12
+  revision: 2018-04-14
 
 game
   sha256:   80c34b50817d58820bc8c88d2d9fa462550b4a76372e19c6467cbfbc8cf5d9ef
@@ -16,7 +16,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   859c7f7b4771d920a5bdb11f1d247ab6b43fb026594d1062f6f72d32cd340a0a
@@ -28,7 +28,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   c92a15fdd9b0133f9ea69105d0230a3acd1cdeef98567462eca86ea02a959e4e
@@ -40,5 +40,5 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
diff --git a/icarus/Database/Sufami Turbo.bml b/icarus/Database/Sufami Turbo.bml
index cf74ca4e..64969ec5 100644
--- a/icarus/Database/Sufami Turbo.bml	
+++ b/icarus/Database/Sufami Turbo.bml	
@@ -1,10 +1,10 @@
 database
-  revision: 2018-03-13
+  revision: 2018-04-15
 
 //Sufami Turbo (JPN)
 
 database
-  revision: 2018-02-12
+  revision: 2018-04-14
 
 game
   sha256:   f73bda08743565e0bd101632ebbac2d363d703a3ab39d23f49d95217cab29269
@@ -16,7 +16,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
   note: Unlinkable
 
 game
@@ -29,7 +29,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
   note: Unlinkable
 
 game
@@ -42,7 +42,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
   note: Unlinkable
 
 game
@@ -55,7 +55,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
   note: Unlinkable
 
 game
@@ -68,12 +68,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
   note: Linkable: SFT-0103-JPN
 
 game
@@ -86,12 +85,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
   note: Linkable: SFT-0104-JPN, SFT-0105-JPN, SFT-0107-JPN, SFT-0108-JPN, SFT-0110-JPN, SFT-0111-JPN
 
 game
@@ -104,12 +102,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
   note: Linkable: SFT-0104-JPN, SFT-0105-JPN, SFT-0107-JPN, SFT-0108-JPN, SFT-0110-JPN, SFT-0111-JPN
 
 game
@@ -122,12 +119,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
   note: Linkable: SFT-0104-JPN, SFT-0105-JPN, SFT-0107-JPN, SFT-0108-JPN, SFT-0110-JPN, SFT-0111-JPN
 
 game
@@ -140,12 +136,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
   note: Linkable: SFT-0104-JPN, SFT-0105-JPN, SFT-0107-JPN, SFT-0108-JPN, SFT-0110-JPN, SFT-0111-JPN
 
 game
@@ -158,12 +153,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
   note: Linkable: SFT-0104-JPN, SFT-0105-JPN, SFT-0107-JPN, SFT-0108-JPN, SFT-0110-JPN, SFT-0111-JPN
 
 game
@@ -176,12 +170,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
   note: Linkable: SFT-0104-JPN, SFT-0105-JPN, SFT-0107-JPN, SFT-0108-JPN, SFT-0110-JPN, SFT-0111-JPN
 
 game
@@ -194,12 +187,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
   note: Linkable: SFT-0101-JPN, SFT-0102-JPN
 
 game
@@ -212,11 +204,10 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
   note: Linkable: SFT-0101-JPN, SFT-0102-JPN
 
diff --git a/icarus/Database/Super Famicom.bml b/icarus/Database/Super Famicom.bml
index 0caee069..8b26f6e9 100644
--- a/icarus/Database/Super Famicom.bml	
+++ b/icarus/Database/Super Famicom.bml	
@@ -1,10 +1,10 @@
 database
-  revision: 2018-03-13
+  revision: 2018-04-15
 
 //Prototypes (JPN)
 
 database
-  revision: 2018-02-16
+  revision: 2018-04-14
 
 game
   sha256:   182cd72c2ef57119b56bef1f7c18660498422a912f1bb652771d465cd183b04e
@@ -16,7 +16,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   bcba4ca39f0279f7a52657bccbffa84564eaea455e2565597b93942ec245fdb1
@@ -28,12 +28,12 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 //Super Comboy (KOR)
 
 database
-  revision: 2016-09-24
+  revision: 2018-04-14
 
 game
   sha256:   b820ef79c16b3f43139cc9622c685020db3e87364c3a0f3946242bff93b787c8
@@ -45,7 +45,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   9170aacd61bd2f936818db901451e44c18f3e88fd8d534553c2650ccad082466
@@ -57,33 +57,33 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
     memory
       type: ROM
       size: 0x1800
-      category: Program
+      content: Program
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: ROM
       size: 0x800
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: RAM
       size: 0x200
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
+      volatile
     oscillator
       frequency: 7600000
 
@@ -97,12 +97,12 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 //Super Famicom (HKG)
 
 database
-  revision: 2018-02-14
+  revision: 2018-04-14
 
 game
   sha256:   bd763c1a56365c244be92e6cffefd318780a2a19eda7d5baf1c6d5bd6c1b3e06
@@ -114,19 +114,18 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
     oscillator
       frequency: 21440000
 
 //Super Famicom (JPN)
 
 database
-  revision: 2018-03-01
+  revision: 2018-04-14
 
 game
   sha256:   5c4e283efc338958b8dd45ebd6daf133a9eb280420a98e2e1df358ae0242c366
@@ -138,7 +137,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   6f6bacdd73aef29ff6a015c25db4a5cd8ba31142b2cc3fe56261d23bbf8329ea
@@ -150,12 +149,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   1f7619ea0d02f16e2b2dcbb36013bb3405eb791885f23884b583eb63768614c4
@@ -167,12 +165,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   47779500c43a0c2e75d7684078489a17baea31170a123063b8ece6ce77359413
@@ -184,12 +181,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   a05f76cbceffc7b015491a1c4d4913758484d392471bca20af1dce6fd62d878b
@@ -201,7 +197,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   af12d61733f120ef25cac2c095e0152345143025eb9d8ef820c7f857207d46ac
@@ -213,7 +209,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   ecd772c4a21101d079a795e47abbe00052bef69cc1c854a328f0077016c53311
@@ -225,12 +221,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   3ce321496edc5d77038de2034eb3fb354d7724afd0bc7fd0319f3eb5d57b984d
@@ -242,16 +237,15 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
     memory
       type: PSRAM
       size: 0x80000
-      category: Download
+      content: Download
 
 game
   sha256:   6e7dcbb4df32903d6ff5da1e308342c0a72f5af3f11479cf49391dc3a17d5d7b
@@ -263,7 +257,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   0938ff33f5bab359e383bb5499f4fcc2a488fe49747026db355c2d3d5c7c2fdb
@@ -275,12 +269,11 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   0a8e5b78caf79f4710de3ccc41e2d1975cff3a6cb4146be9ed1c8767be1b0c5d
@@ -292,11 +285,12 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
       size: 0x2000
-      category: Save
+      content: Save
+      volatile
   note: No battery on PCB
 
 game
@@ -309,12 +303,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   7fccf61a698b250f01b548fd20a7c133ef1c6dbb8172d3ee6c24657b60820a00
@@ -326,7 +319,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   248217975279bbf9db8e74da11a906a6dd867a3ec88441b0b031ecf900466618
@@ -338,7 +331,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   700e5d0a79a46d343216b822e28e6f3d0f33f68906f59b1c719735365c129553
@@ -350,12 +343,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   38a855229eab468c3ede7573db73082c66b157adfc7af787ccac50559b747f5f
@@ -367,12 +359,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   b7209ec3a5a0d28724f5867343195aef7cb85aeb453aa84a6cbe201b61b0d083
@@ -384,7 +375,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   dcb14c95f058a32f40cc329793f5d95fd6cf1755cffe02c0594d1c583a06d356
@@ -396,12 +387,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   dc1ecf27d9ce4fdf674c9405339016f5a812f7c4687e588cc6404e2b3b92541a
@@ -413,12 +403,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   f49417cb8759a30e12439e846f7d581afd1519c625e6a0522876666098521fcc
@@ -430,12 +419,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   69d06a3f3a4f3ba769541fe94e92b42142e423e9f0924eab97865b2d826ec82d
@@ -447,24 +435,21 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: ROM
       size: 0x400000
-      category: Data
+      content: Data
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
     memory
       type: RTC
-        battery
       size: 0x10
-      category: Time
+      content: Time
       manufacturer: Epson
-      model: RTC4513
-      identity: RTC4513
+      identifier: RTC4513
 
 game
   sha256:   74aa3a26b66f34819fbbdcdb2475cf9161cc2590fb1ec89fb24940ef10e44332
@@ -476,12 +461,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   32125257a20c4a6495131f5df79128d189cf6dfb6d45e5314f8b0173ac6f6ebd
@@ -493,7 +477,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   2d0e06e970ad7a1305db754a3a92b6e07e2eab848be196c8182b48dc416f1762
@@ -505,12 +489,11 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   db337a2e8cf6de653d092ba3489cabc658f91c63ec8a9db4e1866400aadf913f
@@ -522,12 +505,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   b248b2122a0caf99298ebd9a4f66ad8047dbfce1e4bbac8219ba3ea9fb7488b5
@@ -539,7 +521,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   3a59d7d8df992e9e19c3944f1e17b8a3e9500b266412f51af306e14ff543ab45
@@ -551,7 +533,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   4e790991a1dc4a9df209f68895412597b4069b42971683c3a3092a160556f305
@@ -563,12 +545,11 @@ game
     memory
       type: ROM
       size: 0x280000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   8d4e736e1876182a5cc6d9dcc3ca4eb36b16485bc35e2f40e750d023138ada43
@@ -580,7 +561,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   4a910531609abb6e0a8bab15c1c6269b608eb72cb2fbf227c0e706d0d6f6fe5b
@@ -592,7 +573,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   83a9d5c7732677838fd4812071aacf04e513e43b3a52e68bd7242db23b2ecc95
@@ -604,7 +585,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   8e0d620a307a225a757bbc9ef2a2a666792e5d533aa0279d3c0060a1b93ead82
@@ -616,7 +597,7 @@ game
     memory
       type: ROM
       size: 0x140000
-      category: Program
+      content: Program
 
 game
   sha256:   4dfba33201de6b5dec952d0f327aeb44ed784c025a72c982356dd41b52efc219
@@ -628,16 +609,16 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
     memory
       type: RAM
       size: 0x800
-      category: Internal
+      content: Internal
+      volatile
 
 game
   sha256:   23b320be74b9fc20de512080be3051575ba36c3246d5c4ee224f31a2fa7808f5
@@ -649,12 +630,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   ff19a9c3f5a1ccb3ac6261886f54870ac910b0f25df9e46a436e4a621f8a0a59
@@ -666,7 +646,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   f9ec39546e18b15b8f6a738204d0227c1542cd8157e3e0ea16934e76f39e288c
@@ -678,7 +658,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   1281841d3b9624e3b4cc3234f46350ce65473fba8d963b30a9f25b5385b8dd83
@@ -690,7 +670,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   374e411f64e4fd581a32296c90a5c74c0adf2936003077565e0672d0a91affdf
@@ -702,7 +682,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   1906b351d51fc0fc6d5a3cfa0fe7cb45b10d09aba256c411f5abad827bce95c6
@@ -714,12 +694,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   0266520683f2df2179a2e6abf62754d0e8c7d82d12e59d3d3cbf7ae403a2625f
@@ -731,12 +710,11 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   fe44f9d0db9f04f704764577b94e5bf2e18bc7a1c4ff1e6bdaca06d49ed6813c
@@ -748,7 +726,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   106c8158a10f493e0f57bd66ee3b3db36af01964bc44a48819498bf02cb1af7c
@@ -760,7 +738,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   ed617ad12c865fc9c9c5c75de840d3afeded57d13ca3a3062bf8e30095629414
@@ -772,7 +750,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   78d0f6dd9ce0813e0532c7b25c7fa0b6b945d12a4ace21aa940e98babf4dacb1
@@ -784,7 +762,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   c51c5930b344f553415d54c3c964c050e1eb6355b10f5966deabb686e70e1750
@@ -796,7 +774,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   e842cac1a4301be196f1e137fbd1a16866d5c913f24dbca313f4dd8bd7472f45
@@ -808,12 +786,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   dd314086a62e587bc6ad50c84a38a6ff9082b2d2d06dc50be5fa4c096bed5da3
@@ -825,7 +802,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   2298d92acdfecc7270a6c9a57a6ddc55d7fa841fe9c0e7c0d64e33682fffa429
@@ -837,16 +814,16 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
     memory
       type: RAM
       size: 0x800
-      category: Internal
+      content: Internal
+      volatile
 
 game
   sha256:   a5bfdaaf490d834917f7ac23ec115147b4c94bf4c18c62e18c64431d7cc79b01
@@ -858,7 +835,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   97c5dcdc457fb29e6294ed93bc2a74117126c45eb399c7caf5920eca36fb63ec
@@ -870,7 +847,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   c48a4ca22d001eb269fd85110fbe459034bf89f14b5b2733ee70b2d10c0687c0
@@ -882,7 +859,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   b41126e52ce1696da2efe524f7fd7467d76dcc3fbfa52ff6666671137587b089
@@ -894,12 +871,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   d712adecbde70a74c4a580fe90a45d0d19f2641d1b4e091d507bddeec9601de1
@@ -911,12 +887,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   18434c35fe5196bf699494bb5dbabda23019cfea099f4ca638437fda43133b39
@@ -928,12 +903,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   87e8e3f8b4fc83d2e56662c8b6844b104f6b562744c090d96cdacfcb9523af39
@@ -945,12 +919,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   e9a1f5cf088e060293b5566e7f518b0da89aeaebffb1c3f73fcc3f36fac036ae
@@ -962,7 +935,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   96af51216ee7d2978265a474e382835a88b78d12b456a57f39f944a048e95574
@@ -974,7 +947,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   e98821977389fe0ae16ec22e1f63d226698b5f869b2228885bd231a8a551c003
@@ -986,7 +959,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   82a9ee11b5640409c67772363f1148517b26127cef13aa2a8ffc2480b487d81f
@@ -998,7 +971,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   4fc2832e7aa01d105ca67977b38840ec1188869b5e74d20e58613c1cd127d78f
@@ -1010,12 +983,11 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   2626625f29e451746c8762f9e313d1140457fe68b27d36ce0cbee9b5c5be9743
@@ -1023,11 +995,11 @@ game
   name:     Rockman X
   region:   SHVC-RX
   revision: SHVC-RX-0
-  board:    SHVC-2A0N-01#R
+  board:    SHVC-2A0N-01#A
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
   note: Custom wiring on PCB
 
 game
@@ -1040,7 +1012,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   d1e0d1c930011d22423cb7cde8feac445a00705da8067a4e53a735b08389a19d
@@ -1052,12 +1024,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x10000
-      category: Save
+      content: Save
 
 game
   sha256:   00e78318926e5cae79bce0535fddd3dccaa732f5c70e43acefc2769a9899eaed
@@ -1069,7 +1040,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   3a709383208d8258dceb20a5e566903326515ba42931bf97fd389a415a13a72d
@@ -1081,12 +1052,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   208f5ecb7a82b33629e67f39e96b7aa7a992cb2fcc3d1e4eb959abb0a8b7dd95
@@ -1098,16 +1068,16 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
     memory
       type: RAM
       size: 0x800
-      category: Internal
+      content: Internal
+      volatile
 
 game
   sha256:   f1acb9fb0c73b4799b28c26d339823a8c6713106fdf1a15260e75ebb47b376f7
@@ -1119,11 +1089,12 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
       size: 0x2000
-      category: Save
+      content: Save
+      volatile
   note: No battery on PCB
 
 game
@@ -1136,7 +1107,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
+    memory
+      type: RAM
+      size: 0x2000
+      content: Save
 
 game
   sha256:   302ba8a084081bbdd4f1f25bb473fe072b07d1514716c5a3ffd258595e9a176d
@@ -1148,7 +1123,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   7be858fc681df6728650f460d67fe6c80d816d5fbfc530c11153f652f8b1878e
@@ -1160,12 +1135,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x10000
-      category: Save
+      content: Save
 
 game
   sha256:   efae37be832d0ea1490784d57bef00761a8bf0b5bcef9c23f558e063441c3876
@@ -1177,12 +1151,11 @@ game
     memory
       type: ROM
       size: 0x600000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   e722d20b9c264f81bbdb37d77338c5767f6b549af489486e75a648a0a65d5bfc
@@ -1194,7 +1167,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   f15731675e22dbf3882b777b2d8cd541a637dfdf5d8880c83903cf1e0b64590e
@@ -1206,7 +1179,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   edacb453da14f825f05d1134d6035f4bf034e55f7cfb97c70c4ee107eabc7342
@@ -1218,7 +1191,7 @@ game
     memory
       type: ROM
       size: 0x40000
-      category: Program
+      content: Program
 
 game
   sha256:   e57aa265b2fbfb7ee7f5488a3df06ae771db202d59ebbd13df8fc2db80a856f3
@@ -1230,7 +1203,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   442397be57b3740ca236cfb37633b95f88a2c80dafc94b56a805229793563ce1
@@ -1242,7 +1215,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   5f8e6894f71c62bc5e70485715dbd2e2d8f3c0383ec54211dc5fe180098d0e3f
@@ -1254,12 +1227,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   f73238b97807fc37911d9e94ad7b671be2746baf11200974e12aeb089b7f3c35
@@ -1271,12 +1243,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   4d7fc331a811b8dc630b469262fd6f45e289243cef83101f32038158967d1b28
@@ -1288,14 +1259,14 @@ game
     memory
       type: ROM
       size: 0x40000
-      category: Program
+      content: Program
     memory
       type: ROM
       size: 0x100
-      category: Boot
+      content: Boot
       manufacturer: Nintendo
-      model: DMG
-      identity: SGB1
+      architecture: LR35902
+      identifier: SGB1
 
 game
   sha256:   e1db895a9da7ce992941c1238f711437a9110c2793083bb04e0b4d49b7915916
@@ -1307,14 +1278,14 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: ROM
       size: 0x100
-      category: Boot
+      content: Boot
       manufacturer: Nintendo
-      model: MGB
-      identity: SGB2
+      architecture: LR35902
+      identifier: SGB2
     oscillator
       frequency: 20971520
 
@@ -1328,12 +1299,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   96c0cb3c670c36e068c36b38d1edae145f24f60159537da4988bf956eee58d59
@@ -1345,12 +1315,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   15d1187d17fa10c77152f691197d33674e64c33a1f8ceb37e8570588be507b89
@@ -1362,12 +1331,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   68def3754ee32d6bce8f7e346e4d46dc2861c2c590835f8151c291c78f37b21b
@@ -1379,12 +1347,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   3972e52c1a6641842160ed70bac59c51d0d68a234deb8b2ad3b1e5daea38446e
@@ -1396,7 +1363,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   ecd462c64516169cc83dd266af354fe676fcf53811863a361d78cc918619da0d
@@ -1408,12 +1375,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   fde83367c1caf6edfb41a0c609bacc90084e9808b32ba52b13d204eb59535ab5
@@ -1425,7 +1391,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   8dda3b0888a32005041f2feb9be4e14807d40291f951a4612461cf41dac9cb78
@@ -1437,12 +1403,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   a72b6f6722decc1c9e3f979f3d637794d3016b525822dd97f2aeba88696959aa
@@ -1454,7 +1419,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   db04fad1cfb1b8a58cb05ce62ae9e66532923699b54499344869cf8143f06098
@@ -1466,7 +1431,11 @@ game
     memory
       type: ROM
       size: 0x2e0000
-      category: Program
+      content: Program
+    memory
+      type: RAM
+      size: 0x2000
+      content: Save
 
 game
   sha256:   c9002e77bcc656e033c35e2574ee6067c4c0d070943359a850806c123a558949
@@ -1478,7 +1447,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   b97f1bb3c7258d500660757a57c1c7e1d90a719dfcf7b3de5e8a0d06f7f8e814
@@ -1490,7 +1459,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   d844223275a9f8d428c73d5540c6e9ddd2781c53ba8a8d733bde5835ebfa4e25
@@ -1502,7 +1471,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   b66da2a23f249e525b1dd444596a3f10559cb3c30fa3c0bca83ed8f4405fcfcf
@@ -1514,12 +1483,11 @@ game
     memory
       type: ROM
       size: 0x60000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   cb8073cf95eace56ba4324a2106164fa540900c2de083aff490c4afe91ae95f7
@@ -1531,7 +1499,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   6b37c3bd79db2553bf71b79efbb131d96c40462cffac54c40dbc783f1ef44428
@@ -1543,7 +1511,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   491b5d20c0e00eaa7ae89e9f4cde044408258aa31042bb3ed16dff082e01a7a7
@@ -1555,12 +1523,11 @@ game
     memory
       type: ROM
       size: 0x1e0000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   c06e3c14a2f73180a7a6ff50ee76790c4542d58e8994bb3fae06412f7303d089
@@ -1572,7 +1539,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   2b2fe61ac7a79c3cfaa0bc16f1b1f4da544fcc37cfdf3c18879d31b8b9f87941
@@ -1584,7 +1551,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   64a124461cc12dd073191563729f559d0cf8911890ca7ede051e32024f6d9695
@@ -1596,12 +1563,12 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 //Super Famicom (ROC)
 
 database
-  revision: 2018-02-11
+  revision: 2018-04-14
 
 game
   sha256:   1cf13dac329f83a7fe5347dcc20f92c3a09b3eab1511dd461f9cec90e9258403
@@ -1613,17 +1580,16 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 //Super Nintendo (AUS)
 
 database
-  revision: 2017-12-31
+  revision: 2018-04-14
 
 game
   sha256:   7dbaebb1007984610623cb0b571f0e7167d73d89274598bfffc845cfb2de4aac
@@ -1635,12 +1601,11 @@ game
     memory
       type: ROM
       size: 0x280000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   0483780080d10bae49f62c3e4bf6954f891a29c0b1356b3a073cc894784593b8
@@ -1652,7 +1617,7 @@ game
     memory
       type: ROM
       size: 0x40000
-      category: Program
+      content: Program
 
 game
   sha256:   a1daaaaacf723ddfa4fcb406d0218a045d8f8a78674b6449a2322a0306e0af9f
@@ -1664,12 +1629,12 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 //Super Nintendo (BRA)
 
 database
-  revision: 2018-02-11
+  revision: 2018-04-14
 
 game
   sha256:   1edcceab07d1544dcbd0fd681148b0fbefeea58b7077136fa0c3011973bf34df
@@ -1681,18 +1646,17 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
   note: Serial# is from ROM data; it is not present on cartridge or ROM chip
 
 //Super Nintendo (CAN)
 
 database
-  revision: 2018-01-29
+  revision: 2018-04-14
 
 game
   sha256:   dd499445275fca6692c0487a8bd70a23f6c8e78e766df0e3c58fbbe53f8adb06
@@ -1704,17 +1668,16 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 //Super Nintendo (ESP)
 
 database
-  revision: 2018-02-11
+  revision: 2018-04-14
 
 game
   sha256:   bd5e7a6bc08f64d39c54204b82c6c156f144c03e13c890128588c5faa560659c
@@ -1726,7 +1689,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   7a75021fb390d04645b654a3dbd986c82cee1dbf34018e7ff7bf4b6ea125fa35
@@ -1738,7 +1701,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   6582c8f0ebec73d9dee61c1ff95b7b8e7c753a30c7bdd5dab560025dc531a43e
@@ -1750,7 +1713,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   4a4803056afb251b06a2e9fa68d8062b6999156535bb66ff9fb069de180f32c1
@@ -1762,7 +1725,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   929e15c8439b3beea249730e598e72cb192a3a70af0624ab7f91300f8f786a13
@@ -1774,7 +1737,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   d2233d6310522bbf183b6ca9bbe3e2afaf24de0cc4304bff6d0d547d678aed6f
@@ -1786,7 +1749,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   9eaf1c46d8a068c910d66f582e23b1155882ddfa4b9fd0813819fc5c008167e2
@@ -1798,7 +1761,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   bd9cbb4c115716ec0f5d2d438bb812d02d496c41b7677a1d9520ff454254247b
@@ -1810,7 +1773,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   9ed876a632aa699047e9efba8a64ab57abc55086a0aab6b5fa67d87ea4647f3f
@@ -1822,7 +1785,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   ffcdce24171d9dc225a8a8b52e7d24a7832873f85135767359952537a8b9f8f1
@@ -1834,12 +1797,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   d897f80465d02a92f17e1eecb727b99211ec2fb9c58cbabfa76b35c554096ea6
@@ -1851,12 +1813,12 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 //Super Nintendo (EUR)
 
 database
-  revision: 2018-02-11
+  revision: 2018-04-14
 
 game
   sha256:   ec3e81d628a293514e303b44e3b1ac03461ddd1da32764b10b7fab1e507602df
@@ -1868,7 +1830,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   a0baba78c9cad02957b80ed74fc8d09fac3c77e131e47333ef42ba471dc61228
@@ -1880,7 +1842,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   e0c065aecfb6167cdb6dee8368b5f36d52fe55131ed4f6adbb3b2c62a39aafca
@@ -1892,7 +1854,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   ffd634dbfa9ad88a81cfc59adcc889c15e03730536c171d358bf58b37c6bca6a
@@ -1904,7 +1866,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   65feac0ff8bf834bdb3f1eade09102496e1bd021a261ca05fc3a75983c357c84
@@ -1916,7 +1878,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   79ff74b758bb5df40d9fb6f830e9370de799c7a1423c482b2cc74eee78c55127
@@ -1928,7 +1890,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   41084f83e269d46b9d589f11c802a15e84fede57d604c7986053f2858f757adc
@@ -1940,7 +1902,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   ea4240989114fd2c6dbbf2bfcafb2047ab482ebc4aa276f30f3dc7b551197808
@@ -1952,7 +1914,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   f0cfaab9a4be5b2bac0cb3dafea14cea4cf8d7cbfa562323ab3026466985c9e1
@@ -1964,7 +1926,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   a10f7406d76a85e27ae340ed2dd2379897321ed388b439e247b3437fa07806cb
@@ -1976,7 +1938,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   4d347d60795008852ec11bc8e0256a3d1f159bf48c130b9798cb2961e560f319
@@ -1988,7 +1950,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   a73c8864743dd64a61d756ebe001a1244d6ae387621a46f9da4421d061c6b7ac
@@ -2000,7 +1962,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   597894334926c326e332ecdea0d4ad61430ab6af03830a9beeb2c007c280c843
@@ -2012,12 +1974,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   a057383e41bd5735b1c554c555b89fe0ff9b7eb7e9f9d46dbefbdd749c8d2181
@@ -2029,7 +1990,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   be86b8b9c390f1a85384117ce19170567e1234ddb08b538e1361af2feee63869
@@ -2041,7 +2002,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   3545306505c463c627bc4ced91ff4413481c945a658860ddc1f6e8e7b4cc6144
@@ -2053,7 +2014,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   04a347e7d600c8aff435e769f72273ac1ae8160838905f325f03ef4c5aa93bbe
@@ -2065,7 +2026,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   0f37da5beb0beb5e8f8c34443bf0734575649f8222074e3394926c3b697589cc
@@ -2077,7 +2038,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   ca99787148aac7053ae9d1a1b06c8a5f42f2bfdd70c2942282a9dd0c1c0fda4f
@@ -2089,7 +2050,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   e1e2cc6b7ef58b512bb8aa6848dd67fce9e5d092ea67e6b4f31f156b060cc2b1
@@ -2101,7 +2062,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   b9d6cf21e7a280b83fadcf513029158be6f4dcdc51f73b699b7c215a5150be42
@@ -2113,7 +2074,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   3a158e49478bd9a25b487a347c25f401cd0ed1cd1ccf72d8010752139a2143dc
@@ -2125,7 +2086,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   f6afe40ced7033c845df84b895230fd26ea0b48e6a58d6b6e18beee9b594ad6e
@@ -2137,7 +2098,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   a2dc5ffc82e8d055d030c3f021d8df3ae8b08571c8301cdd1d7652248d6f9b55
@@ -2149,12 +2110,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   574c61ab1a670a79b8dc69445b8f55aa5b4caa95ed0e1504fae8a1e3d336e7f1
@@ -2166,12 +2126,11 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   753467f4e343a563a1e4f5da43b731968a47cf3fc035f98575134e680a596f27
@@ -2183,7 +2142,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   89dddd495d29db4542d45bf4a89d387bf2465eb8d2bd5b300c5397d8b24dc4af
@@ -2195,15 +2154,17 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
       size: 0x2000
-      category: Save
+      content: Save
+      volatile
     memory
       type: RAM
       size: 0x800
-      category: Internal
+      content: Internal
+      volatile
 
 game
   sha256:   4a96f3c0a7694a1d8235e2bf03b583ed2e99488d1dc0e26691db003fd23191f7
@@ -2215,7 +2176,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   df2b34467581f8ffdad24f59119d54a03875f355d33ab552459b60f8f0de3e78
@@ -2227,7 +2188,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   f4cabd80dd20b076ff90bf1f394b5dff5800900fa1fe178a42b6af967fd80c25
@@ -2239,7 +2200,7 @@ game
     memory
       type: ROM
       size: 0x280000
-      category: Program
+      content: Program
 
 game
   sha256:   a12391775fa9770f85f383ffaec6441a686c33b2e1800de7c01a79a0b7c93154
@@ -2251,7 +2212,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   20af141280d75c29a0981c6a4decfa1835c3613a47636a4ae0967948a7878f7c
@@ -2263,7 +2224,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   ea769b616ad5d6f7b0a5e42951c31096191800347dc9fd6c8c9845f2afa95f5b
@@ -2275,12 +2236,11 @@ game
     memory
       type: ROM
       size: 0x1e0000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   14e8f7963bd71a3d8792952ae0c0def733178ac720417b954ea5cb12cc76dece
@@ -2292,7 +2252,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   a0106f9cff7abbf25e081e2531f6d4b4aedf6f0dc8d155a66506817bff267d12
@@ -2304,7 +2264,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   21d79cd5382ad5503fdee1c44416a7a425904cebe37bb531d508ef62aa4f2ed0
@@ -2316,12 +2276,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   6a6a95528e4c8cfdf46cade2a354f3e28f63b55bba002e10af0f60227ec4c833
@@ -2333,7 +2292,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   0d7a1649915d45b4c6e0752ea06ad353c2b1a590370912c18deeb42986821624
@@ -2345,7 +2304,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   ee4ab0df49db4024b5da62d04c18c8c866830b54d286dec69440af7285ec2854
@@ -2357,7 +2316,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   d98487781da9307309eec8830c6a28c907b0f1848e351df7f5b6d005c653b4ac
@@ -2369,7 +2328,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   21e8632a6da085cae5d4bcf7334c63fbda0028c2a37c0b0c3041ab59f307ebd3
@@ -2381,7 +2340,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   09d937a73595df67c473f1a4beba2f302570c1434d8093051d027ec1e440b984
@@ -2393,7 +2352,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   6fe482f91a59a71992e14014a0a4e23fb866cf4e870c10d57c81b0c20ae6688e
@@ -2405,7 +2364,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   686f2507e9969fd7617fc544c139e124668294d102e79a0eb34478c8deb75271
@@ -2417,7 +2376,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   02cb423199be3368fc2b40148f83b7a48900394983e04d43f94bb7d76ce44e94
@@ -2429,7 +2388,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   2516843fa405ab1aa1f242b57f19977519aefb68599474d2c7065aaef88ecb88
@@ -2441,7 +2400,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   9b1dbcac063b524eef533e78cf7051e3f566a49d5ac13d23474dc6afb293d6be
@@ -2453,7 +2412,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   07386ef7dfcc70a67beb01fa7e2300249914b2ce0b010a74cbfbf0714c32fcf1
@@ -2465,7 +2424,7 @@ game
     memory
       type: ROM
       size: 0x280000
-      category: Program
+      content: Program
 
 game
   sha256:   51364bc86ba8f00f0eeb2dcd59c68b42f94595af5ce272e914dedb5fc4ffa191
@@ -2477,12 +2436,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   bf0d2739c2bd1aeba9cc979928e0702341cb290023dbc39bd25f18c1412fe674
@@ -2494,7 +2452,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   4f83fc7c1fa4fae99568ae8e049a45e6e65176761fe3ac74315bee8eff846fd4
@@ -2506,7 +2464,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   9da7274457995b39ae7b00387c1eaab92f1fdb0beac55372726c3a3af1cb8f7e
@@ -2518,7 +2476,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   81f90a36c07221546c441d67689d951864f071f3218aa96994c0c54e93998a67
@@ -2530,7 +2488,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   ae6fb12b5077eaa9c13c6124368343bfef076bc1e42f53f442973576266255c4
@@ -2542,21 +2500,22 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: ROM
       size: 0xc00
-      category: Data
+      content: Data
       manufacturer: Hitachi
-      model: HG51BS169
-      identity: Cx4
+      architecture: HG51BS169
+      identifier: Cx4
     memory
       type: RAM
       size: 0xc00
-      category: Data
+      content: Data
       manufacturer: Hitachi
-      model: HS51BS169
-      identity: Cx4
+      architecture: HS51BS169
+      identifier: Cx4
+      volatile
     oscillator
       frequency: 20000000
 
@@ -2570,21 +2529,22 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: ROM
       size: 0xc00
-      category: Data
+      content: Data
       manufacturer: Hitachi
-      model: HG51BS169
-      identity: Cx4
+      architecture: HG51BS169
+      identifier: Cx4
     memory
       type: RAM
       size: 0xc00
-      category: Data
+      content: Data
       manufacturer: Hitachi
-      model: HS51BS169
-      identity: Cx4
+      architecture: HS51BS169
+      identifier: Cx4
+      volatile
     oscillator
       frequency: 20000000
 
@@ -2598,7 +2558,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   b7fa4b79590ecdef2d0303b5cbccf1e1a3af31fca289652acbdb3d5381137f24
@@ -2610,7 +2570,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   964f8391806bc8d674f24aa2f201b20982d2f2f3e3efb2f730c4a34a289c3007
@@ -2622,7 +2582,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   bfec7d5afdf0d41cfce7f4e73dc20d91981db0edc2a0f41c5737d861efd4ab2a
@@ -2634,7 +2594,7 @@ game
     memory
       type: ROM
       size: 0x40000
-      category: Program
+      content: Program
 
 game
   sha256:   65377b1f6dbf1b3258c0554fe54ab0fbe59d6c3f07d3cad1c69ff692e0872b9a
@@ -2646,12 +2606,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   aa3f0608fa8723a21a4a5121f04098c53a76b5188f4dc30fcc26db9232c734d8
@@ -2663,12 +2622,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   25d04bba3f3b12c63ae7ee4450e1d924df7aff077515d634721e22e6420c09b9
@@ -2680,7 +2638,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   d9860f4f9b5e71290c5419b88c49b545f947a35cfe0549c2f32e54f05bc55815
@@ -2692,7 +2650,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   2ec71aca4efc3791b6b3e65956df3eafd2a46e223d5ea71aead07d30ca48b6c9
@@ -2704,7 +2662,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   908b1b18403a1330e1af5844f8c9d11a66279ff107cf14b56e6be849fbd4a7f9
@@ -2716,7 +2674,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   166fe888ac03f88cce5759c1008021082bd81254aab8fea8203cdb13080709d7
@@ -2728,7 +2686,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   1744a87d4817be07948e1b37b59c4de49c85e6aec2cf49879c7b9649d1b1fc90
@@ -2740,7 +2698,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   00e2c72fd82d78c5bb6f144101df6145d0a7f68dd77632f49969f13c5623c59a
@@ -2752,7 +2710,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   862a53905b9e2ed33bae8e01e755ab6ca9fe2f181567510cb0840ed9a19f20d8
@@ -2764,7 +2722,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   2d5e3091ce4912e2325dedf99b439c5b4cb6ba6899e25bf8957b19eda942de88
@@ -2776,7 +2734,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   09fdef0c959e7275563f65d8267d95a20104f054e9438e9ac739ef7f46120a2d
@@ -2788,7 +2746,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   9638d4daa7bc63fd178b77c4487c3b080def5b808c0b7ccc959101f33e221b42
@@ -2800,7 +2758,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   4001418ceb26f38efbea10b7bcc8233adc7bfcaa7e11dfb401d820f3254f06ef
@@ -2812,7 +2770,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   4ef0053b294be64353df47e4f7d079cb97044e18263b55d46b6e4f9adda55766
@@ -2824,7 +2782,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   640acb63dae038ad6f0ae65e103416f5a1f84d4a37ddaeeab5046122def774d5
@@ -2836,12 +2794,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   148f6bbf0578ff6ec62e6dacb9e3d266f6d7a427baa104e8ecd3cb2df64bca14
@@ -2853,7 +2810,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   92946358ee4fbc5cb1df81a26ebd323c2f4e8cc76acd038e1191b8aa31ad1c24
@@ -2865,7 +2822,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   a52b98da8f65bf2210b7d2e931548c672838fa7e44d852f2e3c6f3cd2ba950d6
@@ -2877,7 +2834,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   299984b4148ee4503d67cba8469c5023f7ecb204949bc70c3271cc56b117bb8e
@@ -2889,7 +2846,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   93ba50d853e98e1ca227a2ca72389c0e3ac18d6b50c946b3f618c16c2d3edd38
@@ -2901,12 +2858,11 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   41648e6d73bd1b998f5c0737a4e61cd603e574ce4a3439e579d2b74b14390159
@@ -2918,7 +2874,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   dbf11d4c77b9aa3416f687201d57d71a23bb8fb0b8fe5e9e8212db3fac036631
@@ -2930,7 +2886,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   03540084486c21724819515d1cb967c658f7f08ec180855fa7c191ca13d8bef1
@@ -2942,7 +2898,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   fc8c611bc46c850515a933d4388e2123e20ab24a3a3d3c1ac95afdc76c82c3d4
@@ -2954,7 +2910,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   1217ddf2fe475661a54f50e111864102faf854397ce5aceea4297204ebd6cbb6
@@ -2966,7 +2922,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   150073c04e9c0e8b283a8eb237acea8fda3268c722f922ee42642009e17dc729
@@ -2978,12 +2934,12 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
+      volatile
     oscillator
       frequency: 21440000
 
@@ -2997,7 +2953,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   aceb9ac7cfd68e6740de47ad1a19be70d4efe3974caa4aa8ec50b0a0a6672e47
@@ -3009,12 +2965,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x10000
-      category: Save
+      content: Save
     oscillator
       frequency: 21440000
 
@@ -3028,12 +2983,12 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 //Super Nintendo (FAH)
 
 database
-  revision: 2018-02-11
+  revision: 2018-04-14
 
 game
   sha256:   0aafd04a43ae29266e43920a7f9954d4a49f6fe43a5abffecc9c2fd5ad7d6cea
@@ -3045,7 +3000,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   a4b1e125b421c5a58e2fd73edc4d58b31d7a596c07dee263c565f00ee712223f
@@ -3057,7 +3012,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   d54d2703e474d7f469766d2d095ffcbbcab893e3fe58bbbcc57e24082a44bb40
@@ -3069,7 +3024,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   d9127808fb02c47dd74fd22f39582c69f19936a794a8efc153cc0e51a0d4d782
@@ -3081,7 +3036,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   e6adeeee287204b06300b790fe048358f54e322306806142fb4e667ae8b57378
@@ -3093,7 +3048,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   dde314fea056445685b97f9c8b554d2be81ea1fe6ace935934592464908d05fb
@@ -3105,12 +3060,11 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   259537561fc1a0ddf0beacf9169ccb5fbe8ad88a322c07fccb862a39b379ae62
@@ -3122,12 +3076,11 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   ce09743d44a54f64862d8c53c11c2c84f2f861ec74c778bd8b05b0a3b07708d6
@@ -3139,7 +3092,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   5a181f25055298579d24571b4f1cd21dd81583fb41a235fc4f226fa28d9df916
@@ -3151,7 +3104,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   9b52a2848b78aa7ecb7cac295bce7ae033089af6099e127c2c904f518c6d4b89
@@ -3163,7 +3116,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   8510491f99400115ccf33570269bc4e484fb56370f7ac36f12e73eec19d342da
@@ -3175,7 +3128,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   1c41bb11c9df5aa8a6ca98caa5215418f37025f7a5e88ff62188b257338af3ab
@@ -3187,7 +3140,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   a6772914f3d0c2fda5bfde855a41f211c89d9452b7bd437b41d69b46727ed6e8
@@ -3199,7 +3152,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   558b437e10915c2ca79f376634fa4623c87efdb9292a5878b886c7a6fbef61e2
@@ -3211,7 +3164,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   034850392507ec2ea7219970a8be7ad4a4418a11eccbda9df7a5bbf4c74f0287
@@ -3223,7 +3176,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   3a30a6aff66e1ab44b7f742eafde45710cd5a7165681649470c3f04afa579927
@@ -3235,7 +3188,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   553940ad4b0bbcf375cf2a06f092b44fcd880db820828c8c900c4cd9d4f5753f
@@ -3247,11 +3200,12 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
       size: 0x8000
-      category: Save
+      content: Save
+      volatile
 
 game
   sha256:   35c1d6623748f66e254843cf340121e3e268a8301951f35c7ba3ef666bc293bf
@@ -3263,7 +3217,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   54ac1f0c99f1521e4c390f43af5da2138ec0526a97912790bdb53f9ab1b10b63
@@ -3275,7 +3229,7 @@ game
     memory
       type: ROM
       size: 0x280000
-      category: Program
+      content: Program
 
 game
   sha256:   abe8db202f9bd12d845a4c7ecb97d85fb149d7f17a608b3eae015d92f52f2c04
@@ -3287,12 +3241,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x10000
-      category: Save
+      content: Save
     oscillator
       frequency: 21440000
 
@@ -3306,12 +3259,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   9760fb407282d91005044fb08f9c15dc3e0ae65063a02eedfbbd285566501fd0
@@ -3323,12 +3275,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   12d04359329bd646fc65c62db6121b4a7e4ece68556d68252e81ced421069f4c
@@ -3340,33 +3291,33 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
     memory
       type: ROM
       size: 0x1800
-      category: Program
+      content: Program
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: ROM
       size: 0x800
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: RAM
       size: 0x200
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
+      volatile
     oscillator
       frequency: 7600000
 
@@ -3380,12 +3331,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   824f07e93c9ad38fe408af561e8979e3c0211f0c6c98aeb6e6bc85cd6f9edc91
@@ -3397,12 +3347,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
     oscillator
       frequency: 21440000
 
@@ -3416,12 +3365,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   71de4dec6a8e8be685627b6e929317f7cefb836997059bbd3b438ccc07a60044
@@ -3433,7 +3381,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   da8b8bccebf51b70213adecda37387d1bdb55aeb7bc0805bb1be1cd9b514daf6
@@ -3445,12 +3393,12 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 //Super Nintendo (FRA)
 
 database
-  revision: 2018-02-11
+  revision: 2018-04-14
 
 game
   sha256:   65df600780021f13ced52e7fbc507b7b2e6491b2c5c25fe78d0515dcbe669403
@@ -3462,7 +3410,7 @@ game
     memory
       type: ROM
       size: 0x140000
-      category: Program
+      content: Program
 
 game
   sha256:   7baaa65ced8fed14e161615e1fffff971f10be4b723523b4a7302891db02ba09
@@ -3474,7 +3422,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   dd920a8f29dde8712a246a56d28ac0825d15c041d7f77f97dbeb37680751ce68
@@ -3486,7 +3434,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   e135511707c68c16d07b656f63e2b9dc42f436a37b0c85a949fc9e75e1111b34
@@ -3498,7 +3446,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   663116d015cad3398644608ca6f2506071ab23d38b03b4890e1a6caecb1a55aa
@@ -3510,7 +3458,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   a97a5ffdef892d7574e5cb807ec657059fd65490186feae975079cd11baa2df7
@@ -3522,7 +3470,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   b2a44f5bb49f6a033e5c82f05356246f5918cacf6f026b88cab5a0b410659b01
@@ -3534,12 +3482,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   8dc982c6dd0dfd094b74e4af94a2b10ddc51d334f7f0fa77a9f70917fa324e84
@@ -3551,7 +3498,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   7ba2709cffa654f73b3b1364c13d6a5b595b820629102fe3d51c10bca30d0e4e
@@ -3563,7 +3510,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   29a0d5812ccbb4b11bdb55d8f751a2a797b4110bf402ca8ba15eb2bf85db7b39
@@ -3575,12 +3522,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   6d37b2ed794b2f3e5f3d28490ffe89a0ff3c8a0cfc0418bd2aa8e0c66d4868ff
@@ -3592,7 +3538,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   18f5666860c36fabebc909d262e234bb0bf51a87b55945c134118a4c36b49b52
@@ -3604,7 +3550,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   600df7da79c95e14c1b9e6e54e0b3a061d079831d015ef6f31bc3772c1d0efc6
@@ -3616,12 +3562,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   1432590492b63d7103caa715e10e3c3ebbc77b63b6472ee9dee0e5afda311551
@@ -3633,12 +3578,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   a4621118ef174d2c8a9ffe934e31ff3a00f66a3aaa13340983eec43625a773f6
@@ -3650,7 +3594,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   febcb3325240293cc82b4038630b89bbd936f092cb172107eb82452a5555859e
@@ -3662,7 +3606,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   896e09a0d24bfec0412aa75d121063b015153a754ed542f7db7d66366b555de4
@@ -3674,7 +3618,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   0aa16d6b588ba05ab00936201e68a694746fc5e1b2e4f2dbf7cda09265a81379
@@ -3686,7 +3630,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   f73e6da9e979c839c7c22ec487bea6667d3e65e7d8f9fcc97a2bcdeb4487cddf
@@ -3698,17 +3642,16 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 //Super Nintendo (FRG)
 
 database
-  revision: 2017-11-10
+  revision: 2018-04-14
 
 game
   sha256:   f415cafaaac4d5fe062b61be35e64ee6b5e8b925f12b9c82777b4566d31de8f4
@@ -3720,7 +3663,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   5e1cce5ccedb20eff9d188eca445e54bd413db63570fd281f76b3ab56abffd82
@@ -3732,7 +3675,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   ddad4a3708b8cf760e520b784f42d7085154b0699f3824b8d722512ccab687cb
@@ -3744,12 +3687,12 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 //Super Nintendo (GPS)
 
 database
-  revision: 2017-12-27
+  revision: 2018-04-14
 
 game
   sha256:   0d4c05f75c95d5b8c0fc00e61027ce3fda2dd288fcf6695656232176fce7843e
@@ -3761,17 +3704,16 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 //Super Nintendo (HOL)
 
 database
-  revision: 2018-02-11
+  revision: 2018-04-14
 
 game
   sha256:   dc8b3144329a23459bfcce93c89e0e561d133709aca6bfc74f9e0755f1a04b91
@@ -3783,17 +3725,16 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 //Super Nintendo (ITA)
 
 database
-  revision: 2016-09-24
+  revision: 2018-04-14
 
 game
   sha256:   aafbae4c2a7a5a35c81a183df0470027b4b5690f836592af21c15af6b259328d
@@ -3805,12 +3746,12 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 //Super Nintendo (LTN)
 
 database
-  revision: 2016-09-22
+  revision: 2018-04-14
 
 game
   sha256:   e678a29a93111cf2016c487ba9977b14de8f719040651a42c74bd74eea2d0d81
@@ -3822,12 +3763,12 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 //Super Nintendo (NOE)
 
 database
-  revision: 2018-02-11
+  revision: 2018-04-14
 
 game
   sha256:   b342d12d71729edebc1911725ea23d58c1a397b27253a5c8cd96cfb58af242a9
@@ -3839,7 +3780,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   475c601df7384621539ebcf2586a50720cc8de5d089b71fc65ff3f605cff7c8f
@@ -3851,7 +3792,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   12c00475e5d881c26fbdce025d05ca32d4f5534bfa441d9887624a843df74222
@@ -3863,7 +3804,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a4b1e125b421c5a58e2fd73edc4d58b31d7a596c07dee263c565f00ee712223f
@@ -3875,7 +3816,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   b2df16101a2daa0f718853be92e3cf5d88f8e8843d04962e4b403d13769c1119
@@ -3887,7 +3828,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   daa9a6a3872f252d74d7112094b6c97409fc166dae564e032b5158d12443b68c
@@ -3899,7 +3840,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   85b88af9b1f2071804e27c3ff9d42da6b26417c26b6f8a9e878733b8c35724ab
@@ -3911,7 +3852,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   d54d2703e474d7f469766d2d095ffcbbcab893e3fe58bbbcc57e24082a44bb40
@@ -3923,7 +3864,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   bb81d1730222c518084d06c5ce456ee860d5ccb6a410f14a73e68971305bdd12
@@ -3935,7 +3876,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   ffd6668607ee279d79ef3f2b35713b99f8b046a53c608a82df9d37ef39bb079b
@@ -3947,7 +3888,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   716214f0b17233021f8ee07500530947655c4c871cd041290adb204523984821
@@ -3959,7 +3900,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   13cd21706cbb02536714c9f0a4d14b37d59a9161abe155e043fd74ba4d5dea15
@@ -3971,7 +3912,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   08e02381cf59bdb3ad4d561587c8ccd001c722c7731705a9d84b39cb0337ca53
@@ -3983,7 +3924,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   34221406999172e342b9442e30d12c467fbcd9afa86bedb5ec5ddb5ebc2ee8a1
@@ -3995,7 +3936,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   5a054466ffe0694599498b9d94427b25d4f4d55ab4fc1542335f69025e817a3f
@@ -4007,7 +3948,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   6df9b702c65183ef13dd2a66d1bc95e7ec1452e088e9c19a0e3beb9ef952e939
@@ -4019,7 +3960,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   0a49023824d812c64cd262db6e85ce9900c88af7ac6dab3e47078ab0dd1e546c
@@ -4031,7 +3972,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   6795e22c6ddcbfa48de1e5b1b22ad72890214533a12e59763cb4b8d5b2535aef
@@ -4043,7 +3984,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   a20bdbdafccee20bf17eae28fdb0b79fced5b53f90a1cad259461a37903f9ad1
@@ -4055,7 +3996,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a2e3a81f7dfbd50423bebfce8c2f6b85d58f7336810ee6c813fb74ac7d4427a3
@@ -4067,7 +4008,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a60886ea6459861bb8d149023a975c4e83c172847264756840ca0754eb9f1f15
@@ -4079,7 +4020,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   fd7e471b7855614f1a4782c2194e6d268406c694d0f674350317a3efed26c4aa
@@ -4091,7 +4032,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   9f072794e9f379e35dabd50a714e08b98deab61e3dd97ef982d7504b85b28d24
@@ -4103,7 +4044,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   9ae517aef04a7157f9e8e13c874a9ac5f452d02ad6343e03fed9cce0aa515171
@@ -4115,7 +4056,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   f000606a504c7a51617c0e32865924a68bf899170aea2647cf403fede8491c0e
@@ -4127,7 +4068,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   1ee967210f980b76b6c810a8b130049405183d20e4c308b17c7ef982912fc628
@@ -4139,7 +4080,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   e0c51ca00f22716531cb9138cfe8d5af4680cde1c95bfbfcd52c35f246763e65
@@ -4151,7 +4092,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   81220ffa1f167d9b5b909b0315a6734fae8957b8d708b3887fb0e9105f816edb
@@ -4163,7 +4104,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   5d42cef66c529939b6038f4ecaf1aeb06acda2dabbf7bcf4e7203f3cb6b43f7a
@@ -4175,7 +4116,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a9ababea552f9d7f756e99bfc0f7f88b30898297c762d35d603837475e713f86
@@ -4187,7 +4128,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   6ce516e3d1a7068cc9732cd3517cfd1e92179f2340c63a244625a1ff49815085
@@ -4199,7 +4140,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   3e4e16a5d47197a2f7bc724e3a6875b682f738800c7377ea655a6d7f54156a0e
@@ -4211,7 +4152,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a7612dbb5fd122090d4fcbffec81d295c0911ff5c83fa865c441c7b3996fcc92
@@ -4223,7 +4164,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   984107f2dbccbcaec1f7e74b62af82785918438144221bd0228fa36419a11ed8
@@ -4235,7 +4176,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   dddacae010766c1201f50810fcf15dff7c0f6d41ac1a1004c8eea4873a71db12
@@ -4247,12 +4188,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   450df78c9b7c92e9f8ce5c2ee0e1dbf939031c1e4f9e10c52c8d8f874364d1d6
@@ -4264,7 +4204,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   c7abc997e0f685a726dacd82e2734f557028490c1c9b8e575bc6cbc18de243a4
@@ -4276,7 +4216,7 @@ game
     memory
       type: ROM
       size: 0x140000
-      category: Program
+      content: Program
 
 game
   sha256:   b7ab3afb4f63b95c2ceafcaf03fd691fe9fc53b173d7fd22a8a111b40f8713b3
@@ -4288,7 +4228,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   6cce3d0c8b2eec350475e3c274d7ad80c9a208ba101d9cf9ac637c5d09760ab7
@@ -4300,7 +4240,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   c7935e5e147a8c1b2646fbb7776cf73198967bd053f2a58f4f01e9a3a5c2911a
@@ -4312,7 +4252,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   6d0095422fe380202e62ed5b34f038681f777dcd9a943cf3534645068e118fb2
@@ -4324,7 +4264,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   ddda02bc9fff44c702ce6b2d043c8c2dc520c568a1df221de0bde24e16e1618d
@@ -4336,7 +4276,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   320c9a88c2fa3221d8e8d2dc8eaae9d6143753b0b881166b5376bcd50031e1da
@@ -4348,7 +4288,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   ca2d67f208e3dc7aaeea88b60d7008b6e00b525bf935c259b642ad5cad783bb1
@@ -4360,7 +4300,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   e4b315f714529a9ba593ffa16ac7456db178294405e26811313c08177969a05f
@@ -4372,7 +4312,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a9dffa5d97855733f14b1b888bc478e8e0630107812b7b3df729c499e0e0734f
@@ -4384,7 +4324,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   039beb46f81ad9e0844ecec420cc78bfdbf2b1ae940adb4fdf08dbf1b55ac7ed
@@ -4396,12 +4336,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   42bc8987dda4f8e4a1d135f3327ef89fb51b9bea97a79dba0060f6fdf9f4c0ba
@@ -4413,7 +4352,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   2c08b32ecbba97bea0fbb569186294f9ad738a301d90245d9729046ba0ecabab
@@ -4425,7 +4364,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   74c55ea3c9733bf263628a260df7492fc840d7de1c3fceebb7bcf6d99a8c81d6
@@ -4437,7 +4376,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   3fa82117fe88b0b5398995b68624f3027184259456123f2a61d55f668326c769
@@ -4449,12 +4388,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   53ccf6970d4577608893f38633cc0609ba0eec1b393f891df31e2e5c2f903a9c
@@ -4466,7 +4404,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   11a6c5de89b25836c8b66d3e3077bacdcaf52faab5a0f7fe2bc751aa85a8dd68
@@ -4478,7 +4416,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   9bc7afdb9ffaca90db4390697e80a75bf4889cd8529e21c28ad42c41171e2630
@@ -4490,7 +4428,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   9ed408bb30b32c0a86605ea80e2b431563a33d54354a4b68e8b7d4eedde25295
@@ -4502,7 +4440,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   5ec66298ddb579b35cc5d3df5bfeeee05bdf71347565c7c5f5f3869bf4f1e469
@@ -4514,7 +4452,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   0ecdd9d6fc78c0bdbc2f684c682ec834cda1148ed2e675cc783a95c601000d3b
@@ -4526,7 +4464,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   8510491f99400115ccf33570269bc4e484fb56370f7ac36f12e73eec19d342da
@@ -4538,7 +4476,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   be9c42913fee053a8d854054a27a0fb4d1cf6c092b46c7291d2743e94204a323
@@ -4550,7 +4488,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   8f6920549b28a065a030fbdbe2ea2e9d966d42ab5ac1ef0e9dabc99875a51df2
@@ -4562,12 +4500,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   9283ac563e3d8244fb103db13256c669063e67be5eaf6e82b94527f079c9d8a3
@@ -4579,7 +4516,7 @@ game
     memory
       type: ROM
       size: 0x140000
-      category: Program
+      content: Program
 
 game
   sha256:   4703cb071611874b0d9e9555f102278e33dd494202875dc994a232029148bf67
@@ -4591,7 +4528,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   41803805d28cad8873029c4b648cc6dd7503b7a33afa8ff584434a970dc9d8c1
@@ -4603,7 +4540,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   558b437e10915c2ca79f376634fa4623c87efdb9292a5878b886c7a6fbef61e2
@@ -4615,7 +4552,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   b8fcbad3c712a2ff69a5f9bb9fbe4c4284f91bbe96fe849275a8bcfcb497d204
@@ -4627,7 +4564,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   ec6f444dcab84d251c12eb4f47aeac23ed997bf0416c5a537bac6bb9d40b725d
@@ -4639,7 +4576,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   9932ed1419bc606ea19337b74a8ef17adaa6b31be5fca8d2b6b266b3f6383e39
@@ -4651,7 +4588,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   b2717bec03b627c4f02bd6dd77cfa790ea4eab91f0f47626ea452c50369d35d4
@@ -4663,7 +4600,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a0888a9c02b0ca0c9e95246c9ea60407f7f9c4dfde1ff1c15b7f6d5bd4ea5b85
@@ -4675,7 +4612,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   c341668847170d36fa5cfb720568b0b1ecbb24fc426a821f665f1d3853a46a6d
@@ -4687,12 +4624,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   1444ab11f96f7750db992e9a4160532b27abede8a7054128c09f448300c91ebf
@@ -4704,12 +4640,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   bc819454a2082f93b03ad3dc11795eb8cd4ccec72a41560462a91b6f0edd432f
@@ -4721,11 +4656,12 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
       size: 0x8000
-      category: Save
+      content: Save
+      volatile
 
 game
   sha256:   e4df822294a12919b35cd73a1ca24105418ca2c2bc5e08f887fe1d10b3e4f200
@@ -4737,11 +4673,12 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
       size: 0x8000
-      category: Save
+      content: Save
+      volatile
 
 game
   sha256:   35c1d6623748f66e254843cf340121e3e268a8301951f35c7ba3ef666bc293bf
@@ -4753,7 +4690,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   54ac1f0c99f1521e4c390f43af5da2138ec0526a97912790bdb53f9ab1b10b63
@@ -4765,7 +4702,7 @@ game
     memory
       type: ROM
       size: 0x280000
-      category: Program
+      content: Program
 
 game
   sha256:   30291b60cb7bb0bf92dc48b922daff71f6bc4b29200bef5540a522bcb0a64cee
@@ -4777,28 +4714,29 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: ROM
       size: 0x1800
-      category: Program
+      content: Program
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: ROM
       size: 0x800
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: RAM
       size: 0x200
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
+      volatile
     oscillator
       frequency: 7600000
 
@@ -4812,7 +4750,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   3b8e4da1435a548927a120a827eac01fef7d3636f3f763923063e5613adad42f
@@ -4824,7 +4762,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   bbedc3b9263993c1294793895b5901973fbb159157db4c6d1b79ee8245007791
@@ -4836,7 +4774,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   4d7fc331a811b8dc630b469262fd6f45e289243cef83101f32038158967d1b28
@@ -4848,14 +4786,14 @@ game
     memory
       type: ROM
       size: 0x40000
-      category: Program
+      content: Program
     memory
       type: ROM
       size: 0x100
-      category: Boot
+      content: Boot
       manufacturer: Nintendo
-      model: DMG
-      identity: SGB1
+      architecture: LR35902
+      identifier: SGB1
 
 game
   sha256:   4c5b426ea5950b66098ba4377f6a86d091d7af2f4783895086a621aa98811596
@@ -4867,7 +4805,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   2b1ca521975c3010650fd2055be8c6b964ea4eff765ad03198ac71995285fee7
@@ -4879,7 +4817,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   7c7e90fb7c762769219234baf7b5fa6bf574fff7dc63b7134d49ec7c8b38ea7e
@@ -4891,7 +4829,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   70c07b2c7bdff9353d3849e2d4bde2bfa631b29e0743862635c2212ac551cb27
@@ -4903,7 +4841,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   1bc2b230d6bb6091412fcc9b957192d9a729496f9f2123449d968afb088fc525
@@ -4915,7 +4853,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   454dbc5383f36e1d611fcc76a23162ae03e269c76c98919b1e7505ea4c7c2402
@@ -4927,7 +4865,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   eea3584fe574b1e7ba6c559ef32f86a990f54c7fa36b25242656b4c6dc18e6f0
@@ -4939,7 +4877,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   3e26fbb8004635f4128f8e989d96f89fddc0a2cf85a8ede6b93ae6648bd6a717
@@ -4951,7 +4889,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   d6968f79ec66cec751dcf54a1fd0c7321a8e1b69722d81b10d1969a8415412a6
@@ -4963,24 +4901,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
-
-game
-  sha256:   613cd1a31eaded18648168bd7453a57830ca9a6f3c10de5154625436fbd49556
-  label:    Terranigma
-  name:     Terranigma
-  region:   SNSP-AQTD-NOE
-  revision: SPAL-AQTD-1
-  board:    SHVC-1J3M-20
-    memory
-      type: ROM
-      size: 0x400000
-      category: Program
-    memory
-      type: RAM
-        battery
-      size: 0x2000
-      category: Save
+      content: Program
 
 game
   sha256:   2465335e0a16e65d41d42067f53d97ce0929d003ef41ec605d160cfb30c20df7
@@ -4992,12 +4913,27 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
+
+game
+  sha256:   613cd1a31eaded18648168bd7453a57830ca9a6f3c10de5154625436fbd49556
+  label:    Terranigma
+  name:     Terranigma
+  region:   SNSP-AQTD-NOE
+  revision: SPAL-AQTD-1
+  board:    SHVC-1J3M-20
+    memory
+      type: ROM
+      size: 0x400000
+      content: Program
+    memory
+      type: RAM
+      size: 0x2000
+      content: Save
 
 game
   sha256:   3c94c600fefcf34e5d251885c209d6b61b40de119589b67badec38deeffb46f9
@@ -5009,7 +4945,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a1105819d48c04d680c8292bbfa9abbce05224f1bc231afd66af43b7e0a1fd4e
@@ -5021,12 +4957,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   847c9189580fc92e785c8124cbde4f1d72be75e1941b35021f6b159e0470c1b0
@@ -5038,7 +4973,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   8315596b4fe517b970d004336c86ed2bc74e167692ffaa51c529a41e2197519e
@@ -5050,7 +4985,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   9eb2f90cae9958ae7f387d797cb28797b5ccaf520c41d4c5ca9494c74a87c422
@@ -5062,7 +4997,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   92dd66642e86b9b4156352a583bd479c200c342820a8b6cf906cca6bb923cf25
@@ -5074,7 +5009,7 @@ game
     memory
       type: ROM
       size: 0x1e0000
-      category: Program
+      content: Program
 
 game
   sha256:   24aad9739f8ffe9319f20d4fa1c4f58108e73843d20d65296926e00ba9c456be
@@ -5086,12 +5021,12 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 //Super Nintendo (SCN)
 
 database
-  revision: 2017-12-29
+  revision: 2018-04-14
 
 game
   sha256:   beb379ba48f63561c0f939ecd8f623ec06c1b5e06976eef9887e5c62f3df2766
@@ -5103,7 +5038,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   896e09a0d24bfec0412aa75d121063b015153a754ed542f7db7d66366b555de4
@@ -5115,7 +5050,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   e15247495311e91db9431d61777a264d4b42def011291d512b273fc8acd1cbfa
@@ -5127,12 +5062,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   a6297356fb06f1575b432fae463171f53e3b786fd77b841557547a9117fb52fe
@@ -5144,12 +5078,12 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 //Super Nintendo (UKV)
 
 database
-  revision: 2018-02-11
+  revision: 2018-04-14
 
 game
   sha256:   38e050ac3ffec01031c6dd8ead20676aacec78ebf8d890a3a00d1badaaba3d3b
@@ -5161,7 +5095,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   8c5f2f8d45d86b27e48313d136477ba6f30989c93748d800ad6bf82f14ecd4a1
@@ -5173,7 +5107,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   0a49023824d812c64cd262db6e85ce9900c88af7ac6dab3e47078ab0dd1e546c
@@ -5185,7 +5119,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   536f9c2ff7dfdc6e5b51389142151b1c9e9d73f1c2451eafe16d0224d15ad35f
@@ -5197,12 +5131,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   1c12660c99571692d2fba4ba871a1086b115486697e789f85fb939c55eeec7c7
@@ -5214,11 +5147,12 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
       size: 0x10000
-      category: Save
+      content: Save
+      volatile
     oscillator
       frequency: 21440000
 
@@ -5232,7 +5166,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   dddacae010766c1201f50810fcf15dff7c0f6d41ac1a1004c8eea4873a71db12
@@ -5244,12 +5178,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   b0d2439944b6ae85d4ec6f39c91e3c8b9c740a43d077f4d0675dc2c2235204df
@@ -5261,7 +5194,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   7d423c7d5ac4fef6ae608ae87e77608294ef7e51a6f0afff1042ed66a1c639fe
@@ -5273,7 +5206,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   e9e2152411fec3bd10e8cd4587b62717169a25a4cd28f491f8e477b9aae2fcee
@@ -5285,7 +5218,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   94b2e68503514afe956cbc8ef4fb2cb93a323761e9b7d205e44e544049a4ae3b
@@ -5297,7 +5230,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   9d936f3b0b5bea0b7c4588e65fa147fff1108d0e630337dd75eb16133a55e317
@@ -5309,12 +5242,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   975397a09ec1dfa518f1f0a2029ecb74e5b4c1113bf3376de94711672ff4e054
@@ -5326,7 +5258,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   f5e74f09c485d58b444ef2b168d041a1d451056b5feb295901974ca73190dbdb
@@ -5338,7 +5270,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   1be41a3a2d490be97b98f2ab8934d8e8812d7d2596598a7841e3027b23e95261
@@ -5350,7 +5282,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   ddad4a3708b8cf760e520b784f42d7085154b0699f3824b8d722512ccab687cb
@@ -5362,7 +5294,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   6379d7d476a29ae2655e30fc20699772af81abefc903f5816872dd46e4e88242
@@ -5374,7 +5306,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   654183585e88abf965b19570c194f3d69ef209a7f2d32f71881eceaea6a3487e
@@ -5386,12 +5318,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   0c4038eb0ee37c0faac6a04928b37b5c2f1047ab59c5345da16de48c92db5021
@@ -5403,7 +5334,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   528f9697cdb5b50504aa4f6d6f7882c4997e7141898f9a00a630692b964204eb
@@ -5415,7 +5346,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   1c41bb11c9df5aa8a6ca98caa5215418f37025f7a5e88ff62188b257338af3ab
@@ -5427,7 +5358,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   d33f682605b3d6c8a162506ef333a24933ae26a32f10ff8e49fc113bcd189137
@@ -5439,7 +5370,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   d147bfe392e8c2129fb887379410804d79be426bbffdd01cec7bd2332e03f39e
@@ -5451,28 +5382,29 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: ROM
       size: 0x1800
-      category: Program
+      content: Program
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1B
+      architecture: uPD7725
+      identifier: DSP1B
     memory
       type: ROM
       size: 0x800
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1B
+      architecture: uPD7725
+      identifier: DSP1B
     memory
       type: RAM
       size: 0x200
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1B
+      architecture: uPD7725
+      identifier: DSP1B
+      volatile
     oscillator
       frequency: 7600000
 
@@ -5486,12 +5418,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   e95278ec68bf983111a52e38d5e6031c41141858e87e2cb8ef92fdfe17e41a15
@@ -5503,12 +5434,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   21f4b54ed90de7bb0f5f02d64d11f80ba9f2147197b7a3bd09fc7aa1858ba0f5
@@ -5520,7 +5450,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   d02f8e6b75f9b9ede20a32b8ec93c06475f18160ced1eb069cd6a3cbbc3cba2e
@@ -5532,7 +5462,7 @@ game
     memory
       type: ROM
       size: 0xe0000
-      category: Program
+      content: Program
 
 game
   sha256:   8c7a8aa1d16aeef31244b016ac951eab0b9ccd46daea61adbe890e5c5daa29c6
@@ -5544,7 +5474,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   80e7ba7c756c70eedd55ca4548c1965f84f9ef01d3a5ca91a2e5465a6930c49a
@@ -5556,11 +5486,12 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
       size: 0x8000
-      category: Save
+      content: Save
+      volatile
 
 game
   sha256:   2a25bf4c1a4fc64f9312ddf039f5b3e8949054cbaeb4f86d1ccd9ea2bb779643
@@ -5572,11 +5503,12 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
       size: 0x8000
-      category: Save
+      content: Save
+      volatile
 
 game
   sha256:   b8ee1b5b9deae5c84fa209815515030109cc271b645a18de882aaf1b254cda1f
@@ -5588,7 +5520,7 @@ game
     memory
       type: ROM
       size: 0x280000
-      category: Program
+      content: Program
 
 game
   sha256:   df43b3a4f511401a4d162ee6e7e3b08485533600dc44a29ee0a829b937b144d4
@@ -5600,7 +5532,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   f1a75578e6711716340bb26ea93bf05d5762bc7da21dbc19576fc65de1e885b5
@@ -5612,7 +5544,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   e8b1639acd44a536f060d6d8dbcc4ef368279e3e17e1e3862a463d3ebf07ea14
@@ -5624,7 +5556,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   8bc56d4d23638ff592715e089dfd697fe7884a388c5ac95e147973bc2ff71e72
@@ -5636,7 +5568,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   9760fb407282d91005044fb08f9c15dc3e0ae65063a02eedfbbd285566501fd0
@@ -5648,12 +5580,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   12d04359329bd646fc65c62db6121b4a7e4ece68556d68252e81ced421069f4c
@@ -5665,33 +5596,33 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
     memory
       type: ROM
       size: 0x1800
-      category: Program
+      content: Program
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: ROM
       size: 0x800
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: RAM
       size: 0x200
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
+      volatile
     oscillator
       frequency: 7600000
 
@@ -5705,12 +5636,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   3438e78d35634d0ed7f58cb395c77da548fb601248725a18365edaed38a565d5
@@ -5722,12 +5652,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   7c7e90fb7c762769219234baf7b5fa6bf574fff7dc63b7134d49ec7c8b38ea7e
@@ -5739,7 +5668,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a52b98da8f65bf2210b7d2e931548c672838fa7e44d852f2e3c6f3cd2ba950d6
@@ -5751,7 +5680,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   d92b74678e58360db9b47a7044cedd6c57f191570a5677b1a1bf5e476f92721d
@@ -5763,7 +5692,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   c0a7e27131a7d8c9ef52a5227329e6de5846c045a9da1f3f84845e3be8e4efba
@@ -5775,7 +5704,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   f899b083b29f34bee62cc022262ab4ff6aad9b16423011faff37f2c21a45fd89
@@ -5787,7 +5716,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   717fe462a79c298581423c614f62e22dbf6a33e0bf75e691d96848086869418e
@@ -5799,12 +5728,12 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 //Super Nintendo (USA)
 
 database
-  revision: 2018-02-11
+  revision: 2018-04-14
 
 game
   sha256:   2ffe8828480f943056fb1ab5c3c84d48a0bf8cbe3ed7c9960b349b59adb07f3b
@@ -5816,7 +5745,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   4dd631433c867ba920997fd3add2c838b62e70e06e0ef55c53884b8b68b0dd27
@@ -5828,12 +5757,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   ce164872c4f5814bce04cf0565edcdb5b7969ae95a3b5cd515cfb626b5cde7b3
@@ -5845,7 +5773,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   bb83f982961c33b81fefc1f545e18ab572d1c43cf6c241948544f05a1a71f2ba
@@ -5857,12 +5785,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   d07e8802a6d9c777247874e05ec08fce7e0fa1bf122cc1ab9913f7d828e4072b
@@ -5874,12 +5801,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   b8055844825653210d252d29a2229f9a3e7e512004e83940620173c57d8723f0
@@ -5891,12 +5817,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   71bdd448a30b88725864e55594ebb67a118b1f197a3f9e5dd39dbf23399efa15
@@ -5908,7 +5833,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   f59a0a8ed11ea2ba6217b1640e74bab8d8d8161a4585f5ae4a02edd7958ad9a3
@@ -5920,7 +5845,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   e645310d2406ace85523ed91070ee7ff6aa245217267dacb158ae9fc75109692
@@ -5932,7 +5857,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   b6957bae7fd97ba681afbf8962fe2138e209649fd88ed9add2d5233178680aaa
@@ -5944,7 +5869,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   0a8cd5101f849ccd4e40d55fdc4edce914b2825b69eb76ec31cf53b59719e79e
@@ -5956,12 +5881,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   8083307f3f4b7df9e5bf53d5f25877c2e548f0f677540d4ee62d60ccca3098f8
@@ -5973,7 +5897,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   ecd964ae44e61203bc8759cfc6441365bf0c6e7bae6ad2a0fd553d4c7efab71e
@@ -5985,7 +5909,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   670d898bdcf97d7ca3aab6c2dd1641f1270fcc2a070bbd3028ab413aef2b2ecc
@@ -5997,7 +5921,7 @@ game
     memory
       type: ROM
       size: 0x140000
-      category: Program
+      content: Program
 
 game
   sha256:   889beb58d2a48a05a6230cabda14555cb030e2e986c0293bdf396e85af5c6798
@@ -6009,7 +5933,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   b70099186d3774355ac5db370240e370c73f9ce5341f6c805cf9f771374b43ae
@@ -6021,7 +5945,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   8049175767eddbc3e21ca5b94ee23fc225f834ccfab4ded30d2e981b0ef73ab6
@@ -6033,7 +5957,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   b737de81315eef8ded7cfd5df6b37aba01d9e6e14566486db7ec83eb0c1aa85e
@@ -6045,7 +5969,7 @@ game
     memory
       type: ROM
       size: 0x140000
-      category: Program
+      content: Program
 
 game
   sha256:   18a553dafd4980cc2869180b05f9fdf6e980bf092cc683e498ec6373c9701c6e
@@ -6057,7 +5981,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   fc5df5db0a96d39d3df651f63993adf0f5cb5a6b92a36211f3a05d460d92c72d
@@ -6069,7 +5993,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   d5f0fbeed3774bbccbd769698fc4051487a0a5eb699790a8a094451595600f60
@@ -6081,12 +6005,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   6b6921d7aba9ba353e96e39c8d79d24eef1b84eb5c7fa54edaa83d2447dcd954
@@ -6098,12 +6021,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   1f5738552c51de25ffe8aa44ff396c1ab238435296f1e8f99f8cf335483c03d5
@@ -6115,7 +6037,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   69c5805ad0494703e7d636d3d40d615d33e79bebef9d2cdb4a23b73d44c7b6f9
@@ -6127,12 +6049,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   0099bdb56e4190f81440c8c29395ecc15d78eeabfc38a93dca4773817d6f720f
@@ -6144,7 +6065,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   aa768b8b00123717c8d49f2c6731cdbfd80ab6a54128bae7594e93f45e38a19e
@@ -6156,7 +6077,7 @@ game
     memory
       type: ROM
       size: 0x140000
-      category: Program
+      content: Program
 
 game
   sha256:   e637b8241d55ee334a3452888df5e30d72c520dbb55c498db1a984438bab3e55
@@ -6168,7 +6089,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   05eb897d7696555790591c431c9d55a43ff9a1c12162443c17c5fcddfa5eb3c5
@@ -6180,7 +6101,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   dc9cefb4dd50dce2e9d626ac71d4a06306516cba4bc784c90e4a30fe4e7ff4ef
@@ -6192,7 +6113,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   6931a3eacb7ab3c2f2fb57ba7d59c6da56fe6c7d60484cebec9332e6caca3ae9
@@ -6204,7 +6125,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   9abb426bac62e03e4437f5a9a8455c3000042f339125cc60ae29382ae89d8493
@@ -6216,7 +6137,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   626f1fe52b0df0f8ede23f0062cd842321c8dabf14aefdca12e526876ecf383a
@@ -6228,7 +6149,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   31569bef662bc438194726967970bf19f504101060763cbd649350362fb6ef2f
@@ -6240,7 +6161,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   aac9d6f2b8408e4bbdc83ebbba755428caf8021fefbfac7220fb4c772abd9944
@@ -6252,12 +6173,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   0f474dafe5a26f3dea491d18073dd490d2f1f91313a7e91086565510d38d9a09
@@ -6269,7 +6189,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   14d3ece30898587eda20c661a4a55ec595ba6352ca1f0bfc177542aa0eef0039
@@ -6281,7 +6201,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   55e57c5e012583ff0fafd1aee16b3f8269ee2b34fe10f10b93ba0dde72f2b78d
@@ -6293,7 +6213,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   2431f8dc067ba27c6c3a846929f3deac6a45aa53a9a9ac20ede8ec5ca6854ea2
@@ -6305,7 +6225,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a3213e40d7abbc25a5b909642433103b06d8f90500c930bf64093ade0329da78
@@ -6317,28 +6237,29 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: ROM
       size: 0x1800
-      category: Program
+      content: Program
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1B
+      architecture: uPD7725
+      identifier: DSP1B
     memory
       type: ROM
       size: 0x800
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1B
+      architecture: uPD7725
+      identifier: DSP1B
     memory
       type: RAM
       size: 0x200
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1B
+      architecture: uPD7725
+      identifier: DSP1B
+      volatile
     oscillator
       frequency: 7600000
 
@@ -6352,7 +6273,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   fe1ad128313b2b9a47f89cf0d95d4c0cc2cb35a817ac5d915ee6c4d98d47d675
@@ -6364,7 +6285,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   c670e16c076f6d92ba581b78769b604e79ad567c04c647dac557f45a48c3448f
@@ -6376,7 +6297,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   db1ac03cc8b7daaa812da239029bcf999b30b2afe1c03d51f7ae849a796617ea
@@ -6388,7 +6309,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   e2be173c77bd1957787be36d13334f655e14d32dad99cacb0fd5e5fc65d96fa1
@@ -6400,12 +6321,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   e36aaba64be016cabc33a2dcf88913341e2edacc722e2a1ebe04eccda2a5d6e7
@@ -6417,7 +6337,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   f8d5c51f74df33edc827fbf8df7aab70160770ab0a896db6e59438ad9208cc6e
@@ -6429,7 +6349,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   983022203546e031773db0d1af7552c489187954882843f13ff123f09064c1d3
@@ -6441,7 +6361,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   d19113964c4d268e986018e256e9358cde9a23a05e6053b54c0f2d950dcdf395
@@ -6453,7 +6373,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   32f42fda0667d9435a2de84c7ce7b067bcbab1164f8f6d837992ad6cfac4f8de
@@ -6465,7 +6385,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   6e436020d967d35a0f7ce43e38e83a616b70696ae7d35b37cd56601cfb3822ba
@@ -6477,7 +6397,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   c7f0269498d190e4fd0f6f880a148fbe3713cd3a632083bac1e5bd18f8172371
@@ -6489,7 +6409,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   b0dbd4d7e5689c32234e80b0c5362ef67c425ab72d6ddb49d1cb1133ef630ef7
@@ -6501,7 +6421,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   0b0f991da7ce4b3c2974d6adf62191ec554db9793c5def14cdfb62b7ae28cc98
@@ -6513,7 +6433,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   d7271ca08400bbf5ae165b0aaa6e8a8a1b266f72e6e0ae10aae529732a472f7c
@@ -6525,7 +6445,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   15d4fc90cb202a9391718cd40b9f0384165aef03018ed932540e8f7c18b397dd
@@ -6537,7 +6457,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   4958eda26f2419f473449017c64121caee5e49c480ffa205422e7dd45cd23e31
@@ -6549,7 +6469,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   4d22279e534848012e0f1595468687742ae18cabc3fe44eeef938bc3a4dd08bf
@@ -6561,7 +6481,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   e4e9beaeeb3e968af772d1c4c9e4c1b4dfdba4e47c0205b458e1ab3a62a96060
@@ -6573,7 +6493,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   4cb601168c91fa0608c16a8cf2f292d991c6a5615d51861dee2f9b91c8d6bb19
@@ -6585,12 +6505,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   91ba5691dea3cdf103177ae5779110fc372fce8229cf91f263073667e7a8b5b7
@@ -6602,7 +6521,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   6fa6b8a8804ff6544bdedf94339a86ba64ce0b6dbf059605abb1cd6f102d3483
@@ -6614,12 +6533,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   ec2d91e238c26a5ddf7067d104b3b3e2eaee89255377e1eb6c4df8f301300e64
@@ -6631,7 +6549,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   de1de85ad549a6aaf0431cceb47cbd07e1f6e81f9e16fd62575305e2c1f06240
@@ -6643,7 +6561,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   328c8f57e2ea371f6fd5b8a9834c56e35eb3bfe710502dd80f370739f9ccb7e1
@@ -6655,7 +6573,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   0d4e0d134396bd1c7254cdc1da356eb944ca14910b6690f484a75a9c3a8106e7
@@ -6667,7 +6585,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   99f40f06fa4dbeeea4fe67d2de5b4c1bf301bedac1958ba1c239dcaf39b0a998
@@ -6679,7 +6597,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   9e6ebebcf14609c2a38a5f4409d0c8c859949cded70c5b6fd16fd15d9983d9d3
@@ -6691,7 +6609,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   854d2492d1cb059749bb0904ca5f92a5eeec09167abf84f7cca4023b1819e4f0
@@ -6703,7 +6621,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   8f131182b286bd87f12cf4f00453336538ce690d0e1f0972ac0be98df4d48987
@@ -6715,7 +6633,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   e67940a2106c1507f3a8d38790f263bbbf814578ebf3dbc4e3eb6007d310793c
@@ -6727,7 +6645,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   f4666355e7fea434843dc6d5119673bd6c23e69b884aac0b382ff036997e52b5
@@ -6739,12 +6657,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   9885ca148d32c4df6230642bcfa153f7e51b9559415042a831db14d07b3e6c3d
@@ -6756,7 +6673,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   bbde8b46c7262f9d4a5b3926a00850cb00b4f7711f6421f0adf4e2b0c847a5d6
@@ -6768,7 +6685,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   130a74e76369b0ec4d6378a014550921433f1ae1ac1dddffb51f77c9f21a818f
@@ -6780,12 +6697,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   044b61613ed66eae08abd5fa5dcd13b24aab11a942e3309cdff624d198c47440
@@ -6797,7 +6713,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   aad8c9be1b7a9662256b0c3d76f5b7a273bcd497aa838232d307e9f2e80cf699
@@ -6809,7 +6725,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   cbc496a7879ba78f32c51c3df4ba1a1a42f17d78d48a39ea9c709d1ad18cb8df
@@ -6821,12 +6737,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   fede9d4aec8c35ed11e2868c3c517bce53ee3e6af724085c92500e99e43e63de
@@ -6838,12 +6753,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   99450b45ccc70a1ed387f968c8f863a3c7f6a4b86809e841c25a71e1e904ac61
@@ -6855,7 +6769,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   a427db4860cb5140935f263ba872fe14949c3548db644fed46b2edf3dff3d4a8
@@ -6867,7 +6781,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   f2bc4cb460dfc5d5288065a2f529190b72e69d4e02634246086244c20f30521c
@@ -6879,7 +6793,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   ee00c57ddfa9b967d1857acb518df039ba73055bdebe78db014de0f5da262fd9
@@ -6891,7 +6805,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   9e3ad5e521e759a2e2260ea8072eb3314b6fcf67a3b7247357a5de9bcb24eeaa
@@ -6903,7 +6817,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   2357d344af77d25dda030520ce203045fd9060f83e3b9609a228dba859d9017b
@@ -6915,7 +6829,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   811cbc3287c0959e8eb242e817684d36de664ebebc5873a1fa9958693857c438
@@ -6927,7 +6841,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   49020695a017acc3dfadea97a60e28609e583571f69c5abeb3c6b1c2db8113fa
@@ -6939,7 +6853,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   ba4f31353e0e1233b574391ad97a80901d7de212e2c55d7be2af11a9a57c8225
@@ -6951,7 +6865,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   d8b3d9267470adb8ef2d197ade44476e504c0823f8fe9d2cf2883a03aa75bd49
@@ -6963,7 +6877,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   d6f6c30732dae8d00cd83628c3156acbdf26f99df701f779522e21de74dae5fe
@@ -6975,7 +6889,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   a8294d449bbb8370816efe0374704e8af20dbbde9c19afe969d898528bc293d0
@@ -6987,7 +6901,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   75993076c8773e7c7d555ef290be10590def40ca7b83307b8dc86556b04a6565
@@ -6999,7 +6913,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   19f4a1f08aa55ff3cc8ff7ae60ffe03f0e436e8d8901455f1311f2276497a492
@@ -7011,7 +6925,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   6cdec3cb9c91aa23feb13005f874bda580c2f548302874491a31951031c9dbbd
@@ -7023,12 +6937,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   9590110a990e90f525d5c8d70fc2a3da10879378003173b6761afb8bf042ee0d
@@ -7040,7 +6953,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   fd5761f9dd1f2b87ad11df6085046d0dfcdc3a79139263e47b0cff707966ba51
@@ -7052,7 +6965,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   2a117951adcfbc4298763673a834d502c3f7a3964db1e59650f113c07bb831fb
@@ -7064,7 +6977,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   d9b7f9356be0780f0037093a86ef8450f15e569cbd3680073d1cd345dfadb709
@@ -7076,7 +6989,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   8784614896e2b3e8d98c8166613ca5d2329643795a4dc107791c58c6c51e1268
@@ -7088,7 +7001,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   ee5fc27dd19a2ecb3c3c7c73d558a18ffd5ff365710c18b88150e277f08d587e
@@ -7100,7 +7013,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   b9b982cd8f91c51089d49b550f11882b1ee785ebddcb7355cfc465916d61a042
@@ -7112,7 +7025,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   367725a149a471411e4f72ad77603b61fb101c9cab4521be5647e13708cc97ba
@@ -7124,7 +7037,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   32008c429eafe7eb59aff7a89f77e1a267f02f9061ff8830ade7b99081e27f7c
@@ -7136,7 +7049,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   e6c4f468b39f2dea3436b63758db8ac9b29731357b982ec373334a36f202623f
@@ -7148,7 +7061,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   fdd763dffc6fb38975d4c6d6e3123f9738122781b7d13e1fc7f9820464cbaeb5
@@ -7160,12 +7073,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   aa69d4e19c2eb206fe88eba65994c830256c220e5506f59824aefa0a75dd44d5
@@ -7177,12 +7089,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   39de64101cf7f25863ce55e03a27d13422ea572ee996746578b5936fea80228b
@@ -7194,7 +7105,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   ee0e51d922d1cf8abe3dfc6b0d84a988a6635dc96b2a96962007c41aaa542774
@@ -7206,7 +7117,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   c7e7df8932bf0056aa530f3dc3c913c1171a359af4c197094c2b972946dc6051
@@ -7218,7 +7129,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   21a2aa488cb8140ca318f7d1f513103d14e758181aa336a594097d32ba0a7587
@@ -7230,7 +7141,7 @@ game
     memory
       type: ROM
       size: 0x140000
-      category: Program
+      content: Program
 
 game
   sha256:   9a064b67f522b75b82d0857519c0e33b4dbbe494c2ef79a44fdc913d605d0b26
@@ -7242,7 +7153,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   06d1c2b06b716052c5596aaa0c2e5632a027fee1a9a28439e509f813c30829a9
@@ -7254,12 +7165,11 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   63ab79e86ea13e2cf9bb67aec971febb68450db9865b00b5f412610653822393
@@ -7271,7 +7181,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   8b7525b2aa30cbea9e3deee601dd26e0100b8169c1948f19866be15cae0ac00d
@@ -7283,7 +7193,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   ea52b39a8e1ea15bfad6b92883c9a5fe744cecd7c0e175aa3bd40280cf7a966e
@@ -7295,7 +7205,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   2d40c86bc19d85555bf2672acf515b04dbf56a6a59b29ad503e672310b0fae3b
@@ -7307,7 +7217,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   6d9cd7f0cda3c0a82ed3f6a92cbbba4fe8365438e0a7867ad1cae2044d1738eb
@@ -7319,7 +7229,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   e5980b990605a9c91fa89101c440b2ec9993329296ba09a9538042d724a080fb
@@ -7331,7 +7241,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   03f6c69aef92d36b5ea25a6023368da0e1da9fa160e8316ebd533d4f358ffacf
@@ -7343,7 +7253,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   5536cea2da39f2572abe3b0fcf71f8fcd981376b470b174969772aae4a7a1845
@@ -7355,12 +7265,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   b0be35a0d5e500f4fffca5f2940e0ec52c81ce99dacd773c3ca9cf92f592d943
@@ -7372,12 +7281,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   c88a882ad72dfa07a9b1eb8a2183aa10057d60877a02edf90cf2cd8c78abe65e
@@ -7389,7 +7297,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   26e09f5bc2bde28d57aeca0bf5be7f7fb8e3b3887af975bcbf2e6f29b07df56f
@@ -7401,7 +7309,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   a93ea87fc835c530b5135c5294433d15eef6dbf656144b387e89ac19cf864996
@@ -7413,7 +7321,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   c7d622391f7699fb0dc6367e141c894e700cc9bd8abca69f36785e7bc2f42a49
@@ -7425,7 +7333,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   9674cc269d89a52d1719a487b44acf004fb777cbd58d76b19a2cd25749728215
@@ -7437,7 +7345,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   7c722f9941957630467c1784d0eb3f92fbfc0a2a1da3c8f5c27f593eca2a5a04
@@ -7449,7 +7357,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   c4ae2797fac2586b8640064be6398f2b4f2b3158a07f26c66912b29f7fd197de
@@ -7461,7 +7369,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   ad31b94ce928ecff605e2b89082154671691509e95d38370ed381437f2c36698
@@ -7473,7 +7381,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   337e643d3e63915de06429992f306e8d2b73aed6849b795f9c855c2d03c18180
@@ -7485,7 +7393,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   4068add412571bd85adac32dff9835e4a4886077d752adb104fee3908e42b7ef
@@ -7497,7 +7405,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   ceb470157576eac3b8b8c16e8ab6b59672409681ffb4232e4ec39dd0cb37ef91
@@ -7509,7 +7417,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   e6efb6361af04963f22c772f879a466543f56b3b6a084204fef2dcb4659d82d9
@@ -7521,7 +7429,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   300c1937e4b68108302e9b0f49974d1ec6b6c45dd8da69dddc19443f9562ecf4
@@ -7533,7 +7441,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   752d24fab240f4dd1dfbfea5ec83438998316806ad44488bf8c84430ca5a2cd0
@@ -7545,7 +7453,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   18d40a807d5f88c5b6a1ad849eec7e0f189225d9a1586037c850f6680b5844de
@@ -7557,7 +7465,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   a362033d0d7e754d79202b255679186ad799b9e784719614b913ec8c9857ae33
@@ -7569,7 +7477,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   606abf536440173ae36466db360c7db6b474beb7a105c8a62bc74a54cbe1c38b
@@ -7581,7 +7489,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   9c4721339a197185d61e0697ea0149db143a27ddb2f57ebd398f18bcf4d7724b
@@ -7593,12 +7501,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   7dbfc44d28a46e6d399628e43086aa9fd0b2abeda4c108751a5ad91c102c3aaf
@@ -7610,7 +7517,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   c5474de3592e2a99aac0e5511516658f9f0b50167c754a018409842ec35bcd45
@@ -7622,12 +7529,12 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x10000
-      category: Save
+      content: Save
+      volatile
     oscillator
       frequency: 21440000
 
@@ -7641,12 +7548,11 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   628147468c3539283197f58f03b94df49758a332831857481ea9cc31645f0527
@@ -7658,12 +7564,11 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   07ff03fa8c8e31d2f8277ef2a9785022edebf7f79b694c66a00c66d8e563bce5
@@ -7675,12 +7580,11 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   35421a9af9dd011b40b91f792192af9f99c93201d8d394026bdfb42cbf2d8633
@@ -7692,12 +7596,11 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   b79c2bb86f6fc76e1fc61c62fc16d51c664c381e58bc2933be643bbc4d8b610c
@@ -7709,12 +7612,11 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   2277a2d8dddb01fe5cb0ae9a0fa225d42b3a11adccaeafa18e3c339b3794a32b
@@ -7726,12 +7628,11 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   d45e26eb10c323ecd480e5f2326b223e29264c3adde67f48f0d2791128e519e8
@@ -7743,11 +7644,12 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
       size: 0x10000
-      category: Save
+      content: Save
+      volatile
     oscillator
       frequency: 21440000
 
@@ -7761,7 +7663,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   b32aa9cbf8f6baacc84f6418fa6fbc33b9ce71458fecc91275aafdbf6f743a99
@@ -7773,7 +7675,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   d98d7da1e7636e067563e2e480d7dfbc013b7e9bdf1329fd61c5cacac0293e1d
@@ -7785,7 +7687,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   a3b1cae3fe55fe52c035ab122e7f850640b0935524496d45b1915ca3c8a934f4
@@ -7797,12 +7699,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   49a1f9f5e6084b3daa1b13ab5a37ebe8bd3cf20e1c7429fbf722298092893e81
@@ -7814,7 +7715,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   74910ce01d19d25cb97a243a51f21c3d522f02fb116682f60440da3292bb14f7
@@ -7826,12 +7727,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   1a79d51a2ad7dd4848205a07ff8e5d873b155dc420de5e52158c9bab935e05c3
@@ -7843,7 +7743,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   03d25227fb88899d0f3234c4a3f76f1dbe8d582cb6429454fd6f1c4cf14d5c6e
@@ -7855,33 +7755,33 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
     memory
       type: ROM
       size: 0x1800
-      category: Program
+      content: Program
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP2
+      architecture: uPD7725
+      identifier: DSP2
     memory
       type: ROM
       size: 0x800
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP2
+      architecture: uPD7725
+      identifier: DSP2
     memory
       type: RAM
       size: 0x200
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP2
+      architecture: uPD7725
+      identifier: DSP2
+      volatile
     oscillator
       frequency: 7600000
 
@@ -7895,7 +7795,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a8fe2226728002786d68c27ddddf0b90a894db52e4dfe268fdf72a68cae5f02e
@@ -7907,12 +7807,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   4579e437279f79eedd6b9cf648a814df2ab2c83d937a1bcec1578d28965fb9a0
@@ -7924,7 +7823,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   10eadaab168707829418702386e1bcedd2619d9bbefc37cf31c4118313bcf6de
@@ -7936,7 +7835,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   5d658b63d35e2e0baf48ae3bb04ea5e1553855b34bb39fc2c7ca41fbd3894d52
@@ -7948,7 +7847,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   b296054effb1948039635044bc905fdf8ff53e7a73038fd5d8436a913ea5ad8a
@@ -7960,7 +7859,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   f14e30ee452ec930a6d08094094b287d0c40c8108f2017c418015242987649b3
@@ -7972,12 +7871,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   cfd666f0bbabec59613d9fe189db7d0a060a78047bc084c0c365840769047bf2
@@ -7989,12 +7887,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   c702c3860e9dffdaa1917d013ecbcefdd2c47f89726992f7f810d879772dcc4d
@@ -8006,7 +7903,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   3326061160ad12c7aef5176544ec1c8ef2f534a51960ca882dbc7fcb9b1a7384
@@ -8018,12 +7915,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   7b2fdab972e393395f5379d7fb13e40464db152f6acf58b2d2a6a18f81cefecb
@@ -8035,12 +7931,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   faf595b4671f005fa9367ba3fcd30dbff371bc7a9ca8bbfbc0ebfcc5826b60f8
@@ -8052,12 +7947,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   8481e47381bd98c27b9782b5727a5d5f0976fbb3aa3df25c2c42aa37e0586815
@@ -8065,16 +7959,15 @@ game
   name:     EVO - Search for Eden
   region:   SNS-46-USA
   revision: SNS-46-0
-  board:    SHVC-2A3M-01#R
+  board:    SHVC-2A3M-01#A
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   f2455253db316b6ccd0c5c686d1f1e2d94cd5e37534e70a3a07a409120d58df6
@@ -8086,12 +7979,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   a0521f50b0d0bff6666bfb712498476eb8d5974ef38caf157e2f67cbce5475bb
@@ -8103,12 +7995,11 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   1576066e0cb771a91caf79e7d4f6dc00eb0daa47f0786f1604b32537429a7f45
@@ -8120,12 +8011,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   bf16c3c867c58e2ab061c70de9295b6930d63f29f81cc986f5ecae03e0ad18d2
@@ -8137,12 +8027,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   55c33efb514568c9946c4b866c160ed190fe436faee265ee2fb107f7fe94d524
@@ -8154,12 +8043,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   1d38e3af9e3a6409e93f4705b68c42558f558c68f3e83ef2a40e46cf560b26cc
@@ -8171,12 +8059,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   3ae7bfd38a3dc273f4d387af3b15621beefebf5056731af06e3822f5e57db5c5
@@ -8188,26 +8075,28 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: ROM
       size: 0xc000
-      category: Program
+      content: Program
       manufacturer: NEC
-      model: uPD96050
-      identity: ST010
+      architecture: uPD96050
+      identifier: ST010
     memory
       type: ROM
       size: 0x1000
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD96050
-      identity: ST010
+      architecture: uPD96050
+      identifier: ST010
     memory
       type: RAM
-        battery
       size: 0x1000
-      category: Save
+      content: Data
+      manufacturer: NEC
+      architecture: uPD96050
+      identifier: ST010
     oscillator
       frequency: 11000000
 
@@ -8221,7 +8110,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   2891f1eab285133364ecc379a5c9e1d0026d60f425f1a458d149014f386cfa50
@@ -8233,7 +8122,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   4f43ce12e1d8cd195468d7048494ad2930721e5bf9e69bfd86eeee707ffc634b
@@ -8245,7 +8134,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   d5c651d726dd957b80d03ab6fdbed4cdd26a3cccf5ec9d91af67251b3ec26a3c
@@ -8257,7 +8146,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   c92f389d25870aada3002775838ec9f69a988120c0238af885fd08d46bd94930
@@ -8269,7 +8158,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   a0c554d46034caef231c36dd6849828ca39703678fb7fdd15a11f292b93bcd6b
@@ -8281,7 +8170,7 @@ game
     memory
       type: ROM
       size: 0x280000
-      category: Program
+      content: Program
 
 game
   sha256:   410e90db3d38507ccc85ad3bca6b27a080123fd5160e82b5de4d914d4b6d6e61
@@ -8293,7 +8182,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   1f454f2ce16fb96ba0b950ceaa098fe6eabed9e4a0e512252debad8fa6bc5ef5
@@ -8305,7 +8194,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   26ff143c2f1a4a16ca838cc4b5555e39bbe7208515dca8f1c4b1a00dec61cf09
@@ -8317,12 +8206,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   c514f855ad377242582952eee95513a2152ebbf6bb5b06bdf9f031fc5ac748ab
@@ -8334,12 +8222,11 @@ game
     memory
       type: ROM
       size: 0x1e0000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   b9594d588816ae570ea5fea14577ed47de4db9ac9a40a116c84e0ad7a2ce58f8
@@ -8351,7 +8238,7 @@ game
     memory
       type: ROM
       size: 0x280000
-      category: Program
+      content: Program
 
 game
   sha256:   6151389f33ce2e53db3cd99592440c0020f5f4668f581ce3bd615bc92077f255
@@ -8363,12 +8250,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   680535dc1c4196c53b40dc9c2c9bc159a77802ab8d4b474bef5dc0281c15ad06
@@ -8380,12 +8266,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   0f51b4fca41b7fd509e4b8f9d543151f68efa5e97b08493e4b2a0c06f5d8d5e2
@@ -8397,12 +8282,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   60cca2592d0756b8c4c7a0a254fafa5ac47aa752521fd1f77dcbf4b6ee1bee90
@@ -8414,7 +8298,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   744d1a16c3f99970283597ae8f43b7c3621c5f995c4566ef24b8d70b0692007b
@@ -8426,7 +8310,7 @@ game
     memory
       type: ROM
       size: 0x140000
-      category: Program
+      content: Program
 
 game
   sha256:   f9dac709b2c2859f828103a0dd980716817e2bde3b9d7e2fdea36e9bb9bed7f2
@@ -8438,7 +8322,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   8c47f9dc79748c0ae6c648f8480614d22eaefade065612ad1fe749fc3db4d1bc
@@ -8450,7 +8334,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   003dba0193acc5336840307194643ca3b1f848dcfc77580b4e17c605105b27f5
@@ -8462,7 +8346,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   6f32355bef68d4ad58822f50074b46bcc9a68357cd2c6a5470c96bf5344f84d8
@@ -8474,7 +8358,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   4c1354337efa788169387458fa6bdbcf4be0c98369920af2bd876ad98d29070f
@@ -8486,7 +8370,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   064a880a8dfcf576f74ae8a17c3ec7b0a27e8cb0300a5e5959452fcc30422f14
@@ -8498,7 +8382,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   ff09d72d6241b331dc429d1cf27c04c26546f23312a22c7a14e6a4bf41ed1069
@@ -8510,7 +8394,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   3d5bbc06e7e9797d937c803610c40b262c14c3f0a39e8048dd6b0b052a040fc1
@@ -8522,7 +8406,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   40b55ee44bc6f1c83daac3e1806dcf7ecd5b35280cdb6a63c7a5e52fbd2115e6
@@ -8534,7 +8418,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   bc6b0344a434644c391ac69a53c7720c51e2d3c5c082b8d78598ae4df100c464
@@ -8546,7 +8430,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   ba93721bdb0f19506e722bc580d0b4dad6e8648dddbc52e3ce45dd75ea165f72
@@ -8558,12 +8442,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   25b380f529f5a9295df7c0adcc5213d67f131f552d078a3d8f545f988047c90a
@@ -8575,7 +8458,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   1ce72767795f41049a1f4d2829e837a8885eb91e1c14faf1ca62d05839ebe3c9
@@ -8587,7 +8470,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   3db8a496a49d47b1ac2a893feaf682722765b2cde63c22af3aa68212dcfa975f
@@ -8599,7 +8482,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   dcceb5be536c9b91bf34f65e7fcec4b55a78af0192323cf86f3b9555072037ee
@@ -8611,7 +8494,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   78e2b8210d8dd8776ee23153eb3dce2cbf7d8ddc3e8a5d25b580428f59d98bdb
@@ -8623,12 +8506,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   05e9404bfe0689e484a34991f22712c9da718cf000b0f748378af5758b654a3d
@@ -8640,12 +8522,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   fc993c122079b94ebc9b9452b46a55d5ddcd3715a4b97af795222b264827e90f
@@ -8657,7 +8538,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a4ceb31b82ea532e6eb640fa2eda61625758e72251efa5f0ae9a984f4a98a8a0
@@ -8669,7 +8550,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   feff03cfa195512ad87dc876012d70520cf192e2874c518b6dbdf3d876ea60c4
@@ -8681,12 +8562,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   8796ca4de3aeffd3a494fe28e7d7e2aeb220ca652b43684f29e2cc94f02c20c4
@@ -8698,7 +8578,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   2bb368c47189ce813ad716eef16c01cd47685cb98e2c1cb35fa6f0173c97dd7c
@@ -8710,7 +8590,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   342ddf438aec3f0696de8f2cd74bb7f48a956f488f1246eeccaff5ef246ca50b
@@ -8722,7 +8602,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   2e478569949c3935529c956448947ef90bae64abaf3d523bd89e7f4cf5e83702
@@ -8734,7 +8614,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   93da752a0c76167d0907efa832367e5d14aab8e835b864f345c386071a9af718
@@ -8746,7 +8626,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   b5492aea296ee4bfcd2c677fbec5153fd4c4db758c835b372ef750cf2399649b
@@ -8758,7 +8638,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   3ab1ca181000f10cb7c2ae8dc9fafeecd5d77314ee92960e26dff0d6a1fd11ee
@@ -8770,7 +8650,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   f921297c361f16ad3f1257e91829638fc795f9323172015d7237ed648c8f7515
@@ -8782,7 +8662,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   5a6deb5617e86a9f4b981031e939510e30c5c8ad047f5f012e40442113fd28c2
@@ -8794,7 +8674,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   de1cf1512e48473b03adb87b7504f394e8b330b346bac24044f833d83609799a
@@ -8806,7 +8686,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   21cd6d749674c55342f5f1a895642d4b58b9bd7eb211f5df3a35dc6c2f5d4501
@@ -8818,7 +8698,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   4fb9b010e4b1dc166ab7995a6f9491114063b68aac344004b1edfc555951d959
@@ -8830,7 +8710,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   6e2a02a8944c19db3da76d2646f232fbe3ed039bc7d44cc03910814fa77a7acf
@@ -8842,7 +8722,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   73a3aa87ddd5ce5df5ba51292316f42b6e128280179b0a1b11b4dcddc17d4163
@@ -8854,12 +8734,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   9ff6bbcce7dc1f3bded96860a86698cab161d13ee167c57b5b114ac646eea0ea
@@ -8871,7 +8750,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   fa418618787145291201b3d9247048b2d7dfba37f6556dcb1d40db499124dd60
@@ -8883,7 +8762,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   7c34908526db2a634216fab0276c42a8e4e22d59c728cd586200142a12dd2c2c
@@ -8895,7 +8774,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   27eaccb4eea93832639565a664bf3561ed5a11ac025d377a3f33262d851c1b2b
@@ -8907,7 +8786,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   48a3ac52e2c9128abc2dc60e07817a51898e8a93be0d51d6f541a8635263a089
@@ -8919,7 +8798,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   acad4c594f156e0f30dec2532b35fcb3bab800e08263377634e2d96dfd055f3e
@@ -8931,7 +8810,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a03528344d40bf800cdbde2dd240b30442cec7aea6026fbbe312a7c36bf0f74a
@@ -8943,7 +8822,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   41cc900d2461a8dc4706640e493885ddf85db04d8dffceebf7a0ed89cc983d8d
@@ -8955,7 +8834,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   db57f45e113127b7148c1b0add2da888e16e16b3e46749f95973b3ef497ae90b
@@ -8967,7 +8846,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   f57c49cc3e4c5e34929e12658db0de8794265c517e42f3c518bb1466ba46f14a
@@ -8979,7 +8858,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   fa143784fd20721d61101920e6aae9b7f5012b8157b1ce0c7ea83ea6c875d84d
@@ -8991,7 +8870,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   32adc048fd89228a4310c03df243e83de7d436cdb2460b4cc83ade20d359b2bd
@@ -9003,12 +8882,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   4dc2b5de98e9109583d9b61b38d26a8216af4dba246ef71350122213630562d0
@@ -9020,7 +8898,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   c41150c0e84055801377fb7cb273cc51ca442b269ca6287cadf514f553e34750
@@ -9032,7 +8910,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   0415adfe80977485f84cdffaaa79f18c91c004c7dba202b4cf9a94eb11adeada
@@ -9044,7 +8922,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   8d170628d2d2fdf142bb82ad80e908bba54c45fa33241c779b8eafaf1b21171f
@@ -9056,7 +8934,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   cf611b40f9570e8fcfdc21db623965da62561e8ca82ded59e432ba6fb0bfb562
@@ -9068,7 +8946,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   5e5cac64fdcf09a52a9c0ab1ebc8bd309dcb1256faf1405284443569b5284fe5
@@ -9080,12 +8958,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   c7b1706a0ee96f3e0d65cd043c05966bfe3d5c57d08bbd2df3118817424adf82
@@ -9097,7 +8974,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   6443fecebcdc2ff7061a40432f3ad1db6dfd354909a5f306972cf6afa122752c
@@ -9109,7 +8986,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   d2fe66c1ce66c65ce14e478c94be2e616f9e2cad374b5783a6a64d3c1a99cfa9
@@ -9121,7 +8998,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   4e8044b1e7a779685d6751351eef2391272ac8b2bd909edeecfc3d3c5a594bef
@@ -9133,7 +9010,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   8304d8bc55aa9e64bdd144d384f4b185af2426e7d64888c6c23dd41366a53981
@@ -9145,7 +9022,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   39bfe828571cdb23e7c85c23cf5b175979dcc2042c5841add58f5ae6492168a9
@@ -9157,7 +9034,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   183af7d642b55d52cd594786ec2f031d033cc6c8c1a2a84a834e4ada04301b26
@@ -9169,7 +9046,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   3ffbb6e0ccf8e9f5e4c72d9fe526a16371e562b71a91d6430e562bf358a5126b
@@ -9181,7 +9058,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   9cf82dd9a851cdc38bf2afc286c077ff18a0a5d3bb301eba606cc52db62f8965
@@ -9193,7 +9070,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   8b7b33f3d2edb844f1d43cfdd595b8c2cb6fc005d59acb899a1afda999e47638
@@ -9205,7 +9082,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   85e5f6fedc420925557092d728e1dc6b4e2042368fb78bf93c0df447f8c9c0c0
@@ -9217,7 +9094,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   76d760da59aa7fc2fd4426c1d1aec57412703ab901b9df60ac2be16ede80b0e7
@@ -9229,7 +9106,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   d7110ddc0b34aa4ecd5e55f7b846657edb982db82cf0ba340fe0464daf0ca9be
@@ -9241,7 +9118,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   ee7a29eb9c302ea2bb235ef990fd8344a6beb9817499941c40a8a94ad5f7c964
@@ -9253,7 +9130,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a314583b11d594b8245b5177aa64a4d3b7497d096edabbea7c1842c57aa2ad2b
@@ -9265,7 +9142,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   6f0bec87ece503b0fbe108cd159ed6f5fa7711b1c4fe31e982af41ad5c638093
@@ -9277,7 +9154,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   205890f94e27e7c1b381124cc35c866351bafa906383e507cd17ccb9d1b68ffd
@@ -9289,7 +9166,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   6abe908b4005a68d1f6e9a54339c94a33db41801890d8c058ce974fdab3d0bcd
@@ -9301,12 +9178,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   3b2b8b813b58049a4a86ce1c42d2a651f19fd9bbab2407a494e20cf343d3c1a4
@@ -9318,7 +9194,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   c9889799a9ae8558f26d66ae546db930c99acb78d921b4395afbbc38da6272aa
@@ -9330,7 +9206,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   5a76347672ea7d27bb334b1e30bbc73e06f92373883bed499245377327a8f0cf
@@ -9342,7 +9218,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   3e62872bf69ea90dd7093608268f8defa2c6016adb1011745dab3c2af45d69b7
@@ -9354,7 +9230,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   67fa7115eb6bf292c024c3a8b06ce9bd457c4d46de182a06a573afff968cc0f1
@@ -9366,7 +9242,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   771a0322d9f5f8e13a52d01e80257a1f75cc693cf4abf74793520eb5f8b5580e
@@ -9378,7 +9254,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   8d812ea4fa897274116f7f43bc689e110f1cfbd3f7eb3a1737c2a85d36369159
@@ -9390,7 +9266,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   fe91d45201753ae9655d5ce38838e352f478b26b2d933c1bcb5bd8330121f9ff
@@ -9402,7 +9278,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   0a4e9d6fa2ac16aa51da5538d93280734de480e44c430173ed14826c84553c7d
@@ -9414,7 +9290,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   5eff7c27f69b3ebc1ec1294ffcd1debf3512bc3e6c1c75fbdc5e778dcaaba1c9
@@ -9426,7 +9302,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   7f05959f423bc656091ea3bddfbc89c877ae243dca346f63233e27973f34e0eb
@@ -9438,7 +9314,7 @@ game
     memory
       type: ROM
       size: 0x280000
-      category: Program
+      content: Program
 
 game
   sha256:   05152bcf9bf086e7bcdbfa7dd8edfe2085f1339c4d7e193e0071c49a10471ef4
@@ -9450,7 +9326,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   7cc3693cc5e1e834d57795f04b048fab27864a898a9507e7ca383771e2035414
@@ -9462,7 +9338,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   fec6dd097e378e795dd164be658b10b1c60672b2351a7f4a7722d1fe5736410e
@@ -9474,7 +9350,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   3104d6c06c8909c56f6adb2faecf1b4382f2490370798b605631da926c5306d8
@@ -9486,12 +9362,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   f9f7a2de8cbafd6f9042841dfc42529f8245d75f436bed1c23f9ba1663182e61
@@ -9503,12 +9378,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   18b5276be764c06531219c1757d40214aeec06fae68f4ce3ec78b58ee750a43e
@@ -9520,12 +9394,11 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   b16661d5151d73cea5ac46d7c899531c7b2cdee2558092c23a5460c8092b80b8
@@ -9537,7 +9410,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   914652f72d6ceb83b8b43414d6c42581ec12e9b3f45259b8b2768d26b8d4f073
@@ -9549,7 +9422,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   618a23636e07110e094277ec1d1e60c3620a6e9a5f386292808267593fa803ad
@@ -9561,7 +9434,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   1b58d0aed4510811c73d267244a7e915aa0b334c86e68f3fa5883f5cb534e4d7
@@ -9573,7 +9446,7 @@ game
     memory
       type: ROM
       size: 0x280000
-      category: Program
+      content: Program
 
 game
   sha256:   aca9eb59d6783e2cae3787c69053888fea98f5dfe4c8af8b5a6360e0afb3b5d7
@@ -9585,7 +9458,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   6638b5541059814d4c34574e5e277ef613aebf81c91d3def557a7642fb5840e1
@@ -9597,7 +9470,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   1135858a1ce686a0a163bb0e6f3a4d7cd71c0cd56efbc79677372f2624cf2306
@@ -9609,7 +9482,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a9729d049ce580839bbfef1836a13dc16f2fc934d203ebf7390e0b1c47ea9a2d
@@ -9621,7 +9494,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   4e095fbbdec4a16b075d7140385ff68b259870ca9e3357f076dfff7f3d1c4a62
@@ -9633,17 +9506,16 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Internal
+      content: Internal
+      volatile
 
 game
   sha256:   67937dd7a29a93b1aaabb6df89f0748369ff47f3f6c655a402c00d5657973140
@@ -9655,7 +9527,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   0f984dc5fe8293f75e3b8fad98b0cb564706d9b1e3902b56415aa399c2d4df2b
@@ -9667,12 +9539,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   b50bf9d95485e8aeb7a6730e9f9f9c9c4ec23a85b336a4fb2e3b63034531e36f
@@ -9684,17 +9555,16 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Internal
+      content: Internal
+      volatile
 
 game
   sha256:   fb601ead645edce139b0483d3155b4e3d7ab245bf87a3a66cb88c0a617c0a526
@@ -9706,7 +9576,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   bed18c968aee0eb0c866c1964c28135364cd6d65fff7bcb5873342c04e63750d
@@ -9718,7 +9588,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   e36322697c48baae6492db91e6cbf3844a420f6e0cc8a75f3a73556026ddbbb8
@@ -9730,7 +9600,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   daf3e45bafbec81ffa5911b94810b2cd267574de717292360f9940f41fb2a6a9
@@ -9742,7 +9612,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   46c811f0cacffe8f20e1d63072d25d7c47e9bb3fd5124851fd05aca9884d21fb
@@ -9754,12 +9624,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   48cd9476fef1ed685b9c30dd1669b46048f7295cbbb2abcfa5b1a48699346ea3
@@ -9771,7 +9640,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   314d53f409b66ba3f4426a6f1bb7c69f6779aeed277ce2e19535f94d7c8ca586
@@ -9783,7 +9652,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a179a1188220b59787c49a78a0dde79b89380e3a8a8a0ab558f0102c5796f873
@@ -9795,7 +9664,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   c7814cee0fc95d6422cf19a3dc8c9a65b60f6f56da75f09cebea02cc5f99261b
@@ -9807,7 +9676,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   c865fb17e8c59a21d32b9a605319241fa74ec732e3f0ee58f5d7fcbd8ee57c6b
@@ -9819,7 +9688,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   66871d66be19ad2c34c927d6b14cd8eb6fc3181965b6e517cb361f7316009cfb
@@ -9831,12 +9700,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   4b28d2ddab405976bb56e41a40ec1ea11d7362a8f398d5f8c117d715a15719ca
@@ -9848,7 +9716,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   cd016c41c7ef9f4f243d57c2b1564b4ceb3b4c38cc165cd02ab6c8e35c93aa2e
@@ -9860,7 +9728,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   63ecdca7f89b2432ccd57bdb81c0875f6336353f5897f756ef162ab2ec2ee707
@@ -9872,12 +9740,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   a2c1970670e2831e47e24ced01bf4ba5aba05cac3773bf524c62d689c35687e1
@@ -9889,7 +9756,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   3bc5f296c3dbee012e93a5cf25568f9288ce87b34d74085401a560350eaca03f
@@ -9901,7 +9768,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   80c22cc92d51a54de9cd9fd00db5ff58a35fff35e822169c94e445d50834fba3
@@ -9913,7 +9780,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   8fcb9c34aea863d49ff08a0ace3f83d301b81f01e2ede28bee7e6d778878d0cc
@@ -9925,12 +9792,11 @@ game
     memory
       type: ROM
       size: 0x140000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   457abe634e0a8be03e29513a3dca8f3e9d0ddc6bf97d8931f2316094260f3712
@@ -9942,7 +9808,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   0e2ba574ff73587f211c8f818d444631584832e9240548f003171c11b898ad62
@@ -9954,28 +9820,29 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: ROM
       size: 0x1800
-      category: Program
+      content: Program
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: ROM
       size: 0x800
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: RAM
       size: 0x200
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
+      volatile
     oscillator
       frequency: 7600000
 
@@ -9989,7 +9856,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   62557ee2a3fc3b5a3f59431f966eb61bb380ba983ef6c7742cb55cf075f15f6c
@@ -10001,7 +9868,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   ab3d97c1a3a979e1680a428ec65df54cfb72997bbfe2173292248a4fa8c51ba1
@@ -10013,7 +9880,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   9f7782a92fda789f9d119b1f0a2f7da0f35606357556a48eca9487797ee1a888
@@ -10025,7 +9892,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   73731a5a7932965de02a9e98055dcf88b4d17b8f710a6ecfde3e36a1f248773b
@@ -10037,12 +9904,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   7c34ecb16c10f551120ed7b86cfbc947042f479b52ee74bb3c40e92fdd192b3a
@@ -10054,12 +9920,11 @@ game
     memory
       type: ROM
       size: 0x280000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   7e77e196db47e87a5b297e60f0dfa7ce41df8d2d1fdd9152e06628d0b0e586af
@@ -10071,7 +9936,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   0ad77ae7af231313e1369a52d1622b88e3751aa5ec774628df7071f9e4244abc
@@ -10083,12 +9948,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   3059d86cdc383985c564a7a891fe18e08f5222ead7ede9fa309159d60cde13a1
@@ -10100,12 +9964,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   6874568d985f65dd817d4b03998e71c8cbacc8d8707411fde7bffee350605a88
@@ -10117,12 +9980,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   e3c62c9fe55d2311aa6a264f41b45d6cbc7b1b069ed3aa82ee57d381c062547d
@@ -10134,12 +9996,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   c01fb8989d391d3e343003934937f02bd8ef9aacdad68c32c3d3f56feb72f5b0
@@ -10151,7 +10012,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   1d3cceaa05e054b002caeb09fd5fb9e718ec446764f4169d97bc185da76fdf4d
@@ -10163,7 +10024,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   f301bb8ea867e530ecb64e8eff504ed5b9697cf076c70e2036ecf2ffbe6c487a
@@ -10175,7 +10036,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   8267e2f092c86d5a29c9a826db82c7473638e28e2507cdaf5c86981f07cd0bef
@@ -10187,7 +10048,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   e842cac1a4301be196f1e137fbd1a16866d5c913f24dbca313f4dd8bd7472f45
@@ -10199,12 +10060,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   22b21fb39d40447846f6ff77a07f7b4aba2a7473941ba50c787aae6153b1fb5e
@@ -10216,7 +10076,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   57b94f5f576abbe8bd8f5a4eeb6cf927300ec1b5f0596610f3539ba733505c12
@@ -10228,7 +10088,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   c646b1e60e2cd5a2741915f5d3dfe3c17f45ff7283f8052e840bd4354b0990e1
@@ -10240,7 +10100,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   4b69d4958e099c3b3f6ae45e153ced9b24755d8c161dfee06c9f67886a7c0f09
@@ -10252,7 +10112,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   908440f96fd0df14602fc6d1daee8519fc31f765ad00bf64aaba35c2c6ef0b56
@@ -10264,12 +10124,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   49dd77b310b476c875633335243553be59ecfb0bffae62e46f2e53ff05c20fcd
@@ -10281,7 +10140,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   2731f0bd1c87e75121f41d1ed5cc9fbf177f414b8bf831c76fd9c4b58c86ed08
@@ -10293,7 +10152,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   44cc113ce1e7616cc737adea9e8f140436c9f1c3fba57e8e9db48025d4ace632
@@ -10305,7 +10164,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   22453182d44380f08004a12c6492a0c4b2e1f584e268dcc3296a03ea03ae0909
@@ -10317,7 +10176,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a203a13870eaec92095daef1196a0c9fe8416e600504d55dd0dc724d4f5f5cb0
@@ -10329,7 +10188,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   c3c4afdeb67136619c643bd9a9f3fe90337541a40745503b5d4eb9b9e6e64b67
@@ -10341,12 +10200,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   2a08704748f5ef6488348c4099729feca600412d331bda3756e51efd8b94e113
@@ -10358,12 +10216,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   7bffa1dc31604fa3d61e06ce2c59168098cc8dd7e59998e1d5f30c49bdf8d617
@@ -10375,7 +10232,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   a255fec32453739903a1954149f19bc9658f4a415600b44badf1d4e5e13a16f9
@@ -10387,7 +10244,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   cf4d603dc0a3759da571224c671a9bfd29f9e52ca8dbb61bcc8ac8be5481e9b2
@@ -10399,7 +10256,7 @@ game
     memory
       type: ROM
       size: 0x140000
-      category: Program
+      content: Program
 
 game
   sha256:   3e1209f473bff8cd4bcbf71d071e7f8df17a2d564e9a5c4c427ee8198cebb615
@@ -10411,7 +10268,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   da484f2a636b8d692840f40e5468e992c5f2af26d365c69fbc12ef2923588d23
@@ -10423,21 +10280,22 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: ROM
       size: 0xc00
-      category: Data
+      content: Data
       manufacturer: Hitachi
-      model: HG51BS169
-      identity: Cx4
+      architecture: HG51BS169
+      identifier: Cx4
     memory
       type: RAM
       size: 0xc00
-      category: Data
+      content: Data
       manufacturer: Hitachi
-      model: HS51BS169
-      identity: Cx4
+      architecture: HS51BS169
+      identifier: Cx4
+      volatile
     oscillator
       frequency: 20000000
 
@@ -10451,21 +10309,22 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: ROM
       size: 0xc00
-      category: Data
+      content: Data
       manufacturer: Hitachi
-      model: HG51BS169
-      identity: Cx4
+      architecture: HG51BS169
+      identifier: Cx4
     memory
       type: RAM
       size: 0xc00
-      category: Data
+      content: Data
       manufacturer: Hitachi
-      model: HS51BS169
-      identity: Cx4
+      architecture: HS51BS169
+      identifier: Cx4
+      volatile
     oscillator
       frequency: 20000000
 
@@ -10479,12 +10338,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   0a9609a505dd1555006b16f53d961b3ce50c518aa1597a77dcd46e55ecc716ff
@@ -10496,7 +10354,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   057484558ebd18165f98e556b994080535e31cefdd98b5edb190516f7040fc9d
@@ -10508,7 +10366,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   0d7f875877fe856066cfb39b4ecdbbe7d48393a75770720876c94419f809bb1c
@@ -10520,7 +10378,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   88545d24c60c18c695cc3fce8c4074f46ad1bac905e8a39a61d8a6ae6b608621
@@ -10532,28 +10390,29 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: ROM
       size: 0x1800
-      category: Program
+      content: Program
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: ROM
       size: 0x800
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: RAM
       size: 0x200
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
+      volatile
     oscillator
       frequency: 7600000
 
@@ -10567,7 +10426,7 @@ game
     memory
       type: ROM
       size: 0x140000
-      category: Program
+      content: Program
 
 game
   sha256:   0773eb741ce28f963f767fc7dd44678eb3d37ed4dc7fc82bb9cce7d55f1cfc64
@@ -10579,7 +10438,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   add082caffe707df2c0259489c3e272d6557ab07ba3ff856cbc0adba0d7db6a5
@@ -10591,7 +10450,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a2adeb4bf0e7cc943611ac726e5578da404373a79e91436c9bbd15480688b15c
@@ -10603,7 +10462,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   835ded9479f0e7babae00405d85233d767e82fa247aa1a9cdc14fd1f147b62ef
@@ -10615,12 +10474,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   624a66607caef2ca34920ea15b84b28cdd1916ee089d496cec4f1d43621fdbb3
@@ -10632,7 +10490,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   1b85c0690aa156a255c7f79e133e453345452698fa98abf8df744c262d0cf865
@@ -10644,7 +10502,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   c706b70097c679f6f0ced6f77a30620807d0b2555fc3c683c0ec2fc791176039
@@ -10656,7 +10514,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   8546dfc91f6256df8b21083531457e3edf0021da12fce6858e2c59ff239c31da
@@ -10668,7 +10526,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   d32f194e27d177e64bf3bda046889b8198276fca2e8772e4b02a17152e9273e4
@@ -10680,7 +10538,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   8715a641f2e4dd8b6066be7f2683d9129fff3fcccaf0a09cc8bdd2aa56460764
@@ -10692,7 +10550,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   480ae7186fd5b28200cd88e136b9cd3b6600d32508e280a0bc27ea0ed8d3c0bb
@@ -10704,7 +10562,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   6b0ac4d52d24536cdb7d9d0dc7d19ee30d08ac34363983290c5912ccc850fa0d
@@ -10716,7 +10574,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   3c6d3e4a9c9af160f1c1cf11ce4ead531d9500c1f58f1cbe682c90a5eaa3efb2
@@ -10728,7 +10586,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   417874aa57856fe93eefdb24066fa1a9ca3f23c72c09d5247ae2b3ab4b3d09d1
@@ -10740,7 +10598,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   43e36a74fb73a7efc46b380599e269b1fff8f55ecf80f5cf50c34d02ceda041a
@@ -10752,7 +10610,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   ca2f86ca77f822fcd8e86f5a287f2a76d0becbb81a7bce73ae22909beb2f834c
@@ -10764,7 +10622,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   340293c06536d7b6981ad7c681e404f4390ff6c62340f844a4558877c1b82af0
@@ -10776,7 +10634,7 @@ game
     memory
       type: ROM
       size: 0x40000
-      category: Program
+      content: Program
 
 game
   sha256:   3472dd574b50aed2fa998f464398db4fbb00f5a300a672c3737ee9336a008a16
@@ -10788,7 +10646,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   007735e68a91cab403f1c955d9d562e9311124e660fa5b32e5c5d0a2e052160e
@@ -10800,7 +10658,7 @@ game
     memory
       type: ROM
       size: 0x40000
-      category: Program
+      content: Program
 
 game
   sha256:   f292598ac462fdfcd32ad9b6b35ac01d4bab020391dff92bfe94780ec604289a
@@ -10812,7 +10670,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   8d4ada4f98464d176ae7f0fb8a20032056680f3241637a0f903f23f31f41ff36
@@ -10824,7 +10682,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   22d2260de02552b1205aac2ff5a202a4c80532ac28045ef5a058d88279ab758e
@@ -10836,7 +10694,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   c70b812a9d2df7f95b279e4050e03a4b8a68588a370816e645f378296b84e5d1
@@ -10848,7 +10706,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   5874b942f974bb906d8cbc33b601a1faf8f14aee8d0995124c8dc84bb4973808
@@ -10860,7 +10718,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   af2fe0627de2bb2672f4f65dcbdaaee22b211275f679f123d5fa5d37fd699363
@@ -10872,12 +10730,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   0f18c496426bb97fe5e8b91ad5299f0b1c3898ac17047b745c86b167c212ab7a
@@ -10889,7 +10746,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   b257cffb3484e6be051a56268cb99ee888bd6d3e9c0e8d6d0779ff66c411f6ba
@@ -10901,12 +10758,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   2115c39f0580ce19885b5459ad708eaa80cc80fabfe5a9325ec2280a5bcd7870
@@ -10918,12 +10774,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   2d6fc4214245684a8f8f9bb553de637b7c660919ec775bfe3baaf74060c9157e
@@ -10935,12 +10790,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   4b945493d28653d5d047a375136ec9792f27e652be4af00e2c03c40369bd6ecf
@@ -10952,12 +10806,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   1d1b257dcf859cc412d3a9521fc58dc876a5917e6a69cd1d960a8e9840454bb4
@@ -10969,12 +10822,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   6a7324734004d99206439430243b51a05fa8c25ffa314dafc7f127235d1a730f
@@ -10986,12 +10838,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   351587366eca8aeb38236e4ad6cbd4a1b6e37b8cc592725a79249c3a054fa3a7
@@ -11003,12 +10854,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   8ef5d5c50ffeca1e62e88e4fe2909eaf191e28fbb5a9faf98b7b10bea72c9ed9
@@ -11020,12 +10870,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   d297c76efbcd9a528d8ee51025f8774ab2cb6bbc676c24e28592c50f47e71bfc
@@ -11037,12 +10886,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   8c43b7c2f2ef1fca9237c64c2f4c9e98d1a48940dae500ce8eac71278d34efb3
@@ -11054,12 +10902,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   489d6d704d3d917d9b46ce382230700419983a8d0d61a98fe07e08c935522dde
@@ -11071,7 +10918,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   f651a42bb351f7691b880827178c36fcf6c265c7833c6de1d94f7ed69bac0517
@@ -11083,7 +10930,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   6a59115a9958d4a9fa167095505a2ddf222ca6291209d07618319e39a2be8b61
@@ -11095,12 +10942,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   f43f8ec546b8060e9d191fca860c38caf5a43eda86a304f0073647c6fad7b2c9
@@ -11112,12 +10958,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   5132e1c0d466963e6adc09e8a608ebd90619ab94f7fc908d626bbaf6a99dfa19
@@ -11129,7 +10974,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   01c0b58d5fd5d5484fea988455a55a71ed9e606538d2b3ce3f216159cc6929b0
@@ -11141,12 +10986,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   d24c0175ee4eafed88e277691c5f5dafd4e197723097e2eb68aa6b40f449fff2
@@ -11158,12 +11002,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   2a2dc2ef84efd9a773d1e8231b7e3e57f0de7e4528968670963f2f1f358eef39
@@ -11175,12 +11018,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   0d933149242a2a5278b9ada9294481db5b30aaa134c660951dc340bf8ab441e8
@@ -11192,12 +11034,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   8113c2cedafc8fd5a56c8638ae340fb275f263ff5c5e18d04dc6c3ebc5cfffee
@@ -11209,12 +11050,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   d44f487d84f5bb761955b7b70a5464b2f094e199875f595f312c88e04ac647ff
@@ -11226,12 +11066,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   55f3432a130085c112d65aa6443c41eb7a8aeec59aad2c2b4b2ac536b604b449
@@ -11243,7 +11082,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   d7ad6f67860da78fe25d9e79dd13af7ac7efaa0c8e0103898a4849ab4af9e438
@@ -11255,7 +11094,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   ce9c819d6496e58901b39d9b04558a89e09ccc3aac33690b8d02bb0406682a57
@@ -11267,7 +11106,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   fccc96af24a2463b1c53253e1c5c8ef63641355fae53c0fb410427f29743262b
@@ -11279,7 +11118,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   3c109e50b91ec6df3bb8509778ae544c99433fb40dda9b801178dfe513053618
@@ -11291,7 +11130,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   f099937ac4c8afb38c517c5d85475224985fb8f345dacb44994a617ea05bf4e5
@@ -11303,7 +11142,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   437ea48711d54c2275286170a17948cb57ba9d961ba475715c0dba5fbd61a2db
@@ -11315,12 +11154,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   ae572a51ebe429cfc06a3b75d7db9581f2884f9adc78827dc162b4c4ddc6ce2d
@@ -11332,12 +11170,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   7f3d0ebac6ecfb99cfd1d5b13210e989df9e8b2f2319a63c42faef8ad115a964
@@ -11349,12 +11186,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   9712829b38f23229d4e3d65da78237659c790235f425c6b12487e4d9e9a37ae9
@@ -11366,7 +11202,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   31bc862ab0a8eabf23b5124e13940cb3501e7ecdd3f15e34142248ceb4aa139a
@@ -11378,12 +11214,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   b766c26498d0afd63f44aefdef42642d2483b54f18d2b81a4f1d67a57f641044
@@ -11395,12 +11230,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   a137f4fc1c635f706d10e0c7927e71f52da171ce2d27394ce0deb451b5bed8ae
@@ -11412,7 +11246,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   e153195de7b59dd5b9854952cccca6bb93164e5fdff8292124bee6bbe5dbf16f
@@ -11424,7 +11258,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   9e1a39aaf3585af0d6a5d79de3c35fcfe030c34bd4b09606a6fb8c7def19340b
@@ -11436,12 +11270,11 @@ game
     memory
       type: ROM
       size: 0x140000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   190742792a950a112f893cba0e083eb787cf24293f698967defff929635ba0e7
@@ -11453,7 +11286,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   5cbed0401734142184166917427d24f9e5f107a7adea665e2f4b4101491ad54b
@@ -11465,7 +11298,7 @@ game
     memory
       type: ROM
       size: 0x140000
-      category: Program
+      content: Program
 
 game
   sha256:   0c08e6b817e4d0b333acb910a0bde3d79bd2dc188defc5df9a7c1233fa81c98d
@@ -11477,7 +11310,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   582548dc86598a3557e9e3c27285c81964b006a954affe5c73948da5375ea11c
@@ -11489,7 +11322,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   54b2f03393109ac7fd36d8c7752f15a44d9607ab0187a371b853191db3592c01
@@ -11501,7 +11334,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   db44f8b58a31b640a47aa4390101c3c6a5f613e4e49c636d44786278033dec19
@@ -11513,7 +11346,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   10c8abce67b49f8afbe880d2f13e0fd6d5efc162df34d5941e4a94851f23b2ff
@@ -11525,7 +11358,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   7fe4cb9c294d66589ff78e225774471ecb7db80df25f2b6199ca25671358072b
@@ -11537,7 +11370,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   4cb52ba751c42d9e12ca429e5d657622a370b608002880a997f64de453f0de20
@@ -11549,7 +11382,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   83727f6954bce024edac7f3fd18a6fbf63d05b580f692d96faa37e60893c91cd
@@ -11561,12 +11394,11 @@ game
     memory
       type: ROM
       size: 0x140000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   2c6119fbe40d23576adde568d60ffae793bbf6b512f8fea8dcd0b1cd2623ef02
@@ -11578,12 +11410,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   b1586c8ece4da9697f0602a684d7a9108027247a34652c3771831d31f82ee078
@@ -11595,7 +11426,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   ecaf51852e111512385c5f209d51578e65b45fcaa17b295ca06120c8d1464520
@@ -11607,7 +11438,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   46286d0839a4397fc4c067b39783f98d2aefeca870a468bae601a1434f1dde90
@@ -11619,12 +11450,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   7cec4ffc3eda0441561717cf55927901b5fbbd669c254079f78ca74c67c4a17b
@@ -11636,7 +11466,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   c414a4084b3d03aba19496d2efdd68fcf826194d8f1308f5c98e3a7af2fcc063
@@ -11648,7 +11478,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   5abfb974ca0e56aabb3f4126817d14a546c57a5a5c6042d31196063d80996698
@@ -11660,17 +11490,16 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Internal
+      content: Internal
+      volatile
 
 game
   sha256:   571d3129350bfb7cca2285499cf31dda48d1047cf9eaef122c8c33dffa9ad296
@@ -11682,17 +11511,16 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Internal
+      content: Internal
+      volatile
 
 game
   sha256:   5c0b5266a191852ca593235f07180e673cb79e3f0b0dd31f65808eef83bf6e90
@@ -11704,12 +11532,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   0663330bc061f4b768fa1806610878ef6e6cf546f36041ae087c8e55703693b8
@@ -11721,7 +11548,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   b7291088f5c49e1fc55bf932076ec03f7b39f6e409ae06e884b57024c56cdc87
@@ -11733,7 +11560,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   a0b39d7fd7c39c5b0f41f3542fb8d2887530ded1c111b4ffb2a863845e704ecc
@@ -11745,7 +11572,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   724144e34990069213591b5df067dd437a613b30f669840e9098db1dce626d2d
@@ -11757,28 +11584,29 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: ROM
       size: 0x1800
-      category: Program
+      content: Program
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: ROM
       size: 0x800
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: RAM
       size: 0x200
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
+      volatile
     oscillator
       frequency: 7600000
 
@@ -11792,7 +11620,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   0888d20ab2f834c77b0a2dc2162c43890a1640adc78c6b0bb5892ca8d5008ad3
@@ -11804,7 +11632,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   d0f4a5040ecf96dc49aa0084160e291a38f2ee75319750db4d6687ab36828da9
@@ -11816,7 +11644,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   98c51c3bb577600fe79577c323333a791baa30904f37c695890e6e380b75e3c8
@@ -11828,7 +11656,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   447dfa710e69479159e9d407474fbf5f67d3a3330ab0c7627afd123ded3fdb3a
@@ -11840,7 +11668,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   c2a1a66648a0a0bfe2f201cf4f926d138e410fbf85ecf436ccb9aac70c0df3de
@@ -11852,7 +11680,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   e03d117d8b3093b0bbad5224638f85378b254b81eb304e506a732b4338802e0f
@@ -11864,7 +11692,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   0b3b0fd42bbe06a812053df376b183412fc0de335c4b7cb8e45f3fe47b0044e9
@@ -11876,7 +11704,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   72b2b3bead3fcd27a1610ad5d4d8be3235efeaff96df2e7858911992a5892d21
@@ -11888,7 +11716,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   cc33ae02114ea18a86592de327b2b4bcc80728b11a5e4c61666dca71480d4169
@@ -11900,7 +11728,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   5e580f220ed16281df8ee9a5f450b553f39f8c4078d3f3048d66bda15f98e19f
@@ -11912,7 +11740,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   ee9759fdb590ba908f569c2bb8a63703d282b58b84bd1fe0a472ea47685acdc5
@@ -11924,7 +11752,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   06c8fc466805f97c9147711b2d8370d4f4d05d9fa3a916f17aa1682f73c9a63b
@@ -11936,7 +11764,7 @@ game
     memory
       type: ROM
       size: 0x280000
-      category: Program
+      content: Program
 
 game
   sha256:   42ee7829d3db0213b718168c29674879bb4532573e9fb3450a5b417174a16ed0
@@ -11948,7 +11776,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   0288ec049723cd0c7f1148cdc1aef0b6922b8a756affe373c99d5690e0dfceaa
@@ -11960,29 +11788,28 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   2e2a8c0da7f6def617077a25b222062f6988ef14b36b2edfe10d47c6a942d023
   label:    Power Rangers Zeo: Battle Racers
-  name:     Power Rangers Zero - Battle Racers
+  name:     Power Rangers Zeo - Battle Racers
   region:   SNS-A4RE-USA
   revision: SNS-A4RE-0
   board:    SHVC-1L3B-11
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Internal
+      content: Internal
+      volatile
 
 game
   sha256:   8f387d083de1399bb79e5312c31a6f1757f2a536bfa25cecf1aea77bfd77058b
@@ -11994,7 +11821,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   55376715f243b1bacd9aeecf1092bbc7837fe512592a2c1703d24b0829fc1934
@@ -12006,7 +11833,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   494190cd6d7fd68882cbe255a6e237d9c4bdaf3988615ede0297a5e285ad5dd9
@@ -12018,7 +11845,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   04ca1a481093c4a7e12f18b33697d6e05e50e30e0f5b1655aa265abd14719bba
@@ -12030,7 +11857,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   85e2e58e1f99fce366c85d49f77446395584ca4959ef772a707fe454ed46c68f
@@ -12042,7 +11869,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   00b5b3d3febd1a6f28ceb49e39cdd9476a944fe62ea3850808cdeafaaaa63040
@@ -12054,12 +11881,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   475c9baa1c2b76a6b3119e47d32814dc1c08e84e23250ae015bb0bccea915637
@@ -12071,7 +11897,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   89d57bf308033ef17f770a80080cbeed2d112244635d5b5f860f2016398cd2f6
@@ -12083,7 +11909,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   4d6c7d6d2693d8d43bafaff7582f9a94885362dadd9ee4012bbbdce1ba10c30e
@@ -12095,7 +11921,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   dd0feb78e2d5d81f59241baf3bca5e2edaebbe98f0ac860a4eb6d448718f1ca5
@@ -12107,7 +11933,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   edf990e502c646a2fe83fcd1d359ca0ed5003ace06cb4c3de5a51a0c56d6ec54
@@ -12119,12 +11945,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   1869c0faf93bf21b7ff965f1925fad4b2924a64b1e48f4837221eebdf741226c
@@ -12136,7 +11961,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   5fd7666e509f9d3cf1fd6b209dc22f2f3848f74eae7b83239d1090e031fc6df2
@@ -12148,7 +11973,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   e19f7d8d5c3e4cefeff5889380d8780495e01f0553d13be4182a15a5d4b615bb
@@ -12160,7 +11985,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   32d32ef56af83887cdc2c04b3da4be1cd82a473988deaa2e7dd50d38ef79c3a1
@@ -12172,7 +11997,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   920bbaaf6a32cab5feabb5bc8b2b427dccd53bfd31d0da8acb7ea4e819139e4f
@@ -12184,7 +12009,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   097cbe9720903bc14599158b80e0cc314ef2fe8a585d6d0a8962eb1626031492
@@ -12196,7 +12021,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   549f2e5b17f685cad25ba71ce7bc6e004e7bfd09e6be12a827af9a9a26556fff
@@ -12208,7 +12033,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   b2221d0a59a399e437710e1191a37071d0a59c72d8e62427cd499de8d8fd7b61
@@ -12220,7 +12045,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   d322ce440076be0e3678277596acee8089098f4397b35ac8b3df88be5ce5e02f
@@ -12232,7 +12057,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   71e7083cfcf32b738f60f5eeffd4f9d1fd9250afbde0c56e22a4b97abac377a1
@@ -12244,7 +12069,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   ad7dd4efb8836d4009f6c76bd21865d8f5dcf9c3cbd8fa7bb32d686488847120
@@ -12256,7 +12081,7 @@ game
     memory
       type: ROM
       size: 0x140000
-      category: Program
+      content: Program
 
 game
   sha256:   ba54d715abf100b94fee801351986fa818e4309730cefbacf9b4fad36e284c1c
@@ -12268,7 +12093,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   5fb072c3c2e9d8e7f84bea9c4bf2253e6868eb2b1f13e35a7d75fdf05896d873
@@ -12280,7 +12105,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   f44482e2cccd9fcfd5875d84ff700f6e783f3bd8abd1ac4d939074cd6ad3fe65
@@ -12292,7 +12117,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   e3ea89964ee82d2ae1e5739b8503acf62732aedef28d1b3d5caa9ebae0feec06
@@ -12304,12 +12129,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   cce455b7074f62ffdb41863ee8c160ea06f7acd028837666329bc1e0c3567ad0
@@ -12321,12 +12145,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   38be8013bbe07b2020ba30031fb0a2c77bad8a3eb61fac8217adfe82d6c402af
@@ -12338,7 +12161,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   3f59cc687d22cd1b23cc33ae6e4518234c9da813c01f79f4c43716e12d32a12d
@@ -12350,7 +12173,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   864aa9068fb23cd20022a9ac36fb9082299278ea0cb07a20deec2b6a1c6cbc70
@@ -12362,7 +12185,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   2e8203e421f97cf165f03a5d4f69dadf0bcca18c42c6a1dfe79c8705c522cc54
@@ -12374,7 +12197,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   055d9c6311a663af7c899a6f76a419c274c57baada3ef64c52fadb1c676b1446
@@ -12386,7 +12209,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a2115e7576dec06e0de613efb89de861815a78ef72e78a3784be09fb7541928f
@@ -12398,7 +12221,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   1e2ded7b1e350449b7a99b7ec414525e4b9b086c416deeee5eb3e48e032c46bd
@@ -12410,12 +12233,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   9d721753301278325c851f1843d669a697aed757dcf6495a31fc31ddf664b182
@@ -12427,7 +12249,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   b072fd9b08042e3262446fdf418a41848251072a32bd7f8335cc03543c4ae6c8
@@ -12439,7 +12261,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   cde8876b99c337ff932322506ceef05519e5882b853c54bb8c650d9500cd5957
@@ -12451,7 +12273,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   7c0f915b581796e5b6dd384ecdc0dad8af4d956492fbcedec628c8845d911d7e
@@ -12463,7 +12285,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   e21300c8c4170e084fd83ce4c842dd73f939fbd10ddfe47c9a49b6e291dcd52d
@@ -12475,7 +12297,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   f7e3c3012af2dbad350646b6ef3470f0b4c42e4a2873109f7aa6c81d7157c887
@@ -12487,7 +12309,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   815bfcf4fd6eb23a20c2e50dde023c210b273ffb6cd86a93909d803c3643ce46
@@ -12499,12 +12321,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
-      size: 0x800
-      category: Save
+      size: 0x8000
+      content: Save
 
 game
   sha256:   88fa0a78ca98c6386e086c7fa9e81a2625bdecc55115dde6c6f4770b0670aa40
@@ -12516,12 +12337,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   9670c67eeeb5581fa5345025a2e2ee875179e0da9f5be4bf78641e477d785f17
@@ -12533,12 +12353,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   4158e3e8890a52f0b12dc9ad5a29276058a247ff41e9f1d22897ebde1eb11269
@@ -12550,7 +12369,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   5db804171fca42486485ed85e4afe45b29e6d01304bdf75d520bfc42429739e3
@@ -12562,7 +12381,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   34e1af0642c85148c5a3dc3c7ab4bcbda13a9fea190934b5526c555fff035651
@@ -12574,7 +12393,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   7fb5236d10852125f0f37c2188b907d636647400a57bccbdb2f63098ffae8b2d
@@ -12586,7 +12405,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   a4ab8cfad2f236675b1c0124f8484688e149f38e8628a3b38e9ec14d491ec07e
@@ -12598,7 +12417,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   17c864a76d498feb6479eee8e7d6807b951c66225033228622bb66754baab1db
@@ -12610,12 +12429,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   4c15013131351e694e05f22e38bb1b3e4031dedac77ec75abecebe8520d82d5f
@@ -12627,12 +12445,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   e6bc0a595d5c7c4bc0bbb61ffe35a70288a77eb78544ed74682d489a9e6f07f4
@@ -12644,12 +12461,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   bdbcc53b266159b5a08e307e5b60fdb0cb5a1ba8f8c1c6c7f89d81eaf5133e85
@@ -12661,7 +12477,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   c73757eea258e169e506eaef989227a59918060f94117917f338183db14c50b6
@@ -12673,7 +12489,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   454c580498a7d317ed61cb5863b1999eff57ad440ecd30ebb76e193c9c52f3ac
@@ -12685,7 +12501,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   de2d5a952096c5f50368b9270d342aa6e7a39007ffbec27117e182e30ef4cf32
@@ -12697,12 +12513,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   d09ca5adaee65cfd686742482bc55b1a3ce9bc5ebed61f24c5631555151a7fc7
@@ -12714,7 +12529,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   c0bd1b378337c32047a6b7122a3813beb646e496fbdb1fa5c87ab9856271e4c5
@@ -12726,12 +12541,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   e9c0bc05511e05a0d7c3e7cc42e761e1e8e532d46f59b9854b6902e1a2e9dd0a
@@ -12743,12 +12557,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   bf74c58e4190faca2f3a967dc190fe529d13887d1262b72e057b5353e43cf67f
@@ -12760,12 +12573,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   446a1036d036986fdea7906c83832d3ba79ef63a6ed8c4e88b89ab9cb25daded
@@ -12777,12 +12589,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   f0d98e9061d0f6a193bb856de8a592f336dada97c41966e8d03119ba97465413
@@ -12794,7 +12605,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   29c28188234ddbb0b72fc84253dcd3514e23034779c773db8097b073b73390c8
@@ -12806,7 +12617,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   70008efe51185eb0a2f8d8d8ac2bdbb99bd3dfcc169dcc474962f82692998051
@@ -12818,7 +12629,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   e10070f01845505ae8bfdf7b5b492e7209c2ae876f169fb6ff420dea269f4da3
@@ -12830,7 +12641,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   a4ba1483db79c3f6278082387bce216d8f3e3b11ca32d49516d27f5ac07135a5
@@ -12842,7 +12653,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   cbca00fa5dfd6c72db2f21d010255657c33f7ac48de2554262035ead11bdf314
@@ -12854,7 +12665,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   f653b8308b617e1cba1caf004e5a670088b882e320fa6afcc7a29dd3b2dd0ea0
@@ -12866,7 +12677,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   6fe7c8d39fcfab7f0a18e837a7ee0dd162e0557d6989c6e0d10c81616d3a0b8b
@@ -12878,7 +12689,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   75a7b5b8ad0329dc828d3201089e125fd55fdfc99d4cec704ffcd7e3036c2410
@@ -12890,7 +12701,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   efe78f6fc68ddd0f6ef0ad9e0223d9417c14fcadece987dc8f50423fd6723b27
@@ -12902,7 +12713,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   8f0a7670fe53d30f721784e5fff78349eb157a9f0eb2246206f9d7db478b7c56
@@ -12914,7 +12725,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   8438da09de8ce9aded3bb08644543f7b60fb60cffc68ce2d67d6a0643f2ecfc2
@@ -12926,12 +12737,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   85887dfa92374048fb20809c00eabea428992024cf875d287d0431b9767cc7cb
@@ -12943,7 +12753,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   24f3f22949f36ebf8ab4beaa8cba22db107efe7a7585f749343f2860bf041fe1
@@ -12955,7 +12765,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   dc5353ddc350816619230f25f8c51bddabf7438e6dfba21662eb1c4794856735
@@ -12967,7 +12777,7 @@ game
     memory
       type: ROM
       size: 0x40000
-      category: Program
+      content: Program
 
 game
   sha256:   f5b7418c00ccac44615cfc57c7e17d57533837056886f6d733e6b714c36dec1f
@@ -12979,7 +12789,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   14dc44687c8da35aec63b9edadbaac21bf7293f5171646f614139192e82ab071
@@ -12991,7 +12801,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   eaa06470734ea57eff9b888137aa468fcb7bb149a0870a85e68c9db123de4670
@@ -13003,7 +12813,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   32d0f1ca5b91fd9b2caf81422fb9e8fb30bc091f0b2a429b9269dd307fcba4fd
@@ -13015,7 +12825,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   22d0b7687d66436abaf447bb29558e43f562283ec4dbe744df7d79a3e27a2577
@@ -13027,7 +12837,7 @@ game
     memory
       type: ROM
       size: 0xe0000
-      category: Program
+      content: Program
 
 game
   sha256:   54046ec1fc57f6165ad33080502f72809d1b06b438a5a0d0a80ffa2bb3df8b0b
@@ -13039,7 +12849,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   df02d0f4f40e2732138309d38e91b48aef482490979007ecb63359a35115dfd4
@@ -13051,7 +12861,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   68a51b7a06b6a9e7100a89521e52b5c467c46c828c0f6504bee677beac2aa6fd
@@ -13063,7 +12873,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   964d21996e385e032b5d18baf716692ba1db780245cd71956c212045c1b8eb9a
@@ -13075,7 +12885,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   b72fbbfe737eff49f59dcef9f13b963e50c5bc322d7eb0e7b4c25f3a71aa0815
@@ -13087,7 +12897,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   63210a91573fa8e19592f2e6c746a400831d804c00453739447d2df32e731df7
@@ -13099,7 +12909,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   f05d777e3de69aab18d336cac0af07f794f8d00090d085f86cebaed3679cabad
@@ -13111,7 +12921,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   fe10238ae42ed9eb4d906a81dd50ebe585140982cdfe266308ce1f16e78e6903
@@ -13123,7 +12933,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   8d3f20af0be588cf2edc39aee0d96d4085512919a05c0e90a7848e414cc20e42
@@ -13135,12 +12945,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   254d17a82a32d8bd231ca3a87d356b65e65cb0229902a69a57c21a4c99bbba1f
@@ -13152,7 +12961,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   3857b5294ea8f7468849437bb2d8271564e8a0ff30774622e9c872bcbd53a84d
@@ -13164,11 +12973,12 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
       size: 0x8000
-      category: Save
+      content: Save
+      volatile
 
 game
   sha256:   2c0bac12a7866fad1cb306da768a201c12f2520332df1ef51cba1576db21ff06
@@ -13180,11 +12990,12 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
       size: 0x8000
-      category: Save
+      content: Save
+      volatile
 
 game
   sha256:   3a16ad45ae3d89b13c9e53e21c2a4c725ff7cec7fbe7896d538d163f92cb4aac
@@ -13196,7 +13007,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   b4d0b4a3fd73469f5469dfcc2316e50848ebf0630a225df2969c740759e321f4
@@ -13208,7 +13019,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   22c907b56ac6f414365801ed375c3fbf75696ce7f34ec89e1724628dc5622957
@@ -13220,7 +13031,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   9ffd95486904804aca1f7068c99f1c9e91c2c0e5474ec758df1a913393571cc7
@@ -13232,7 +13043,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   91f938b4989215b1cd39635797f23b59b9d7b6d36e583f9eb69d022abe537bfc
@@ -13244,7 +13055,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   e3b07a59f969ced91c4579bb459f2c747a6c3f12c45ae4776483ef4830f5f00f
@@ -13256,7 +13067,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   dad9c116283322d5a13fd659874c681582abdff3df182cc4c90511d33fb7110a
@@ -13268,7 +13079,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   b4626cf0c876a124b50f9421c48a7d762e9ed808ad336c799d543d60b484897c
@@ -13280,7 +13091,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   910a29f834199c63c22beddc749baba746da9922196a553255deade59f4fc127
@@ -13292,7 +13103,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   2b34161e96ef3f0f48cecd67e531a9bb94310652d8686f301bac426e4ab97e77
@@ -13304,7 +13115,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   3e487f8ba48c0b5e31744e3281d6bce375089db6075c8eb3d9a929376b817381
@@ -13316,7 +13127,7 @@ game
     memory
       type: ROM
       size: 0x280000
-      category: Program
+      content: Program
 
 game
   sha256:   6756f92fe8e066be4b204cfdc94c1615ba6ece7e78fb5d2c77c81a9d298aa744
@@ -13328,7 +13139,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   d1f61b6bb4bb6879a4fbd2c82d77390c546ee7f821edddc884fb9cc7463ad79b
@@ -13340,7 +13151,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   05f14e6ed3394d9273e2397769a8acf1a9db646be6066e82269521e8eec53562
@@ -13352,7 +13163,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   c04d80b84514202ff319384ca20641eb0189e975eed5612915bd9c224b2ab30a
@@ -13364,12 +13175,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x10000
-      category: Save
+      content: Save
     oscillator
       frequency: 21440000
 
@@ -13383,7 +13193,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   190999122aacc2cff20c5677b3f60ed938d8a36b696d16cc1bf416705efe151e
@@ -13395,7 +13205,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   eaf1b83e95d8a04f9a84d4960cf87cc182fc60ef07be35eb8929c4033d6fef67
@@ -13407,12 +13217,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   0deb7a91fbe5848f1733ce668daaa49b0dad3d821bacc0791837c1ba15e60d7c
@@ -13424,7 +13233,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   b64f9f95fb244feddb3ff50bf0972af88f5d006e9b09050b930374fef8b37862
@@ -13436,7 +13245,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   8808783f789ca6413364a7abea240f6f7291b5906026f360ba8cfdd2791fc179
@@ -13448,7 +13257,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   1622371a5a4001fff9690323e89b7a8d449cdc3cae6dcd1249f0c7dc8c651d33
@@ -13460,12 +13269,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
-      size: 0x200
-      category: Save
+      size: 0x2000
+      content: Save
 
 game
   sha256:   a8239355631d303ecebfd43fc14e80f148e4ac9937234e29cc87d6f939b033a0
@@ -13477,7 +13285,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   327745aceb708d82419c3d2cffdffa78f55df0878bb1786e1b7fc294385f20ba
@@ -13489,33 +13297,33 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
     memory
       type: ROM
       size: 0x1800
-      category: Program
+      content: Program
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: ROM
       size: 0x800
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: RAM
       size: 0x200
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
+      volatile
     oscillator
       frequency: 7600000
 
@@ -13529,12 +13337,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   165938810948f3226f7446978fa36ae8bc781616d95b39cd126d5c8afbf6e2ee
@@ -13546,7 +13353,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   1d6573e3db2efab0c98d1940b4171d569348d27a1cc20e80a83094e6c0e66e35
@@ -13558,7 +13365,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   94496e73fc7fdf2f72f16bf2becb0c3935db2ebd97555eac73b63400acbceec6
@@ -13570,7 +13377,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   b68e865b0b5fe6af421a171e94fb1cb0006ae3e412b6361f6f858c44adaa304b
@@ -13582,7 +13389,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   f0913358cb0870c3dcc7f0c0d2d69704874c31a113150eda668c95024c0d6fd9
@@ -13594,7 +13401,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   4efab3f49cbe91ec77b6cba747ddfedfdc0b080c755a8b6ba51234f0676c000f
@@ -13606,7 +13413,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   0a4b4a783a7faf6ada3e1326ecf85de77e8c2a171659b42a78a1fae43f806ca6
@@ -13618,7 +13425,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   21d4a72461d8680cf75cf3b8eba42e13127815bc17b6249d89a5e39beb3f1406
@@ -13630,7 +13437,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   946de556b4f877e54e16b5c828db89c038e50349cfd0ddf8ea96b6541f9d70fa
@@ -13642,7 +13449,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   5965bde449ff775c1a0d9fd3cf2fb8c51a86b44ad1942dfb5c14a91f103be030
@@ -13654,7 +13461,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   d42f8c7969b4c434f9ca04ce0080d897877a5e71c2926d309ef5dae93ba25548
@@ -13666,7 +13473,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   0ef6f4cce5a2273fa49fe1ce724e0048a8e39c91da6b00dbb693fe1ba909177d
@@ -13678,7 +13485,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   b839253b878821ff00847491d11452e933baaf303f49dd39d22e3a524ea1ff81
@@ -13690,7 +13497,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   6cbc4db85cb8420020f9edbfd290c0f435b313a59577aca65314d31f8b816620
@@ -13702,12 +13509,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   db7d727de86a1ac886ce3c243bf5941910154eaef3be50209187b9711592830d
@@ -13719,7 +13525,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   bcced1be76ef920b562a555696bcb4583d1c8cea4d4b057cab6e0e09be8ef8c4
@@ -13731,7 +13537,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   4d7fc331a811b8dc630b469262fd6f45e289243cef83101f32038158967d1b28
@@ -13743,14 +13549,14 @@ game
     memory
       type: ROM
       size: 0x40000
-      category: Program
+      content: Program
     memory
       type: ROM
       size: 0x100
-      category: Boot
+      content: Boot
       manufacturer: Nintendo
-      model: DMG
-      identity: SGB1
+      architecture: LR35902
+      identifier: SGB1
 
 game
   sha256:   7468c271d7240cf4e0d08c16e9969a1b1b1caf5adc0e5adc568d93c92651a057
@@ -13762,7 +13568,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   d4caa6683ee1b6c70c10fd0555ade33dadcc6551d94e791586e64fd683d8f3a8
@@ -13774,7 +13580,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   33dda5838264c93341ef865512e4b86e16fd4a0387eda04e331517bfaecf1c0b
@@ -13786,7 +13592,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   d78ff42efdbb0e180777d17b5f7a96e08530ab77f15a99237f60714f7cfe2b74
@@ -13798,7 +13604,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   3f8efb19eae68f24feb42c018b7dc7a819bfd8d993ab36899681caa7ee94b06e
@@ -13810,7 +13616,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   a9e3e57d591e995e8e0dd228b619b6aed42205eaf55316fa8ff33f236b3a32b3
@@ -13822,12 +13628,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   a8806bfe07cd3c9945d9fd3fcea932ae1cd671cab5cae12bb7a2ae726cbf9175
@@ -13839,12 +13644,11 @@ game
     memory
       type: ROM
       size: 0x280000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   89ad4ba02a2518ca792cf96b61b36613f86baac92344c9c10d7fab5433bebc16
@@ -13856,33 +13660,33 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
     memory
       type: ROM
       size: 0x1800
-      category: Program
+      content: Program
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: ROM
       size: 0x800
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: RAM
       size: 0x200
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
+      volatile
     oscillator
       frequency: 7600000
 
@@ -13896,17 +13700,16 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Internal
+      content: Internal
+      volatile
 
 game
   sha256:   0838e531fe22c077528febe14cb3ff7c492f1f5fa8de354192bdff7137c27f5b
@@ -13918,12 +13721,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   bd763c1a56365c244be92e6cffefd318780a2a19eda7d5baf1c6d5bd6c1b3e06
@@ -13935,12 +13737,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
     oscillator
       frequency: 21440000
 
@@ -13954,12 +13755,11 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   40b46bb29785fb431b325f22377faa8b099be4d77aecc1f03000b8a4cb589b63
@@ -13971,7 +13771,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a8acbbd6f8afbf289a6b837da6cd8bd109a00cd38625c956ab8ff739732d9e4f
@@ -13983,7 +13783,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   24b687f95bb9737d223738f13c00aeaa7d697fa9e2fd50597b81d0cfa2160daa
@@ -13995,7 +13795,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   16f9c90d75bd23d0620be00ecf818fcb25c5935d4ee26b1fe17b926f8987aa65
@@ -14007,7 +13807,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   6bf0e7a7b95613b9d0e5c8cc98eee5d0ac200e88b5d4444ad5cf93d3e8265118
@@ -14019,7 +13819,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   65aff1403838c938d7c6170f3044a2b0317cd2ee13ad79353a4cdd2aa82f4e87
@@ -14031,7 +13831,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   5a4b0c89606f71182fa5552ac476cc3bbda5ddc7d44e33f9184114aaea38020d
@@ -14043,12 +13843,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   a3d803b8c6b0b6ac55085671040b840f993543915c7f802e14fb651beabe9b63
@@ -14060,12 +13859,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   3dff3513ae6acb85a02b00b9f5adb4757ab97661993bded4f329127a792cef87
@@ -14077,7 +13875,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   05c7f6461209020785fba33007e1830820aa44ada4b1a6f991d936bf2335b15b
@@ -14089,7 +13887,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   607bfa0f74e57298f59ebe237c2e7b59364024d844534f3befb9ad1301bbedf8
@@ -14101,7 +13899,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   7a8ffaf8bb549b400ec2f0bda9f3c0dbf5852c38618cdb21cd783c368383e2c7
@@ -14113,7 +13911,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   e987ceb53cc1407b1ba612b13a7b5391db6c41ea14552c165ae62ad42eeaa0ae
@@ -14125,7 +13923,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   c39ebf88af138e87ca5d963ed71a8b7defba3e2bc271d72186d00056e8225721
@@ -14137,7 +13935,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   8b75ab4bb1b63c45a56e7a4c5a37c0864f14375ab3131edc33489764426ad888
@@ -14149,7 +13947,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   694ad2b34ab808bd8a1aa9dda359594cfd3a5fd9d95d4cf262ccaa0eb57eef67
@@ -14161,7 +13959,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   5eb9736d66b3ac730ebbfdd19ef2397282b5f1a62dc0048093e041e23b807741
@@ -14173,7 +13971,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   5985cdad45958a5b8c5967ad39efe51569f560bf237a4e9864f21111082a8500
@@ -14185,7 +13983,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   c6bd7239cb2074ff1c471d14535bead6290bba2d7c75b4f03209cb114877b4c8
@@ -14197,7 +13995,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   1dd01da68cb61def641389bf3fa87b7a29113c9c8dd172cf303c0f7e03ba6e47
@@ -14209,7 +14007,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   46370b3bd6ff9ee04c425eef0f482f521f3b61bd4b058f2f4e9d322253d7b5de
@@ -14221,7 +14019,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   c49be867cdd276703a3ae46a6b17673b9e359af4f9af2329c8eb747120245817
@@ -14233,7 +14031,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   f7df5cd16ce6624567d1a24e9b9c0b9050ea9b6a9fe5a7973484589637756596
@@ -14245,7 +14043,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   d17cb5c73174060fcbd9cba6c705643f19c3b8be24d0f7ee43aee674ff1ea38e
@@ -14257,7 +14055,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   830c900083cccc6ded74c167c4e257db34df4786ecd6e2f053de454db7d31fe5
@@ -14269,7 +14067,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   6e45a80ea148654514cb4e8604a0ffcbc726946e70f9e0b9860e36c0f3fa4877
@@ -14281,7 +14079,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   02cb7f1ed21ed6bfb9eaa0e91df2adb063a9bf4cbd6feb6cd024d676829e227e
@@ -14293,7 +14091,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   056ac8160363d577e3ffc2f593801b8bb3d024fe4f3a3331b711dc556204949d
@@ -14305,7 +14103,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   96da3512a1aa05a40f1e5d61c48932b0d55d9f136d6418b848153a9fecab06de
@@ -14317,7 +14115,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   792e615a34ceae5a1b9a4f54c5a5d9b53e39299332fece83e4bceca2c22efb21
@@ -14329,7 +14127,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   62d3d650e956f23f3b221f83c5c5bd204afd0e4f4d9c47a3251962323de96089
@@ -14341,7 +14139,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   dfada65f4497f482d5f81964322d9952f678f50e65418d307d4503f9bf9a32d9
@@ -14353,28 +14151,29 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: ROM
       size: 0x1800
-      category: Program
+      content: Program
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: ROM
       size: 0x800
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
     memory
       type: RAM
       size: 0x200
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP1
+      architecture: uPD7725
+      identifier: DSP1
+      volatile
     oscillator
       frequency: 7600000
 
@@ -14388,7 +14187,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   c2015d03dd3db08069b2a6ea1ed6b3e1ac1e3a5f804b02295c3cd3717add91ef
@@ -14400,7 +14199,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   1711fe9010232b41ec406900e5b4ef528dd2beaa97b27d94ed7eef57d63904a0
@@ -14412,7 +14211,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   7da4a3cfa5de4bb4722a6e2a42c26aae322b5e668f1645d8c870fb99e6080600
@@ -14424,12 +14223,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   c3cb1d2fd9775aa9d15b7eedd45ad82519b73d47ca166737ed398c748717bcc4
@@ -14441,12 +14239,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   35dd020cf57fc402417ab6e4a6c49866c5a86bba25218c0aaf7ce85cb134bcf8
@@ -14458,12 +14255,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   2972057a0087f8239d2523eaa995405f06e5d5ba3a3203b6b50d401379c8ebde
@@ -14475,12 +14271,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   8cfd4c5525f4bd4bba5af7e2323f1e61f27ce97c6d5617cfa685c9276fbf6407
@@ -14492,12 +14287,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   14bce564f976d1431127259edbcb23c52c79361fed9814d307d627c4650e800e
@@ -14509,12 +14303,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   5b82cdd6f2da56f43680d6a5021faebe2e06036d30602c1a7917aa414cf8b5f4
@@ -14526,7 +14319,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   849141370f164d6db3e5709da670726f958ce13ffef69319564db3fb0b12c69d
@@ -14538,7 +14331,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   bd7074ef4a05d790646abe145ffd2587fb48044e4b730286d807abe102841177
@@ -14550,7 +14343,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   06db3be569a587d79b51bfc684fd2ebdea977863875aedec88218fbb4169c21b
@@ -14562,7 +14355,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   365f10f9d9f68cc59e769eeb451c417e1ff7415022a625de9976a3b924c0bd61
@@ -14574,7 +14367,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   c9563cb57314588aa3db22b76dc8acfba3e73733dd3538edd90af5a15595830e
@@ -14586,7 +14379,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   3cdebbd8adc4bb6773a7995f542fdac49adefca71cba583255a1c1bf37ac3946
@@ -14598,7 +14391,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   accc836c3adabadc810fbe35702c6a64d50a09f4c672d2734fa58b251d7a20aa
@@ -14610,7 +14403,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   70dea29a928c1625def31c862dc74960e39e587e416b45829efc21f13ebd9630
@@ -14622,7 +14415,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   579bf1a1988d4af06a69cc1d82a2478ebe51940c5ced7f97e83029a24e6aa778
@@ -14634,7 +14427,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   1121df3f05dd9dbb749f6b785eb9b3eb69968004f9d6ceffa6f84757af2f3702
@@ -14646,7 +14439,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   d50aaa41e153ca356eee16a9deccb1a763ee56ebbe6c80cd28c5ad1db66a5316
@@ -14658,7 +14451,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   eb958801fd1f08771e5a0933f7701d633262efbfe8d47de21dda18e3b77670de
@@ -14670,7 +14463,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   16fb965130e57f37dda2466f23820f091f8b96758aa7e30ba4fd63cb618e5ddb
@@ -14682,7 +14475,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   8e82f98d2e62bc1e5fcf2386c2b5ca54998398220efcedd67858aaaa92289a42
@@ -14694,7 +14487,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   fa7e2b40093f0cc7233cc77e95bbbea2144c8183dec10446590396fffd7cda37
@@ -14706,7 +14499,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   271a67b32b3bb00ceb0f4e7d81494888d0d821635f0f936d481dfbe671567c08
@@ -14718,7 +14511,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   0503cd93b4d211a825acd47ff3813668b4ce68890c8be2fbfe5ac2b46882dfcf
@@ -14730,12 +14523,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   ba679a11264e9695895a6c17358a41e8459be06166d056811df9c2738fef3d0d
@@ -14747,7 +14539,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   f753de4a38bd83f7d937fc7bf5565a3c351a794c113dead8fdee6d86c85633e8
@@ -14759,7 +14551,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   08d808e9c5851e4301a38a56b350a20ea9e3adbef51546e87e1785d691d0f2d5
@@ -14771,7 +14563,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   ced8c0bc2791ffe47cb9eec03db67567945af8c58b5330326722f1cfca41bf51
@@ -14783,12 +14575,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   4f500da19dbb1557a7bc0ce14437098c1402478d573fb569303b81c011f86fbf
@@ -14800,7 +14591,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   d99008d2181986dc7f65228696d940b5d31be8471f166d1ab9b1c14f1503bcfb
@@ -14812,7 +14603,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   e0fbf731550266d79a0b6ca460afd04c8c312f7023b2c9882c4fc3acc3e7932f
@@ -14824,7 +14615,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   ca9889f17f184b3d99a2eaaa82af73e366f03ed00313fdd369e5e023b208e788
@@ -14836,7 +14627,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   76b2702c4be8b668c1017f2817c280283c275eaa41535bf6ffa2b8d2220b68c6
@@ -14848,7 +14639,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   ede60f0d283b6ea3a45308981d99e7c422a0296e5fadde51c6bafd4dcc789ca2
@@ -14860,28 +14651,29 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: ROM
       size: 0x1800
-      category: Program
+      content: Program
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP4
+      architecture: uPD7725
+      identifier: DSP4
     memory
       type: ROM
       size: 0x800
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP4
+      architecture: uPD7725
+      identifier: DSP4
     memory
       type: RAM
       size: 0x200
-      category: Data
+      content: Data
       manufacturer: NEC
-      model: uPD7725
-      identity: DSP4
+      architecture: uPD7725
+      identifier: DSP4
+      volatile
     oscillator
       frequency: 7600000
 
@@ -14895,7 +14687,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   345e795000e74f51704774edfc8049473461761a65eb47cab710caa29e09897b
@@ -14907,7 +14699,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   7a6e5da46b026900fba4584a32ad40d940b9ecf9fccfb11f96a205a914014784
@@ -14919,7 +14711,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   4070a7702dc506a1ceb6f65b5c330b3a162df6f01735c8f206934fd47b810ed4
@@ -14931,7 +14723,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   46fcca4ce29f472afa8519958d256eec347c2dc2da154c95f263a051c5c02dbb
@@ -14943,12 +14735,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   dd96a8f4f9c8988301ff710a4c70ebe3bf7914901f3547abe1d5f0dd5c0b921b
@@ -14960,12 +14751,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   5c7b28bb24bad697156ad444ff23bd15ad6744dbf9899b3cccf2aa36d559d825
@@ -14977,12 +14767,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   72088194a65fc057f2910945a33d9f071682a4cecac8996f0bdabcdb5ef39962
@@ -14994,12 +14783,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   47dd8ea2d12a6bb2a9774de1d492259fc4fb9f8ec7976383bbfd922532671f6b
@@ -15011,7 +14799,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   8f62d014f513a7dcbca5aa76cbe476c3e4526100f34913af831bc05dab029bd1
@@ -15023,7 +14811,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   e4343c0fadc00ffdc3dc31345068d751eea5d639f826731f08cb81673d508c40
@@ -15035,7 +14823,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   259c25d4613f97f5fa7992900fb583625d7fb912c7ae09fa9def2e682834dc9f
@@ -15047,12 +14835,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   094555d5720158ee60c9d5ab9a13110192db5ebf0f6cf69abbb59a00bc470345
@@ -15064,12 +14851,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   11659bd8dd620d50400d16042aeb2d0ddb00c7183fc1ecb95b1a34f07db0431b
@@ -15081,12 +14867,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   a31af0e39afb55bbc92a5543b504327fbe7e8cd0a5e08626976bed7b65376737
@@ -15098,12 +14883,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   78bf82963cded9162e25035053c8b1a9f760748ff0beacc230d005204992737d
@@ -15115,7 +14899,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   cb2fdfce61858063bf4c9da4228381c3ec3abe423f4d378cddd174ae4adb261e
@@ -15127,7 +14911,7 @@ game
     memory
       type: ROM
       size: 0x400000
-      category: Program
+      content: Program
 
 game
   sha256:   e9fae4c2e171a1fc4f2bd800abd9e42750aaf7a4db9e40c5b9142e15029500bd
@@ -15139,7 +14923,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   0b155a54b6134601fc0791252a63ca73efd522667c3d6fd7a44f5b3c500039d7
@@ -15151,7 +14935,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   794152fc6f55cb15a0b203fa645ac9fa314a293da999d8ec8b3dda080434d175
@@ -15163,12 +14947,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   64bc4707f422661a66618088887e2363a5f896ea683c58984fffd96dd21ab5f0
@@ -15180,12 +14963,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
 
 game
   sha256:   859ec99fdc25dd9b239d9085bf656e4f49c93a32faa5bb248da83efd68ebd478
@@ -15197,12 +14979,11 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   ecefb4117a6aae117e033c8cc07f0db2797d6be93dd5cdcefc23692a21fae02e
@@ -15214,7 +14995,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   dcb33a89fcb8d8ca8f3a467034728ad6375273d8eb51a60418ca51ef745e9b38
@@ -15226,7 +15007,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   2500d6c846c78bcb729f15535bf2b852a120411891cabaaaa6fc407906d0214e
@@ -15238,12 +15019,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   78bf9d79fb2ff3f9d03ecc1176d070e53ddaca2c6b0cda69e74c19a4e50b195b
@@ -15255,12 +15035,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   41b5561de9e4984276e52987ea46c5f4fa8526d8141c70c738875a9eb9fe9d70
@@ -15272,12 +15051,12 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x8000
-      category: Save
+      content: Save
+      volatile
     oscillator
       frequency: 21440000
 
@@ -15291,12 +15070,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   82bba8ae2bb4dbc74a18af31aaec19c368576e4369dd70b396caa5e8729540bb
@@ -15308,7 +15086,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   8b12e5e4553fc921c23739d1aec2ed517535ec239daef800f39f602d8473847f
@@ -15320,7 +15098,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   be420715152394e0e4a25ab10931b67f92f910cfcf7793e31dfee1c6334808e5
@@ -15332,12 +15110,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   8579dd352d20589072ed5c026bde7adadd6229d18a022e7cb47cf5602b54015e
@@ -15349,7 +15126,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   36ec2f409f08a08f8327570eadcd8960b6a47bf5797441c2df05fcc50c5b762b
@@ -15361,7 +15138,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   dd73690dd3165a16580e191c92a497102758f312c759353f685e371755c663a8
@@ -15373,12 +15150,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   56ba3d585bf6b701e342d86a0bd164ab0a97dfbd5df46b3a964506842633459c
@@ -15390,7 +15166,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   215ab7e576b31462e3284d035006dc638cae06bbfb1af2c5617403b15ab2b25a
@@ -15402,7 +15178,7 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
 
 game
   sha256:   e931c3c08f20f78e3a43ad92d16eb472be619abaa17c2d8e2b0fcd5d05dbd74d
@@ -15414,7 +15190,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   0b1ba31ae95b61d7d9a0f5509b5836fff84f60915802e3b3ba1170a5c50a4b71
@@ -15426,7 +15202,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   12abf1ba063c120c1a98495a1c85e67a0007aff771ef92adcb94b4a0a2fd5adb
@@ -15438,7 +15214,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   c7af9e7f3243ba1b5dd81f32f710e60c2ae1d443ecaf7140bf42d71a1b69d8a2
@@ -15450,7 +15226,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   1bd3af0125743bf9bbbac6e7dc215fe32c4ff7043a2ee034d56b627e3f6875f0
@@ -15462,7 +15238,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   e3177f066bf004fd99aef31f2692ba0b412dd280d613dc3f4cf334d97f4c9af8
@@ -15474,7 +15250,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   0a52dc1e7820f5541f53ce0e1e96144fe079af0efe3dae5c2c89d86365feb8b1
@@ -15486,7 +15262,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   c8f159e2625ac8078535c06857ea28475706da45df494de8e46f50888272cf71
@@ -15498,7 +15274,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   39bb99eddb224de5f0789f807ffef06b9efa2efb7962dced31fb272f986699cd
@@ -15510,7 +15286,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   60d01a3f499463156546ecdee18ee3e946b95302ee0b1569decb97f52372d2eb
@@ -15522,7 +15298,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   2167fc7c5447b2287668d2f3e4ef1a285361b2292ecc8a4cbd9f966a460ad7a2
@@ -15534,7 +15310,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   132ca0b6a4888edf7de785d48f4417fac28522646e6c7514f80c5e9ff1438d5f
@@ -15546,7 +15322,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   c3bcd5c716f96e6359ebcfd85c3e9b07b46c5124bf4010d89ceef5b6f2f868f6
@@ -15558,7 +15334,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   0e834647669783c2b79cc1120c057c870c541079a7abd1eee3f787d59dc3c3eb
@@ -15570,7 +15346,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   025dd3047c474d879e69b91a3918add9cdabedf4182e1c1e10e5f0c13a124bf9
@@ -15582,7 +15358,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   bc68f40075f9983f5027fe264c3037d1a831e8e76a6c9adb60d10226f6ef005b
@@ -15594,12 +15370,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   e0165bafeb8d65be08a5a4079f8651104471f450c60794b761b1255853ca2d98
@@ -15611,7 +15386,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   9c2b458e8fda5cb437a4c6d28fb430e45c4cfef98420c40546b8e08563a4fc7d
@@ -15623,7 +15398,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   44428a3d1c796fbd41da7620e321c45f11cd80a0e5f4ab8c48177106cb960d77
@@ -15635,7 +15410,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   82e2b636e66c4edbae27a5be91a61194ef2881ec93f40d1de93a6153617b12f2
@@ -15647,7 +15422,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   86e9d76a8834732e511253d8092727bdbfb409b3d0ff1c06b6b6e481c9a039ef
@@ -15659,12 +15434,11 @@ game
     memory
       type: ROM
       size: 0x180000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   ea76cfdbb2a555a7b6eff8b466a879f9a9189639416e8c2fb45bf074e695105f
@@ -15676,7 +15450,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   159d5341d13d6801324e8271f7191c0223617c9d30984676319b2df7937c78c0
@@ -15688,7 +15462,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   d4d9f1b41dad7e7a126a9adbe8d86c4b339e120c866156796de1cb0c9a214189
@@ -15700,12 +15474,11 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x800
-      category: Save
+      content: Save
 
 game
   sha256:   2143bbd87ea1c5cfe5eaf46ae39e3ebb11a2e929d05cbb929904037f4d72acfe
@@ -15717,7 +15490,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   0af7b0d3022acd24a1fb15865a076519f7f56e7a4b33f12b6d851b3a91e5388c
@@ -15729,7 +15502,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   51c53e36ed0b959b0695fc6ef036fa7302d1c995eca35c28261d6f3cb77df0ca
@@ -15741,7 +15514,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   0b9abf2fc25a5f07c71f9d8efbb0d0e616c1494060138fbb63f7398e9c26198e
@@ -15753,7 +15526,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   67faa6ed3406a5ab0d7224b811c0960bb36560040ee959bb3304c9293ceaa093
@@ -15765,7 +15538,7 @@ game
     memory
       type: ROM
       size: 0x300000
-      category: Program
+      content: Program
 
 game
   sha256:   dc3792e9fe7ef7aaea4ac675a48ad06129dd3ebdd4b96a513bc8241549cbd579
@@ -15777,7 +15550,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   65fe17fd6b297f52df6ce9812ecb02c3bb1bfda3ebc05a19c4a8decbf9a446ae
@@ -15789,7 +15562,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   93272180090e8418582f69b79c5cee6b28638b9a93192cc4bcd96291a4fca02d
@@ -15801,7 +15574,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   71b69490c78d0bbaf47da25217c5dae295190311aa5df75653c3fac0a1b45358
@@ -15813,12 +15586,11 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
     memory
       type: RAM
-        battery
       size: 0x2000
-      category: Save
+      content: Save
 
 game
   sha256:   90ad69a489194aca7ef7b7fd1d30e0105da4934a81ac8b0333ea20f9248df92d
@@ -15830,7 +15602,7 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
 game
   sha256:   12fba2aff04c8e39968e828629ebd16caa314bca397a9418d35fdaffe8188e20
@@ -15842,7 +15614,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   fbe8926fc0149d3e8e2aec20f15640ea6814f4f4b01c3960f3c477f5f17e890f
@@ -15854,7 +15626,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   7d414b7f5941f1eddc35259a22accbbbd7b47c517dfcf8bad86c4dcfa9e50b1e
@@ -15866,7 +15638,7 @@ game
     memory
       type: ROM
       size: 0x200000
-      category: Program
+      content: Program
 
 game
   sha256:   b27e2e957fa760f4f483e2af30e03062034a6c0066984f2e284cc2cb430b2059
@@ -15878,7 +15650,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   25414de02c6805ca62574cfb39c23bf292b3d8c4ff33eb8f212ccdbcd61c5ae3
@@ -15890,7 +15662,7 @@ game
     memory
       type: ROM
       size: 0x100000
-      category: Program
+      content: Program
 
 game
   sha256:   a3f1abf2740ff64042d82f7a940fb4269ece57d7c6967571549d8b60b20f305a
@@ -15902,5 +15674,5 @@ game
     memory
       type: ROM
       size: 0x80000
-      category: Program
+      content: Program
 
diff --git a/icarus/heuristics/famicom.cpp b/icarus/heuristics/famicom.cpp
index 2d293776..66746231 100644
--- a/icarus/heuristics/famicom.cpp
+++ b/icarus/heuristics/famicom.cpp
@@ -162,10 +162,10 @@ auto Famicom::manifest() const -> string {
   }
 
   if(prgrom) output.append(Memory{}.type("ROM").size(prgrom).content("Program").text());
-  if(prgram) output.append(Memory{}.type("RAM").size(prgram).content("Save").battery().text());
+  if(prgram) output.append(Memory{}.type("RAM").size(prgram).content("Save").text());
 
   if(chrrom) output.append(Memory{}.type("ROM").size(chrrom).content("Character").text());
-  if(chrram) output.append(Memory{}.type("RAM").size(chrram).content("Character").text());
+  if(chrram) output.append(Memory{}.type("RAM").size(chrram).content("Character").isVolatile().text());
 
   return output;
 }
diff --git a/icarus/heuristics/game-boy-advance.cpp b/icarus/heuristics/game-boy-advance.cpp
index 718a59b2..2a450d6f 100644
--- a/icarus/heuristics/game-boy-advance.cpp
+++ b/icarus/heuristics/game-boy-advance.cpp
@@ -58,9 +58,9 @@ auto GameBoyAdvance::manifest() const -> string {
   else if(list.left().beginsWith("SRAM_V"    )) output.append(Memory{}.type("RAM"   ).size( 0x8000).content("Save").text());
   else if(list.left().beginsWith("SRAM_F_V"  )) output.append(Memory{}.type("RAM"   ).size( 0x8000).content("Save").text());
   else if(list.left().beginsWith("EEPROM_V"  )) output.append(Memory{}.type("EEPROM").size(    0x0).content("Save").text());
-  else if(list.left().beginsWith("FLASH_V"   )) output.append(Memory{}.type("Flash" ).size(0x10000).content("Save").text());
-  else if(list.left().beginsWith("FLASH512_V")) output.append(Memory{}.type("Flash" ).size(0x10000).content("Save").text());
-  else if(list.left().beginsWith("FLASH1M_V" )) output.append(Memory{}.type("Flash" ).size(0x20000).content("Save").text());
+  else if(list.left().beginsWith("FLASH_V"   )) output.append(Memory{}.type("Flash" ).size(0x10000).content("Save").manufacturer("Macronix").text());
+  else if(list.left().beginsWith("FLASH512_V")) output.append(Memory{}.type("Flash" ).size(0x10000).content("Save").manufacturer("Macronix").text());
+  else if(list.left().beginsWith("FLASH1M_V" )) output.append(Memory{}.type("Flash" ).size(0x20000).content("Save").manufacturer("Macronix").text());
   return output;
 }
 
diff --git a/icarus/heuristics/game-boy.cpp b/icarus/heuristics/game-boy.cpp
index ff8c6ccf..68f41422 100644
--- a/icarus/heuristics/game-boy.cpp
+++ b/icarus/heuristics/game-boy.cpp
@@ -242,12 +242,14 @@ auto GameBoy::manifest() const -> string {
   output.append("  name:   ", Location::prefix(location), "\n");
   output.append("  board:  ", mapper, "\n");
   output.append(Memory{}.type("ROM").size(data.size()).content("Program").text());
-if(ram && ramSize)
-  output.append(Memory{}.type("RAM").size(ramSize).content("Save").battery(battery).text());
+if(ram && ramSize && battery)
+  output.append(Memory{}.type("RAM").size(ramSize).content("Save").text());
+if(ram && ramSize && !battery)
+  output.append(Memory{}.type("RAM").size(ramSize).content("Save").isVolatile().text());
 if(flash && flashSize)
   output.append(Memory{}.type("Flash").size(flashSize).content("Download").text());
 if(rtc && rtcSize)
-  output.append(Memory{}.type("RTC").size(rtcSize).content("Time").battery().text());
+  output.append(Memory{}.type("RTC").size(rtcSize).content("Time").text());
 if(accelerometer)
   output.append("    accelerometer\n");
 if(rumble)
diff --git a/icarus/heuristics/game-gear.cpp b/icarus/heuristics/game-gear.cpp
index a903b795..5897c90f 100644
--- a/icarus/heuristics/game-gear.cpp
+++ b/icarus/heuristics/game-gear.cpp
@@ -25,7 +25,7 @@ auto GameGear::manifest() const -> string {
   output.append("  name:   ", Location::prefix(location), "\n");
   output.append("  board\n");
   output.append(Memory{}.type("ROM").size(data.size()).content("Program").text());
-  output.append(Memory{}.type("RAM").size(0x8000).content("Save").battery().text());
+  output.append(Memory{}.type("RAM").size(0x8000).content("Save").text());
   return output;
 }
 
diff --git a/icarus/heuristics/heuristics.cpp b/icarus/heuristics/heuristics.cpp
index 0b0016be..89eb9ac9 100644
--- a/icarus/heuristics/heuristics.cpp
+++ b/icarus/heuristics/heuristics.cpp
@@ -4,8 +4,6 @@ auto Memory::text() const -> string {
   string output;
   output.append("    memory\n");
   output.append("      type: ", _type, "\n");
-if(_battery)
-  output.append("        battery\n");
   output.append("      size: 0x", hex(_size), "\n");
   output.append("      content: ", _content, "\n");
 if(_manufacturer)
@@ -14,6 +12,8 @@ if(_architecture)
   output.append("      architecture: ", _architecture, "\n");
 if(_identifier)
   output.append("      identifier: ", _identifier, "\n");
+if(_volatile)
+  output.append("      volatile\n");
   return output;
 }
 
diff --git a/icarus/heuristics/heuristics.hpp b/icarus/heuristics/heuristics.hpp
index d16eb3e8..f3f6ef2a 100644
--- a/icarus/heuristics/heuristics.hpp
+++ b/icarus/heuristics/heuristics.hpp
@@ -2,12 +2,12 @@ namespace Heuristics {
 
 struct Memory {
   auto& type(string type) { _type = type; return *this; }
-  auto& battery(boolean battery = true) { _battery = battery; return *this; }
   auto& size(natural size) { _size = size; return *this; }
   auto& content(string content) { _content = content; return *this; }
   auto& manufacturer(string manufacturer) { _manufacturer = manufacturer; return *this; }
   auto& architecture(string architecture) { _architecture = architecture; return *this; }
   auto& identifier(string identifier) { _identifier = identifier; return *this; }
+  auto& isVolatile() { _volatile = true; return *this; }
   auto text() const -> string;
 
   string _type;
@@ -17,6 +17,7 @@ struct Memory {
   string _manufacturer;
   string _architecture;
   string _identifier;
+  boolean _volatile;
 };
 
 struct Oscillator {
diff --git a/icarus/heuristics/master-system.cpp b/icarus/heuristics/master-system.cpp
index 670f7530..450ebaac 100644
--- a/icarus/heuristics/master-system.cpp
+++ b/icarus/heuristics/master-system.cpp
@@ -25,7 +25,7 @@ auto MasterSystem::manifest() const -> string {
   output.append("  name:   ", Location::prefix(location), "\n");
   output.append("  board\n");
   output.append(Memory{}.type("ROM").size(data.size()).content("Program").text());
-  output.append(Memory{}.type("RAM").size(0x8000).content("Save").battery().text());
+  output.append(Memory{}.type("RAM").size(0x8000).content("Save").text());
   return output;
 }
 
diff --git a/icarus/heuristics/sufami-turbo.cpp b/icarus/heuristics/sufami-turbo.cpp
index 0067d378..5e4ea2da 100644
--- a/icarus/heuristics/sufami-turbo.cpp
+++ b/icarus/heuristics/sufami-turbo.cpp
@@ -32,7 +32,7 @@ auto SufamiTurbo::manifest() const -> string {
   output.append("  board\n");
   output.append(Memory{}.type("ROM").size(data.size()).content("Program").text());
 if(ramSize)
-  output.append(Memory{}.type("RAM").size(ramSize).content("Save").battery().text());
+  output.append(Memory{}.type("RAM").size(ramSize).content("Save").text());
   return output;
 }
 
diff --git a/icarus/heuristics/super-famicom.cpp b/icarus/heuristics/super-famicom.cpp
index c1dd5693..f1e29c76 100644
--- a/icarus/heuristics/super-famicom.cpp
+++ b/icarus/heuristics/super-famicom.cpp
@@ -13,7 +13,7 @@ struct SuperFamicom {
   auto romSize() const -> uint;
   auto ramSize() const -> uint;
   auto expansionRamSize() const -> uint;
-  auto battery() const -> bool;
+  auto nonVolatile() const -> bool;
 
 private:
   auto size() const -> uint { return data.size(); }
@@ -72,29 +72,29 @@ auto SuperFamicom::manifest() const -> string {
   }
 
   if(auto size = ramSize()) {
-    output.append(Memory{}.type("RAM").size(size).content("Save").battery(battery()).text());
+    output.append(Memory{}.type("RAM").size(size).content("Save").text());
   }
 
   if(auto size = expansionRamSize()) {
-    output.append(Memory{}.type("RAM").size(size).content("Save").battery(battery()).text());
+    output.append(Memory{}.type("RAM").size(size).content("Save").text());
   }
 
   if(0) {
   } else if(board(0) == "ARM") {
     output.append(Memory{}.type("ROM").size(0x20000).content("Program").manufacturer("SETA").architecture("ARM6").identifier(firmwareARM()).text());
     output.append(Memory{}.type("ROM").size( 0x8000).content("Data"   ).manufacturer("SETA").architecture("ARM6").identifier(firmwareARM()).text());
-    output.append(Memory{}.type("RAM").size( 0x4000).content("Data"   ).manufacturer("SETA").architecture("ARM6").identifier(firmwareARM()).text());
+    output.append(Memory{}.type("RAM").size( 0x4000).content("Data"   ).manufacturer("SETA").architecture("ARM6").identifier(firmwareARM()).isVolatile().text());
     output.append(Oscillator{}.frequency(21'440'000).text());
   } else if(board(0) == "BS" && board(1) == "MCC") {
-    output.append(Memory{}.type("RAM").size(0x80000).content("Download").battery().text());
+    output.append(Memory{}.type("RAM").size(0x80000).content("Download").text());
   } else if(board(0) == "HITACHI") {
     output.append(Memory{}.type("ROM").size(0xc00).content("Data").manufacturer("Hitachi").architecture("HG51BS169").identifier(firmwareHITACHI()).text());
-    output.append(Memory{}.type("RAM").size(0xc00).content("Data").manufacturer("Hitachi").architecture("HG51BS169").identifier(firmwareHITACHI()).text());
+    output.append(Memory{}.type("RAM").size(0xc00).content("Data").manufacturer("Hitachi").architecture("HG51BS169").identifier(firmwareHITACHI()).isVolatile().text());
     output.append(Oscillator{}.frequency(20'000'000).text());
   } else if(board(0) == "NEC") {
     output.append(Memory{}.type("ROM").size(0x1800).content("Program").manufacturer("NEC").architecture("uPD7725").identifier(firmwareNEC()).text());
     output.append(Memory{}.type("ROM").size( 0x800).content("Data"   ).manufacturer("NEC").architecture("uPD7725").identifier(firmwareNEC()).text());
-    output.append(Memory{}.type("RAM").size( 0x200).content("Data"   ).manufacturer("NEC").architecture("uPD7725").identifier(firmwareNEC()).text());
+    output.append(Memory{}.type("RAM").size( 0x200).content("Data"   ).manufacturer("NEC").architecture("uPD7725").identifier(firmwareNEC()).isVolatile().text());
     output.append(Oscillator{}.frequency(7'600'000).text());
   } else if(board(0) == "NECEX") {
     output.append(Memory{}.type("ROM").size(0xc000).content("Program").manufacturer("NEC").architecture("uPD96050").identifier(firmwareNECEX()).text());
@@ -102,9 +102,9 @@ auto SuperFamicom::manifest() const -> string {
     output.append(Memory{}.type("RAM").size(0x1000).content("Data"   ).manufacturer("NEC").architecture("uPD96050").identifier(firmwareNECEX()).text());
     output.append(Oscillator{}.frequency(firmwareNECEX() == "ST010" ? 11'000'000 : 15'000'000).text());
   } else if(board(0) == "RTC") {
-    output.append(Memory{}.type("RTC").size(0x10).content("Time").battery().text());
+    output.append(Memory{}.type("RTC").size(0x10).content("Time").text());
   } else if(board(0) == "SA1") {
-    output.append(Memory{}.type("RAM").size(0x800).content("Internal").text());
+    output.append(Memory{}.type("RAM").size(0x800).content("Internal").isVolatile().text());
   } else if(board(0) == "SGB") {
     output.append(Memory{}.type("ROM").size(0x100).content("Boot").manufacturer("Nintendo").architecture("LR35902").identifier(firmwareSGB()).text());
   if(firmwareSGB() == "SGB2")
@@ -112,7 +112,7 @@ auto SuperFamicom::manifest() const -> string {
   } else if(board(0) == "SPC7110") {
     output.append(Memory{}.type("ROM").size(romSize() - 0x100000).content("Data").text());
   if(board(1) == "RTC")
-    output.append(Memory{}.type("RTC").size(0x10).content("Time").battery().text());
+    output.append(Memory{}.type("RTC").size(0x10).content("Time").text());
   } else if(board(0) == "SUPERFX") {
   //todo: MARIO CHIP 1 uses CPU oscillator
     output.append(Oscillator{}.frequency(21'440'000).text());
@@ -411,7 +411,7 @@ auto SuperFamicom::expansionRamSize() const -> uint {
   return 0;
 }
 
-auto SuperFamicom::battery() const -> bool {
+auto SuperFamicom::nonVolatile() const -> bool {
   auto cartridgeTypeLo = data[headerAddress + 0x26] & 15;
   return cartridgeTypeLo == 0x2 || cartridgeTypeLo == 0x5 || cartridgeTypeLo == 0x6;
 }
diff --git a/icarus/heuristics/wonderswan.cpp b/icarus/heuristics/wonderswan.cpp
index 5e18eead..fd14007e 100644
--- a/icarus/heuristics/wonderswan.cpp
+++ b/icarus/heuristics/wonderswan.cpp
@@ -49,7 +49,7 @@ auto WonderSwan::manifest() const -> string {
   output.append("  board\n");
   output.append(Memory{}.type("ROM").size(data.size()).content("Program").text());
 if(ramType && ramSize)
-  output.append(Memory{}.type(ramType).size(ramSize).content("Save").battery(ramType == "RAM").text());
+  output.append(Memory{}.type(ramType).size(ramSize).content("Save").text());
 if(hasRTC)
   output.append(Memory{}.type("RTC").size(0x10).content("Time").text());
   return output;
diff --git a/nall/string/markup/find.hpp b/nall/string/markup/find.hpp
index 8303c2d3..021abf88 100644
--- a/nall/string/markup/find.hpp
+++ b/nall/string/markup/find.hpp
@@ -34,7 +34,7 @@ auto ManagedNode::_evaluate(string query) const -> bool {
     if(side(0)) {
       auto result = _find(side(0));
       if(result.size() == 0) return false;
-      data = result[0].value();
+      data = result[0].text();  //strips whitespace so rules can match without requiring it
     }
 
     switch(comparator) {