diff --git a/codegen/src/lib.rs b/codegen/src/lib.rs
index 47631888a9..4ae257db86 100644
--- a/codegen/src/lib.rs
+++ b/codegen/src/lib.rs
@@ -346,7 +346,7 @@ fn default_derives(crate_path: &syn::Path) -> DerivesRegistry {
 fn default_substitutes(crate_path: &syn::Path) -> TypeSubstitutes {
     let mut type_substitutes = TypeSubstitutes::new();
 
-    let defaults: [(syn::Path, syn::Path); 11] = [
+    let defaults: [(syn::Path, syn::Path); 12] = [
         (
             parse_quote!(bitvec::order::Lsb0),
             parse_quote!(#crate_path::utils::bits::Lsb0),
@@ -387,7 +387,14 @@ fn default_substitutes(crate_path: &syn::Path) -> TypeSubstitutes {
             parse_quote!(BTreeMap),
             parse_quote!(#crate_path::utils::KeyedVec),
         ),
-        (parse_quote!(BTreeSet), parse_quote!(::std::vec::Vec)),
+        (
+            parse_quote!(BinaryHeap),
+            parse_quote!(::std::vec::Vec),
+        ),
+        (
+            parse_quote!(BTreeSet),
+            parse_quote!(::std::vec::Vec),
+        ),
         // The `UncheckedExtrinsic(pub Vec<u8>)` is part of the runtime API calls.
         // The inner bytes represent the encoded extrinsic, however when deriving the
         // `EncodeAsType` the bytes would be re-encoded. This leads to the bytes