diff --git a/Bitvault/AllNavigationViewModel.cs b/Bitvault/AllNavigationViewModel.cs
index 0c80327..bc3a1f7 100644
--- a/Bitvault/AllNavigationViewModel.cs
+++ b/Bitvault/AllNavigationViewModel.cs
@@ -6,6 +6,6 @@ public partial class AllNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer,
     string filter) : FilterContainerNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, filter);
diff --git a/Bitvault/ArchiveItemActionViewModel.cs b/Bitvault/ArchiveItemActionViewModel.cs
index 4c6e6da..1442e59 100644
--- a/Bitvault/ArchiveItemActionViewModel.cs
+++ b/Bitvault/ArchiveItemActionViewModel.cs
@@ -7,7 +7,7 @@ public partial class ArchiveItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer)
 {
     [RelayCommand]
diff --git a/Bitvault/ArchiveNavigationViewModel.cs b/Bitvault/ArchiveNavigationViewModel.cs
index c0541ff..82a7f16 100644
--- a/Bitvault/ArchiveNavigationViewModel.cs
+++ b/Bitvault/ArchiveNavigationViewModel.cs
@@ -6,6 +6,6 @@ public partial class ArchiveNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer,
     string name) : FilterContainerNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, name);
\ No newline at end of file
diff --git a/Bitvault/CategoriesNavigationViewModel.cs b/Bitvault/CategoriesNavigationViewModel.cs
index 210b2ef..89f5ead 100644
--- a/Bitvault/CategoriesNavigationViewModel.cs
+++ b/Bitvault/CategoriesNavigationViewModel.cs
@@ -6,6 +6,6 @@ public partial class CategoriesNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer,
     string name) : FilterContainerNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, name);
\ No newline at end of file
diff --git a/Bitvault/ConfirmItemActionViewModel.cs b/Bitvault/ConfirmItemActionViewModel.cs
index 78b32dc..6066cc6 100644
--- a/Bitvault/ConfirmItemActionViewModel.cs
+++ b/Bitvault/ConfirmItemActionViewModel.cs
@@ -7,7 +7,7 @@ public partial class ConfirmItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer)
 {
 
diff --git a/Bitvault/ContainerHeaderViewModel.cs b/Bitvault/ContainerHeaderViewModel.cs
index 8a74c21..e301ee7 100644
--- a/Bitvault/ContainerHeaderViewModel.cs
+++ b/Bitvault/ContainerHeaderViewModel.cs
@@ -9,7 +9,7 @@ public partial class ContainerHeaderViewModel : ObservableCollectionViewModel<st
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscriber subscriber,
+        ISubscription subscriber,
         IDisposer disposer,
         IContentTemplate template) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
diff --git a/Bitvault/ContainerNavigationViewModel.cs b/Bitvault/ContainerNavigationViewModel.cs
index 2cf537e..eef0e80 100644
--- a/Bitvault/ContainerNavigationViewModel.cs
+++ b/Bitvault/ContainerNavigationViewModel.cs
@@ -30,7 +30,7 @@ public partial class ContainerNavigationViewModel :
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscriber subscriber,
+        ISubscription subscriber,
         IDisposer disposer,
         IContentTemplate template,
         string name) : base(provider, factory, mediator, publisher, subscriber, disposer)
diff --git a/Bitvault/ContainerViewModel.cs b/Bitvault/ContainerViewModel.cs
index 27359ed..a6ee071 100644
--- a/Bitvault/ContainerViewModel.cs
+++ b/Bitvault/ContainerViewModel.cs
@@ -9,7 +9,7 @@ public partial class ContainerViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer,
     IContentTemplate template,
     NamedComponent named,
diff --git a/Bitvault/CreateContainerNavigationViewModel.cs b/Bitvault/CreateContainerNavigationViewModel.cs
index b6f4976..345328f 100644
--- a/Bitvault/CreateContainerNavigationViewModel.cs
+++ b/Bitvault/CreateContainerNavigationViewModel.cs
@@ -6,7 +6,7 @@ public partial class CreateContainerNavigationViewModel(IServiceProvider provide
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer) :
     ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer),
     IMainNavigationViewModel;
\ No newline at end of file
diff --git a/Bitvault/CreateContainerViewModel.cs b/Bitvault/CreateContainerViewModel.cs
index d39f85a..62c264d 100644
--- a/Bitvault/CreateContainerViewModel.cs
+++ b/Bitvault/CreateContainerViewModel.cs
@@ -8,7 +8,7 @@ public partial class CreateContainerViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IPublisher publisher,
     IMediator mediator,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer) :
     ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer),
     IPrimaryConfirmation
