diff --git a/AppleModels/DataBase/MacBook/MB61.yaml b/AppleModels/DataBase/MacBook/MB61.yaml
index 63b3f31f..21428b98 100644
--- a/AppleModels/DataBase/MacBook/MB61.yaml
+++ b/AppleModels/DataBase/MacBook/MB61.yaml
@@ -60,9 +60,9 @@ SmcBranch:
   - 0x00
 # FIXME: check
 SmcPlatform:
-  - 0x4E
-  - 0x41
-  - 0x00
+  - 0x6B
+  - 0x38
+  - 0x34
   - 0x00
   - 0x00
   - 0x00
diff --git a/AppleModels/DataBase/MacBook/MB91.yaml b/AppleModels/DataBase/MacBook/MB91.yaml
index 9c93bbf1..28251e3c 100644
--- a/AppleModels/DataBase/MacBook/MB91.yaml
+++ b/AppleModels/DataBase/MacBook/MB91.yaml
@@ -53,12 +53,12 @@ SmcRevision:
   - 0x01
   - 0x06
 SmcBranch:
-  - 0x6A
-  - 0x39
-  - 0x33
-  - 0x00
-  - 0x00
-  - 0x00
+  - 0x32
+  - 0x30
+  - 0x31
+  - 0x36
+  - 0x6d
+  - 0x62
   - 0x00
   - 0x00
 SmcPlatform:
diff --git a/AppleModels/DataBase/MacBookAir/MBA21.yaml b/AppleModels/DataBase/MacBookAir/MBA21.yaml
index f2597364..31ed246c 100644
--- a/AppleModels/DataBase/MacBookAir/MBA21.yaml
+++ b/AppleModels/DataBase/MacBookAir/MBA21.yaml
@@ -48,9 +48,9 @@ SmcRevision:
   - 0x08
 # FIXME: check
 SmcBranch:
-  - 0x4E
-  - 0x41
-  - 0x00
+  - 0x6d
+  - 0x39
+  - 0x36
   - 0x00
   - 0x00
   - 0x00
@@ -58,9 +58,9 @@ SmcBranch:
   - 0x00
 # FIXME: check
 SmcPlatform:
-  - 0x4E
-  - 0x41
-  - 0x00
+  - 0x6d
+  - 0x39
+  - 0x36
   - 0x00
   - 0x00
   - 0x00
diff --git a/AppleModels/DataBase/MacBookAir/MBA32.yaml b/AppleModels/DataBase/MacBookAir/MBA32.yaml
index bac9e015..03e84f62 100644
--- a/AppleModels/DataBase/MacBookAir/MBA32.yaml
+++ b/AppleModels/DataBase/MacBookAir/MBA32.yaml
@@ -51,19 +51,19 @@ SmcRevision:
   - 0x61
 # FIXME: check
 SmcBranch:
-  - 0x4E
-  - 0x41
-  - 0x00
-  - 0x00
-  - 0x00
-  - 0x00
+  - 0x6b
+  - 0x31
+  - 0x36
+  - 0x6b
+  - 0x39
+  - 0x39
   - 0x00
   - 0x00
 # FIXME: check
 SmcPlatform:
-  - 0x4E
-  - 0x41
-  - 0x00
+  - 0x6b
+  - 0x31
+  - 0x36
   - 0x00
   - 0x00
   - 0x00
diff --git a/AppleModels/DataBase/MacBookPro/MBP114.yaml b/AppleModels/DataBase/MacBookPro/MBP114.yaml
index b97e2e77..7196b10b 100644
--- a/AppleModels/DataBase/MacBookPro/MBP114.yaml
+++ b/AppleModels/DataBase/MacBookPro/MBP114.yaml
@@ -46,7 +46,7 @@ SmcRevision:
   - 0x0f
   - 0x00
   - 0x00
-  - 0x23
+  - 0x24
 # FIXME: check
 SmcBranch:
   - 0x6A
diff --git a/AppleModels/DataBase/MacBookPro/MBP115.yaml b/AppleModels/DataBase/MacBookPro/MBP115.yaml
index b465038b..55e0fc5e 100644
--- a/AppleModels/DataBase/MacBookPro/MBP115.yaml
+++ b/AppleModels/DataBase/MacBookPro/MBP115.yaml
@@ -48,21 +48,21 @@ SmcRevision:
   - 0x02
 # FIXME: check
 SmcBranch:
-  - 0x4E
-  - 0x41
-  - 0x00
-  - 0x00
-  - 0x00
+  - 0x6a
+  - 0x31
+  - 0x34
+  - 0x35
+  - 0x67
   - 0x00
   - 0x00
   - 0x00
 # FIXME: check
 SmcPlatform:
-  - 0x4E
-  - 0x41
-  - 0x00
-  - 0x00
-  - 0x00
+  - 0x6a
+  - 0x31
+  - 0x34
+  - 0x35
+  - 0x67
   - 0x00
   - 0x00
   - 0x00
diff --git a/AppleModels/DataBase/MacBookPro/MBP55.yaml b/AppleModels/DataBase/MacBookPro/MBP55.yaml
index 6e260fbc..da0d59d9 100644
--- a/AppleModels/DataBase/MacBookPro/MBP55.yaml
+++ b/AppleModels/DataBase/MacBookPro/MBP55.yaml
@@ -58,9 +58,9 @@ SmcBranch:
   - 0x00
 # FIXME: check
 SmcPlatform:
-  - 0x4E
-  - 0x41
-  - 0x00
+  - 0x6b
+  - 0x32
+  - 0x34
   - 0x00
   - 0x00
   - 0x00
diff --git a/AppleModels/DataBase/MacPro/MP61.yaml b/AppleModels/DataBase/MacPro/MP61.yaml
index cf8e2b80..c196bd48 100755
--- a/AppleModels/DataBase/MacPro/MP61.yaml
+++ b/AppleModels/DataBase/MacPro/MP61.yaml
@@ -54,13 +54,13 @@ SmcBranch:
   - 0x00
 SmcPlatform:
   - 0x6A
+  - 0x39
   - 0x30
   - 0x00
   - 0x00
   - 0x00
   - 0x00
   - 0x00
-  - 0x00
 SmcEPCI: 0xF0F006
 OEMStrings: |-
   Apple ROM Version
diff --git a/AppleModels/DataBase/iMac/IM171.yaml b/AppleModels/DataBase/iMac/IM171.yaml
index ece22a97..7f5ea03e 100644
--- a/AppleModels/DataBase/iMac/IM171.yaml
+++ b/AppleModels/DataBase/iMac/IM171.yaml
@@ -69,31 +69,6 @@ SmcPlatform:
   - 0x00
   - 0x00
   - 0x00
-# SmcRevision:
-#   - 0x02
-#   - 0x34
-#   - 0x0f
-#   - 0x00
-#   - 0x00
-#   - 0x02
-# SmcBranch:
-#   - 0x6a
-#   - 0x39
-#   - 0x35
-#   - 0x6a
-#   - 0x39
-#   - 0x35
-#   - 0x61
-#   - 0x6d
-# SmcPlatform:
-#   - 0x6a
-#   - 0x39
-#   - 0x35
-#   - 0x61
-#   - 0x6d
-#   - 0x00
-#   - 0x00
-#   - 0x00
 SmcEPCI: 0xF01008
 OEMStrings: |-
   Apple ROM Version
diff --git a/AppleModels/DataBase/iMac/IM181.yaml b/AppleModels/DataBase/iMac/IM181.yaml
index cc34a4c2..7d932b35 100644
--- a/AppleModels/DataBase/iMac/IM181.yaml
+++ b/AppleModels/DataBase/iMac/IM181.yaml
@@ -37,8 +37,6 @@ ProcessorType:
 ProcessorBusSpeed:
   - 12345
 SmcGeneration: 2
-# FIXME: I believe it should match iMac18,3...
-# But it was checked from Firmware.pkg of 10.15.1
 SmcRevision:
   - 0x02
   - 0x39
@@ -59,7 +57,7 @@ SmcPlatform:
   - 0x6a
   - 0x31
   - 0x33
-  - 0x35
+  - 0x33
   - 0x00
   - 0x00
   - 0x00
diff --git a/AppleModels/DataBase/iMac/IM192.yaml b/AppleModels/DataBase/iMac/IM192.yaml
index 439e3b47..fa35f4b8 100644
--- a/AppleModels/DataBase/iMac/IM192.yaml
+++ b/AppleModels/DataBase/iMac/IM192.yaml
@@ -63,7 +63,7 @@ SmcPlatform:
   - 0x6A
   - 0x31
   - 0x33
-  - 0x35
+  - 0x39
   - 0x00
   - 0x00
   - 0x00
