diff --git a/entity/src/main/java/sydney/cheng/microservice/commons/entity/AbstractBaseEntity.java b/entity/src/main/java/sydney/cheng/microservice/commons/entity/AbstractBaseEntity.java
index 32db4cc..712f046 100644
--- a/entity/src/main/java/sydney/cheng/microservice/commons/entity/AbstractBaseEntity.java
+++ b/entity/src/main/java/sydney/cheng/microservice/commons/entity/AbstractBaseEntity.java
@@ -2,10 +2,10 @@ package sydney.cheng.microservice.commons.entity;
 
 import jakarta.persistence.Id;
 import jakarta.persistence.MappedSuperclass;
+import lombok.Builder;
+import lombok.Data;
 import lombok.AllArgsConstructor;
-import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
 import org.hibernate.annotations.UuidGenerator;
@@ -14,8 +14,8 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 @MappedSuperclass
-@Getter
-@Setter
+@Builder
+@Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class AbstractBaseEntity implements Serializable {