diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index 3579b90c..3f3259c3 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -139,6 +139,10 @@ public class ApplicationEvaluationDao {
     @Autowired
     private EvaluationFormRepository evaluationFormRepository;
 
+    @Autowired
+    private ObjectMapper objectMapper;
+
+
     private ApplicationEvaluationEntity convertToEntity(UserEntity user, ApplicationEvaluationRequest req, Long assignedApplciationId) {
 
         ApplicationEvaluationEntity entity = new ApplicationEvaluationEntity();
@@ -2161,17 +2165,13 @@ public class ApplicationEvaluationDao {
     }
 
     private ApplicationEvaluationFormResponse processEvaluationForm(ApplicationEvaluationEntity evaluationEntity){
-        ApplicationEvaluationFormResponse response = new ApplicationEvaluationFormResponse();
-        response.setApplicationId(evaluationEntity.getApplicationId());
-        response.setNote(evaluationEntity.getNote());
-        response.setStatus(evaluationEntity.getStatus());
-        response.setEvaluationVersion(EvaluationVersionEnum.valueOf(evaluationEntity.getEvaluationVersion()));
-        response.setAssignedApplicationId(evaluationEntity.getAssignedApplicationsEntity().getId());
 
+        Object convertedResponse = convertToResponse(evaluationEntity);
+
+        ApplicationEvaluationFormResponse response = objectMapper.convertValue(convertedResponse, ApplicationEvaluationFormResponse.class);
         EvaluationFormEntity evaluationFormEntity = evaluationFormRepository.findByCallIdAndIsDeletedFalse(evaluationEntity.getAssignedApplicationsEntity().getApplication().getCall().getId());
 
         if (evaluationFormEntity != null) {
-            response.setEvaluationFormId(evaluationFormEntity.getId());
             response.setApplicationEvaluationFormResponse(convertEvaluationFormToResponse(evaluationFormEntity, evaluationEntity));
         }
 
diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java
index d58219dd..f51378e0 100644
--- a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationFormResponse.java
@@ -1,18 +1,48 @@
 package net.gepafin.tendermanagement.model.response;
 
 import lombok.Data;
+import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
+import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
 import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
 @Data
 public class ApplicationEvaluationFormResponse {
 
-    private Long evaluationFormId;
+
+    private Long id;
     private Long applicationId;
+    private ApplicationStatusTypeEnum applicationStatus;
     private Long assignedApplicationId;
     private String note;
-    private String status;
-    private EvaluationVersionEnum evaluationVersion;
+    private ApplicationEvaluationStatusTypeEnum status;
+    private Long minScore;
     private ApplicationEvaluationFormResponseBean applicationEvaluationFormResponse;
-
+    private List<FieldResponse> files;
+    private List<EvaluationDocumentResponse> evaluationDocument;
+    private List<AmendmentDocumentResponseBean> amendmentDetails;
+    private LocalDateTime createdDate;
+    private LocalDateTime updatedDate;
+    private String beneficiary;
+    private Long assignedUserId;
+    private String assignedUserName;
+    private Long protocolNumber;
+    private String callName;
+    private String motivation;
+    private LocalDateTime submissionDate;
+    private LocalDateTime evaluationEndDate;
+    private LocalDateTime callEndDate;
+    private String companyName;
+    private LocalDateTime assignedAt;
+    private String ndg;
+    private String appointmentId;
+    private BigDecimal amountRequested;
+    private BigDecimal amountAccepted;
+    private LocalDateTime dateAccepted;
+    private LocalDateTime dateRejected;
+    private EvaluationVersionEnum evaluationVersion;
 
 }
diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java
index 0e59e6ac..d955ecaf 100644
--- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java
+++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java
@@ -84,7 +84,7 @@ public interface ApplicationEvaluationApi {
                             @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })),
                     @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
                             @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
-    @GetMapping(value = "", produces = "application/json")
+    @GetMapping(value = "/v2", produces = "application/json")
     ResponseEntity<Response<ApplicationEvaluationFormResponse>> getApplicationEvaluationForm(HttpServletRequest request,
                                                                                              @Parameter(required = false) @RequestParam(value = "applicationId", required = false) Long applicationId,
                                                                                              @Parameter( required = false) @RequestParam(value = "assignedApplicationId", required = false) Long assignedApplicationId);