diff --git a/MARS_Packages/REL01_ADDITIONS/MARS-828/new_version/FILE_ARCHIVER.pkb b/MARS_Packages/REL01_ADDITIONS/MARS-828/new_version/FILE_ARCHIVER.pkb
index 529ec6e..24bfc47 100644
--- a/MARS_Packages/REL01_ADDITIONS/MARS-828/new_version/FILE_ARCHIVER.pkb
+++ b/MARS_Packages/REL01_ADDITIONS/MARS-828/new_version/FILE_ARCHIVER.pkb
@@ -533,12 +533,13 @@ AS
 
          -- LEVEL 3: Restore single file by A_SOURCE_FILE_RECEIVED_KEY
          BEGIN
-            SELECT r.*, c.*
-              INTO vSourceFileReceived, vSourceFileConfig
-              FROM CT_MRDS.A_SOURCE_FILE_RECEIVED r
-              JOIN CT_MRDS.A_SOURCE_FILE_CONFIG c ON r.A_SOURCE_FILE_CONFIG_KEY = c.A_SOURCE_FILE_CONFIG_KEY
-             WHERE r.A_SOURCE_FILE_RECEIVED_KEY = pSourceFileReceivedKey
-               AND r.PROCESSING_STATUS = 'ARCHIVED_AND_TRASHED';
+            SELECT *
+              INTO vSourceFileReceived
+              FROM CT_MRDS.A_SOURCE_FILE_RECEIVED
+             WHERE A_SOURCE_FILE_RECEIVED_KEY = pSourceFileReceivedKey
+               AND PROCESSING_STATUS = 'ARCHIVED_AND_TRASHED';
+
+            vSourceFileConfig := CT_MRDS.FILE_MANAGER.GET_SOURCE_FILE_CONFIG(pSourceFileConfigKey => vSourceFileReceived.A_SOURCE_FILE_CONFIG_KEY);
          EXCEPTION
             WHEN NO_DATA_FOUND THEN
                RAISE_APPLICATION_ERROR(-20101, 'File not found or status is not ARCHIVED_AND_TRASHED for A_SOURCE_FILE_RECEIVED_KEY: ' || pSourceFileReceivedKey);
@@ -702,12 +703,13 @@ AS
 
          -- LEVEL 3: Delete single file by A_SOURCE_FILE_RECEIVED_KEY
          BEGIN
-            SELECT r.*, c.*
-              INTO vSourceFileReceived, vSourceFileConfig
-              FROM CT_MRDS.A_SOURCE_FILE_RECEIVED r
-              JOIN CT_MRDS.A_SOURCE_FILE_CONFIG c ON r.A_SOURCE_FILE_CONFIG_KEY = c.A_SOURCE_FILE_CONFIG_KEY
-             WHERE r.A_SOURCE_FILE_RECEIVED_KEY = pSourceFileReceivedKey
-               AND r.PROCESSING_STATUS = 'ARCHIVED_AND_TRASHED';
+            SELECT *
+              INTO vSourceFileReceived
+              FROM CT_MRDS.A_SOURCE_FILE_RECEIVED
+             WHERE A_SOURCE_FILE_RECEIVED_KEY = pSourceFileReceivedKey
+               AND PROCESSING_STATUS = 'ARCHIVED_AND_TRASHED';
+
+            vSourceFileConfig := CT_MRDS.FILE_MANAGER.GET_SOURCE_FILE_CONFIG(pSourceFileConfigKey => vSourceFileReceived.A_SOURCE_FILE_CONFIG_KEY);
          EXCEPTION
             WHEN NO_DATA_FOUND THEN
                RAISE_APPLICATION_ERROR(-20301, 'File not found or status is not ARCHIVED_AND_TRASHED for A_SOURCE_FILE_RECEIVED_KEY: ' || pSourceFileReceivedKey);