diff --git a/src/main/java/sg/com/smartinventory/exceptions/ErrorResponse.java b/src/main/java/sg/com/smartinventory/exceptions/ErrorResponse.java
new file mode 100644
index 0000000..a2248e2
--- /dev/null
+++ b/src/main/java/sg/com/smartinventory/exceptions/ErrorResponse.java
@@ -0,0 +1,15 @@
+package sg.com.smartinventory.exceptions;
+
+import java.time.LocalDateTime;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class ErrorResponse {
+  private String message;
+  private LocalDateTime timeStamp;
+}
diff --git a/src/main/java/sg/com/smartinventory/exceptions/GlobalExceptionHandler.java.dev b/src/main/java/sg/com/smartinventory/exceptions/GlobalExceptionHandler.java
similarity index 86%
rename from src/main/java/sg/com/smartinventory/exceptions/GlobalExceptionHandler.java.dev
rename to src/main/java/sg/com/smartinventory/exceptions/GlobalExceptionHandler.java
index 50d9e6c..39c470d 100644
--- a/src/main/java/sg/com/smartinventory/exceptions/GlobalExceptionHandler.java.dev
+++ b/src/main/java/sg/com/smartinventory/exceptions/GlobalExceptionHandler.java
@@ -3,8 +3,6 @@
 import java.time.LocalDateTime;
 import java.util.List;
 
-import sg.com.smartinventory.entities.ErrorResponse;
-
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -24,15 +22,6 @@ public ResponseEntity<ErrorResponse> handleResourceNotFoundException(CustomerNot
         return new ResponseEntity<>(errorResponse, HttpStatus.NOT_FOUND);
     }
 
-    // @ExceptionHandler(ProductNotFoundException.class)
-    // public ResponseEntity<ErrorResponse>
-    // handleProductNotFoundException(CustomerNotFoundException ex){
-    // ErrorResponse errorResponse = new ErrorResponse(ex.getMessage(),
-    // LocalDateTime.now());
-    //
-    // return new ResponseEntity<>(errorResponse, HttpStatus.NOT_FOUND);
-    // }
-
     @ExceptionHandler(EmptyResultDataAccessException.class)
     public ResponseEntity<ErrorResponse> handleEmptyResultDataAccessException(EmptyResultDataAccessException ex) {
         ErrorResponse errorResponse = new ErrorResponse("Entry does not exist. ", LocalDateTime.now());
diff --git a/src/main/java/sg/com/smartinventory/utility/DataLoader.java b/src/main/java/sg/com/smartinventory/utility/DataLoader.java
index 0f84f5b..38493b7 100644
--- a/src/main/java/sg/com/smartinventory/utility/DataLoader.java
+++ b/src/main/java/sg/com/smartinventory/utility/DataLoader.java
@@ -57,15 +57,25 @@ public void loadData() {
                 productRepository.save(new Product("Books", "Science Fiction Novel",
                                 "Bestselling sci-fi novel set in a dystopian future. ", 14.99, 300));
 
-                reviewRepository.save(new Review("Electronics", "Great smartphone with excellent features. ",
-                                5, 1, 1));
+                reviewRepository.save(new Review("Books", "Expected more from the ending, felt rushed. ",
+                                3, 1, 1));
+                reviewRepository.save(new Review("Electronics", "Fast delivery, product works as expected. ",
+                                4, 1, 2));
                 reviewRepository.save(new Review("Clothing", "Very comfortable t-shirt, fits perfectly. ",
                                 4, 2, 2));
-                reviewRepository.save(new Review("Home & Kitchen", "Makes delicious coffee, easy to use. ",
-                                4, 3, 3));
+                reviewRepository.save(new Review("Home & Kitchen", "Difficult to assemble, but sturdy once done. ",
+                                3, 2, 4));
+                reviewRepository.save(new Review("Electronics", "Great smartphone with excellent features. ",
+                                5, 3, 1));
+                reviewRepository.save(new Review("Clothing", "The color faded after a few washes. ",
+                                2, 3, 3));
                 reviewRepository.save(new Review("Beauty", "Lovely fragrance, long-lasting. ",
                                 5, 4, 4));
+                reviewRepository.save(new Review("Home & Kitchen", "Makes delicious coffee, easy to use. ",
+                                4, 4, 3));
                 reviewRepository.save(new Review("Books", "Intriguing plot, couldn't put it down. ",
                                 5, 5, 5));
+                reviewRepository.save(new Review("Beauty", "Disappointed with the scent, doesn't last long. ",
+                                2, 5, 5));
         }
 }
\ No newline at end of file