diff --git a/rnex-core/.sqlx/query-f66ad3f63457ee6b256d909dbbe9269ec6b63387a44b9beaa0da2e11c73d2680.json b/rnex-core/.sqlx/query-f66ad3f63457ee6b256d909dbbe9269ec6b63387a44b9beaa0da2e11c73d2680.json
new file mode 100644
index 0000000..2c95fcc
--- /dev/null
+++ b/rnex-core/.sqlx/query-f66ad3f63457ee6b256d909dbbe9269ec6b63387a44b9beaa0da2e11c73d2680.json
@@ -0,0 +1,17 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO datastore.buffer_queues (\n                data_id,\n                slot,\n                creation_date,\n                buffer\n            ) VALUES (\n                $1,\n                $2,\n                $3,\n                $4\n            ) ON CONFLICT (data_id, slot, buffer) DO UPDATE SET creation_date=$3\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int4",
+        "Timestamp",
+        "Bytea"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "f66ad3f63457ee6b256d909dbbe9269ec6b63387a44b9beaa0da2e11c73d2680"
+}
diff --git a/rnex-core/src/nex/datastore.rs b/rnex-core/src/nex/datastore.rs
index 9d97eeb..4ef91c6 100644
--- a/rnex-core/src/nex/datastore.rs
+++ b/rnex-core/src/nex/datastore.rs
@@ -1,6 +1,4 @@
-use crate::rmc::protocols::datastore::{
-    DataStoreGetCourseRecordParam, DataStoreGetCourseRecordResult, DataStoreUploadCourseRecordParam,
-};
+use crate::rmc::protocols::datastore::{DataStoreFileServerObjectInfo, DataStoreGetCourseRecordParam, DataStoreGetCourseRecordResult, DataStoreUploadCourseRecordParam};
 use chrono::{NaiveDateTime, Utc};
 use futures::TryStreamExt;
 use rnex_core::PID;
