diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index 04eb8b95..c68d3f2e 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -870,7 +870,7 @@ public class ApplicationDao {
                 throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_IS_INCOMPLETE_MSG));
             }
 
-            applicationEntity.setStatus(ApplicationStatusTypeEnum.AWAIT.getValue());
+            applicationEntity.setStatus(ApplicationStatusTypeEnum.AWAITING.getValue());
             applicationEntity = saveApplicationEntity(applicationEntity);
         return getApplicationResponse(applicationEntity);
     }
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/BeneficiaryPreferredCallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/BeneficiaryPreferredCallDao.java
index 13b0f719..285702f1 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/BeneficiaryPreferredCallDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/BeneficiaryPreferredCallDao.java
@@ -5,13 +5,11 @@ import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.entities.BeneficiaryPreferredCallEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.enums.BeneficiaryCallStatus;
-import net.gepafin.tendermanagement.enums.RoleStatusEnum;
-import net.gepafin.tendermanagement.enums.UserStatusEnum;
 import net.gepafin.tendermanagement.model.request.BeneficiaryPreferredCallReq;
 
 import net.gepafin.tendermanagement.model.response.BeneficiaryPreferredCallResponseBean;
 import net.gepafin.tendermanagement.repositories.BeneficiaryPreferredCallRepository;
-import net.gepafin.tendermanagement.service.UserService;
+import net.gepafin.tendermanagement.util.Validator;
 import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException;
 import net.gepafin.tendermanagement.web.rest.api.errors.Status;
 import org.slf4j.Logger;