diff --git a/Bitvault/CreateItemActionViewModel.cs b/Bitvault/CreateItemActionViewModel.cs
index f4a2a4d..f794e9d 100644
--- a/Bitvault/CreateItemActionViewModel.cs
+++ b/Bitvault/CreateItemActionViewModel.cs
@@ -7,7 +7,7 @@ public partial class CreateItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer,
     NamedComponent named) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer)
 {
diff --git a/Bitvault/DeleteItemActionViewModel.cs b/Bitvault/DeleteItemActionViewModel.cs
index 85f1112..3a03411 100644
--- a/Bitvault/DeleteItemActionViewModel.cs
+++ b/Bitvault/DeleteItemActionViewModel.cs
@@ -7,7 +7,7 @@ public partial class DeleteItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer)
 {
     [RelayCommand]
diff --git a/Bitvault/DismissItemActionViewModel.cs b/Bitvault/DismissItemActionViewModel.cs
index 4162260..044f3b8 100644
--- a/Bitvault/DismissItemActionViewModel.cs
+++ b/Bitvault/DismissItemActionViewModel.cs
@@ -6,5 +6,5 @@ public partial class DismissItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer);
\ No newline at end of file
diff --git a/Bitvault/EditItemActionViewModel.cs b/Bitvault/EditItemActionViewModel.cs
index 7a35bdd..153bc36 100644
--- a/Bitvault/EditItemActionViewModel.cs
+++ b/Bitvault/EditItemActionViewModel.cs
@@ -7,7 +7,7 @@ public partial class EditItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer) : ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer)
 {
     [RelayCommand]
diff --git a/Bitvault/FilterContainerNavigationViewModel.cs b/Bitvault/FilterContainerNavigationViewModel.cs
index db94cf2..f857b9f 100644
--- a/Bitvault/FilterContainerNavigationViewModel.cs
+++ b/Bitvault/FilterContainerNavigationViewModel.cs
@@ -22,7 +22,7 @@ public partial class FilterContainerNavigationViewModel : ObservableViewModel,
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscriber subscriber,
+        ISubscription subscriber,
         IDisposer disposer,
         string? filter = null) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
diff --git a/Bitvault/FooterViewModel.cs b/Bitvault/FooterViewModel.cs
index fb0feb7..a3c30ae 100644
--- a/Bitvault/FooterViewModel.cs
+++ b/Bitvault/FooterViewModel.cs
@@ -9,7 +9,7 @@ public partial class FooterViewModel :
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscriber subscriber,
+        ISubscription subscriber,
         IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
         Add<ManageNavigationViewModel>();
diff --git a/Bitvault/IconViewModel.cs b/Bitvault/IconViewModel.cs
index 061e69a..c4b6a9c 100644
--- a/Bitvault/IconViewModel.cs
+++ b/Bitvault/IconViewModel.cs
@@ -8,7 +8,7 @@ public partial class IconViewModel : ObservableViewModel
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscriber subscriber,
+        ISubscription subscriber,
         IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
 
diff --git a/Bitvault/ItemCommandHeaderViewModel.cs b/Bitvault/ItemCommandHeaderViewModel.cs
index 729a4ce..6668cb7 100644
--- a/Bitvault/ItemCommandHeaderViewModel.cs
+++ b/Bitvault/ItemCommandHeaderViewModel.cs
@@ -8,7 +8,7 @@ public partial class ItemCommandHeaderViewModel : ObservableCollectionViewModel
         IServiceFactory factory,
         IMediator mediator, 
         IPublisher publisher, 
-        ISubscriber subscriber, 
+        ISubscription subscriber, 
         IDisposer disposer,
         IContentTemplate template) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
diff --git a/Bitvault/ItemHeaderViewModel.cs b/Bitvault/ItemHeaderViewModel.cs
index 8d6eb8e..d930887 100644
--- a/Bitvault/ItemHeaderViewModel.cs
+++ b/Bitvault/ItemHeaderViewModel.cs
@@ -7,7 +7,7 @@ public partial class ItemHeaderViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer,
     bool immutable,
     string? value = null) : ObservableViewModel<string, string>(provider, factory, mediator, publisher, subscriber, disposer, value),
diff --git a/Bitvault/ItemNavigationViewModel.cs b/Bitvault/ItemNavigationViewModel.cs
index 34532b2..075c6ac 100644
--- a/Bitvault/ItemNavigationViewModel.cs
+++ b/Bitvault/ItemNavigationViewModel.cs
@@ -7,7 +7,7 @@ public partial class ItemNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer,
     IContentTemplate template,
     NamedComponent named,
diff --git a/Bitvault/ItemViewModel.cs b/Bitvault/ItemViewModel.cs
index e442716..2377547 100644
--- a/Bitvault/ItemViewModel.cs
+++ b/Bitvault/ItemViewModel.cs
@@ -20,7 +20,7 @@ public partial class ItemViewModel :
         IServiceFactory factory, 
         IMediator mediator,
         IPublisher publisher, 
-        ISubscriber subscriber, 
+        ISubscription subscriber, 
         IDisposer disposer,
         IContentTemplate template,
         NamedComponent named,
