diff --git a/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/domain/AbstractAuditableWithUTCDateTimeCustom.java b/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/domain/AbstractAuditableWithUTCDateTimeCustom.java
index 1107fdbf8..7aa1315e2 100644
--- a/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/domain/AbstractAuditableWithUTCDateTimeCustom.java
+++ b/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/domain/AbstractAuditableWithUTCDateTimeCustom.java
@@ -53,19 +53,19 @@ public abstract class AbstractAuditableWithUTCDateTimeCustom<T extends Serializa
     private static final long serialVersionUID = 141481953116476081L;
 
     @Column(name = CREATED_BY_DB_FIELD, updatable = false, nullable = false)
-    @Setter(onMethod_ = @Override)
+    @Setter
     private Long createdBy;
 
     @Column(name = CREATED_DATE_DB_FIELD, updatable = false, nullable = false)
-    @Setter(onMethod_ = @Override)
+    @Setter
     private OffsetDateTime createdDate;
 
     @Column(name = LAST_MODIFIED_BY_DB_FIELD, nullable = false)
-    @Setter(onMethod_ = @Override)
+    @Setter
     private Long lastModifiedBy;
 
     @Column(name = LAST_MODIFIED_DATE_DB_FIELD, nullable = false)
-    @Setter(onMethod_ = @Override)
+    @Setter
     private OffsetDateTime lastModifiedDate;
 
     @Override
diff --git a/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/domain/AbstractPersistableCustom.java b/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/domain/AbstractPersistableCustom.java
index ae4744d42..8f0e756d3 100644
--- a/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/domain/AbstractPersistableCustom.java
+++ b/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/domain/AbstractPersistableCustom.java
@@ -54,12 +54,12 @@ public abstract class AbstractPersistableCustom<T extends Serializable> implemen
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Getter(onMethod_ = @Override)
+    @Getter
     private T id;
 
     @Transient
     @Setter(value = AccessLevel.NONE)
-    @Getter(onMethod_ = @Override)
+    @Getter
     private boolean isNew = true;
 
     @PrePersist