diff --git a/entrypoint.sh b/entrypoint.sh
index e3c985b..7b06f93 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -37,7 +37,7 @@ if [ "$CURRENT_UID" != "$PUID" ] || [ "$CURRENT_GID" != "$PGID" ]; then
 
     # Fix ownership of app directories
     echo "🔒 Fixing permissions on app directories..."
-    chown -R soulsync:soulsync /app/config /app/data /app/logs /app/downloads /app/Transfer 2>/dev/null || true
+    chown -R soulsync:soulsync /app/config /app/data /app/logs /app/downloads /app/Transfer /app/Staging 2>/dev/null || true
 else
     echo "✅ User/Group IDs already correct"
 fi
@@ -66,8 +66,8 @@ else
 fi
 
 # Ensure all directories exist and have proper permissions
-mkdir -p /app/config /app/data /app/logs /app/downloads /app/Transfer
-chown -R soulsync:soulsync /app/config /app/data /app/logs /app/downloads /app/Transfer
+mkdir -p /app/config /app/data /app/logs /app/downloads /app/Transfer /app/Staging
+chown -R soulsync:soulsync /app/config /app/data /app/logs /app/downloads /app/Transfer /app/Staging
 
 echo "✅ Configuration initialized successfully"
 
diff --git a/templates/soulsync.xml b/templates/soulsync.xml
index d27760d..a76bb57 100644
--- a/templates/soulsync.xml
+++ b/templates/soulsync.xml
@@ -25,12 +25,14 @@
   <Config Name="Spotify OAuth Port" Target="8888" Default="8888" Mode="tcp" Description="Spotify OAuth callback port" Type="Port" Display="always" Required="true" Mask="false">8888</Config>
   <Config Name="Tidal OAuth Port" Target="8889" Default="8889" Mode="tcp" Description="Tidal OAuth callback port" Type="Port" Display="always" Required="true" Mask="false">8889</Config>
   <Config Name="Config Directory" Target="/app/config" Default="/mnt/user/appdata/soulsync/config" Mode="rw" Description="SoulSync configuration directory (stores config.json and settings)" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/soulsync/config</Config>
-  <Config Name="Database Directory" Target="/app/database" Default="/mnt/user/appdata/soulsync/database" Mode="rw" Description="Database storage (SQLite files and library cache)" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/soulsync/database</Config>
+  <Config Name="Database Directory" Target="/app/data" Default="/mnt/user/appdata/soulsync/data" Mode="rw" Description="Database storage (SQLite files and library cache)" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/soulsync/data</Config>
   <Config Name="Logs Directory" Target="/app/logs" Default="/mnt/user/appdata/soulsync/logs" Mode="rw" Description="Application logs storage" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/soulsync/logs</Config>
   <Config Name="Music Share" Target="/host/music" Default="/mnt/user/Music" Mode="rw" Description="Mount your music share (containing slskd downloads and music library). Use /host/music/Downloads and /host/music/Library in settings." Type="Path" Display="always" Required="true" Mask="false">/mnt/user/Music</Config>
+  <Config Name="Import Staging Directory" Target="/app/Staging" Default="/mnt/user/appdata/soulsync/staging" Mode="rw" Description="Staging folder for importing existing audio files into your library" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/soulsync/staging</Config>
   <Config Name="Timezone" Target="TZ" Default="America/New_York" Mode="" Description="Container timezone (e.g., America/New_York, Europe/London)" Type="Variable" Display="always" Required="false" Mask="false">America/New_York</Config>
-  <Config Name="User ID" Target="PUID" Default="99" Mode="" Description="User ID for file permissions (typically 99 for Unraid)" Type="Variable" Display="advanced" Required="false" Mask="false">99</Config>
-  <Config Name="Group ID" Target="PGID" Default="100" Mode="" Description="Group ID for file permissions (typically 100 for Unraid)" Type="Variable" Display="advanced" Required="false" Mask="false">100</Config>
+  <Config Name="User ID" Target="PUID" Default="99" Mode="" Description="User ID for file permissions (typically 99 for Unraid)" Type="Variable" Display="always" Required="false" Mask="false">99</Config>
+  <Config Name="Group ID" Target="PGID" Default="100" Mode="" Description="Group ID for file permissions (typically 100 for Unraid)" Type="Variable" Display="always" Required="false" Mask="false">100</Config>
+  <Config Name="File Permission Mask" Target="UMASK" Default="022" Mode="" Description="UMASK for new file permissions (022 = standard, 000 = full access)" Type="Variable" Display="always" Required="false" Mask="false">022</Config>
   <Config Name="PYTHONPATH" Target="PYTHONPATH" Default="/app" Mode="" Description="Python path (do not change)" Type="Variable" Display="advanced" Required="true" Mask="false">/app</Config>
   <Config Name="FLASK_ENV" Target="FLASK_ENV" Default="production" Mode="" Description="Flask environment (do not change)" Type="Variable" Display="advanced" Required="true" Mask="false">production</Config>
   <Config Name="FLASK_APP" Target="FLASK_APP" Default="web_server.py" Mode="" Description="Flask app entry point (do not change)" Type="Variable" Display="advanced" Required="true" Mask="false">web_server.py</Config>