@@ -45,7 +45,7 @@ public partial class ItemViewModel :
         {
             item.Invoke(configuration);
         }
-
-         await Mediator.Handle<CreateEventArgs<ItemConfiguration>, bool>(Create.As(configuration));
+        
+        await Mediator.Handle<CreateEventArgs<ItemConfiguration>, bool>(Create.As(configuration));
     }
 }
diff --git a/Bitvault/MainViewModel.cs b/Bitvault/MainViewModel.cs
index 69597f7..d73c7d5 100644
--- a/Bitvault/MainViewModel.cs
+++ b/Bitvault/MainViewModel.cs
@@ -14,7 +14,7 @@ public partial class MainViewModel :
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscriber subscriber,
+        ISubscription subscriber,
         IDisposer disposer,
         IContentTemplate template,
         FooterViewModel footer) : base(provider, factory, mediator, publisher, subscriber, disposer)
diff --git a/Bitvault/MainWindowViewModel.cs b/Bitvault/MainWindowViewModel.cs
index 9b99725..6b31819 100644
--- a/Bitvault/MainWindowViewModel.cs
+++ b/Bitvault/MainWindowViewModel.cs
@@ -6,6 +6,6 @@ public class MainWindowViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer) :
     ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer);
\ No newline at end of file
diff --git a/Bitvault/ManageNavigationViewModel.cs b/Bitvault/ManageNavigationViewModel.cs
index a639a15..37e1512 100644
--- a/Bitvault/ManageNavigationViewModel.cs
+++ b/Bitvault/ManageNavigationViewModel.cs
@@ -6,7 +6,7 @@ public partial class ManageNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer) :
     ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer),
     IMainNavigationViewModel;
\ No newline at end of file
diff --git a/Bitvault/ManageViewModel.cs b/Bitvault/ManageViewModel.cs
index 06d7164..98bd643 100644
--- a/Bitvault/ManageViewModel.cs
+++ b/Bitvault/ManageViewModel.cs
@@ -10,7 +10,7 @@ public partial class ManageViewModel :
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscriber subscriber,
+        ISubscription subscriber,
         IDisposer disposer,
         IContentTemplate template) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
diff --git a/Bitvault/NoteViewModel.cs b/Bitvault/NoteViewModel.cs
index 415122d..f32621d 100644
--- a/Bitvault/NoteViewModel.cs
+++ b/Bitvault/NoteViewModel.cs
@@ -8,7 +8,7 @@ public partial class NoteViewModel : ObservableViewModel
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscriber subscriber,
+        ISubscription subscriber,
         IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
 
diff --git a/Bitvault/OpenContainerViewModel.cs b/Bitvault/OpenContainerViewModel.cs
index fb48972..b8ced71 100644
--- a/Bitvault/OpenContainerViewModel.cs
+++ b/Bitvault/OpenContainerViewModel.cs
@@ -8,7 +8,7 @@ public partial class OpenContainerViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer) :
     ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer)
 {
diff --git a/Bitvault/PasswordViewModel.cs b/Bitvault/PasswordViewModel.cs
index dd954c7..4b1ee22 100644
--- a/Bitvault/PasswordViewModel.cs
+++ b/Bitvault/PasswordViewModel.cs
@@ -8,7 +8,7 @@ public partial class PasswordViewModel : ObservableViewModel
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscriber subscriber,
+        ISubscription subscriber,
         IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
 
diff --git a/Bitvault/SearchHeaderViewModel.cs b/Bitvault/SearchHeaderViewModel.cs
index c4f1629..557328a 100644
--- a/Bitvault/SearchHeaderViewModel.cs
+++ b/Bitvault/SearchHeaderViewModel.cs
@@ -6,5 +6,5 @@ public partial class SearchHeaderViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator, 
     IPublisher publisher,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer) : ObservableViewModel<string>(provider, factory, mediator, publisher, subscriber, disposer);
diff --git a/Bitvault/StarredNavigationViewModel.cs b/Bitvault/StarredNavigationViewModel.cs
index 4826b5a..3918b1d 100644
--- a/Bitvault/StarredNavigationViewModel.cs
+++ b/Bitvault/StarredNavigationViewModel.cs
@@ -6,6 +6,6 @@ public partial class StarredNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscriber subscriber,
+    ISubscription subscriber,
     IDisposer disposer,
     string name) : FilterContainerNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, name);
\ No newline at end of file
diff --git a/Bitvault/TextViewModel.cs b/Bitvault/TextViewModel.cs
index 04fa299..213f7aa 100644
--- a/Bitvault/TextViewModel.cs
+++ b/Bitvault/TextViewModel.cs
@@ -8,7 +8,7 @@ public partial class TextViewModel : ObservableViewModel
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscriber subscriber,
+        ISubscription subscriber,
         IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {