diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index f5045d74..5a0cddfd 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -16,6 +16,11 @@ import net.gepafin.tendermanagement.entities.*;
 import net.gepafin.tendermanagement.entities.SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum;
 import net.gepafin.tendermanagement.enums.*;
 import net.gepafin.tendermanagement.model.request.*;
+import net.gepafin.tendermanagement.model.request.ApplicationFormFieldRequestBean;
+import net.gepafin.tendermanagement.model.request.ApplicationRequest;
+import net.gepafin.tendermanagement.model.request.ApplicationRequestBean;
+import net.gepafin.tendermanagement.model.request.EmailLogRequest;
+import net.gepafin.tendermanagement.model.request.VersionHistoryRequest;
 import net.gepafin.tendermanagement.model.response.*;
 import net.gepafin.tendermanagement.model.util.SortBy;
 import net.gepafin.tendermanagement.repositories.*;
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestEntity.java
index eb71f5c1..c0112618 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestEntity.java
@@ -2,6 +2,7 @@ package net.gepafin.tendermanagement.entities;
 
 import jakarta.persistence.*;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 import net.gepafin.tendermanagement.model.response.EmailSendResponse;
 
 import java.time.LocalDateTime;
@@ -10,6 +11,7 @@ import java.util.List;
 @Entity
 @Table(name="application_amendment_request")
 @Data
