diff --git a/Cargo.toml b/Cargo.toml
index 4cd4ae64b..be3232fd7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,10 +20,11 @@ rust-version = "1.60.0"
 autobenches = false
 
 [dependencies]
+ahash = "0.7.6"
 crossbeam-queue = "0.3"
 hibitset = { version = "0.6.3", default-features = false }
 log = "0.4.8"
-shred = { version = "0.14", default-features = false }
+shred = { version = "0.14.1", default-features = false }
 shrev = "1.1.1"
 tuple_utils = "0.4.0"
 
diff --git a/clippy.toml b/clippy.toml
new file mode 100644
index 000000000..526250bdc
--- /dev/null
+++ b/clippy.toml
@@ -0,0 +1 @@
+disallowed-types = ["std::collections::HashMap"]
\ No newline at end of file
diff --git a/src/lib.rs b/src/lib.rs
index e5a54dd50..65a876921 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,5 @@
 #![warn(missing_docs)]
+#![deny(clippy::disallowed_types)]
 #![cfg_attr(
     feature = "nightly",
     feature(generic_associated_types, associated_type_defaults)
diff --git a/src/storage/storages.rs b/src/storage/storages.rs
index 2409deffc..073a98387 100644
--- a/src/storage/storages.rs
+++ b/src/storage/storages.rs
@@ -1,10 +1,8 @@
 //! Different types of storages you can use for your components.
 
-use std::{
-    collections::{BTreeMap, HashMap},
-    mem::MaybeUninit,
-};
+use std::{collections::BTreeMap, mem::MaybeUninit};
 
+use ahash::AHashMap as HashMap;
 use hibitset::BitSetLike;
 
 use crate::{