diff --git a/Library/OcMacInfoLib/AutoGenerated.c b/Library/OcMacInfoLib/AutoGenerated.c
index fa4f403b..cc85df04 100755
--- a/Library/OcMacInfoLib/AutoGenerated.c
+++ b/Library/OcMacInfoLib/AutoGenerated.c
@@ -54,7 +54,7 @@ CONST MAC_INFO_INTERNAL_ENTRY gMacInfoModels[] = {
   .BoardProduct = "Mac-9AE82516C7C6B903",
   .BoardRevision = MAC_INFO_BOARD_REVISION_MISSING,
   .SmcRevision = {2, 53, 15, 0, 1, 6},
-  .SmcBranch = {106, 57, 51, 0, 0, 0, 0, 0},
+  .SmcBranch = {50, 48, 49, 54, 109, 98, 0, 0},
   .SmcPlatform = {106, 57, 51, 0, 0, 0, 0, 0},
   .BIOSVersion = "192.0.0.0.0",
   .BIOSReleaseDate = "04/24/2020",
@@ -461,7 +461,7 @@ CONST MAC_INFO_INTERNAL_ENTRY gMacInfoModels[] = {
   .SystemProductName = "MacBookPro11,4",
   .BoardProduct = "Mac-06F11FD93F0323C5",
   .BoardRevision = MAC_INFO_BOARD_REVISION_MISSING,
-  .SmcRevision = {2, 41, 15, 0, 0, 35},
+  .SmcRevision = {2, 41, 15, 0, 0, 36},
   .SmcBranch = {106, 49, 52, 53, 0, 0, 0, 0},
   .SmcPlatform = {78, 65, 0, 0, 0, 0, 0, 0},
   .BIOSVersion = "198.0.0.0.0",
@@ -486,8 +486,8 @@ CONST MAC_INFO_INTERNAL_ENTRY gMacInfoModels[] = {
   .BoardProduct = "Mac-06F11F11946D27C5",
   .BoardRevision = MAC_INFO_BOARD_REVISION_MISSING,
   .SmcRevision = {2, 48, 15, 0, 0, 2},
-  .SmcBranch = {78, 65, 0, 0, 0, 0, 0, 0},
-  .SmcPlatform = {78, 65, 0, 0, 0, 0, 0, 0},
+  .SmcBranch = {106, 49, 52, 53, 103, 0, 0, 0},
+  .SmcPlatform = {106, 49, 52, 53, 103, 0, 0, 0},
   .BIOSVersion = "198.0.0.0.0",
   .BIOSReleaseDate = "04/16/2020",
   .SystemVersion = "1.0",
@@ -1015,7 +1015,7 @@ CONST MAC_INFO_INTERNAL_ENTRY gMacInfoModels[] = {
   .BoardRevision = MAC_INFO_BOARD_REVISION_MISSING,
   .SmcRevision = {2, 32, 15, 0, 0, 24},
   .SmcBranch = {106, 57, 48, 0, 0, 0, 0, 0},
-  .SmcPlatform = {106, 48, 0, 0, 0, 0, 0, 0},
+  .SmcPlatform = {106, 57, 48, 0, 0, 0, 0, 0},
   .BIOSVersion = "136.0.0.0.0",
   .BIOSReleaseDate = "04/12/2020",
   .SystemVersion = "1.0",
@@ -1543,7 +1543,7 @@ CONST MAC_INFO_INTERNAL_ENTRY gMacInfoModels[] = {
   .BoardRevision = 0x1F,
   .SmcRevision = {2, 57, 15, 0, 0, 64},
   .SmcBranch = {106, 49, 51, 51, 95, 52, 95, 53},
-  .SmcPlatform = {106, 49, 51, 53, 0, 0, 0, 0},
+  .SmcPlatform = {106, 49, 51, 51, 0, 0, 0, 0},
   .BIOSVersion = "183.0.0.0.0",
   .BIOSReleaseDate = "04/24/2020",
   .SystemVersion = "1.0",
@@ -1639,7 +1639,7 @@ CONST MAC_INFO_INTERNAL_ENTRY gMacInfoModels[] = {
   .BoardRevision = 0x7,
   .SmcRevision = {2, 71, 15, 0, 0, 3},
   .SmcBranch = {106, 49, 51, 56, 95, 57, 0, 0},
-  .SmcPlatform = {106, 49, 51, 53, 0, 0, 0, 0},
+  .SmcPlatform = {106, 49, 51, 57, 0, 0, 0, 0},
   .BIOSVersion = "1037.120.79.0.0",
   .BIOSReleaseDate = "04/23/2020",
   .SystemVersion = "1.0",