+@Where(clause = "is_deleted = false")
 public class ApplicationAmendmentRequestEntity extends BaseEntity {
 
     @Column(name = "NOTE")
@@ -33,9 +35,6 @@ public class ApplicationAmendmentRequestEntity extends BaseEntity {
     @Column(name = "FORM_FIELDS")
     private String formFields;
 
-    @Column(name="IS_DELETED")
-    private Boolean isDeleted=false;
-
     @Column(name = "STATUS")
     private String status;
 
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEntity.java
index 50d16557..e2208c77 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEntity.java
@@ -2,6 +2,7 @@ package net.gepafin.tendermanagement.entities;
 
 import jakarta.persistence.*;
 import lombok.*;
+import org.hibernate.annotations.Where;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -9,6 +10,7 @@ import java.time.LocalDateTime;
 @Entity
 @Table(name = "APPLICATION")
 @Data
+@Where(clause = "is_deleted = false")
 public class ApplicationEntity extends BaseEntity {
 
 	@Column(name = "USER_ID")
@@ -29,9 +31,6 @@ public class ApplicationEntity extends BaseEntity {
     @ManyToOne
     @JoinColumn(name = "CALL_ID", nullable = false)
     private CallEntity call;
-    
-    @Column(name="IS_DELETED")
-    private Boolean isDeleted;
 
     @OneToOne
     @JoinColumn(name = "PROTOCOL_NUMBER")
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java
index b8b00d3b..ae080d48 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationEntity.java
@@ -2,6 +2,7 @@ package net.gepafin.tendermanagement.entities;
 
 import jakarta.persistence.*;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 import net.gepafin.tendermanagement.model.response.EmailSendResponse;
 
 import java.time.LocalDateTime;
@@ -10,6 +11,7 @@ import java.util.List;
 @Data
 @Entity
 @Table(name = "application_evaluation")
+@Where(clause = "is_deleted = false")
 public class ApplicationEvaluationEntity extends BaseEntity{
 	
     @Column(name = "application_Id")
@@ -39,9 +41,6 @@ public class ApplicationEvaluationEntity extends BaseEntity{
     @Column(name = "MOTIVATION")
     private String motivation;
 
-    @Column(name="IS_DELETED")
-    private Boolean isDeleted;
-
     @ManyToOne
     @JoinColumn(name = "assigned_applications_id", nullable = true)
     private  AssignedApplicationsEntity assignedApplicationsEntity;
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationFormEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationFormEntity.java
index 251fb262..78a881a0 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationFormEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationFormEntity.java
@@ -2,16 +2,15 @@ package net.gepafin.tendermanagement.entities;
 
 import jakarta.persistence.*;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Data
 @Table(name = "APPLICATION_EVALUATION_FORM")
+@Where(clause = "is_deleted = false")
 public class ApplicationEvaluationFormEntity extends BaseEntity{
     private Long applicationId;
 
-    @Column(name="IS_DELETED")
-    private Boolean isDeleted;
-
     @ManyToOne
     @JoinColumn(name = "EVALUATION_ID")
     private ApplicationEvaluationEntity applicationEvaluation;
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationFormFieldEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationFormFieldEntity.java
index 913d8831..f4324a2a 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationFormFieldEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationEvaluationFormFieldEntity.java
@@ -2,10 +2,12 @@ package net.gepafin.tendermanagement.entities;
 
 import jakarta.persistence.*;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Data
 @Table(name = "APPLICATION_EVALUATION_FORM_FIELD")
+@Where(clause = "is_deleted = false")
 public class ApplicationEvaluationFormFieldEntity extends BaseEntity {
 
     @ManyToOne
@@ -18,7 +20,4 @@ public class ApplicationEvaluationFormFieldEntity extends BaseEntity {
     @Column(name = "FIELD_VALUE")
     private String fieldValue;
 
-    @Column(name="IS_DELETED")
-    private Boolean isDeleted;
-
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationFormEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationFormEntity.java
index a6cc56aa..cf407cda 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationFormEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationFormEntity.java
@@ -2,11 +2,12 @@ package net.gepafin.tendermanagement.entities;
 
 import jakarta.persistence.*;
 import lombok.*;
-
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "APPLICATION_FORM")
 @Data
+@Where(clause = "is_deleted = false")
 public class ApplicationFormEntity extends BaseEntity {
 
     @ManyToOne
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationFormFieldEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationFormFieldEntity.java
index fbab986d..206be527 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationFormFieldEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationFormFieldEntity.java
@@ -2,6 +2,7 @@ package net.gepafin.tendermanagement.entities;
 
 import jakarta.persistence.*;
 import lombok.*;
+import org.hibernate.annotations.Where;
 
 import java.time.LocalDateTime;
 
@@ -11,6 +12,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@Where(clause = "is_deleted = false")
 public class ApplicationFormFieldEntity extends BaseEntity {
 
     @ManyToOne
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationSignedDocumentEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationSignedDocumentEntity.java
index 9a90af52..3f50c14b 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationSignedDocumentEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationSignedDocumentEntity.java
@@ -6,10 +6,12 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Data
 @Entity
 @Table(name = "application_signed_document")
+@Where(clause = "is_deleted = false")
 public class ApplicationSignedDocumentEntity extends BaseEntity {
 	
     @ManyToOne
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/AssignedApplicationsEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/AssignedApplicationsEntity.java
index bd26f527..0c80c7af 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/AssignedApplicationsEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/AssignedApplicationsEntity.java
@@ -2,13 +2,14 @@ package net.gepafin.tendermanagement.entities;
 
 import jakarta.persistence.*;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 import java.time.LocalDateTime;
 
 @Entity
 @Data
 @Table(name = "assigned_applications")
-
+@Where(clause = "is_deleted = false")
 public class AssignedApplicationsEntity extends BaseEntity{
 
     @ManyToOne
@@ -27,9 +28,7 @@ public class AssignedApplicationsEntity extends BaseEntity{
     @Column(name = "NOTE")
     private String note;
 
-    @Column(name="IS_DELETED")
-    private Boolean isDeleted=false;
-
     @Column(nullable = false)
     private LocalDateTime assignedAt;
+
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/BaseEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/BaseEntity.java
index f8427719..16c7e94f 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/BaseEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/BaseEntity.java
@@ -21,8 +21,13 @@ public class BaseEntity {
     
     @Column(name = "UPDATED_DATE")
     LocalDateTime updatedDate;
-    
-    @PrePersist
+
+
+	@Column(name="IS_DELETED")
+	private Boolean isDeleted = false;
+
+
+	@PrePersist
 	public void setCreatedDate() {
 		this.createdDate = DateTimeUtil.DateServerToUTC(LocalDateTime.now());
 		this.updatedDate = DateTimeUtil.DateServerToUTC(LocalDateTime.now());
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/BeneficiaryEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/BeneficiaryEntity.java
index 2e84dd51..0985c37f 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/BeneficiaryEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/BeneficiaryEntity.java
@@ -7,10 +7,12 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.Email;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "BENEFICIARY")
 @Data
+@Where(clause = "is_deleted = false")
 public class BeneficiaryEntity extends BaseEntity {
 
     @Email
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/BeneficiaryPreferredCallEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/BeneficiaryPreferredCallEntity.java
index 5bbc316d..22333d18 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/BeneficiaryPreferredCallEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/BeneficiaryPreferredCallEntity.java
@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
 import java.time.LocalDateTime;
 
@@ -14,6 +15,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@Where(clause = "is_deleted = false")
 public class BeneficiaryPreferredCallEntity extends BaseEntity{
 
     @Id
@@ -35,9 +37,6 @@ public class BeneficiaryPreferredCallEntity extends BaseEntity{
     @Column(name = "STATUS", length = 255)
     private String status;
 
-    @Column(name="IS_DELETED")
-    private Boolean isDeleted;
-
     @ManyToOne
     @JoinColumn(name = "USER_WITH_COMPANY_ID")
     private UserWithCompanyEntity userWithCompany;
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java
index 25388138..dc8c05d8 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java
@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
+import org.hibernate.annotations.Where;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -16,6 +17,7 @@ import java.time.LocalTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@Where(clause = "is_deleted = false")
 public class CallEntity extends BaseEntity {
 
     @Column(name = "NAME", length = 255)
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/CallTargetAudienceChecklistEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/CallTargetAudienceChecklistEntity.java
index 6b14df58..465baf67 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/CallTargetAudienceChecklistEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/CallTargetAudienceChecklistEntity.java
@@ -2,10 +2,12 @@ package net.gepafin.tendermanagement.entities;
 
 import jakarta.persistence.*;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "CALL_TARGET_AUDIENCE_CHECKLIST")
 @Data
+@Where(clause = "is_deleted = false")
 public class CallTargetAudienceChecklistEntity extends BaseEntity{
 
     @ManyToOne
@@ -18,9 +20,5 @@ public class CallTargetAudienceChecklistEntity extends BaseEntity{
 
     @Column(name = "IS_VALIDATED")
     private Boolean isValidated;
-    
-    @Column(name ="IS_DELETED", nullable = false)
-    private Boolean isDeleted = false;
-
 
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/CommunicationEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/CommunicationEntity.java
index 9029649e..a1c3ff45 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/CommunicationEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/CommunicationEntity.java
@@ -6,12 +6,14 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 import java.time.LocalDateTime;
 
 @Entity
 @Table(name = "communication")
 @Data
+@Where(clause = "is_deleted = false")
 public class CommunicationEntity extends BaseEntity {
 
     @Column(name = "COMMUNICATION_TITLE")
@@ -20,9 +22,6 @@ public class CommunicationEntity extends BaseEntity {
     @Column(name = "COMMUNICATION_COMMENT")
     private String communicationComment;
 
-    @Column(name = "IS_DELETED")
-    private Boolean isDeleted = false;
-
     @Column(name = "COMMENTED_DATE")
     private LocalDateTime commentedDate;
 
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/CompanyDocumentEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/CompanyDocumentEntity.java
index 15c3457c..1a08fffc 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/CompanyDocumentEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/CompanyDocumentEntity.java
@@ -2,12 +2,14 @@ package net.gepafin.tendermanagement.entities;
 
 import jakarta.persistence.*;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 import java.time.LocalDateTime;
 
 @Entity
 @Table(name = "COMPANY_DOCUMENT")
 @Data
+@Where(clause = "is_deleted = false")
 public class CompanyDocumentEntity extends BaseEntity {
 
     @Column(name = "FILE_NAME")
@@ -25,9 +27,6 @@ public class CompanyDocumentEntity extends BaseEntity {
     @Column(name="COMPANY_ID")
     private Long companyId;
 
-    @Column(name ="IS_DELETED")
-    private Boolean isDeleted = false;
-
     @Column(name="UPLOADED_BY")
     private Long uploadedBy;
 
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java
index 88658077..8a6c94e1 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/CompanyEntity.java
@@ -8,10 +8,12 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "COMPANY")
 @Data
+@Where(clause = "is_deleted = false")
 public class CompanyEntity extends BaseEntity{
 
     @Column(name = "COMPANY_NAME")
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/CriteriaFormFieldEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/CriteriaFormFieldEntity.java
index 1177bbd2..8a65ee5e 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/CriteriaFormFieldEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/CriteriaFormFieldEntity.java
@@ -4,10 +4,12 @@ import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "criteria_form_field")
 @Data
+@Where(clause = "is_deleted = false")
 public class CriteriaFormFieldEntity extends BaseEntity {
 	
 	private Long callId;
@@ -17,8 +19,5 @@ public class CriteriaFormFieldEntity extends BaseEntity {
 	private String formFieldId;
 	
 	private Long evaluationCriteriaId;
-	
-	@Column(name ="IS_DELETED", nullable = false)
-    private Boolean isDeleted = false;
 
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/DocumentCategoryEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/DocumentCategoryEntity.java
index 25a25d6d..3307e2d0 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/DocumentCategoryEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/DocumentCategoryEntity.java
@@ -4,10 +4,12 @@ import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "document_category")
 @Data
+@Where(clause = "is_deleted = false")
 public class DocumentCategoryEntity extends BaseEntity {
 
     @Column(name = "CATEGORY_NAME")
@@ -16,7 +18,4 @@ public class DocumentCategoryEntity extends BaseEntity {
     @Column(name = "DESCRIPTION")
     private String description;
 
-    @Column(name ="IS_DELETED")
-    private Boolean isDeleted = false;
-
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/DocumentEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/DocumentEntity.java
index 08bfd623..8c658411 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/DocumentEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/DocumentEntity.java
@@ -6,10 +6,12 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "DOCUMENT")
 @Data
+@Where(clause = "is_deleted = false")
 public class DocumentEntity extends BaseEntity{
     @Column(name = "FILE_NAME", length = 255)
     private String fileName;
@@ -26,9 +28,6 @@ public class DocumentEntity extends BaseEntity{
     @Column(name="SOURCE_ID")
     private Long sourceId;
 
-    @Column(name ="IS_DELETED", nullable = false)
-    private Boolean isDeleted = false;
-
     @Column(name="DOCUMENT_ATTACHMENT_ID")
     private String documentAttachmentId;
 
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/EmailLogEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/EmailLogEntity.java
index 1a582a21..1f8f3fe5 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/EmailLogEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/EmailLogEntity.java
@@ -1,12 +1,14 @@
 package net.gepafin.tendermanagement.entities;
 import jakarta.persistence.*;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 import java.time.LocalDateTime;
 
 @Entity
 @Data
 @Table(name = "email_log")
+@Where(clause = "is_deleted = false")
 public class EmailLogEntity extends BaseEntity{
 
     @Column(name = "email_type", nullable = false, length = 255)
@@ -54,9 +56,6 @@ public class EmailLogEntity extends BaseEntity{
     @Column(name = "call_id")
     private Long callId;
 
-    @Column(name = "is_deleted")
-    private Boolean isDeleted;
-
     @ManyToOne
     @JoinColumn(name = "user_action_id")
     private UserActionEntity userAction;
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/EvaluationCriteriaEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/EvaluationCriteriaEntity.java
index 8d1c0c69..e7954f62 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/EvaluationCriteriaEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/EvaluationCriteriaEntity.java
@@ -5,6 +5,7 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 import java.math.BigDecimal;
 
@@ -12,6 +13,7 @@ import java.math.BigDecimal;
 @Entity
 @Table(name = "EVALUATION_CRITERIA")
 @Data
+@Where(clause = "is_deleted = false")
 public class EvaluationCriteriaEntity extends BaseEntity {
 
     @ManyToOne
@@ -24,8 +26,5 @@ public class EvaluationCriteriaEntity extends BaseEntity {
     
     @Column(name = "SCORE", nullable = false)
     private BigDecimal score;
-    
-    @Column(name ="IS_DELETED", nullable = false)
-    private Boolean isDeleted = false;
 
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/EvaluationFormEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/EvaluationFormEntity.java
index 9d3bd3fa..e839814a 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/EvaluationFormEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/EvaluationFormEntity.java
@@ -5,12 +5,15 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
 @Entity
 @Table(name = "EVALUATION_FORM")
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@Where(clause = "is_deleted = false")
 public class EvaluationFormEntity extends BaseEntity{
 
 
@@ -24,6 +27,4 @@ public class EvaluationFormEntity extends BaseEntity{
     @Column(name = "CONTENT")
     private String content;
 
-    @Column(name="IS_DELETED")
-    private Boolean isDeleted;
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ExpirationConfigEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/ExpirationConfigEntity.java
index 83159e3a..0f8336db 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/ExpirationConfigEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/ExpirationConfigEntity.java
@@ -4,10 +4,12 @@ import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "expiration_config")
 @Data
+@Where(clause = "is_deleted = false")
 public class ExpirationConfigEntity extends BaseEntity {
 
     @Column(name="INTERVAL_DAYS")
@@ -15,7 +17,4 @@ public class ExpirationConfigEntity extends BaseEntity {
 
     @Column(name="TYPE")
     private String type;
-
-    @Column(name="IS_DELETED")
-    private Boolean isDeleted;
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/FaqEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/FaqEntity.java
index 46ebff24..5df715c9 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/FaqEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/FaqEntity.java
@@ -9,11 +9,12 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.Data;
-
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "FAQ")
 @Data
+@Where(clause = "is_deleted = false")
 public class FaqEntity extends BaseEntity {
 
     @ManyToOne
@@ -38,10 +39,7 @@ public class FaqEntity extends BaseEntity {
 
     @Column(name = "RESPONSE_DATE")
     private LocalDateTime responseDate;
-    
-    @Column(name ="IS_DELETED", nullable = false)
-    private Boolean isDeleted = false;
-    
+
     @Column(name ="COMPANY_ID")
     private Long companyId;
 
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/FlowDataEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/FlowDataEntity.java
index cdffe410..a8c99131 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/FlowDataEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/FlowDataEntity.java
@@ -1,6 +1,7 @@
 package net.gepafin.tendermanagement.entities;
 import jakarta.persistence.*;
 import lombok.*;
+import org.hibernate.annotations.Where;
 
 import java.time.LocalDateTime;
 
@@ -10,6 +11,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@Where(clause = "is_deleted = false")
 public class FlowDataEntity extends BaseEntity{
 
     @Column(name = "FORM_ID")
@@ -23,4 +25,5 @@ public class FlowDataEntity extends BaseEntity{
 
     @Column(name="CALL_ID")
     private Long callId;
+
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/FlowEdgesEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/FlowEdgesEntity.java
index 119af700..4bcab38d 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/FlowEdgesEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/FlowEdgesEntity.java
@@ -2,6 +2,7 @@ package net.gepafin.tendermanagement.entities;
 
 import jakarta.persistence.*;
 import lombok.*;
+import org.hibernate.annotations.Where;
 
 import java.time.LocalDateTime;
 
@@ -11,6 +12,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@Where(clause = "is_deleted = false")
 public class FlowEdgesEntity extends BaseEntity {
 
     @Column(name = "SOURCE_ID")
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/FormEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/FormEntity.java
index 588619a5..5861b7a8 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/FormEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/FormEntity.java
@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Builder;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "FORM")
@@ -12,6 +13,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@Where(clause = "is_deleted = false")
 public class FormEntity extends BaseEntity{
     
     @Column(name = "LABEL", length = 255)
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/FormFieldEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/FormFieldEntity.java
index b75b0c57..66e1485d 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/FormFieldEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/FormFieldEntity.java
@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Builder;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "FORM_FIELD")
@@ -12,6 +13,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@Where(clause = "is_deleted = false")
 public class FormFieldEntity extends BaseEntity{
 
     @Column(name = "NAME", length = 255)
@@ -31,4 +33,5 @@ public class FormFieldEntity extends BaseEntity{
 
     @Column(name = "SORT_ORDER")
     private Integer sortOrder;
+
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/FormTemplateEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/FormTemplateEntity.java
index 897a9dfd..93f20e18 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/FormTemplateEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/FormTemplateEntity.java
@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Builder;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "FORM_TEMPLATE")
@@ -12,6 +13,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@Where(clause = "is_deleted = false")
 public class FormTemplateEntity extends BaseEntity{
 
     @Column(name = "LABEL", length = 255)
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/GlobalConfigEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/GlobalConfigEntity.java
index 3f55abdf..21201ba5 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/GlobalConfigEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/GlobalConfigEntity.java
@@ -15,7 +15,4 @@ public class GlobalConfigEntity extends BaseEntity{
 
     @Column(name = "TYPE")
     private String type;
-
-    @Column(name = "IS_DELETED")
-    private Boolean isDeleted = false;
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/HubEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/HubEntity.java
index 603b42b4..f59e3d3c 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/HubEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/HubEntity.java
@@ -4,12 +4,13 @@ import jakarta.persistence.*;
 import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
-
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name="hub")
 @Setter
 @Getter
+@Where(clause = "is_deleted = false")
 public class HubEntity extends BaseEntity{
 
 	@Column(name = "COMPANY_NAME")
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/HubUserEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/HubUserEntity.java
index 1bec68ce..ebed1915 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/HubUserEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/HubUserEntity.java
@@ -3,11 +3,13 @@ package net.gepafin.tendermanagement.entities;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "hub_user")
 @Getter
 @Setter
+@Where(clause = "is_deleted = false")
 public class HubUserEntity extends BaseEntity{
 
     @ManyToOne
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/LoginAttemptEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/LoginAttemptEntity.java
index bc3e445e..6ad5a652 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/LoginAttemptEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/LoginAttemptEntity.java
@@ -2,12 +2,14 @@ package net.gepafin.tendermanagement.entities;
 
 import jakarta.persistence.*;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 import java.time.LocalDateTime;
 
 @Entity
 @Table(name = "LOGIN_ATTEMPT")
 @Data
+@Where(clause = "is_deleted = false")
 public class LoginAttemptEntity extends BaseEntity{
 
     @Column(name = "USERNAME")
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/LookUpDataEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/LookUpDataEntity.java
index 1afe87aa..21475d82 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/LookUpDataEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/LookUpDataEntity.java
@@ -3,10 +3,12 @@ package net.gepafin.tendermanagement.entities;
 import com.fasterxml.jackson.annotation.JsonValue;
 import jakarta.persistence.*;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "LOOKUP_DATA")
 @Data
+@Where(clause = "is_deleted = false")
 public class LookUpDataEntity extends BaseEntity{
 
     @Column(name = "TITLE", columnDefinition = "TEXT", nullable = true)
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/NotificationEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/NotificationEntity.java
index 718a7367..9896140b 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/NotificationEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/NotificationEntity.java
@@ -6,10 +6,12 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "NOTIFICATION")
 @Data
+@Where(clause = "is_deleted = false")
 public class NotificationEntity extends BaseEntity {
 
     @Column(name = "USER_ID")
@@ -24,9 +26,6 @@ public class NotificationEntity extends BaseEntity {
     @Column(name = "STATUS")
     private String status;
 
-    @Column(name = "IS_DELETED")
-    private Boolean isDeleted;
-
     @Column(name = "NOTIFICATION_TYPE")
     private String notificationType;
 
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/NotificationTypeEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/NotificationTypeEntity.java
index 40d3f220..8a56b9ab 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/NotificationTypeEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/NotificationTypeEntity.java
@@ -4,10 +4,12 @@ import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Data
 @Table(name = "NOTIFICATION_TYPE")
+@Where(clause = "is_deleted = false")
 public class NotificationTypeEntity extends BaseEntity {
 
     @Column(name = "NOTIFICATION_NAME")
@@ -18,7 +20,4 @@ public class NotificationTypeEntity extends BaseEntity {
 
     @Column(name = "TITLE")
     private String title;
-
-    @Column(name="IS_DELETED")
-    private Boolean isDeleted;
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/ProtocolEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/ProtocolEntity.java
index e807304a..cc46095a 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/ProtocolEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/ProtocolEntity.java
@@ -3,6 +3,7 @@ package net.gepafin.tendermanagement.entities;
 import jakarta.persistence.*;
 import lombok.Data;
 import net.gepafin.tendermanagement.config.LocalTimeAttributeConverter;
+import org.hibernate.annotations.Where;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -10,6 +11,7 @@ import java.time.LocalTime;
 @Entity
 @Table(name = "PROTOCOL")
 @Data
+@Where(clause = "is_deleted = false")
 public class ProtocolEntity extends BaseEntity {
 
     @Column(name = "PROTOCOL_NUMBER", nullable = false)
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/RegionEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/RegionEntity.java
index 386b9787..d18020bd 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/RegionEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/RegionEntity.java
@@ -6,6 +6,7 @@ import jakarta.persistence.Table;
 
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.annotations.Where;
 
 import java.math.BigDecimal;
 
@@ -13,6 +14,7 @@ import java.math.BigDecimal;
 @Table(name = "REGION")
 @Getter
 @Setter
+@Where(clause = "is_deleted = false")
 public class RegionEntity extends BaseEntity {
 
     @Column(name = "REGION_NAME", length = 255, nullable = true)
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/RoleActionContextEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/RoleActionContextEntity.java
index a3ff676f..88408904 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/RoleActionContextEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/RoleActionContextEntity.java
@@ -4,10 +4,12 @@ import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Data
 @Table(name ="role_action_context")
+@Where(clause = "is_deleted = false")
 public class RoleActionContextEntity extends BaseEntity {
 
     @Column(name = "action_context")
@@ -16,9 +18,6 @@ public class RoleActionContextEntity extends BaseEntity {
     @Column(name = "role_id")
     private Long roleId;
 
-    @Column(name="is_deleted")
-    private Boolean isDeleted;
-
     @Column(name = "is_viewed")
     private Boolean isViewed;
 
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/RoleEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/RoleEntity.java
index c94b36b9..55091136 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/RoleEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/RoleEntity.java
@@ -4,11 +4,13 @@ import jakarta.persistence.*;
 
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "ROLE")
 @Getter
 @Setter
+@Where(clause = "is_deleted = false")
 public class RoleEntity extends BaseEntity {
 
     @Column(name = "ROLE_NAME", length = 255, nullable = true)
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/S3ConfigEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/S3ConfigEntity.java
index 66502bbc..b058aa70 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/S3ConfigEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/S3ConfigEntity.java
@@ -4,10 +4,12 @@ import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "s3_path_configuration")
 @Data
+@Where(clause = "is_deleted = false")
 public class S3ConfigEntity extends BaseEntity {
 
     @Column(name = "TYPE")
@@ -21,5 +23,6 @@ public class S3ConfigEntity extends BaseEntity {
 
     @Column(name = "PARENT_FOLDER")
     private String parentFolder;
+
 }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/SamlResponseEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/SamlResponseEntity.java
index 05535e97..a3dcd2c8 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/SamlResponseEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/SamlResponseEntity.java
@@ -4,10 +4,12 @@ import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "SAML_RESPONSE")
 @Data
+@Where(clause = "is_deleted = false")
 public class SamlResponseEntity extends BaseEntity{
 	
 	@Column(name = "AUTHENTICATION_OBJECT")
@@ -30,6 +32,5 @@ public class SamlResponseEntity extends BaseEntity{
 	
 	@Column(name = "TOKEN")
 	private String token;
-	
 
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java
index 92d97e9f..a4c40863 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java
@@ -8,10 +8,12 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "system_email_template")
 @Data
+@Where(clause = "is_deleted = false")
 public class SystemEmailTemplatesEntity extends BaseEntity {
 	
 
@@ -32,9 +34,6 @@ public class SystemEmailTemplatesEntity extends BaseEntity {
 
 	@Column(name = "SYSTEM")
 	private Boolean system;
-	
-    @Column(name ="IS_DELETED", nullable = false)
-    private Boolean isDeleted = false;
 
 	@Column(name = "email_scenario")
 	private String emailScenario;
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/UserActionEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/UserActionEntity.java
index 6f85f6ef..f15e173c 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/UserActionEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/UserActionEntity.java
@@ -4,10 +4,12 @@ import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Data
 @Entity
 @Table(name = "user_action")
+@Where(clause = "is_deleted = false")
 public class UserActionEntity extends BaseEntity {
 
     @Column(name = "USER_ID")
@@ -40,7 +42,4 @@ public class UserActionEntity extends BaseEntity {
     @Column(name = "RESPONSE")
     private String response;
 
-    @Column(name = "IS_DELETED", nullable = false)
-    private Boolean isDeleted = false;
-
 }
\ No newline at end of file
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/UserCompanyDelegationEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/UserCompanyDelegationEntity.java
index 9def5dc3..8659d16a 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/UserCompanyDelegationEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/UserCompanyDelegationEntity.java
@@ -2,10 +2,12 @@ package net.gepafin.tendermanagement.entities;
 
 import jakarta.persistence.*;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Data
 @Entity
 @Table(name = "user_company_delegation")
+@Where(clause = "is_deleted = false")
 public class UserCompanyDelegationEntity extends BaseEntity{
 	
 	@Column(name="USER_ID")
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java
index 86147cdf..3dbd21d4 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/UserEntity.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.annotations.Where;
 import net.gepafin.tendermanagement.model.response.EmailSendResponse;
 
 import java.time.LocalDateTime;
@@ -16,6 +17,7 @@ import java.util.List;
 @Table(name = "GEPAFIN_USER")
 @Getter
 @Setter
+@Where(clause = "is_deleted = false")
 public class UserEntity extends BaseEntity {
 
     @Column(name = "PASSWORD", columnDefinition = "TEXT",nullable = true)
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/UserWithCompanyEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/UserWithCompanyEntity.java
index 65afbe76..9c067b32 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/UserWithCompanyEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/UserWithCompanyEntity.java
@@ -4,10 +4,12 @@ import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Entity
 @Table(name = "USER_WITH_COMPANY")
 @Data
+@Where(clause = "is_deleted = false")
 public class UserWithCompanyEntity extends BaseEntity{
 	
 	@Column(name = "USER_ID")
@@ -34,8 +36,5 @@ public class UserWithCompanyEntity extends BaseEntity{
 
 	@Column(name = "EMAIL")
 	private String email;
-
-	@Column(name = "IS_DELETED")
-	private Boolean isDeleted = false;
-
+	
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/entities/VersionHistoryEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/VersionHistoryEntity.java
index 2445fb44..cca7dfc2 100644
--- a/src/main/java/net/gepafin/tendermanagement/entities/VersionHistoryEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/VersionHistoryEntity.java
@@ -4,10 +4,12 @@ import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import lombok.Data;
+import org.hibernate.annotations.Where;
 
 @Data
 @Entity
 @Table(name = "version_history")
+@Where(clause = "is_deleted = false")
 public class VersionHistoryEntity extends BaseEntity {
 
     @Column(name = "OLD_DATA", columnDefinition = "LONGTEXT")
@@ -30,7 +32,4 @@ public class VersionHistoryEntity extends BaseEntity {
 
     @Column(name = "USER_ID")
     private Long userId;
-
-    @Column(name = "IS_DELETED", nullable = false)
-    private Boolean isDeleted = false;
 }
diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
index a911a3ac..f69ef624 100644
--- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml
+++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
@@ -2737,6 +2737,132 @@
         </insert>
     </changeSet>
 
+    <changeSet id="09-01-2025_PK_120129" author="Piyush Kag">
+        <addColumn tableName="application_signed_document">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="APPLICATION_FORM">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="APPLICATION_FORM_FIELD">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="BENEFICIARY">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="CALL">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="COMPANY">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="FLOW_DATA">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="FLOW_EDGES">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="FORM">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="FORM_FIELD">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="FORM_TEMPLATE">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+        <addColumn tableName="hub">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="LOGIN_ATTEMPT">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="LOOKUP_DATA">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="PROTOCOL">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="REGION">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="ROLE">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="s3_path_configuration">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="SAML_RESPONSE">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="user_company_delegation">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addColumn tableName="GEPAFIN_USER">
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+    </changeSet>
 
     <changeSet id="08-04-2025_PK_160730" author="Piyush kag">
         <sqlFile dbms="postgresql"