diff --git a/pom.xml b/pom.xml
index 52082a9..3098a67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,11 @@
 			<artifactId>hypersistence-utils-hibernate-63</artifactId>
 			<version>3.8.1</version>
 		</dependency>
+		<dependency>
+			<groupId>com.google.apis</groupId>
+			<artifactId>google-api-services-gmail</artifactId>
+			<version>v1-rev20240520-2.0.0</version>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/com/safeqr/app/qrcode/repository/ScanHistoryRepository.java b/src/main/java/com/safeqr/app/qrcode/repository/ScanHistoryRepository.java
index 7e38e89..b564d8d 100644
--- a/src/main/java/com/safeqr/app/qrcode/repository/ScanHistoryRepository.java
+++ b/src/main/java/com/safeqr/app/qrcode/repository/ScanHistoryRepository.java
@@ -1,5 +1,7 @@
 package com.safeqr.app.qrcode.repository;
 
+import com.safeqr.app.qrcode.entity.QRCodeEntity;
+import com.safeqr.app.qrcode.entity.ScanBookmarkEntity;
 import com.safeqr.app.qrcode.entity.ScanHistoryEntity;
 import com.safeqr.app.user.dto.ScannedHistoriesDto;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -7,14 +9,15 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
 @Repository
 public interface ScanHistoryRepository extends JpaRepository<ScanHistoryEntity, Long> {
-    @Query("SELECT new com.safeqr.app.user.dto.ScannedHistoriesDto(sh.qrCodeEntity, sh.bookmarked) " +
-            "FROM ScanHistoryEntity sh WHERE sh.userId = :userId AND sh.scanStatus = 'ACTIVE' ORDER BY sh.dateCreated DESC")
+    @Query("SELECT new com.safeqr.app.user.dto.ScannedHistoriesDto(sh.qrCodeEntity, sh.bookmarked) FROM ScanHistoryEntity sh WHERE sh.userId = :userId AND sh.scanStatus = 'ACTIVE' ORDER BY sh.dateCreated DESC")
     List<ScannedHistoriesDto> findAllQRCodesByUserId(@Param("userId") String userId);
 
     @Modifying
@@ -24,4 +27,25 @@ public interface ScanHistoryRepository extends JpaRepository<ScanHistoryEntity,
     @Modifying
     @Query("UPDATE ScanHistoryEntity sh SET sh.scanStatus = com.safeqr.app.qrcode.entity.ScanHistoryEntity$ScanStatus.INACTIVE, sh.dateUpdated = CURRENT_TIMESTAMP WHERE sh.userId = :userId AND sh.scanStatus = com.safeqr.app.qrcode.entity.ScanHistoryEntity$ScanStatus.ACTIVE")
     int updateScannedHistoriesToInactiveByUserId(String userId);
+    @Query("SELECT sh FROM ScanHistoryEntity sh WHERE sh.userId = :userId AND sh.qrCodeId = :qrCodeId AND sh.bookmarked = true AND sh.scanStatus = 'ACTIVE'")
+    Optional<ScanHistoryEntity> findByUserIdAndQrCodeId(String userId, UUID qrCodeId);
+
+    @Query("SELECT new com.safeqr.app.user.dto.ScannedHistoriesDto(sh.qrCodeEntity, sh.bookmarked) FROM ScanHistoryEntity sh WHERE sh.userId = :userId AND sh.bookmarked = true AND sh.scanStatus = 'ACTIVE' ORDER BY sh.dateCreated DESC")
+    List<ScannedHistoriesDto> findAllBookmarksByUserId(@Param("userId") String userId);
+
+    @Modifying
+    @Transactional
+    @Query("UPDATE ScanHistoryEntity sh SET sh.bookmarked = true, sh.dateUpdated = CURRENT_TIMESTAMP " +
+            "WHERE sh.userId = :userId AND sh.bookmarked = false AND sh.qrCodeId = :qrCodeId AND sh.scanStatus = 'ACTIVE'")
+    int updateBookmarkStatusToActive(String userId, UUID qrCodeId);
+    @Modifying
+    @Transactional
+    @Query("UPDATE ScanHistoryEntity sh SET sh.bookmarked = false, sh.dateUpdated = CURRENT_TIMESTAMP " +
+            "WHERE sh.userId = :userId AND sh.bookmarked = true AND sh.qrCodeId = :qrCodeId AND sh.scanStatus = 'ACTIVE'")
+    int updateBookmarkStatusToInactive(String userId, UUID qrCodeId);
+
+    @Modifying
+    @Transactional
+    @Query("UPDATE ScanHistoryEntity sh SET sh.bookmarked = false, sh.dateUpdated = CURRENT_TIMESTAMP WHERE sh.userId = :userId AND sh.bookmarked = true AND sh.scanStatus = 'ACTIVE'")
+    int updateBookmarkStatusToInactiveByUserId(String userId);
 }
