diff --git a/ModernKeePass.Infrastructure/project.json b/ModernKeePass.Infrastructure/project.json
index 1236a05..fdab3b7 100644
--- a/ModernKeePass.Infrastructure/project.json
+++ b/ModernKeePass.Infrastructure/project.json
@@ -3,7 +3,7 @@
   "dependencies": {
     "AutoMapper": "5.2.0",
     "Microsoft.NETCore.Portable.Compatibility": "1.0.1",
-    "ModernKeePassLib": "2.44.2",
+    "ModernKeePassLib": "2.44.3",
     "NETStandard.Library": "2.0.3"
   },
   "frameworks": {
diff --git a/ModernKeePass/App.xaml.cs b/ModernKeePass/App.xaml.cs
index ee17779..6590e6e 100644
--- a/ModernKeePass/App.xaml.cs
+++ b/ModernKeePass/App.xaml.cs
@@ -249,9 +249,12 @@ namespace ModernKeePass
             var rootFrame = new Frame();
             var file = args.Files[0] as StorageFile;
 
+            Window.Current.Content = rootFrame;
+
             if (file != null)
             {
-                var token = StorageApplicationPermissions.FutureAccessList.Add(file, file.Name);
+                // TODO: use service
+                var token = StorageApplicationPermissions.MostRecentlyUsedList.Add(file, file.Path);
                 var fileInfo = new FileInfo
                 {
                     Id = token,
@@ -265,7 +268,6 @@ namespace ModernKeePass
                 _navigation.NavigateTo(Constants.Navigation.MainPage);
             }
 
-            Window.Current.Content = rootFrame;
             Window.Current.Activate();
         }
         
diff --git a/ModernKeePass/Views/MainPageFrames/OpenDatabasePage.xaml.cs b/ModernKeePass/Views/MainPageFrames/OpenDatabasePage.xaml.cs
index 594c2c7..8e0ac14 100644
--- a/ModernKeePass/Views/MainPageFrames/OpenDatabasePage.xaml.cs
+++ b/ModernKeePass/Views/MainPageFrames/OpenDatabasePage.xaml.cs
@@ -44,10 +44,9 @@ namespace ModernKeePass.Views
             // Application now has read/write access to the picked file
             var file = await picker.PickSingleFileAsync().AsTask();
             if (file == null) return;
-
-            //var token = StorageApplicationPermissions.FutureAccessList.Add(file, file.Name);
+            
             // TODO: use service
-            var token = StorageApplicationPermissions.MostRecentlyUsedList.Add(file, file.Name);
+            var token = StorageApplicationPermissions.MostRecentlyUsedList.Add(file, file.Path);
             var fileInfo = new FileInfo
             {
                 Path = file.Path,
diff --git a/ModernKeePass/Win81App.csproj b/ModernKeePass/Win81App.csproj
index 4abcb27..19b32c4 100644
--- a/ModernKeePass/Win81App.csproj
+++ b/ModernKeePass/Win81App.csproj
@@ -382,8 +382,8 @@
       <HintPath>..\packages\Microsoft.Toolkit.Uwp.Notifications.2.0.0\lib\dotnet\Microsoft.Toolkit.Uwp.Notifications.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ModernKeePassLib, Version=2.44.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ModernKeePassLib.2.44.2\lib\netstandard1.2\ModernKeePassLib.dll</HintPath>
+    <Reference Include="ModernKeePassLib, Version=2.44.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ModernKeePassLib.2.44.3\lib\netstandard1.2\ModernKeePassLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="SixLabors.Core, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/ModernKeePass/packages.config b/ModernKeePass/packages.config
index 849956d..9f9ec11 100644
--- a/ModernKeePass/packages.config
+++ b/ModernKeePass/packages.config
@@ -15,7 +15,7 @@
   <package id="Microsoft.NETCore.Portable.Compatibility" version="1.0.1" targetFramework="win81" />
   <package id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.1.7" targetFramework="win81" />
   <package id="Microsoft.Toolkit.Uwp.Notifications" version="2.0.0" targetFramework="win81" />
-  <package id="ModernKeePassLib" version="2.44.2" targetFramework="win81" />
+  <package id="ModernKeePassLib" version="2.44.3" targetFramework="win81" />
   <package id="MvvmLight" version="5.4.1.1" targetFramework="win81" />
   <package id="MvvmLightLibs" version="5.4.1.1" targetFramework="win81" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="win81" />
diff --git a/WinAppCommon/ViewModels/ViewModelLocator.cs b/WinAppCommon/ViewModels/ViewModelLocator.cs
index 4d4f18b..e330eb7 100644
--- a/WinAppCommon/ViewModels/ViewModelLocator.cs
+++ b/WinAppCommon/ViewModels/ViewModelLocator.cs
@@ -77,10 +77,10 @@ namespace ModernKeePass.ViewModels
         public SettingsSecurityVm SettingsSecurity => ServiceLocator.Current.GetInstance<SettingsSecurityVm>(Guid.NewGuid().ToString());
         public OpenDatabaseControlVm OpenDatabaseControl => ServiceLocator.Current.GetInstance<OpenDatabaseControlVm>(Guid.NewGuid().ToString());
         public SetCredentialsVm SetCredentials => ServiceLocator.Current.GetInstance<SetCredentialsVm>(Guid.NewGuid().ToString());
-        public NewVm New => ServiceLocator.Current.GetInstance<NewVm>();
-        public OpenVm Open => ServiceLocator.Current.GetInstance<OpenVm>();
+        public NewVm New => ServiceLocator.Current.GetInstance<NewVm>(Guid.NewGuid().ToString());
+        public OpenVm Open => ServiceLocator.Current.GetInstance<OpenVm>(Guid.NewGuid().ToString());
         public RecentVm Recent => ServiceLocator.Current.GetInstance<RecentVm>(Guid.NewGuid().ToString());
-        public SaveVm Save => ServiceLocator.Current.GetInstance<SaveVm>();
+        public SaveVm Save => ServiceLocator.Current.GetInstance<SaveVm>(Guid.NewGuid().ToString());
 
         public static void Cleanup()
         {