diff --git a/src/main/java/net/gepafin/tendermanagement/scheduler/NotificationScheduler.java b/src/main/java/net/gepafin/tendermanagement/scheduler/NotificationScheduler.java
index 24e34282..58908280 100644
--- a/src/main/java/net/gepafin/tendermanagement/scheduler/NotificationScheduler.java
+++ b/src/main/java/net/gepafin/tendermanagement/scheduler/NotificationScheduler.java
@@ -4,6 +4,8 @@ import net.gepafin.tendermanagement.dao.EmailNotificationDao;
 import net.gepafin.tendermanagement.entities.ApplicationAmendmentRequestEntity;
 import net.gepafin.tendermanagement.entities.ApplicationEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
+import net.gepafin.tendermanagement.enums.ApplicationAmendmentRequestEnum;
+import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
 import net.gepafin.tendermanagement.repositories.ApplicationAmendmentRequestRepository;
 import net.gepafin.tendermanagement.repositories.ApplicationRepository;
 import net.gepafin.tendermanagement.repositories.UserRepository;
@@ -44,9 +46,9 @@ public class NotificationScheduler {
                 LocalDateTime requestDate = amendmentRequest.getStartDate();
                 if (requestDate.plusDays(amendmentRequest.getResponseDays()).isBefore(today)) {
                     // Update the application status to REJECTED
-                    application.setStatus("REJECTED");
+                    application.setStatus(ApplicationStatusTypeEnum.REJECTED.getValue());
                     applicationRepository.save(application);
-                    amendmentRequest.setStatus("CLOSE");
+                    amendmentRequest.setStatus(ApplicationAmendmentRequestEnum.CLOSE.getValue());
                     applicationAmendmentRepository.save(amendmentRequest);
                     emailNotificationDao.sendApplicationFailureNotificationEmail(amendmentRequest);
                 }