@@ -19,10 +17,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import jakarta.servlet.http.HttpServletRequest;
+
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static net.gepafin.tendermanagement.util.Utils.setIfUpdated;
 
 @Component
 public class BeneficiaryPreferredCallDao {
@@ -31,11 +30,14 @@ public class BeneficiaryPreferredCallDao {
 
     @Autowired
     private BeneficiaryPreferredCallRepository beneficiaryPreferredCallRepository;
+    
     @Autowired
-    private UserService userService;
+    private Validator validator;
 
-    public BeneficiaryPreferredCallResponseBean createBeneficiaryPreferredCall(BeneficiaryPreferredCallReq request,UserEntity user) {
+
+    public BeneficiaryPreferredCallResponseBean createBeneficiaryPreferredCall(HttpServletRequest httpServletRequest, BeneficiaryPreferredCallReq request,UserEntity user) {
         log.info("Creating new beneficiary preferred call with details: {}", request);
+        validator.validateUserWithCompany(httpServletRequest, request.getCompanyId());
         BeneficiaryPreferredCallEntity entity = convertRequestToEntity(request,user);
         entity = beneficiaryPreferredCallRepository.save(entity);
         log.info("Beneficiary preferred call created with ID: {}", entity.getId());
@@ -44,9 +46,8 @@ public class BeneficiaryPreferredCallDao {
 
     private BeneficiaryPreferredCallEntity convertRequestToEntity(BeneficiaryPreferredCallReq request,UserEntity userEntity) {
         BeneficiaryPreferredCallEntity entity = new BeneficiaryPreferredCallEntity();
-        UserEntity user= userService.validateUser(userEntity.getId());
-        if (user.getBeneficiary()!=null) {
-            entity.setBeneficiaryId(user.getBeneficiary().getId());
+        if (userEntity.getBeneficiary()!=null) {
+            entity.setBeneficiaryId(userEntity.getBeneficiary().getId());
         }
         entity.setStatus(BeneficiaryCallStatus.ENABLED.getValue());
         entity.setCallId(request.getCallId());
@@ -55,9 +56,10 @@ public class BeneficiaryPreferredCallDao {
         return entity;
     }
 
-    public BeneficiaryPreferredCallResponseBean getBeneficiaryPreferredCallById(Long id) {
+    public BeneficiaryPreferredCallResponseBean getBeneficiaryPreferredCallById(HttpServletRequest request, Long id) {
         log.info("Fetching beneficiary preferred call with ID: {}", id);
         BeneficiaryPreferredCallEntity entity = validateBeneficiaryPreferredCall(id);
+        validator.validateUserId(request, entity.getUserId());
         log.info("Beneficiary preferred call found: {}", entity);
         return convertEntityToResponse(entity);
     }
@@ -74,20 +76,18 @@ public class BeneficiaryPreferredCallDao {
 //        return convertEntityToResponse(existingEntity);
 //    }
 
-    private boolean isUserABeneficiary(Long userId) {
-        UserEntity user=userService.validateUser(userId);
-        return RoleStatusEnum.ROLE_BENEFICIARY.getValue().equals(user.getRoleEntity().getRoleType());
-    }
-    public void deleteBeneficiaryPreferredCallById(Long id) {
+    public void deleteBeneficiaryPreferredCallById(HttpServletRequest request, Long id) {
         log.info("Deleting beneficiary preferred call with ID: {}", id);
-        validateBeneficiaryPreferredCall(id);
+        BeneficiaryPreferredCallEntity entity = validateBeneficiaryPreferredCall(id);
+        validator.validateUserId(request, entity.getUserId());
         beneficiaryPreferredCallRepository.deleteById(id);
         log.info("Beneficiary preferred call deleted with ID: {}", id);
     }
 
-    public List<BeneficiaryPreferredCallResponseBean> getAllBeneficiaryPreferredCalls() {
+    public List<BeneficiaryPreferredCallResponseBean> getAllBeneficiaryPreferredCalls(HttpServletRequest request) {
+    	UserEntity userEntity = validator.validateUser(request);
         log.info("Fetching all beneficiary preferred calls");
-        List<BeneficiaryPreferredCallResponseBean> calls = beneficiaryPreferredCallRepository.findAll()
+        List<BeneficiaryPreferredCallResponseBean> calls = beneficiaryPreferredCallRepository.findByUserId(userEntity.getId())
                 .stream()
                 .map(this::convertEntityToResponse)
                 .collect(Collectors.toList());
diff --git a/src/main/java/net/gepafin/tendermanagement/enums/ApplicationStatusTypeEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/ApplicationStatusTypeEnum.java
index e9c1fb7a..fe44af47 100644
--- a/src/main/java/net/gepafin/tendermanagement/enums/ApplicationStatusTypeEnum.java
+++ b/src/main/java/net/gepafin/tendermanagement/enums/ApplicationStatusTypeEnum.java
@@ -6,7 +6,7 @@ public enum ApplicationStatusTypeEnum {
 
     DRAFT("DRAFT"),
     SUBMIT("SUBMIT"),
-    AWAIT("AWAIT"),
+    AWAITING("AWAITING"),
     READY("READY"),
     DISCARD("DISCARD"),
     EVALUATION("EVALUATION");
diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/BeneficiaryPreferredCallServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/BeneficiaryPreferredCallServiceImpl.java
index 48b07bff..01f2648a 100644
--- a/src/main/java/net/gepafin/tendermanagement/service/impl/BeneficiaryPreferredCallServiceImpl.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/impl/BeneficiaryPreferredCallServiceImpl.java
@@ -35,22 +35,22 @@ public class BeneficiaryPreferredCallServiceImpl implements BeneficiaryPreferred
     @Override
     public BeneficiaryPreferredCallResponseBean createBeneficiaryPreferredCall(HttpServletRequest request, BeneficiaryPreferredCallReq beneficiaryPreferredCallRequest) {
         UserEntity userEntity = validator.validateUser(request);
-        return beneficiaryPreferredCallDao.createBeneficiaryPreferredCall(beneficiaryPreferredCallRequest,userEntity);
+        return beneficiaryPreferredCallDao.createBeneficiaryPreferredCall(request, beneficiaryPreferredCallRequest,userEntity);
     }
 
     @Override
     public BeneficiaryPreferredCallResponseBean getBeneficiaryPreferredCallById(HttpServletRequest request, Long id) {
-        return beneficiaryPreferredCallDao.getBeneficiaryPreferredCallById(id);
+        return beneficiaryPreferredCallDao.getBeneficiaryPreferredCallById(request, id);
     }
 
     @Override
     public void deleteBeneficiaryPreferredCall(HttpServletRequest request, Long id) {
-        beneficiaryPreferredCallDao.deleteBeneficiaryPreferredCallById(id);
+        beneficiaryPreferredCallDao.deleteBeneficiaryPreferredCallById(request, id);
     }
 
     @Override
     public List<BeneficiaryPreferredCallResponseBean> getAllBeneficiaryPreferredCalls(HttpServletRequest request) {
-        return beneficiaryPreferredCallDao.getAllBeneficiaryPreferredCalls();
+        return beneficiaryPreferredCallDao.getAllBeneficiaryPreferredCalls(request);
     }
 
 //    @Override
@@ -66,6 +66,7 @@ public class BeneficiaryPreferredCallServiceImpl implements BeneficiaryPreferred
     @Override
     public List<BeneficiaryPreferredCallResponseBean> getBeneficiaryPreferredCallByUserId(HttpServletRequest request,Long userId,Long beneficiaryId,Long companyId) {
         UserEntity userEntity =validateGetBeneficiaryPreferredCallrequest(request,userId,beneficiaryId);
+        validator.validateUserId(request, userEntity.getId());
         return beneficiaryPreferredCallDao.getBeneficiaryPreferredCallByUserId(userEntity,companyId);
     }