diff --git a/src/api/auth/login.rs b/src/api/auth/login.rs
index f7c4fe6..b419279 100644
--- a/src/api/auth/login.rs
+++ b/src/api/auth/login.rs
@@ -8,7 +8,7 @@ pub mod login {
     use crate::errors::InstanceServerError;
     use crate::instance::Instance;
 
-    impl Instance {
+    impl Instance<'_> {
         pub async fn login_account(
             &mut self,
             login_schema: &LoginSchema,
diff --git a/src/api/auth/register.rs b/src/api/auth/register.rs
index b932b9f..df7d8dc 100644
--- a/src/api/auth/register.rs
+++ b/src/api/auth/register.rs
@@ -8,7 +8,7 @@ pub mod register {
         instance::{Instance, Token},
     };
 
-    impl Instance {
+    impl Instance<'_> {
         /**
         Registers a new user on the Spacebar server.
         # Arguments
diff --git a/src/api/policies/instance/instance.rs b/src/api/policies/instance/instance.rs
index 7c1a48a..1c53b27 100644
--- a/src/api/policies/instance/instance.rs
+++ b/src/api/policies/instance/instance.rs
@@ -5,7 +5,7 @@ pub mod instance {
     use crate::errors::InstanceServerError;
     use crate::{api::types::InstancePolicies, instance::Instance};
 
-    impl Instance {
+    impl Instance<'_> {
         /**
         Gets the instance policies schema.
         # Errors
diff --git a/src/instance.rs b/src/instance.rs
index 3e52e88..b1cb153 100644
--- a/src/instance.rs
+++ b/src/instance.rs
@@ -1,26 +1,26 @@
 use crate::api::limits::Limits;
 use crate::api::types::{InstancePolicies, User};
 use crate::errors::{FieldFormatError, InstanceServerError};
+use crate::gateway::Gateway;
 use crate::limit::LimitedRequester;
 use crate::URLBundle;
 
 use std::collections::HashMap;
 use std::fmt;
 
-#[derive(Debug)]
 /**
 The [`Instance`] what you will be using to perform all sorts of actions on the Spacebar server.
  */
-pub struct Instance {
+pub struct Instance<'a> {
     pub urls: URLBundle,
     pub instance_info: InstancePolicies,
     pub requester: LimitedRequester,
     pub limits: Limits,
-    //pub gateway: Gateway,
+    pub gateway: Gateway<'a>,
     pub users: HashMap<Token, User>,
 }
 
-impl Instance {
+impl Instance<'_> {
     /// Creates a new [`Instance`].
     /// # Arguments
     /// * `urls` - The [`URLBundle`] that contains all the URLs that are needed to connect to the Spacebar server.
@@ -30,7 +30,7 @@ impl Instance {
     pub async fn new(
         urls: URLBundle,
         requester: LimitedRequester,
-    ) -> Result<Instance, InstanceServerError> {
+    ) -> Result<Instance<'static>, InstanceServerError> {
         let users: HashMap<Token, User> = HashMap::new();
         let mut instance = Instance {
             urls: urls.clone(),
@@ -48,6 +48,7 @@ impl Instance {
             limits: Limits::check_limits(urls.api).await,
             requester,
             users,
+            gateway: Gateway::new(urls.wss.clone()).await.unwrap(),
         };
         instance.instance_info = match instance.instance_policies_schema().await {
             Ok(schema) => schema,