\ No newline at end of file
diff --git a/src/main/java/com/safeqr/app/user/controller/UserController.java b/src/main/java/com/safeqr/app/user/controller/UserController.java
index f995741..2cf4fae 100644
--- a/src/main/java/com/safeqr/app/user/controller/UserController.java
+++ b/src/main/java/com/safeqr/app/user/controller/UserController.java
@@ -60,7 +60,7 @@ public class UserController {
     }
 
     @GetMapping(value = API_URL_USER_GET_BOOKMARKS, produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<List<QRCodeEntity>> getUserBookmarks(@RequestHeader(name = HEADER_USER_ID) String userId) {
+    public ResponseEntity<List<ScannedHistoriesDto>> getUserBookmarks(@RequestHeader(name = HEADER_USER_ID) String userId) {
         logger.info("Invoking GET User bookmarks endpoint");
         return ResponseEntity.ok(userService.getUserBookmarks(userId));
     }
diff --git a/src/main/java/com/safeqr/app/user/service/UserService.java b/src/main/java/com/safeqr/app/user/service/UserService.java
index e60e00d..190f7ec 100644
--- a/src/main/java/com/safeqr/app/user/service/UserService.java
+++ b/src/main/java/com/safeqr/app/user/service/UserService.java
@@ -2,8 +2,8 @@ package com.safeqr.app.user.service;
 
 import com.safeqr.app.exceptions.ResourceAlreadyExists;
 import com.safeqr.app.exceptions.ResourceNotFoundExceptions;
-import com.safeqr.app.qrcode.entity.QRCodeEntity;
 import com.safeqr.app.qrcode.entity.ScanBookmarkEntity;
+import com.safeqr.app.qrcode.entity.ScanHistoryEntity;
 import com.safeqr.app.qrcode.repository.ScanBookmarkRepository;
 import com.safeqr.app.qrcode.repository.ScanHistoryRepository;
 import com.safeqr.app.user.dto.BaseResponse;
@@ -75,39 +75,32 @@ public class UserService {
                 BaseResponse.builder().message("No QR Code not found").build():
                 BaseResponse.builder().message("All scanned QR Code deleted successfully").build();
     }
-    public List<QRCodeEntity> getUserBookmarks(String userId) {
-        return scanBookmarkRepository.findAllBookmarksByUserId(userId);
+    public List<ScannedHistoriesDto> getUserBookmarks(String userId) {
+        return scanHistoryRepository.findAllBookmarksByUserId(userId);
     }
     @Transactional
     public BaseResponse setBookmark(String userId, UUID qrCodeId) {
         // Check if the bookmark already exists
-        Optional<ScanBookmarkEntity> existingBookmark = scanBookmarkRepository.findByUserIdAndQrCodeId(userId, qrCodeId);
+        Optional<ScanHistoryEntity> existingBookmark = scanHistoryRepository.findByUserIdAndQrCodeId(userId, qrCodeId);
 
         // throw exception if bookmark already exists
         if (existingBookmark.isPresent()) {
             throw new ResourceAlreadyExists("Bookmark already exists!");
         }
-        try {
-            // Save bookmark
-            ScanBookmarkEntity bookmarkEntity = ScanBookmarkEntity.builder()
-                    .userId(userId)
-                    .qrCodeId(qrCodeId)
-                    .bookmarkStatus(ScanBookmarkEntity.BookmarkStatus.ACTIVE)
-                    .build();
-            scanBookmarkRepository.save(bookmarkEntity);
 
-        } catch (DataIntegrityViolationException e) {
-            logger.error("Failed to create bookmark: {}", e.getMessage());
-            // throw exception if bookmark creation fails
+        // Save bookmark by updating booked to true
+        int updatedCount = scanHistoryRepository.updateBookmarkStatusToActive(userId, qrCodeId);
+
+        if (updatedCount < 1)
             throw new ResourceNotFoundExceptions("Unable to create bookmark. The QR code may not exist.");
-        }
 
         return BaseResponse.builder().message("Bookmark saved successfully").build();
+
     }
 
     @Transactional
     public BaseResponse deleteBookmark(String userId, UUID qrCodeId) {
-        int updatedCount = scanBookmarkRepository.updateBookmarkStatusToInactive(userId, qrCodeId);
+        int updatedCount = scanHistoryRepository.updateBookmarkStatusToInactive(userId, qrCodeId);
         // throw exception if bookmark not found
         if (updatedCount < 1)
             throw new ResourceNotFoundExceptions("Bookmark not found");
@@ -117,7 +110,7 @@ public class UserService {
 
     @Transactional
     public BaseResponse deleteAllBookmarkByUserId(String userId) {
-        int updatedCount = scanBookmarkRepository.updateBookmarkStatusToInactiveByUserId(userId);
+        int updatedCount = scanHistoryRepository.updateBookmarkStatusToInactiveByUserId(userId);
 
         return (updatedCount < 1) ?
                 BaseResponse.builder().message("No Bookmark not found").build():