@@ -254,7 +252,7 @@ async fn get_object_info_by_persistence_target(
 
 async fn get_buffer_queues_by_data_id_and_slot(
     data_id: i64,
-    slot: u32,
+    slot: i32,
 ) -> Result<Vec<QBuffer>, ErrorCode> {
     check_object_availability(data_id, 0).await?;
 
@@ -682,6 +680,36 @@ async fn get_rating_with_slot_data_id(dataid: i64) -> Result<Vec<RatingInfoWithS
     Ok(ratings)
 }
 
+pub async fn insert_buffer(dataid: i64, slot: i32, buffer: &QBuffer) {
+    let db_now = Utc::now().naive_utc();
+
+    let row = sqlx::query!(
+        r#"
+            INSERT INTO datastore.buffer_queues (
+                data_id,
+                slot,
+                creation_date,
+                buffer
+            ) VALUES (
+                $1,
+                $2,
+                $3,
+                $4
+            ) ON CONFLICT (data_id, slot, buffer) DO UPDATE SET creation_date=$3
+        "#,
+        dataid,
+        slot,
+        db_now,
+        buffer.0
+    )
+        .execute(get_db())
+        .await
+        .map_err(|e| {
+            log::error!("DB Error: {:?}", e);
+            ErrorCode::DataStore_NotFound
+        });
+}
+
 impl DataStore for User {
     async fn get_meta(&self, metaparam: GetMetaParam) -> Result<GetMetaInfo, ErrorCode> {
         let mut meta_info = if metaparam.dataid != 0 {
@@ -1554,4 +1582,61 @@ impl DataStore for User {
             updated_time: KerberosDateTime::from_i64(0x9C3F3E0000),
         })
     }
+
+    async fn add_to_buffer_queues(
+        &self,
+        bufferparam: Vec<BufferQueueParam>,
+        buffers: Vec<QBuffer>,
+    ) -> Result<Vec<QResult>, ErrorCode> {
+        let mut results = Vec::new();
+
+        let client_pid = self.pid;
+
+        for (param, buffer) in bufferparam.iter().zip(buffers.iter()) {
+            if param.slot == 0 {
+                let object_info = get_object_info_by_data_id(param.dataid, 0).await?;
+
+                if object_info.data_type == 1 && object_info.owner != client_pid {
+                    return Err(ErrorCode::DataStore_PermissionDenied);
+                }
+            }
+
+            insert_buffer(param.dataid, param.slot, buffer).await;
+
+            results.push(QResult::success(ErrorCode::Core_Unknown));
+        }
+
+        Ok(results)
+    }
+
+    async fn get_object_infos(&self, dataids: Vec<i64>) -> Result<Vec<DataStoreFileServerObjectInfo>, ErrorCode> {
+        let mut list = Vec::with_capacity(dataids.len());
+        for dataid in dataids.into_iter() {
+            let object_info = get_object_info_by_data_id(dataid, 0).await?;
+
+            let presigner = S3Presigner::new(
+                &format!("https://{}", *RNEX_DATASTORE_S3_ENDPOINT),
+                format!("{}", *RNEX_DATASTORE_S3_BUCKET),
+            )
+                .await;
+
+            let key = format!("data/{}.bin", dataid);
+            let download_url = presigner.generate_presigned_get(&key);
+
+            list.push(
+                DataStoreFileServerObjectInfo {
+                    dataid,
+                    get_info: DataStoreReqGetInfo {
+                        url: download_url,
+                        request_headers: vec![],
+                        size: object_info.size,
+                        root_ca_cert: vec![],
+                        dataid
+                    }
+                }
+            );
+        };
+
+        Ok(list)
+    }
 }
diff --git a/rnex-core/src/rmc/protocols/datastore.rs b/rnex-core/src/rmc/protocols/datastore.rs
index 2165620..29d4ca1 100644
--- a/rnex-core/src/rmc/protocols/datastore.rs
+++ b/rnex-core/src/rmc/protocols/datastore.rs
@@ -150,7 +150,7 @@ pub struct RateCustomRankingParam {
 #[rmc_struct(0)]
 pub struct BufferQueueParam {
     pub dataid: i64,
-    pub slot: u32,
+    pub slot: i32,
 }
 
 // I just realized I forgot to add "DataStore" in front of the structs. I can't be assed to change it, sucks to be you lol.
@@ -295,6 +295,13 @@ pub struct DataStoreGetCourseRecordResult {
     pub updated_time: KerberosDateTime,
 }
 
+#[derive(RmcSerialize, Clone)]
+#[rmc_struct(0)]
+pub struct DataStoreFileServerObjectInfo {
+    pub dataid: i64,
+    pub get_info: DataStoreReqGetInfo,
+}
+
 #[rmc_proto(115)]
 pub trait DataStore {
     #[method_id(8)]
@@ -329,6 +336,12 @@ pub trait DataStore {
         &self,
         custom_ranking_param: DataStoreGetCustomRankingByDataIDParam,
     ) -> Result<(Vec<DataStoreCustomRankingResult>, Vec<QResult>), ErrorCode>;
+    #[method_id(53)]
+    async fn add_to_buffer_queues(
+        &self,
+        bufferparam: Vec<BufferQueueParam>,
+        buffers: Vec<QBuffer>,
+    ) -> Result<Vec<QResult>, ErrorCode>;
     #[method_id(54)]
     async fn get_buffer_queue(
         &self,
@@ -364,6 +377,11 @@ pub trait DataStore {
         _transactional: bool,
         fetch_ratings: bool,
     ) -> Result<(Vec<RatingInfo>, Vec<QResult>), ErrorCode>;
+    #[method_id(45)]
+    async fn get_object_infos(
+        &self,
+        dataids: Vec<i64>,
+    ) -> Result<Vec<DataStoreFileServerObjectInfo>, ErrorCode>;
     #[method_id(57)]
     async fn complete_attach_file(
         &self,