diff --git a/src/main/java/com/learning/mfscreener/entities/MFSchemeNavEntity.java b/src/main/java/com/learning/mfscreener/entities/MFSchemeNavEntity.java
index ca182e7c..10266650 100644
--- a/src/main/java/com/learning/mfscreener/entities/MFSchemeNavEntity.java
+++ b/src/main/java/com/learning/mfscreener/entities/MFSchemeNavEntity.java
@@ -1,4 +1,4 @@
-/* Licensed under Apache-2.0 2021-2023. */
+/* Licensed under Apache-2.0 2021-2024. */
 package com.learning.mfscreener.entities;
 
 import jakarta.persistence.Column;
@@ -35,7 +35,7 @@ public class MFSchemeNavEntity extends AuditableEntity<String> implements Serial
     @Column(name = "id", nullable = false)
     private Long id;
 
-    private double nav;
+    private Float nav;
 
     @Column(name = "nav_date")
     private LocalDate navDate;
diff --git a/src/main/java/com/learning/mfscreener/mapper/MfSchemeDtoToEntityMapper.java b/src/main/java/com/learning/mfscreener/mapper/MfSchemeDtoToEntityMapper.java
index 4f070126..e72b20ad 100644
--- a/src/main/java/com/learning/mfscreener/mapper/MfSchemeDtoToEntityMapper.java
+++ b/src/main/java/com/learning/mfscreener/mapper/MfSchemeDtoToEntityMapper.java
@@ -1,4 +1,4 @@
-/* Licensed under Apache-2.0 2021-2022. */
+/* Licensed under Apache-2.0 2021-2024. */
 package com.learning.mfscreener.mapper;
 
 import com.learning.mfscreener.entities.MFSchemeEntity;
@@ -34,7 +34,7 @@ public interface MfSchemeDtoToEntityMapper extends Converter<MFSchemeDTO, MFSche
     @AfterMapping
     default void updateMFScheme(MFSchemeDTO scheme, @MappingTarget MFSchemeEntity mfSchemeEntity) {
         MFSchemeNavEntity mfSchemenavEntity = new MFSchemeNavEntity();
-        mfSchemenavEntity.setNav("N.A.".equals(scheme.nav()) ? 0D : Double.parseDouble(scheme.nav()));
+        mfSchemenavEntity.setNav("N.A.".equals(scheme.nav()) ? 0F : Float.parseFloat(scheme.nav()));
         mfSchemenavEntity.setNavDate(LocalDate.parse(scheme.date(), DATE_FORMATTER));
         mfSchemeEntity.addSchemeNav(mfSchemenavEntity);
     }
diff --git a/src/main/java/com/learning/mfscreener/models/NAVDataDTO.java b/src/main/java/com/learning/mfscreener/models/NAVDataDTO.java
index 54467dba..3d1878ff 100644
--- a/src/main/java/com/learning/mfscreener/models/NAVDataDTO.java
+++ b/src/main/java/com/learning/mfscreener/models/NAVDataDTO.java
@@ -1,14 +1,13 @@
-/* Licensed under Apache-2.0 2021-2022. */
+/* Licensed under Apache-2.0 2021-2024. */
 package com.learning.mfscreener.models;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.io.Serializable;
 import java.time.LocalDate;
+import lombok.With;
 
 public record NAVDataDTO(
-        @JsonFormat(pattern = "dd-MM-yyyy", shape = JsonFormat.Shape.STRING) LocalDate date, Double nav, Long schemeId)
-        implements Serializable {
-    public NAVDataDTO setSchemeId(Long schemeCode) {
-        return new NAVDataDTO(date(), nav(), schemeCode);
-    }
-}
+        @JsonFormat(pattern = "dd-MM-yyyy", shape = JsonFormat.Shape.STRING) LocalDate date,
+        Float nav,
+        @With Long schemeId)
+        implements Serializable {}
diff --git a/src/main/java/com/learning/mfscreener/service/SchemeService.java b/src/main/java/com/learning/mfscreener/service/SchemeService.java
index 3b9f6d74..b9c9dc5b 100644
--- a/src/main/java/com/learning/mfscreener/service/SchemeService.java
+++ b/src/main/java/com/learning/mfscreener/service/SchemeService.java
@@ -60,7 +60,7 @@ void mergeList(NavResponse navResponse, MFSchemeEntity mfSchemeEntity, Long sche
         if (navResponse.getData().size()
                 != mfSchemeEntity.getMfSchemeNavEntities().size()) {
             List<MFSchemeNavEntity> navList = navResponse.getData().stream()
-                    .map(navDataDTO -> navDataDTO.setSchemeId(schemeCode))
+                    .map(navDataDTO -> navDataDTO.withSchemeId(schemeCode))
                     .map(conversionServiceAdapter::mapNAVDataDTOToMFSchemeNavEntity)
                     .toList();
             log.info("No of entries from Server :{}", navList.size());
diff --git a/src/test/java/com/learning/mfscreener/web/controllers/NavControllerIT.java b/src/test/java/com/learning/mfscreener/web/controllers/NavControllerIT.java
index 9fb3ea5b..85cf8829 100644
--- a/src/test/java/com/learning/mfscreener/web/controllers/NavControllerIT.java
+++ b/src/test/java/com/learning/mfscreener/web/controllers/NavControllerIT.java
@@ -8,7 +8,6 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import com.learning.mfscreener.common.AbstractIntegrationTest;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.MediaType;
 
@@ -55,7 +54,6 @@ void shouldLoadDataWhenSchemeFoundAndLoadHistoricalData() throws Exception {
     }
 
     @Test
-    @Disabled
     void shouldNotLoadDataWhenSchemeFoundAndLoadHistoricalDataNotFound() throws Exception {
         this.mockMvc
                 .perform(get("/api/nav/{schemeCode}/{date}", 151113, "2022-10-20")