diff --git a/libwvdrmengine/oemcrypto/include/level3.h b/libwvdrmengine/oemcrypto/include/level3.h
index 433fa16a..5de50e6d 100644
--- a/libwvdrmengine/oemcrypto/include/level3.h
+++ b/libwvdrmengine/oemcrypto/include/level3.h
@@ -36,7 +36,6 @@ namespace wvoec3 {
 #define Level3_GenerateDerivedKeys         _lcc12
 #define Level3_GenerateSignature           _lcc13
 #define Level3_GenerateNonce               _lcc14
-#define Level3_RefreshKeys                 _lcc16
 #define Level3_RewrapDeviceRSAKey          _lcc18
 #define Level3_LoadDeviceRSAKey            _lcc19
 #define Level3_GenerateRSASignature        _lcc20
@@ -80,12 +79,13 @@ namespace wvoec3 {
 #define Level3_CreateOldUsageEntry         _lcc70
 #define Level3_GetAnalogOutputFlags        _lcc71
 #define Level3_LoadTestKeybox              _lcc78
-#define Level3_LoadEntitledContentKeys     _lcc79
 #define Level3_SelectKey                   _lcc81
-#define Level3_LoadKeys                    _lcc82
+#define Level3_LoadKeys                    _lcc83
 #define Level3_SetSandbox                  _lcc84
 #define Level3_ResourceRatingTier          _lcc85
 #define Level3_BuildInformation            _lcc90
+#define Level3_RefreshKeys                 _lcc91
+#define Level3_LoadEntitledContentKeys     _lcc92
 #define Level3_CopyBuffer                  _lcc93
 #else
 #define Level3_Initialize                  _oecc01
@@ -101,7 +101,6 @@ namespace wvoec3 {
 #define Level3_GenerateDerivedKeys         _oecc12
 #define Level3_GenerateSignature           _oecc13
 #define Level3_GenerateNonce               _oecc14
-#define Level3_RefreshKeys                 _oecc16
 #define Level3_RewrapDeviceRSAKey          _oecc18
 #define Level3_LoadDeviceRSAKey            _oecc19
 #define Level3_DeriveKeysFromSessionKey    _oecc21
@@ -146,12 +145,13 @@ namespace wvoec3 {
 #define Level3_CreateOldUsageEntry         _oecc70
 #define Level3_GetAnalogOutputFlags        _oecc71
 #define Level3_LoadTestKeybox              _oecc78
-#define Level3_LoadEntitledContentKeys     _oecc79
 #define Level3_SelectKey                   _oecc81
-#define Level3_LoadKeys                    _oecc82
+#define Level3_LoadKeys                    _oecc83
 #define Level3_SetSandbox                  _oecc84
 #define Level3_ResourceRatingTier          _oecc85
 #define Level3_BuildInformation            _oecc90
+#define Level3_RefreshKeys                 _oecc91
+#define Level3_LoadEntitledContentKeys     _oecc92
 #define Level3_CopyBuffer                  _oecc93
 #endif
 
@@ -176,10 +176,6 @@ OEMCryptoResult Level3_GenerateSignature(OEMCrypto_SESSION session,
                                          size_t message_length,
                                          uint8_t* signature,
                                          size_t* signature_length);
-OEMCryptoResult Level3_RefreshKeys(
-    OEMCrypto_SESSION session, const uint8_t* message, size_t message_length,
-    const uint8_t* signature, size_t signature_length, size_t num_keys,
-    const OEMCrypto_KeyRefreshObject_V14* key_array);
 OEMCryptoResult Level3_QueryKeyControl(OEMCrypto_SESSION session,
                                        const uint8_t* key_id,
                                        size_t key_id_length,
@@ -347,23 +343,27 @@ OEMCryptoResult Level3_CreateOldUsageEntry(uint64_t time_since_license_received,
                                            size_t pst_length);
 uint32_t Level3_GetAnalogOutputFlags();
 OEMCryptoResult Level3_LoadTestKeybox(const uint8_t* buffer, size_t length);
-OEMCryptoResult Level3_LoadEntitledContentKeys(
-    OEMCrypto_SESSION session, size_t num_keys,
-    const OEMCrypto_EntitledContentKeyObject_V14* key_array);
 OEMCryptoResult Level3_SelectKey(const OEMCrypto_SESSION session,
                                  const uint8_t* key_id, size_t key_id_length,
                                  OEMCryptoCipherMode cipher_mode);
 OEMCryptoResult Level3_LoadKeys(
     OEMCrypto_SESSION session, const uint8_t* message, size_t message_length,
     const uint8_t* signature, size_t signature_length,
-    const uint8_t* enc_mac_key_iv, const uint8_t* enc_mac_key, size_t num_keys,
-    const OEMCrypto_KeyObject_V14* key_array, const uint8_t* pst,
-    size_t pst_length, const uint8_t* srm_requirement,
+    OEMCrypto_Substring enc_mac_keys_iv, OEMCrypto_Substring enc_mac_keys,
+    size_t num_keys, const OEMCrypto_KeyObject* key_array,
+    OEMCrypto_Substring pst, OEMCrypto_Substring srm_restriction_data,
     OEMCrypto_LicenseType license_type);
 OEMCryptoResult Level3_SetSandbox(const uint8_t* sandbox_id,
                                   size_t sandbox_id_length);
 uint32_t Level3_ResourceRatingTier();
 const char* Level3_BuildInformation();
+OEMCryptoResult Level3_RefreshKeys(
+    OEMCrypto_SESSION session, const uint8_t* message, size_t message_length,
+    const uint8_t* signature, size_t signature_length, size_t num_keys,
+    const OEMCrypto_KeyRefreshObject* key_array);
+OEMCryptoResult Level3_LoadEntitledContentKeys(
+    OEMCrypto_SESSION session, const uint8_t* message, size_t message_length,
+    size_t num_keys, const OEMCrypto_EntitledContentKeyObject* key_array);
 OEMCryptoResult Level3_CopyBuffer(OEMCrypto_SESSION session,
                                   const uint8_t *data_addr,
                                   size_t data_length,