diff --git a/src/main/java/com/snp/batch/jobs/shipMovement/batch/repository/ShipMovementRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/shipMovement/batch/repository/ShipMovementRepositoryImpl.java
index 5c405e0..13a3ac0 100644
--- a/src/main/java/com/snp/batch/jobs/shipMovement/batch/repository/ShipMovementRepositoryImpl.java
+++ b/src/main/java/com/snp/batch/jobs/shipMovement/batch/repository/ShipMovementRepositoryImpl.java
@@ -69,7 +69,7 @@ public class ShipMovementRepositoryImpl extends BaseJdbcRepository<ShipMovementE
             iso2_ntn_cd,
             lcinfo
         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT (imo, mvmn_dt)
+        ON CONFLICT (imo, mvmn_type, mvmn_dt)
         DO UPDATE SET
             mvmn_type = EXCLUDED.mvmn_type,
             mvmn_dt = EXCLUDED.mvmn_dt,
diff --git a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/repository/AnchorageCallsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/repository/AnchorageCallsRepositoryImpl.java
index 0e805d0..0a590a9 100644
--- a/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/repository/AnchorageCallsRepositoryImpl.java
+++ b/src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/repository/AnchorageCallsRepositoryImpl.java
@@ -68,7 +68,7 @@ public class AnchorageCallsRepositoryImpl extends BaseJdbcRepository<AnchorageCa
             iso2_ntn_cd,
             lcinfo
         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT (imo, mvmn_dt)
+        ON CONFLICT (imo,mvmn_type, mvmn_dt)
         DO UPDATE SET
             mvmn_type = EXCLUDED.mvmn_type,
             mvmn_dt = EXCLUDED.mvmn_dt,
diff --git a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/repository/BerthCallsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/repository/BerthCallsRepositoryImpl.java
index 757d8a4..db5d696 100644
--- a/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/repository/BerthCallsRepositoryImpl.java
+++ b/src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/repository/BerthCallsRepositoryImpl.java
@@ -68,7 +68,7 @@ public class BerthCallsRepositoryImpl extends BaseJdbcRepository<BerthCallsEntit
             evt_start_dt,
             lcinfo
         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT (imo, mvmn_dt)
+        ON CONFLICT (imo, mvmn_type, mvmn_dt)
         DO UPDATE SET
             mvmn_type = EXCLUDED.mvmn_type,
             mvmn_dt = EXCLUDED.mvmn_dt,
diff --git a/src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/config/CurrentlyAtJobConfig.java b/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/config/CurrentlyAtJobConfig.java
similarity index 87%
rename from src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/config/CurrentlyAtJobConfig.java
rename to src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/config/CurrentlyAtJobConfig.java
index b5a8909..e6a525d 100644
--- a/src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/config/CurrentlyAtJobConfig.java
+++ b/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/config/CurrentlyAtJobConfig.java
@@ -1,11 +1,11 @@
-package com.snp.batch.jobs.shipCurrentlyAt.batch.config;
+package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.config;
 
 import com.snp.batch.common.batch.config.BaseJobConfig;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.dto.CurrentlyAtDto;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.entity.CurrentlyAtEntity;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.processor.CurrentlyAtProcessor;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.reader.CurrentlyAtReader;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.writer.CurrentlyAtWriter;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.dto.CurrentlyAtDto;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity.CurrentlyAtEntity;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.processor.CurrentlyAtProcessor;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.reader.CurrentlyAtReader;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.writer.CurrentlyAtWriter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;
diff --git a/src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/dto/CurrentlyAtDto.java b/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/dto/CurrentlyAtDto.java
similarity index 93%
rename from src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/dto/CurrentlyAtDto.java
rename to src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/dto/CurrentlyAtDto.java
index 2f1201e..f20bad1 100644
--- a/src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/dto/CurrentlyAtDto.java
+++ b/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/dto/CurrentlyAtDto.java
@@ -1,4 +1,4 @@
-package com.snp.batch.jobs.shipCurrentlyAt.batch.dto;
+package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.dto;
 
 import com.snp.batch.jobs.shipMovement.batch.dto.PortCallsPositionDto;
 import lombok.Data;
