diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/TargetEnhancedDto.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/TargetEnhancedDto.java
index a739d74..6422d83 100644
--- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/TargetEnhancedDto.java
+++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/TargetEnhancedDto.java
@@ -46,7 +46,7 @@ public class TargetEnhancedDto {
     private String imoVerified;
 
     @JsonProperty("OnBerth")
-    private Boolean onBerth;
+    private Object onBerth;
 
     @JsonProperty("DestinationTidied")
     private String destinationTidied;
diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/TargetEnhancedEntity.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/TargetEnhancedEntity.java
index 2689a12..3ad9c91 100644
--- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/TargetEnhancedEntity.java
+++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/TargetEnhancedEntity.java
@@ -39,7 +39,7 @@ public class TargetEnhancedEntity extends BaseEntity {
 
     private String imoVerified;
 
-    private Boolean onBerth;
+    private Object onBerth;
 
     private String destinationTidied;
 
diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipLastPositionRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipLastPositionRepositoryImpl.java
index d1d7ffc..d546995 100644
--- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipLastPositionRepositoryImpl.java
+++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipLastPositionRepositoryImpl.java
@@ -9,6 +9,7 @@ import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.PreparedStatement;
+import java.sql.Types;
 import java.util.List;
 
 @Slf4j
@@ -51,7 +52,11 @@ public class ShipLastPositionRepositoryImpl extends BaseJdbcRepository<TargetEnh
                     heading = ?,
                     speedservice = ?,
                     cog = ?,
-                    navstat = ?
+                    navstat = ?,
+                    tonnes_cargo = ?,
+                    extra_info = ?,
+                    in_sts = ?,
+                    on_berth = ?
               WHERE lrno = ?;
              """;
     }
@@ -74,6 +79,10 @@ public class ShipLastPositionRepositoryImpl extends BaseJdbcRepository<TargetEnh
         ps.setDouble(idx++, entity.getSog()); // sog : speedservice (Double)
         ps.setDouble(idx++, entity.getCog()); // cog : cog (Double)
         ps.setString(idx++, entity.getStatus()); // status : navstat (String)
+        ps.setInt(idx++, entity.getTonnesCargo()); // status : tonnes_cargo (Int)
+        ps.setString(idx++, entity.getExtraInfo()); // status : extra_info (String)
+        ps.setObject(idx++, entity.getInSts(), Types.INTEGER);
+        ps.setObject(idx++, entity.getOnBerth(), Types.BOOLEAN);
         ps.setString(idx++, entity.getImoVerified()); // imoVerified : imo (String)
     }