diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ComponentLogController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ComponentLogController.java
index 1ea2686bf..c923c9f67 100644
--- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ComponentLogController.java
+++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ComponentLogController.java
@@ -34,7 +34,6 @@ import lombok.experimental.FieldDefaults;
 @RestController
 @RequiredArgsConstructor
 @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
-@Deprecated(forRemoval = true)
 public class ComponentLogController implements ComponentLogResource {
 
     ComponentLogService componentLogService;
@@ -42,7 +41,6 @@ public class ComponentLogController implements ComponentLogResource {
 
 
     @Override
-    @Deprecated(forRemoval = true)
     @PreAuthorize("hasAuthority('" + READ_REDACTION_LOG + "')")
     public ComponentLog getComponentLog(String dossierId, String fileId, boolean includeOverrides) {
 
@@ -53,10 +51,10 @@ public class ComponentLogController implements ComponentLogResource {
     }
 
 
+    @Deprecated(forRemoval = true)
     @PostMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
     @PreAuthorize("hasAuthority('" + GET_RSS + "')")
-    public void addOverride(@RequestParam(name = "dossierTemplateId") String dossierTemplateId,
-                            @PathVariable(DOSSIER_ID) String dossierId,
+    public void addOverride(@PathVariable(DOSSIER_ID) String dossierId,
                             @PathVariable(FILE_ID) String fileId,
                             @RequestBody ComponentsOverrides componentsOverrides) {
 
@@ -77,10 +75,10 @@ public class ComponentLogController implements ComponentLogResource {
     }
 
 
+    @Deprecated(forRemoval = true)
     @GetMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
     @PreAuthorize("hasAuthority('" + GET_RSS + "')")
-    public ComponentsOverrides getOverrides(@RequestParam(name = "dossierTemplateId") String dossierTemplateId,
-                                            @PathVariable(DOSSIER_ID) String dossierId,
+    public ComponentsOverrides getOverrides(@PathVariable(DOSSIER_ID) String dossierId,
                                             @PathVariable(FILE_ID) String fileId) {
 
         accessControlService.checkDossierExistenceAndViewPermissionsToDossier(dossierId);
@@ -99,10 +97,10 @@ public class ComponentLogController implements ComponentLogResource {
     }
 
 
+    @Deprecated(forRemoval = true)
     @PostMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + "/revert" + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
     @PreAuthorize("hasAuthority('" + GET_RSS + "')")
-    public void revertOverrides(@RequestParam(name = "dossierTemplateId") String dossierTemplateId,
-                                @PathVariable(DOSSIER_ID) String dossierId,
+    public void revertOverrides(@PathVariable(DOSSIER_ID) String dossierId,
                                 @PathVariable(FILE_ID) String fileId,
                                 @RequestBody RevertOverrideRequest revertOverrideRequest) {
 
diff --git a/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/ComponentLogResource.java b/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/ComponentLogResource.java
index d4c4d2b05..d3d4916c8 100644
--- a/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/ComponentLogResource.java
+++ b/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/ComponentLogResource.java
@@ -49,8 +49,7 @@ public interface ComponentLogResource {
     @PostMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "Adds overrides for components", description = "None")
     @ApiResponses(value = {@ApiResponse(responseCode = "204", description = "OK"), @ApiResponse(responseCode = "404", description = "Not found"), @ApiResponse(responseCode = "403", description = "Forbidden")})
-    void addOverride(@RequestParam(name = "dossierTemplateId") String dossierTemplateId,
-                     @PathVariable(DOSSIER_ID) String dossierId,
+    void addOverride(@PathVariable(DOSSIER_ID) String dossierId,
                      @PathVariable(FILE_ID) String fileId,
                      @RequestBody ComponentsOverrides componentsOverrides);
 
@@ -60,8 +59,7 @@ public interface ComponentLogResource {
     @GetMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "Gets overrides for components", description = "None")
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK"), @ApiResponse(responseCode = "404", description = "Not found")})
-    ComponentsOverrides getOverrides(@RequestParam(name = "dossierTemplateId") String dossierTemplateId,
-                                     @PathVariable(DOSSIER_ID) String dossierId,
+    ComponentsOverrides getOverrides(@PathVariable(DOSSIER_ID) String dossierId,
                                      @PathVariable(FILE_ID) String fileId);
 
 
@@ -70,8 +68,7 @@ public interface ComponentLogResource {
     @PostMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + "/revert" + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "Reverts overrides for components", description = "None")
     @ApiResponses(value = {@ApiResponse(responseCode = "204", description = "OK"), @ApiResponse(responseCode = "404", description = "Not found"), @ApiResponse(responseCode = "403", description = "Forbidden")})
-    void revertOverrides(@RequestParam(name = "dossierTemplateId") String dossierTemplateId,
-                         @PathVariable(DOSSIER_ID) String dossierId,
+    void revertOverrides(@PathVariable(DOSSIER_ID) String dossierId,
                          @PathVariable(FILE_ID) String fileId,
                          @RequestBody RevertOverrideRequest revertOverrideRequest);
 
diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentOverrideTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentOverrideTest.java
index a31ad29cd..554af14e0 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentOverrideTest.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentOverrideTest.java
@@ -176,7 +176,7 @@ public class ComponentOverrideTest extends AbstractPersistenceServerServiceTest
                            .get().isOverridden());
 
         revertOverrideRequest = RevertOverrideRequest.builder().components(Set.of("Study_Title")).build();
-        componentLogClient.revertOverrides(dossierTemplate.getId(), dossier.getId(), file.getId(), revertOverrideRequest);
+        componentLogClient.revertOverrides(dossier.getId(), file.getId(), revertOverrideRequest);
 
         overridesFromOldEndpoint = componentLogClient.getComponentLog(dossier.getId(), file.getId(), true);
         assertFalse(overridesFromOldEndpoint.getComponentLogEntries()
@@ -188,7 +188,7 @@ public class ComponentOverrideTest extends AbstractPersistenceServerServiceTest
         Map<String, String> componentOverrides = new HashMap<>();
         componentOverrides.put("Study_Title", "BBBB Strange Chemical Name And the rest of a title – With a dash and some more text");
         ComponentsOverrides componentOverrideModel4 = ComponentsOverrides.builder().componentOverrides(componentOverrides).build();
-        componentLogClient.addOverride(dossierTemplate.getId(), dossier.getId(), file.getId(), componentOverrideModel4);
+        componentLogClient.addOverride(dossier.getId(), file.getId(), componentOverrideModel4);
 
         overridesFromOldEndpoint = componentLogClient.getComponentLog(dossier.getId(), file.getId(), true);
         assertTrue(overridesFromOldEndpoint.getComponentLogEntries()
diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentLogEntryValue.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentLogEntryValue.java
index c2280392d..da5d16009 100644
--- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentLogEntryValue.java
+++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/analysislog/componentlog/ComponentLogEntryValue.java
@@ -17,6 +17,8 @@ import lombok.experimental.FieldDefaults;
 public class ComponentLogEntryValue {
 
     String value;
+    @Deprecated
+    String originalValue;
     String valueDescription;
     String componentRuleId;