diff --git a/src/gateway/gateway.rs b/src/gateway/gateway.rs
index edccd11..b4149db 100644
--- a/src/gateway/gateway.rs
+++ b/src/gateway/gateway.rs
@@ -22,7 +22,7 @@ pub struct Gateway {
     >,
     websocket_receive: SplitStream<WebSocketStream<MaybeTlsStream<TcpStream>>>,
     kill_send: tokio::sync::broadcast::Sender<()>,
-    store: Arc<Mutex<HashMap<Snowflake, Arc<RwLock<ObservableObject>>>>>,
+    store: GatewayStore,
     url: String,
 }
 
diff --git a/src/gateway/handle.rs b/src/gateway/handle.rs
index 1200b30..a4cf20a 100644
--- a/src/gateway/handle.rs
+++ b/src/gateway/handle.rs
@@ -19,7 +19,7 @@ pub struct GatewayHandle {
     >,
     /// Tells gateway tasks to close
     pub(super) kill_send: tokio::sync::broadcast::Sender<()>,
-    pub(crate) store: Arc<Mutex<HashMap<Snowflake, Arc<RwLock<ObservableObject>>>>>,
+    pub(crate) store: GatewayStore,
 }
 
 impl GatewayHandle {