diff --git a/src/cpuinfo_main.cpp b/src/cpuinfo_main.cpp
index 8d8cce5..eac04d5 100644
--- a/src/cpuinfo_main.cpp
+++ b/src/cpuinfo_main.cpp
@@ -407,6 +407,7 @@
         case icx:
         case icxd:
         case spr:
+        case emr:
         {
             // PPIN can be read through PCS 19
             static constexpr uint8_t u8Size = 4; // default to a DWORD
diff --git a/src/sst_mailbox.cpp b/src/sst_mailbox.cpp
index 7b8c156..0c35d55 100644
--- a/src/sst_mailbox.cpp
+++ b/src/sst_mailbox.cpp
@@ -411,7 +411,14 @@
 
     bool supportsControl() override
     {
-        return model == spr;
+        switch (model)
+        {
+            case spr:
+            case emr:
+                return true;
+            default:
+                return false;
+        }
     }
 
     unsigned int currentLevel() override
@@ -566,12 +573,16 @@
                                                    CPUModel model)
 {
     DEBUG_PRINT << "createMailbox\n";
-    if (model == icx || model == icxd || model == spr || model == emr)
+    switch (model)
     {
-        return std::make_unique<SSTMailbox>(address, model);
+        case icx:
+        case icxd:
+        case spr:
+        case emr:
+            return std::make_unique<SSTMailbox>(address, model);
+        default:
+            return nullptr;
     }
-
-    return nullptr;
 }
 
 SSTProviderRegistration(createMailbox);