diff --git a/application/api/user/routes.py b/application/api/user/routes.py
index 8f374aa7..91b028d5 100644
--- a/application/api/user/routes.py
+++ b/application/api/user/routes.py
@@ -2506,23 +2506,26 @@ class StoreAttachment(Resource):
         user = secure_filename(decoded_token.get("sub"))
         
         try:
+            attachment_id = ObjectId()
             original_filename = secure_filename(file.filename)
-            folder_name = original_filename
-            save_dir = os.path.join(current_dir, settings.UPLOAD_FOLDER, user, "attachments",folder_name)
+            
+            save_dir = os.path.join(
+                current_dir, 
+                settings.UPLOAD_FOLDER,
+                user,
+                "attachments", 
+                str(attachment_id)
+            )
             os.makedirs(save_dir, exist_ok=True)
-            # Create directory structure: user/attachments/filename/
+            
             file_path = os.path.join(save_dir, original_filename)
             
-            # Handle filename conflicts
-            if os.path.exists(file_path):
-                name_parts = os.path.splitext(original_filename)
-                timestamp = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
-                new_filename = f"{name_parts[0]}_{timestamp}{name_parts[1]}"
-                file_path = os.path.join(save_dir, new_filename)
-                original_filename = new_filename
             
             file.save(file_path)
-            file_info = {"folder": folder_name, "filename": original_filename}
+            file_info = {
+                "filename": original_filename,
+                "attachment_id": str(attachment_id)
+            }
             current_app.logger.info(f"Saved file: {file_path}")
             
             # Start async task to process single file
diff --git a/application/worker.py b/application/worker.py
index 23ff0422..0437c38a 100755
--- a/application/worker.py
+++ b/application/worker.py
@@ -334,28 +334,23 @@ def attachment_worker(self, directory, file_info, user):
     db = mongo["docsgpt"]
     attachments_collection = db["attachments"]
     
-    job_name = file_info["folder"]
-    logging.info(f"Processing attachment: {job_name}", extra={"user": user, "job": job_name})
+    filename = file_info["filename"]
+    attachment_id = file_info["attachment_id"]
+    
+    logging.info(f"Processing attachment: {attachment_id}/{filename}", extra={"user": user})
     
     self.update_state(state="PROGRESS", meta={"current": 10})
     
-    folder_name = file_info["folder"]
-    filename = file_info["filename"]
-    
     file_path = os.path.join(directory, filename)
     
-    
-    logging.info(f"Processing file: {file_path}", extra={"user": user, "job": job_name})
-    
     if not os.path.exists(file_path):
-        logging.warning(f"File not found: {file_path}", extra={"user": user, "job": job_name})
-        return {"error": "File not found"}
+        logging.warning(f"File not found: {file_path}", extra={"user": user})
+        raise FileNotFoundError(f"File not found: {file_path}")
     
     try:
         reader = SimpleDirectoryReader(
             input_files=[file_path]
         )
-        
         documents = reader.load_data()
         
         self.update_state(state="PROGRESS", meta={"current": 50})
@@ -364,33 +359,33 @@ def attachment_worker(self, directory, file_info, user):
             content = documents[0].text
             token_count = num_tokens_from_string(content)
             
-            file_path_relative = f"{user}/attachments/{folder_name}/{filename}"
+            file_path_relative = f"{settings.UPLOAD_FOLDER}/{user}/attachments/{attachment_id}/{filename}"
             
-            attachment_id = attachments_collection.insert_one({
+            doc_id = ObjectId(attachment_id)
+            attachments_collection.insert_one({
+                "_id": doc_id,
                 "user": user,
                 "path": file_path_relative,
                 "content": content,
                 "token_count": token_count,
                 "date": datetime.datetime.now(),
-            }).inserted_id
+            })
             
             logging.info(f"Stored attachment with ID: {attachment_id}", 
-                        extra={"user": user, "job": job_name})
+                        extra={"user": user})
             
             self.update_state(state="PROGRESS", meta={"current": 100})
             
             return {
-                "attachment_id": str(attachment_id),
                 "filename": filename,
-                "folder": folder_name,
                 "path": file_path_relative,
-                "token_count": token_count
+                "token_count": token_count,
+                "attachment_id": attachment_id
             }
         else:
             logging.warning("No content was extracted from the file", 
-                           extra={"user": user, "job": job_name})
-            return {"error": "No content was extracted from the file"}
+                           extra={"user": user})
+            raise ValueError("No content was extracted from the file")
     except Exception as e:
-        logging.error(f"Error processing file {filename}: {e}", 
-                     extra={"user": user, "job": job_name}, exc_info=True)
-        return {"error": f"Error processing file: {str(e)}"}
+        logging.error(f"Error processing file {filename}: {e}", extra={"user": user}, exc_info=True)
+        raise
\ No newline at end of file