diff --git a/src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/dto/CurrentlyAtPositionDto.java b/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/dto/CurrentlyAtPositionDto.java
similarity index 84%
rename from src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/dto/CurrentlyAtPositionDto.java
rename to src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/dto/CurrentlyAtPositionDto.java
index 3f0df2a..0fed56a 100644
--- a/src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/dto/CurrentlyAtPositionDto.java
+++ b/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/dto/CurrentlyAtPositionDto.java
@@ -1,4 +1,4 @@
-package com.snp.batch.jobs.shipCurrentlyAt.batch.dto;
+package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
diff --git a/src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/entity/CurrentlyAtEntity.java b/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/entity/CurrentlyAtEntity.java
similarity index 94%
rename from src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/entity/CurrentlyAtEntity.java
rename to src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/entity/CurrentlyAtEntity.java
index c935894..90beda4 100644
--- a/src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/entity/CurrentlyAtEntity.java
+++ b/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/entity/CurrentlyAtEntity.java
@@ -1,4 +1,4 @@
-package com.snp.batch.jobs.shipCurrentlyAt.batch.entity;
+package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import jakarta.persistence.GeneratedValue;
diff --git a/src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/processor/CurrentlyAtProcessor.java b/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/processor/CurrentlyAtProcessor.java
similarity index 91%
rename from src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/processor/CurrentlyAtProcessor.java
rename to src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/processor/CurrentlyAtProcessor.java
index 64256e7..db905bd 100644
--- a/src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/processor/CurrentlyAtProcessor.java
+++ b/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/processor/CurrentlyAtProcessor.java
@@ -1,10 +1,10 @@
-package com.snp.batch.jobs.shipCurrentlyAt.batch.processor;
+package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.processor;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.snp.batch.common.batch.processor.BaseProcessor;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.dto.CurrentlyAtDto;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.entity.CurrentlyAtEntity;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.dto.CurrentlyAtDto;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity.CurrentlyAtEntity;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/reader/CurrentlyAtReader.java b/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/reader/CurrentlyAtReader.java
similarity index 98%
rename from src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/reader/CurrentlyAtReader.java
rename to src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/reader/CurrentlyAtReader.java
index e25bf41..26d0552 100644
--- a/src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/reader/CurrentlyAtReader.java
+++ b/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/reader/CurrentlyAtReader.java
@@ -1,7 +1,7 @@
-package com.snp.batch.jobs.shipCurrentlyAt.batch.reader;
+package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.reader;
 
 import com.snp.batch.common.batch.reader.BaseApiReader;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.dto.CurrentlyAtDto;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.dto.CurrentlyAtDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.batch.core.configuration.annotation.StepScope;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/repository/CurrentlyAtRepository.java b/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/repository/CurrentlyAtRepository.java
similarity index 54%
rename from src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/repository/CurrentlyAtRepository.java
rename to src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/repository/CurrentlyAtRepository.java
index 30f12da..ae47b79 100644
--- a/src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/repository/CurrentlyAtRepository.java
+++ b/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/repository/CurrentlyAtRepository.java
@@ -1,6 +1,6 @@
-package com.snp.batch.jobs.shipCurrentlyAt.batch.repository;
+package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.repository;
 
-import com.snp.batch.jobs.shipCurrentlyAt.batch.entity.CurrentlyAtEntity;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity.CurrentlyAtEntity;
 
 import java.util.List;
 
diff --git a/src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/repository/CurrentlyAtRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/repository/CurrentlyAtRepositoryImpl.java
similarity index 94%
rename from src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/repository/CurrentlyAtRepositoryImpl.java
rename to src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/repository/CurrentlyAtRepositoryImpl.java
index fc25a22..9cb26eb 100644
--- a/src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/repository/CurrentlyAtRepositoryImpl.java
+++ b/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/repository/CurrentlyAtRepositoryImpl.java
@@ -1,19 +1,14 @@
-package com.snp.batch.jobs.shipCurrentlyAt.batch.repository;
+package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.repository;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.snp.batch.common.batch.repository.BaseJdbcRepository;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.entity.CurrentlyAtEntity;
-import com.snp.batch.jobs.shipMovement.batch.entity.ShipMovementEntity;
-import com.snp.batch.jobs.shipMovement.batch.repository.ShipMovementRepository;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity.CurrentlyAtEntity;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Repository;
 
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.util.List;
 
@@ -71,7 +66,7 @@ public class CurrentlyAtRepositoryImpl extends BaseJdbcRepository<CurrentlyAtEnt
             iso2_ntn_cd,
             lcinfo
         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT (imo, mvmn_dt)
+        ON CONFLICT (imo, mvmn_type, mvmn_dt)
         DO UPDATE SET
             mvmn_type = EXCLUDED.mvmn_type,
             mvmn_dt = EXCLUDED.mvmn_dt,
