diff --git a/MARS_Packages/REL03/MARS-1057/new_version/FILE_MANAGER.pkb b/MARS_Packages/REL03/MARS-1057/new_version/FILE_MANAGER.pkb
index c4a78e3..a8f4d8d 100644
--- a/MARS_Packages/REL03/MARS-1057/new_version/FILE_MANAGER.pkb
+++ b/MARS_Packages/REL03/MARS-1057/new_version/FILE_MANAGER.pkb
@@ -2011,14 +2011,14 @@ AS
          
          SELECT grantee, privilege, grantable
          BULK COLLECT INTO pGrantList
-         FROM DBA_TAB_PRIVS
-         WHERE owner = 'ODS'
+         FROM ALL_TAB_PRIVS
+         WHERE table_schema = USER
            AND table_name = pTableName
            AND grantee NOT IN ('SYS', 'SYSTEM', 'PUBLIC')  -- Exclude system accounts
          ORDER BY grantee, privilege;
          
          ENV_MANAGER.LOG_PROCESS_EVENT(
-            'Saved ' || pGrantList.COUNT || ' grants for table: ODS.' || pTableName, 
+            'Saved ' || pGrantList.COUNT || ' grants for table: ' || USER || '.' || pTableName, 
             'INFO'
          );
       EXCEPTION
@@ -2055,7 +2055,7 @@ AS
          FOR i IN 1..pGrantList.COUNT LOOP
             BEGIN
                vGrantSQL := 'GRANT ' || pGrantList(i).privilege || 
-                           ' ON ODS.' || pTableName || 
+                           ' ON ' || USER || '.' || pTableName || 
                            ' TO ' || pGrantList(i).grantee;
                
                IF pGrantList(i).grantable = 'YES' THEN
@@ -2084,7 +2084,7 @@ AS
          
          ENV_MANAGER.LOG_PROCESS_EVENT(
             'Restored ' || vGrantCount || ' of ' || pGrantList.COUNT || 
-            ' grants for table: ODS.' || pTableName || 
+            ' grants for table: ' || USER || '.' || pTableName || 
             CASE WHEN vFailCount > 0 THEN ' (' || vFailCount || ' failed)' ELSE '' END, 
             'INFO'
          );
@@ -2094,11 +2094,11 @@ AS
       BEGIN
          SELECT COUNT(*) INTO vTableExists
          FROM ALL_TABLES
-         WHERE OWNER = 'ODS' AND TABLE_NAME = pTableName;
+         WHERE OWNER = USER AND TABLE_NAME = pTableName;
          
          IF vTableExists > 0 THEN
             ENV_MANAGER.LOG_PROCESS_EVENT('Dropping existing table: ' || pTableName, 'INFO');
-            EXECUTE IMMEDIATE 'DROP TABLE ODS.' || pTableName;
+            EXECUTE IMMEDIATE 'DROP TABLE ' || USER || '.' || pTableName;
          END IF;
       EXCEPTION
          WHEN OTHERS THEN