diff --git a/src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/writer/CurrentlyAtWriter.java b/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/writer/CurrentlyAtWriter.java
similarity index 77%
rename from src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/writer/CurrentlyAtWriter.java
rename to src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/writer/CurrentlyAtWriter.java
index c84e7f0..ceea6b6 100644
--- a/src/main/java/com/snp/batch/jobs/shipCurrentlyAt/batch/writer/CurrentlyAtWriter.java
+++ b/src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/writer/CurrentlyAtWriter.java
@@ -1,8 +1,8 @@
-package com.snp.batch.jobs.shipCurrentlyAt.batch.writer;
+package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.writer;
 
 import com.snp.batch.common.batch.writer.BaseWriter;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.entity.CurrentlyAtEntity;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.repository.CurrentlyAtRepository;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity.CurrentlyAtEntity;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.repository.CurrentlyAtRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/repository/DarkActivityRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/repository/DarkActivityRepositoryImpl.java
index 89eb8fd..2055651 100644
--- a/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/repository/DarkActivityRepositoryImpl.java
+++ b/src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/repository/DarkActivityRepositoryImpl.java
@@ -66,7 +66,7 @@ public class DarkActivityRepositoryImpl extends BaseJdbcRepository<DarkActivityE
             evt_start_dt,
             lcinfo
         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT (imo, mvmn_dt)
+        ON CONFLICT (imo, mvmn_type, mvmn_dt)
         DO UPDATE SET
             mvmn_type = EXCLUDED.mvmn_type,
             mvmn_dt = EXCLUDED.mvmn_dt,
diff --git a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/repository/DestinationRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/repository/DestinationRepositoryImpl.java
index d864265..bea7875 100644
--- a/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/repository/DestinationRepositoryImpl.java
+++ b/src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/repository/DestinationRepositoryImpl.java
@@ -57,7 +57,7 @@ public class DestinationRepositoryImpl extends BaseJdbcRepository<DestinationEnt
             iso2_ntn_cd,
             lcinfo
         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT (imo, mvmn_dt)
+        ON CONFLICT (imo, mvmn_type, mvmn_dt)
         DO UPDATE SET
             mvmn_type = EXCLUDED.mvmn_type,
             mvmn_dt = EXCLUDED.mvmn_dt,
diff --git a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/repository/StsOperationRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/repository/StsOperationRepositoryImpl.java
index 06cb967..4cebb94 100644
--- a/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/repository/StsOperationRepositoryImpl.java
+++ b/src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/repository/StsOperationRepositoryImpl.java
@@ -67,7 +67,7 @@ public class StsOperationRepositoryImpl extends BaseJdbcRepository<StsOperationE
             evt_start_dt,
             lcinfo
         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT (imo, mvmn_dt)
+        ON CONFLICT (imo, mvmn_type, mvmn_dt)
         DO UPDATE SET
             mvmn_type = EXCLUDED.mvmn_type,
             mvmn_dt = EXCLUDED.mvmn_dt,
diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/repository/TerminalCallsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/repository/TerminalCallsRepositoryImpl.java
index 53b60ee..66366e1 100644
--- a/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/repository/TerminalCallsRepositoryImpl.java
+++ b/src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/repository/TerminalCallsRepositoryImpl.java
@@ -66,7 +66,7 @@ public class TerminalCallsRepositoryImpl extends BaseJdbcRepository<TerminalCall
             evt_start_dt,
             lcinfo
         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT (imo, mvmn_dt)
+        ON CONFLICT (imo, mvmn_type, mvmn_dt)
         DO UPDATE SET
             mvmn_type = EXCLUDED.mvmn_type,
             mvmn_dt = EXCLUDED.mvmn_dt,
diff --git a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/repository/TransitlsRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/repository/TransitlsRepositoryImpl.java
index f44e00a..af747c0 100644
--- a/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/repository/TransitlsRepositoryImpl.java
+++ b/src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/repository/TransitlsRepositoryImpl.java
@@ -51,7 +51,7 @@ public class TransitlsRepositoryImpl extends BaseJdbcRepository<TransitsEntity,
             fclty_type,
             draft
         ) VALUES (?, ?, ?, ?, ?, ?)
-        ON CONFLICT (imo, mvmn_dt)
+        ON CONFLICT (imo, mvmn_type, mvmn_dt)
         DO UPDATE SET
             mvmn_type = EXCLUDED.mvmn_type,
             mvmn_dt = EXCLUDED.mvmn_dt,