diff --git a/.gitignore b/.gitignore
index 61069dc..662e4a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ mono_crash.*
 [Rr]eleases/
 x64/
 x86/
+[Ww][Ii][Nn]32/
 [Aa][Rr][Mm]/
 [Aa][Rr][Mm]64/
 bld/
@@ -61,6 +62,9 @@ project.lock.json
 project.fragment.lock.json
 artifacts/
 
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
 # StyleCop
 StyleCopReport.xml
 
@@ -350,3 +354,6 @@ MigrationBackup/
 
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
\ No newline at end of file
diff --git a/NetCore.Tests/ButtonExtensionsTests.cs b/NetCore.Tests/ButtonExtensionsTests.cs
new file mode 100644
index 0000000..93881b5
--- /dev/null
+++ b/NetCore.Tests/ButtonExtensionsTests.cs
@@ -0,0 +1,33 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using PresentationBase.Extensions;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace PresentationBase.Tests
+{
+    [TestClass]
+    public class ButtonExtensionsTests : WpfTestsBase
+    {
+        [TestMethod]
+        public void CommandExecute()
+        {
+            App!.Dispatcher.Invoke(() =>
+            {
+                App.ShutdownMode = ShutdownMode.OnExplicitShutdown;
+
+                var button = new Button();
+                ButtonExtensions.SetDialogResult(button, true);
+
+                CreateInvisibleMainWindow();
+                App.MainWindow.Content = button;
+
+                Assert.IsTrue(App.MainWindow.DialogResult != true);
+                App.MainWindow.Loaded += (s, e) =>
+                {
+                    button.RaiseEvent(new RoutedEventArgs(Button.ClickEvent));
+                };
+                Assert.IsTrue(App.MainWindow.ShowDialog() == true);
+            });
+        }
+    }
+}
diff --git a/NetCore.Tests/CommandBindingTests.cs b/NetCore.Tests/CommandBindingTests.cs
new file mode 100644
index 0000000..f18fece
--- /dev/null
+++ b/NetCore.Tests/CommandBindingTests.cs
@@ -0,0 +1,87 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace PresentationBase.Tests
+{
+    [TestClass]
+    public class CommandBindingTests : WpfTestsBase
+    {
+        [TestMethod]
+        public void CommandExecute()
+        {
+            App!.Dispatcher.Invoke(() =>
+            {
+                var viewModel = new TestViewModel();
+                var button = new Button
+                {
+                    DataContext = viewModel
+                };
+
+                CreateInvisibleMainWindow();
+                App.MainWindow.Content = button;
+                App.MainWindow.Show();
+
+                Assert.IsTrue(button.IsEnabled);
+
+                BindingOperations.SetBinding(button, Button.CommandParameterProperty, new Binding());
+                BindingOperations.SetBinding(button, Button.CommandProperty, new CommandBinding(typeof(TestCommand)));
+                Assert.IsNotNull(button.CommandParameter);
+                Assert.IsNotNull(button.Command);
+                Assert.IsInstanceOfType(button.Command, typeof(TestCommand));
+
+                Assert.IsFalse(button.IsEnabled);
+                Assert.IsTrue(((TestCommand)button.Command).CanExecuteCalled);
+                ((TestCommand)button.Command).CanExecuteCalled = false;
+
+                viewModel.Name = "Adam Jensen";
+                Assert.IsTrue(button.IsEnabled);
+                Assert.IsTrue(((TestCommand)button.Command).CanExecuteCalled);
+
+                button.Command.Execute(button.CommandParameter);
+                Assert.IsTrue(((TestCommand)button.Command).ExecuteCalled);
+
+                BindingOperations.SetBinding(button, Button.CommandProperty, new CommandBinding(typeof(DummyCommand)));
+                Assert.IsNull(button.Command);
+            });
+        }
+
+        class TestViewModel : ViewModel
+        {
+            private string? _name;
+
+            public string? Name
+            {
+                get => _name;
+                set => SetProperty(ref _name, value);
+            }
+        }
+
+        class TestCommand : ViewModelCommand<TestViewModel>
+        {
+            public bool CanExecuteCalled { get; set; }
+
+            public bool ExecuteCalled { get; set; }
+
+            public override void Execute(TestViewModel parameter)
+            {
+                ExecuteCalled = true;
+            }
+
+            public override bool CanExecute(TestViewModel parameter)
+            {
+                CanExecuteCalled = true;
+                return base.CanExecute(parameter) && parameter.Name != null;
+            }
+        }
+
+        class DummyCommand : ViewModelCommand<ViewModel>
+        {
+            public override void Execute(ViewModel parameter)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/NetCore.Tests/CompositeViewModelCollectionTests.cs b/NetCore.Tests/CompositeViewModelCollectionTests.cs
new file mode 100644
index 0000000..6ee8c0f
--- /dev/null
+++ b/NetCore.Tests/CompositeViewModelCollectionTests.cs
@@ -0,0 +1,76 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Linq;
+
+namespace PresentationBase.Tests
+{
+    [TestClass]
+    public class CompositeViewModelCollectionTests
+    {
+        [TestMethod]
+        public void Exceptions()
+        {
+            var viewModel = new TestViewModel();
+
+            Assert.ThrowsException<ArgumentNullException>(() => viewModel.Composition.Add(null!));
+            Assert.ThrowsException<ArgumentNullException>(() => viewModel.Composition.Contains(null!));
+            Assert.ThrowsException<ArgumentNullException>(() => viewModel.Composition.IndexOf(null!));
+            Assert.ThrowsException<ArgumentNullException>(() => viewModel.Composition.Insert(0, null!));
+            Assert.ThrowsException<ArgumentNullException>(() => viewModel.Composition.Remove(null!));
+        }
+
+        [TestMethod]
+        public void CollectionManipulation()
+        {
+            var viewModel = new TestViewModel();
+            Assert.IsNotNull(viewModel.Composition);
+            Assert.AreEqual(2, viewModel.Composition.Count);
+            Assert.AreSame(viewModel.Children, viewModel.Composition[0]);
+            Assert.AreSame(viewModel.Dummies, viewModel.Composition[1]);
+
+            foreach (var collection in viewModel.Composition)
+            {
+                Assert.IsNotNull(collection);
+                Assert.AreEqual(0, collection.Count());
+            }
+
+            viewModel.Children!.AddRange(new[] { new TestViewModel(), new TestViewModel(), new TestViewModel() });
+            Assert.AreEqual(2, viewModel.Composition.Count);
+            Assert.AreEqual(3, viewModel.Composition[0].Count());
+            viewModel.Children.Clear();
+            Assert.AreEqual(0, viewModel.Composition[0].Count());
+
+            viewModel.Dummies!.AddRange(new[] { new DummyViewModel() });
+            Assert.AreEqual(2, viewModel.Composition.Count);
+            Assert.AreEqual(1, viewModel.Composition[1].Count());
+            viewModel.Dummies.Clear();
+            Assert.AreEqual(0, viewModel.Composition[1].Count());
+
+            viewModel.Composition.Remove(viewModel.Children);
+            Assert.AreEqual(1, viewModel.Composition.Count);
+            Assert.AreSame(viewModel.Dummies, viewModel.Composition[0]);
+
+            viewModel.Composition.Clear();
+            Assert.AreEqual(0, viewModel.Composition.Count);
+        }
+
+        class TestViewModel : ViewModel
+        {
+            public ObservableViewModelCollection<TestViewModel>? Children { get; set; }
+
+            public ObservableViewModelCollection<DummyViewModel>? Dummies { get; set; }
+
+            public CompositeViewModelCollection<ViewModel> Composition { get; set; } = new CompositeViewModelCollection<ViewModel>();
+
+            public TestViewModel()
+            {
+                Children = new ObservableViewModelCollection<TestViewModel>(this);
+                Dummies = new ObservableViewModelCollection<DummyViewModel>(this);
+                Composition.Add(Children);
+                Composition.Add(Dummies);
+            }
+        }
+
+        class DummyViewModel : ViewModel { }
+    }
+}
diff --git a/NetCore.Tests/Converters/AllBoolToVisibilityConverterTests.cs b/NetCore.Tests/Converters/AllBoolToVisibilityConverterTests.cs
new file mode 100644
index 0000000..1b32700
--- /dev/null
+++ b/NetCore.Tests/Converters/AllBoolToVisibilityConverterTests.cs
@@ -0,0 +1,29 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using PresentationBase.Converters;
+using System.Windows;
+
+namespace PresentationBase.Tests.Converters
+{
+    [TestClass]
+    public class AllBoolToVisibilityConverterTests
+        : ConverterTestsBase<AllBoolToVisibilityConverter>
+    {
+        [TestMethod]
+        public override void Convert()
+        {
+            var result1 = _converter!.Convert(new object[] { true, true }, null, null, null);
+            Assert.IsNotNull(result1);
+            Assert.IsInstanceOfType(result1, typeof(Visibility));
+            Assert.AreEqual(Visibility.Visible, result1);
+
+            var result2 = _converter!.Convert(new object[] { true, false }, null, null, null);
+            Assert.IsNotNull(result2);
+            Assert.IsInstanceOfType(result2, typeof(Visibility));
+            Assert.AreEqual(Visibility.Collapsed, result2);
+
+            var result3 = _converter!.Convert(null, null, null, null);
+            Assert.IsNotNull(result3);
+            Assert.AreEqual(DependencyProperty.UnsetValue, result3);
+        }
+    }
+}
diff --git a/NetCore.Tests/Converters/BoolToVisibilityConverterTests.cs b/NetCore.Tests/Converters/BoolToVisibilityConverterTests.cs
new file mode 100644
index 0000000..475e288
--- /dev/null
+++ b/NetCore.Tests/Converters/BoolToVisibilityConverterTests.cs
@@ -0,0 +1,60 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using PresentationBase.Converters;
+using System.Windows;
+
+namespace PresentationBase.Tests.Converters
+{
+    [TestClass]
+    public class BoolToVisibilityConverterTests
+        : ConverterTestsBase<BoolToVisibilityConverter>
+    {
+        [TestMethod]
+        public override void Convert()
+        {
+            var result1 = _converter!.Convert(true, null, null, null);
+            Assert.IsNotNull(result1);
+            Assert.IsInstanceOfType(result1, typeof(Visibility));
+            Assert.AreEqual(Visibility.Visible, result1);
+
+            var result2 = _converter!.Convert(false, null, null, null);
+            Assert.IsNotNull(result2);
+            Assert.IsInstanceOfType(result2, typeof(Visibility));
+            Assert.AreEqual(Visibility.Collapsed, result2);
+
+            var result3 = _converter!.Convert(null, null, null, null);
+            Assert.IsNotNull(result3);
+            Assert.AreEqual(DependencyProperty.UnsetValue, result3);
+
+            var result4 = _converter!.Convert("Trash", null, null, null);
+            Assert.IsNotNull(result4);
+            Assert.AreEqual(DependencyProperty.UnsetValue, result4);
+        }
+
+        [TestMethod]
+        public override void ConvertBack()
+        {
+            var result1 = _converter!.ConvertBack(Visibility.Visible, null, null, null);
+            Assert.IsNotNull(result1);
+            Assert.IsInstanceOfType(result1, typeof(bool));
+            Assert.AreEqual(true, result1);
+
+            var result2 = _converter!.ConvertBack(Visibility.Collapsed, null, null, null);
+            Assert.IsNotNull(result2);
+            Assert.IsInstanceOfType(result2, typeof(bool));
+            Assert.AreEqual(false, result2);
+
+            var result3 = _converter!.ConvertBack(Visibility.Hidden, null, null, null);
+            Assert.IsNotNull(result3);
+            Assert.IsInstanceOfType(result3, typeof(bool));
+            Assert.AreEqual(false, result3);
+
+            var result4 = _converter!.ConvertBack(null, null, null, null);
+            Assert.IsNotNull(result4);
+            Assert.AreEqual(DependencyProperty.UnsetValue, result4);
+
+            var result5 = _converter!.ConvertBack("Trash", null, null, null);
+            Assert.IsNotNull(result5);
+            Assert.AreEqual(DependencyProperty.UnsetValue, result5);
+        }
+    }
+}
diff --git a/NetCore.Tests/Converters/ConverterTestsBase.cs b/NetCore.Tests/Converters/ConverterTestsBase.cs
new file mode 100644
index 0000000..9e3512d
--- /dev/null
+++ b/NetCore.Tests/Converters/ConverterTestsBase.cs
@@ -0,0 +1,43 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using PresentationBase.Converters;
+using System.Reflection;
+using System.Windows.Data;
+using System.Windows.Markup;
+
+namespace PresentationBase.Tests.Converters
+{
+    public abstract class ConverterTestsBase<TConverter>
+        where TConverter : class, IConverter, new()
+    {
+        protected TConverter? _converter = null;
+
+        [TestInitialize]
+        public void Initialize()
+        {
+            _converter = new TConverter();
+        }
+
+        [TestMethod]
+        public void ProvideValue()
+        {
+            var result = _converter!.ProvideValue(null!);
+            Assert.IsNotNull(result);
+            Assert.IsInstanceOfType(result, typeof(TConverter));
+        }
+
+        [TestMethod]
+        public void Attributes()
+        {
+            var valueConversionAttr = _converter!.GetType().GetCustomAttribute<ValueConversionAttribute>(false);
+            Assert.IsNotNull(valueConversionAttr);
+
+            var returnTypeAttr = _converter!.GetType().GetCustomAttribute<MarkupExtensionReturnTypeAttribute>(false);
+            Assert.IsNotNull(returnTypeAttr);
+            Assert.AreEqual(typeof(TConverter), returnTypeAttr!.ReturnType);
+        }
+
+        public abstract void Convert();
+
+        public virtual void ConvertBack() { }
+    }
+}
diff --git a/NetCore.Tests/NetCore.Tests.csproj b/NetCore.Tests/NetCore.Tests.csproj
new file mode 100644
index 0000000..eb6c5ac
--- /dev/null
+++ b/NetCore.Tests/NetCore.Tests.csproj
@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <!-- Assembly -->
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <AssemblyName>PresentationBase.Tests</AssemblyName>
+    <RootNamespace>PresentationBase.Tests</RootNamespace>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <!-- C# compiler -->
+  <PropertyGroup>
+    <LangVersion>8.0</LangVersion>
+    <Nullable>enable</Nullable>
+    <Features>strict</Features>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <!-- Project references -->
+  <ItemGroup>
+    <ProjectReference Include="..\NetCore\NetCore.csproj" />
+  </ItemGroup>
+
+  <!-- NuGet Icon -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
+    <PackageReference Include="coverlet.collector" Version="1.2.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+</Project>
diff --git a/NetCore.Tests/UiHelperTests.cs b/NetCore.Tests/UiHelperTests.cs
new file mode 100644
index 0000000..833bd6c
--- /dev/null
+++ b/NetCore.Tests/UiHelperTests.cs
@@ -0,0 +1,49 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Windows.Controls;
+
+namespace PresentationBase.Tests
+{
+    [TestClass]
+    public class UiHelperTests : WpfTestsBase
+    {
+        [TestMethod]
+        public void TryFindChild()
+        {
+            App!.Dispatcher.Invoke(() =>
+            {
+                var grid = new Grid();
+                grid.Children.Add(new Button
+                {
+                    Name = "ButtonToFind"
+                });
+                grid.Children.Add(new Button
+                {
+                    Name = "OtherButton"
+                });
+                grid.Children.Add(new TextBox());
+
+                CreateInvisibleMainWindow();
+                App.MainWindow.Content = grid;
+                App.MainWindow.Show();
+
+                var foundButton = UiHelper.TryFindChild<Button>(App.MainWindow, "ButtonToFind");
+                Assert.IsNotNull(foundButton);
+                Assert.AreEqual("ButtonToFind", foundButton!.Name);
+                Assert.AreSame(grid.Children[0], foundButton);
+
+                foundButton = UiHelper.TryFindChild<Button>(App.MainWindow, "OtherButton");
+                Assert.IsNotNull(foundButton);
+                Assert.AreEqual("OtherButton", foundButton!.Name);
+                Assert.AreSame(grid.Children[1], foundButton);
+
+                foundButton = UiHelper.TryFindChild<Button>(App.MainWindow, "NotExistingButton");
+                Assert.IsNull(foundButton);
+
+                var foundTextBox = UiHelper.TryFindChild<TextBox>(App.MainWindow);
+                Assert.IsNotNull(foundTextBox);
+                Assert.AreEqual(string.Empty, foundTextBox!.Name);
+                Assert.AreSame(grid.Children[2], foundTextBox);
+            });
+        }
+    }
+}
diff --git a/NetCore.Tests/WpfTestsBase.cs b/NetCore.Tests/WpfTestsBase.cs
new file mode 100644
index 0000000..a933c11
--- /dev/null
+++ b/NetCore.Tests/WpfTestsBase.cs
@@ -0,0 +1,58 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Threading;
+using System.Windows;
+
+namespace PresentationBase.Tests
+{
+    public abstract class WpfTestsBase
+    {
+        protected Application? App { get; private set; }
+
+        private Thread? AppThread { get; set; }
+
+        [TestInitialize]
+        public void Initialize()
+        {
+            bool appStarted = false;
+
+            AppThread = new Thread(() =>
+            {
+                App = new Application();
+                App.Startup += (s, e) => appStarted = true;
+                App.Run();
+            });
+            AppThread.SetApartmentState(ApartmentState.STA);
+            AppThread.Start();
+
+            while (!appStarted) { }
+        }
+
+        protected void CreateInvisibleMainWindow()
+        {
+            App!.MainWindow = new Window
+            {
+                ShowInTaskbar = false,
+                ShowActivated = false,
+                Width = 0,
+                Height = 0,
+                WindowStyle = WindowStyle.None
+            };
+        }
+
+        [TestCleanup]
+        public void Cleanup()
+        {
+            if (App != null)
+            {
+                App.Dispatcher.Invoke(() => App.Shutdown());
+                App = null;
+            }
+
+            if (AppThread != null)
+            {
+                AppThread.Join();
+                AppThread = null;
+            }
+        }
+    }
+}
diff --git a/NetCore/CompositeViewModelCollection.cs b/NetCore/CompositeViewModelCollection.cs
index 3c24062..35eb24c 100644
--- a/NetCore/CompositeViewModelCollection.cs
+++ b/NetCore/CompositeViewModelCollection.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
@@ -30,7 +31,7 @@ public CompositeViewModelCollection() : base() { }
         /// </summary>
         /// <param name="capacity">The number of collections that the new list is initially capable of storing.</param>
         public CompositeViewModelCollection(int capacity) : base(capacity) { }
-        
+
         /// <inheritdoc/>
         public IEnumerator<IEnumerable<TViewModel>> GetEnumerator()
         {
@@ -48,19 +49,19 @@ public IEnumerator<IEnumerable<TViewModel>> GetEnumerator()
             {
                 IEnumerable<TViewModel>? result = null;
 
-                Application.Current.Dispatcher.Invoke(() =>
+                Dispatcher.Dispatch(() =>
                 {
                     result = (IEnumerable<TViewModel>)((CollectionContainer)base[collectionIndex]).Collection;
-                }, DispatcherPriority.Send);
+                });
 
                 return result!;
             }
             set
             {
-                Application.Current.Dispatcher.Invoke(() =>
+                Dispatcher.Dispatch(() =>
                 {
                     base[collectionIndex] = new CollectionContainer { Collection = value };
-                }, DispatcherPriority.Send);
+                });
             }
         }
 
@@ -76,10 +77,10 @@ public int Add(IEnumerable<TViewModel> collection)
 
             int result = 0;
 
-            Application.Current.Dispatcher.Invoke(() =>
+            Dispatcher.Dispatch(() =>
             {
                 result = base.Add(new CollectionContainer { Collection = collection });
-            }, DispatcherPriority.Send);
+            });
 
             return result;
         }
@@ -89,7 +90,7 @@ public int Add(IEnumerable<TViewModel> collection)
         /// </summary>
         new public void Clear()
         {
-            Application.Current.Dispatcher.Invoke(() => base.Clear(), DispatcherPriority.Send);
+            Dispatcher.Dispatch(() => base.Clear());
         }
 
         /// <summary>
@@ -104,7 +105,7 @@ public bool Contains(IEnumerable<TViewModel> containCollection)
 
             bool result = false;
 
-            Application.Current.Dispatcher.Invoke(() =>
+            Dispatcher.Dispatch(() =>
             {
                 foreach (var existingCollection in this)
                 {
@@ -114,7 +115,7 @@ public bool Contains(IEnumerable<TViewModel> containCollection)
                         break;
                     }
                 }
-            }, DispatcherPriority.Send);
+            });
 
             return result;
         }
@@ -131,7 +132,7 @@ public int IndexOf(IEnumerable<TViewModel> indexCollection)
 
             int result = 0;
 
-            Application.Current.Dispatcher.Invoke(() =>
+            Dispatcher.Dispatch(() =>
             {
                 for (int i = 0; i < Count; i++)
                 {
@@ -141,7 +142,7 @@ public int IndexOf(IEnumerable<TViewModel> indexCollection)
                         break;
                     }
                 }
-            }, DispatcherPriority.Send);
+            });
 
             return result;
         }
@@ -157,7 +158,7 @@ public void Insert(int insertIndex, IEnumerable<TViewModel> insertCollection)
             if (insertCollection == null)
                 throw new ArgumentNullException(nameof(insertCollection));
 
-            Application.Current.Dispatcher.Invoke(() => base.Insert(insertIndex, new CollectionContainer { Collection = insertCollection }), DispatcherPriority.Send);
+            Dispatcher.Dispatch(() => base.Insert(insertIndex, new CollectionContainer { Collection = insertCollection }));
         }
 
         /// <summary>
@@ -170,7 +171,7 @@ public void Remove(IEnumerable<TViewModel> removeCollection)
             if (removeCollection == null)
                 throw new ArgumentNullException(nameof(removeCollection));
 
-            Application.Current.Dispatcher.Invoke(() =>
+            Dispatcher.Dispatch(() =>
             {
                 for (int i = 0; i < Count; i++)
                 {
@@ -180,7 +181,7 @@ public void Remove(IEnumerable<TViewModel> removeCollection)
                         break;
                     }
                 }
-            }, DispatcherPriority.Send);
+            });
         }
 
         /// <summary>
@@ -190,7 +191,7 @@ public void Remove(IEnumerable<TViewModel> removeCollection)
         /// <param name="removeIndex">The index at which to remove a collection.</param>
         new public void RemoveAt(int removeIndex)
         {
-            Application.Current.Dispatcher.Invoke(() => base.RemoveAt(removeIndex), DispatcherPriority.Send);
+            Dispatcher.Dispatch(() => base.RemoveAt(removeIndex));
         }
 
         #region Overshadowed members
diff --git a/NetCore/Converters/AllBoolToVisibilityConverter.cs b/NetCore/Converters/AllBoolToVisibilityConverter.cs
index adc00a6..9899607 100644
--- a/NetCore/Converters/AllBoolToVisibilityConverter.cs
+++ b/NetCore/Converters/AllBoolToVisibilityConverter.cs
@@ -14,32 +14,15 @@ namespace PresentationBase.Converters
     [ValueConversion(typeof(bool), typeof(Visibility))]
     [MarkupExtensionReturnType(typeof(AllBoolToVisibilityConverter))]
     public class AllBoolToVisibilityConverter
-        : MarkupExtension, IMultiValueConverter
+        : MultiConverterBase
     {
-        /// <summary>
-        /// A static instance of this value converter.
-        /// </summary>
-        public static readonly AllBoolToVisibilityConverter Instance = new AllBoolToVisibilityConverter();
-
         /// <inheritdoc/>
-        public object? Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        public override object? Convert(object[]? values, Type? targetType, object? parameter, CultureInfo? culture)
         {
-            if (values.Any(v => !(v is bool)))
+            if (values == null || values.Any(v => !(v is bool)))
                 return DependencyProperty.UnsetValue;
 
             return values.Cast<bool>().All(b => b) ? Visibility.Visible : Visibility.Collapsed;
         }
-
-        /// <inheritdoc/>
-        public object[]? ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return Instance;
-        }
     }
 }
diff --git a/NetCore/Converters/AllBoolToVisibilityReversedConverter.cs b/NetCore/Converters/AllBoolToVisibilityReversedConverter.cs
index c655a80..ad56d9e 100644
--- a/NetCore/Converters/AllBoolToVisibilityReversedConverter.cs
+++ b/NetCore/Converters/AllBoolToVisibilityReversedConverter.cs
@@ -14,32 +14,15 @@ namespace PresentationBase.Converters
     [ValueConversion(typeof(bool), typeof(Visibility))]
     [MarkupExtensionReturnType(typeof(AllBoolToVisibilityReversedConverter))]
     public class AllBoolToVisibilityReversedConverter
-        : MarkupExtension, IMultiValueConverter
+        : MultiConverterBase
     {
-        /// <summary>
-        /// A static instance of this value converter.
-        /// </summary>
-        public static readonly AllBoolToVisibilityReversedConverter Instance = new AllBoolToVisibilityReversedConverter();
-
         /// <inheritdoc/>
-        public object? Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        public override object? Convert(object[]? values, Type? targetType, object? parameter, CultureInfo? culture)
         {
-            if (values.Any(v => !(v is bool)))
+            if (values == null || values.Any(v => !(v is bool)))
                 return DependencyProperty.UnsetValue;
 
             return values.Cast<bool>().All(b => b) ? Visibility.Collapsed : Visibility.Visible;
         }
-
-        /// <inheritdoc/>
-        public object[]? ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc/>
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return Instance;
-        }
     }
 }
diff --git a/NetCore/Converters/AnyBoolToVisibilityConverter.cs b/NetCore/Converters/AnyBoolToVisibilityConverter.cs
index a5409d5..a0d7b42 100644
--- a/NetCore/Converters/AnyBoolToVisibilityConverter.cs
+++ b/NetCore/Converters/AnyBoolToVisibilityConverter.cs
@@ -14,32 +14,15 @@ namespace PresentationBase.Converters
 	[ValueConversion(typeof(bool), typeof(Visibility))]
 	[MarkupExtensionReturnType(typeof(AnyBoolToVisibilityConverter))]
 	public class AnyBoolToVisibilityConverter
-		: MarkupExtension, IMultiValueConverter
+		: MultiConverterBase
 	{
-		/// <summary>
-		/// A static instance of this value converter.
-		/// </summary>
-		public static readonly AnyBoolToVisibilityConverter Instance = new AnyBoolToVisibilityConverter();
-
 		/// <inheritdoc/>
-		public object? Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+		public override object? Convert(object[]? values, Type? targetType, object? parameter, CultureInfo? culture)
 		{
-			if (values.Any(v => !(v is bool)))
+			if (values == null || values.Any(v => !(v is bool)))
 				return DependencyProperty.UnsetValue;
 
 			return values.Cast<bool>().Any(b => b) ? Visibility.Visible : Visibility.Collapsed;
 		}
-
-		/// <inheritdoc/>
-		public object[]? ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-		{
-			throw new NotImplementedException();
-		}
-
-		/// <inheritdoc/>
-		public override object ProvideValue(IServiceProvider serviceProvider)
-		{
-			return Instance;
-		}
 	}
 }
diff --git a/NetCore/Converters/AnyBoolToVisibilityReversedConverter.cs b/NetCore/Converters/AnyBoolToVisibilityReversedConverter.cs
index 0e658ea..29612a1 100644
--- a/NetCore/Converters/AnyBoolToVisibilityReversedConverter.cs
+++ b/NetCore/Converters/AnyBoolToVisibilityReversedConverter.cs
@@ -14,32 +14,15 @@ namespace PresentationBase.Converters
 	[ValueConversion(typeof(bool), typeof(Visibility))]
 	[MarkupExtensionReturnType(typeof(AnyBoolToVisibilityReversedConverter))]
 	public class AnyBoolToVisibilityReversedConverter
-		: MarkupExtension, IMultiValueConverter
+		: MultiConverterBase
 	{
-		/// <summary>
-		/// A static instance of this value converter.
-		/// </summary>
-		public static readonly AnyBoolToVisibilityReversedConverter Instance = new AnyBoolToVisibilityReversedConverter();
-
 		/// <inheritdoc/>
-		public object? Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+		public override object? Convert(object[]? values, Type? targetType, object? parameter, CultureInfo? culture)
 		{
-			if (values.Any(v => !(v is bool)))
+			if (values == null || values.Any(v => !(v is bool)))
 				return DependencyProperty.UnsetValue;
 
 			return values.Cast<bool>().Any(b => b) ? Visibility.Collapsed : Visibility.Visible;
 		}
-
-		/// <inheritdoc/>
-		public object[]? ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-		{
-			throw new NotImplementedException();
-		}
-
-		/// <inheritdoc/>
-		public override object ProvideValue(IServiceProvider serviceProvider)
-		{
-			return Instance;
-		}
 	}
 }
diff --git a/NetCore/Converters/BoolToBoolReversedConverter.cs b/NetCore/Converters/BoolToBoolReversedConverter.cs
index 24bd6ef..7811aeb 100644
--- a/NetCore/Converters/BoolToBoolReversedConverter.cs
+++ b/NetCore/Converters/BoolToBoolReversedConverter.cs
@@ -12,15 +12,10 @@ namespace PresentationBase.Converters
 	[ValueConversion(typeof(bool), typeof(bool))]
 	[MarkupExtensionReturnType(typeof(BoolToBoolReversedConverter))]
 	public class BoolToBoolReversedConverter
-		: MarkupExtension, IValueConverter
+		: ConverterBase
 	{
-		/// <summary>
-		/// A static instance of this value converter.
-		/// </summary>
-		public static readonly BoolToBoolReversedConverter Instance = new BoolToBoolReversedConverter();
-
 		/// <inheritdoc/>
-		public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		public override object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		{
 			if (!(value is bool))
 				return DependencyProperty.UnsetValue;
@@ -29,18 +24,12 @@ public class BoolToBoolReversedConverter
 		}
 
 		/// <inheritdoc/>
-		public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		public override object? ConvertBack(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		{
 			if (!(value is bool))
 				return DependencyProperty.UnsetValue;
 
 			return !(bool)value;
 		}
-
-		/// <inheritdoc/>
-		public override object ProvideValue(IServiceProvider serviceProvider)
-		{
-			return Instance;
-		}
 	}
 }
diff --git a/NetCore/Converters/BoolToProgressStateConverter.cs b/NetCore/Converters/BoolToProgressStateConverter.cs
index d267804..9c754e5 100644
--- a/NetCore/Converters/BoolToProgressStateConverter.cs
+++ b/NetCore/Converters/BoolToProgressStateConverter.cs
@@ -13,15 +13,10 @@ namespace PresentationBase.Converters
 	[ValueConversion(typeof(bool), typeof(TaskbarItemProgressState))]
 	[MarkupExtensionReturnType(typeof(BoolToProgressStateConverter))]
 	public class BoolToProgressStateConverter
-		: MarkupExtension, IValueConverter
+		: ConverterBase
 	{
-		/// <summary>
-		/// A static instance of this value converter.
-		/// </summary>
-		public static readonly BoolToProgressStateConverter Instance = new BoolToProgressStateConverter();
-
 		/// <inheritdoc/>
-		public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		public override object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		{
 			if (!(value is bool))
 				return DependencyProperty.UnsetValue;
@@ -30,18 +25,12 @@ public class BoolToProgressStateConverter
 		}
 
 		/// <inheritdoc/>
-		public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		public override object? ConvertBack(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		{
 			if (!(value is TaskbarItemProgressState))
 				return DependencyProperty.UnsetValue;
 
-			return (TaskbarItemProgressState)value == TaskbarItemProgressState.Indeterminate ? true : false;
-		}
-
-		/// <inheritdoc/>
-		public override object ProvideValue(IServiceProvider serviceProvider)
-		{
-			return Instance;
+			return (TaskbarItemProgressState)value == TaskbarItemProgressState.Indeterminate;
 		}
 	}
 }
diff --git a/NetCore/Converters/BoolToVisibilityConverter.cs b/NetCore/Converters/BoolToVisibilityConverter.cs
index 6e57023..79b6d5a 100644
--- a/NetCore/Converters/BoolToVisibilityConverter.cs
+++ b/NetCore/Converters/BoolToVisibilityConverter.cs
@@ -12,15 +12,10 @@ namespace PresentationBase.Converters
 	[ValueConversion(typeof(bool), typeof(Visibility))]
 	[MarkupExtensionReturnType(typeof(BoolToVisibilityConverter))]
 	public class BoolToVisibilityConverter
-		: MarkupExtension, IValueConverter
+		: ConverterBase
 	{
-		/// <summary>
-		/// A static instance of this value converter.
-		/// </summary>
-		public static readonly BoolToVisibilityConverter Instance = new BoolToVisibilityConverter();
-
 		/// <inheritdoc/>
-		public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		public override object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		{
 			if (!(value is bool))
 				return DependencyProperty.UnsetValue;
@@ -29,18 +24,12 @@ public class BoolToVisibilityConverter
 		}
 
 		/// <inheritdoc/>
-		public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		public override object? ConvertBack(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		{
 			if (!(value is Visibility))
 				return DependencyProperty.UnsetValue;
 
-			return (Visibility)value == Visibility.Visible ? true : false;
-		}
-
-		/// <inheritdoc/>
-		public override object ProvideValue(IServiceProvider serviceProvider)
-		{
-			return Instance;
+			return (Visibility)value == Visibility.Visible;
 		}
 	}
 }
diff --git a/NetCore/Converters/BoolToVisibilityReversedConverter.cs b/NetCore/Converters/BoolToVisibilityReversedConverter.cs
index b1aaa5f..9001d68 100644
--- a/NetCore/Converters/BoolToVisibilityReversedConverter.cs
+++ b/NetCore/Converters/BoolToVisibilityReversedConverter.cs
@@ -12,15 +12,10 @@ namespace PresentationBase.Converters
 	[ValueConversion(typeof(bool), typeof(Visibility))]
 	[MarkupExtensionReturnType(typeof(BoolToVisibilityReversedConverter))]
 	public class BoolToVisibilityReversedConverter
-		: MarkupExtension, IValueConverter
+		: ConverterBase
 	{
-		/// <summary>
-		/// A static instance of this value converter.
-		/// </summary>
-		public static readonly BoolToVisibilityReversedConverter Instance = new BoolToVisibilityReversedConverter();
-
 		/// <inheritdoc/>
-		public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		public override object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		{
 			if (!(value is bool))
 				return DependencyProperty.UnsetValue;
@@ -29,18 +24,12 @@ public class BoolToVisibilityReversedConverter
 		}
 
 		/// <inheritdoc/>
-		public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		public override object? ConvertBack(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		{
 			if (!(value is Visibility))
 				return DependencyProperty.UnsetValue;
 
-			return (Visibility)value == Visibility.Visible ? false : true;
-		}
-
-		/// <inheritdoc/>
-		public override object ProvideValue(IServiceProvider serviceProvider)
-		{
-			return Instance;
+			return (Visibility)value != Visibility.Visible;
 		}
 	}
 }
diff --git a/NetCore/Converters/ConverterBase.cs b/NetCore/Converters/ConverterBase.cs
new file mode 100644
index 0000000..1935047
--- /dev/null
+++ b/NetCore/Converters/ConverterBase.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Markup;
+
+namespace PresentationBase.Converters
+{
+    /// <summary>
+    /// Base class for converters in PresentationBase.
+    /// </summary>
+    public abstract class ConverterBase
+        : MarkupExtension, IValueConverter, IConverter
+    {
+        private ConverterBase? _instance;
+
+        /// <inheritdoc/>
+        private ConverterBase Instance
+        {
+            get
+            {
+                if (_instance == null)
+                    _instance = (Activator.CreateInstance(GetType()) as ConverterBase)!;
+
+                return _instance;
+            }
+        }
+
+        /// <inheritdoc/>
+        IConverter IConverter.Instance => Instance;
+
+        /// <inheritdoc/>
+        public sealed override object ProvideValue(IServiceProvider serviceProvider)
+        {
+            return Instance;
+        }
+
+        /// <inheritdoc/>
+        public abstract object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture);
+
+        /// <inheritdoc/>
+        public virtual object? ConvertBack(object? value, Type? targetType, object? parameter, CultureInfo? culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/NetCore/Converters/EnumToTextConverter.cs b/NetCore/Converters/EnumToTextConverter.cs
index 9ba028b..4575536 100644
--- a/NetCore/Converters/EnumToTextConverter.cs
+++ b/NetCore/Converters/EnumToTextConverter.cs
@@ -12,32 +12,15 @@ namespace PresentationBase.Converters
 	[ValueConversion(typeof(Enum), typeof(string))]
 	[MarkupExtensionReturnType(typeof(EnumToTextConverter))]
 	public class EnumToTextConverter
-		: MarkupExtension, IValueConverter
+		: ConverterBase
 	{
-		/// <summary>
-		/// A static instance of this value converter.
-		/// </summary>
-		public static readonly EnumToTextConverter Instance = new EnumToTextConverter();
-
 		/// <inheritdoc/>
-		public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		public override object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		{
 			if (!(value is Enum))
 				return DependencyProperty.UnsetValue;
 
 			return Enum.GetName(value.GetType(), value);
 		}
-
-		/// <inheritdoc/>
-		public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-		{
-			throw new NotImplementedException();
-		}
-
-		/// <inheritdoc/>
-		public override object ProvideValue(IServiceProvider serviceProvider)
-		{
-			return Instance;
-		}
 	}
 }
diff --git a/NetCore/Converters/EqualsToVisibilityConverter.cs b/NetCore/Converters/EqualsToVisibilityConverter.cs
index 043bc65..2340247 100644
--- a/NetCore/Converters/EqualsToVisibilityConverter.cs
+++ b/NetCore/Converters/EqualsToVisibilityConverter.cs
@@ -13,15 +13,10 @@ namespace PresentationBase.Converters
 	[ValueConversion(typeof(bool), typeof(Visibility), ParameterType = typeof(object))]
 	[MarkupExtensionReturnType(typeof(EqualsToVisibilityConverter))]
 	public class EqualsToVisibilityConverter
-		: MarkupExtension, IValueConverter
+		: ConverterBase
 	{
-		/// <summary>
-		/// A static instance of this value converter.
-		/// </summary>
-		public static readonly EqualsToVisibilityConverter Instance = new EqualsToVisibilityConverter();
-
 		/// <inheritdoc/>
-		public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		public override object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		{
 			if (value == null && parameter == null)
 				return Visibility.Visible;
@@ -29,19 +24,7 @@ public class EqualsToVisibilityConverter
 			if (value != null)
 				return value.Equals(parameter) ? Visibility.Visible : Visibility.Collapsed;
 
-			return parameter.Equals(value) ? Visibility.Visible : Visibility.Collapsed;
-		}
-
-		/// <inheritdoc/>
-		public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-		{
-			throw new NotImplementedException();
-		}
-
-		/// <inheritdoc/>
-		public override object ProvideValue(IServiceProvider serviceProvider)
-		{
-			return Instance;
+			return parameter == null ? Visibility.Visible : Visibility.Collapsed;
 		}
 	}
 }
diff --git a/NetCore/Converters/IConverter.cs b/NetCore/Converters/IConverter.cs
new file mode 100644
index 0000000..c94cfae
--- /dev/null
+++ b/NetCore/Converters/IConverter.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Windows.Markup;
+
+namespace PresentationBase.Converters
+{
+    /// <summary>
+    /// Every PresentationBase converter contains an instance property and a ProvideValue function.
+    /// </summary>
+    public interface IConverter
+    {
+        /// <summary>
+        /// A static instance of this value converter.
+        /// </summary>
+        IConverter Instance { get; }
+
+        /// <summary>
+        /// Needed for the implementation of <see cref="MarkupExtension.ProvideValue(IServiceProvider)"/>.
+        /// </summary>
+        object ProvideValue(IServiceProvider serviceProvider);
+    }
+}
diff --git a/NetCore/Converters/MultiConverterBase.cs b/NetCore/Converters/MultiConverterBase.cs
new file mode 100644
index 0000000..45d4af3
--- /dev/null
+++ b/NetCore/Converters/MultiConverterBase.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Markup;
+
+namespace PresentationBase.Converters
+{
+    /// <summary>
+    /// Base class for multi converters in PresentationBase.
+    /// </summary>
+    public abstract class MultiConverterBase
+        : MarkupExtension, IMultiValueConverter, IConverter
+    {
+        private MultiConverterBase? _instance;
+
+        /// <inheritdoc/>
+        private MultiConverterBase Instance
+        {
+            get
+            {
+                if (_instance == null)
+                    _instance = (Activator.CreateInstance(GetType()) as MultiConverterBase)!;
+
+                return _instance;
+            }
+        }
+
+        /// <inheritdoc/>
+        IConverter IConverter.Instance => Instance;
+
+        /// <inheritdoc/>
+        public sealed override object ProvideValue(IServiceProvider serviceProvider)
+        {
+            return Instance;
+        }
+
+        /// <inheritdoc/>
+        public abstract object? Convert(object[]? values, Type? targetType, object? parameter, CultureInfo? culture);
+
+        /// <inheritdoc/>
+        public virtual object[]? ConvertBack(object? value, Type[]? targetTypes, object? parameter, CultureInfo? culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/NetCore/Converters/NullToBoolConverter.cs b/NetCore/Converters/NullToBoolConverter.cs
index 30be722..47e8ef3 100644
--- a/NetCore/Converters/NullToBoolConverter.cs
+++ b/NetCore/Converters/NullToBoolConverter.cs
@@ -11,29 +11,12 @@ namespace PresentationBase.Converters
 	[ValueConversion(typeof(object), typeof(bool))]
 	[MarkupExtensionReturnType(typeof(NullToBoolConverter))]
 	public class NullToBoolConverter
-		: MarkupExtension, IValueConverter
+		: ConverterBase
 	{
-		/// <summary>
-		/// A static instance of this value converter.
-		/// </summary>
-		public static readonly NullToBoolConverter Instance = new NullToBoolConverter();
-
 		/// <inheritdoc/>
-		public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		public override object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		{
 			return value == null;
 		}
-
-		/// <inheritdoc/>
-		public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-		{
-			throw new NotImplementedException();
-		}
-
-		/// <inheritdoc/>
-		public override object ProvideValue(IServiceProvider serviceProvider)
-		{
-			return Instance;
-		}
 	}
 }
diff --git a/NetCore/Converters/NullToBoolReversedConverter.cs b/NetCore/Converters/NullToBoolReversedConverter.cs
index 74b32f0..381d85b 100644
--- a/NetCore/Converters/NullToBoolReversedConverter.cs
+++ b/NetCore/Converters/NullToBoolReversedConverter.cs
@@ -11,29 +11,12 @@ namespace PresentationBase.Converters
 	[ValueConversion(typeof(object), typeof(bool))]
 	[MarkupExtensionReturnType(typeof(NullToBoolReversedConverter))]
 	public class NullToBoolReversedConverter
-		: MarkupExtension, IValueConverter
+		: ConverterBase
 	{
-		/// <summary>
-		/// A static instance of this value converter.
-		/// </summary>
-		public static readonly NullToBoolReversedConverter Instance = new NullToBoolReversedConverter();
-
 		/// <inheritdoc/>
-		public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		public override object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		{
 			return value != null;
 		}
-
-		/// <inheritdoc/>
-		public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-		{
-			throw new NotImplementedException();
-		}
-
-		/// <inheritdoc/>
-		public override object ProvideValue(IServiceProvider serviceProvider)
-		{
-			return Instance;
-		}
 	}
 }
diff --git a/NetCore/Converters/NullToVisibilityConverter.cs b/NetCore/Converters/NullToVisibilityConverter.cs
index cc82567..8382ec5 100644
--- a/NetCore/Converters/NullToVisibilityConverter.cs
+++ b/NetCore/Converters/NullToVisibilityConverter.cs
@@ -13,29 +13,12 @@ namespace PresentationBase.Converters
 	[ValueConversion(typeof(object), typeof(Visibility))]
 	[MarkupExtensionReturnType(typeof(NullToVisibilityConverter))]
 	public class NullToVisibilityConverter
-		: MarkupExtension, IValueConverter
+		: ConverterBase
 	{
-		/// <summary>
-		/// A static instance of this value converter.
-		/// </summary>
-		public static readonly NullToVisibilityConverter Instance = new NullToVisibilityConverter();
-
 		/// <inheritdoc/>
-		public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		public override object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		{
 			return value == null ? Visibility.Visible : Visibility.Collapsed;
 		}
-
-		/// <inheritdoc/>
-		public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-		{
-			throw new NotImplementedException();
-		}
-
-		/// <inheritdoc/>
-		public override object ProvideValue(IServiceProvider serviceProvider)
-		{
-			return Instance;
-		}
 	}
 }
diff --git a/NetCore/Converters/NullToVisibilityReversedConverter.cs b/NetCore/Converters/NullToVisibilityReversedConverter.cs
index cfbf0f7..6e06af9 100644
--- a/NetCore/Converters/NullToVisibilityReversedConverter.cs
+++ b/NetCore/Converters/NullToVisibilityReversedConverter.cs
@@ -13,29 +13,12 @@ namespace PresentationBase.Converters
 	[ValueConversion(typeof(object), typeof(Visibility))]
 	[MarkupExtensionReturnType(typeof(NullToVisibilityReversedConverter))]
 	public class NullToVisibilityReversedConverter
-		: MarkupExtension, IValueConverter
+		: ConverterBase
 	{
-		/// <summary>
-		/// A static instance of this value converter.
-		/// </summary>
-		public static readonly NullToVisibilityReversedConverter Instance = new NullToVisibilityReversedConverter();
-
 		/// <inheritdoc/>
-		public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		public override object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		{
 			return value == null ? Visibility.Collapsed : Visibility.Visible;
 		}
-
-		/// <inheritdoc/>
-		public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-		{
-			throw new NotImplementedException();
-		}
-
-		/// <inheritdoc/>
-		public override object ProvideValue(IServiceProvider serviceProvider)
-		{
-			return Instance;
-		}
 	}
 }
diff --git a/NetCore/Converters/VisibilityToPanningModeConverter.cs b/NetCore/Converters/VisibilityToPanningModeConverter.cs
index 9a41d9a..46bafbb 100644
--- a/NetCore/Converters/VisibilityToPanningModeConverter.cs
+++ b/NetCore/Converters/VisibilityToPanningModeConverter.cs
@@ -14,15 +14,10 @@ namespace PresentationBase.Converters
 	[ValueConversion(typeof(Visibility), typeof(PanningMode), ParameterType = typeof(PanningMode))]
 	[MarkupExtensionReturnType(typeof(VisibilityToPanningModeConverter))]
 	public class VisibilityToPanningModeConverter
-		: MarkupExtension, IValueConverter
+		: ConverterBase
 	{
-		/// <summary>
-		/// A static instance of this value converter.
-		/// </summary>
-		public static readonly VisibilityToPanningModeConverter Instance = new VisibilityToPanningModeConverter();
-
 		/// <inheritdoc/>
-		public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		public override object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		{
 			if (!(value is Visibility))
 				return DependencyProperty.UnsetValue;
@@ -36,17 +31,5 @@ public class VisibilityToPanningModeConverter
 
 			return scrollBarVisibility == Visibility.Visible ? panningMode : PanningMode.None;
 		}
-
-		/// <inheritdoc/>
-		public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-		{
-			throw new NotImplementedException();
-		}
-
-		/// <inheritdoc/>
-		public override object ProvideValue(IServiceProvider serviceProvider)
-		{
-			return Instance;
-		}
 	}
 }
diff --git a/NetCore/Converters/ZeroToVisibilityConverter.cs b/NetCore/Converters/ZeroToVisibilityConverter.cs
index 5668754..3d2808d 100644
--- a/NetCore/Converters/ZeroToVisibilityConverter.cs
+++ b/NetCore/Converters/ZeroToVisibilityConverter.cs
@@ -13,32 +13,15 @@ namespace PresentationBase.Converters
 	[ValueConversion(typeof(int), typeof(Visibility))]
 	[MarkupExtensionReturnType(typeof(ZeroToVisibilityConverter))]
 	public class ZeroToVisibilityConverter
-		: MarkupExtension, IValueConverter
+		: ConverterBase
 	{
-		/// <summary>
-		/// A static instance of this value converter.
-		/// </summary>
-		public static readonly ZeroToVisibilityConverter Instance = new ZeroToVisibilityConverter();
-
 		/// <inheritdoc/>
-		public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		public override object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		{
 			if (!(value is int))
 				return Visibility.Collapsed;
 
 			return (int)value == 0 ? Visibility.Visible : Visibility.Collapsed;
 		}
-
-		/// <inheritdoc/>
-		public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-		{
-			throw new NotImplementedException();
-		}
-
-		/// <inheritdoc/>
-		public override object ProvideValue(IServiceProvider serviceProvider)
-		{
-			return Instance;
-		}
 	}
 }
diff --git a/NetCore/Converters/ZeroToVisibilityReversedConverter.cs b/NetCore/Converters/ZeroToVisibilityReversedConverter.cs
index 1e649b7..d05d4f2 100644
--- a/NetCore/Converters/ZeroToVisibilityReversedConverter.cs
+++ b/NetCore/Converters/ZeroToVisibilityReversedConverter.cs
@@ -13,32 +13,15 @@ namespace PresentationBase.Converters
 	[ValueConversion(typeof(int), typeof(Visibility))]
 	[MarkupExtensionReturnType(typeof(ZeroToVisibilityReversedConverter))]
 	public class ZeroToVisibilityReversedConverter
-		: MarkupExtension, IValueConverter
+		: ConverterBase
 	{
-		/// <summary>
-		/// A static instance of this value converter.
-		/// </summary>
-		public static readonly ZeroToVisibilityReversedConverter Instance = new ZeroToVisibilityReversedConverter();
-
 		/// <inheritdoc/>
-		public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		public override object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		{
 			if (!(value is int))
 				return Visibility.Visible;
 
 			return (int)value == 0 ? Visibility.Collapsed : Visibility.Visible;
 		}
-
-		/// <inheritdoc/>
-		public object? ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-		{
-			throw new NotImplementedException();
-		}
-
-		/// <inheritdoc/>
-		public override object ProvideValue(IServiceProvider serviceProvider)
-		{
-			return Instance;
-		}
 	}
 }
diff --git a/NetCore/DtoConverters/DtoAttribute.cs b/NetCore/DtoConverters/DtoAttribute.cs
deleted file mode 100644
index 71a40ee..0000000
--- a/NetCore/DtoConverters/DtoAttribute.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Linq;
-
-namespace PresentationBase.DtoConverters
-{
-	/// <summary>
-	/// Links a view model to a data transfer object.
-	/// This enables conversion with <see cref="DtoConverterExtensions.ToDto{TModel}(ViewModel)"/> and <see cref="DtoConverterExtensions.ToViewModel{TViewModel}(object)"/>./>
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
-	public class DtoAttribute
-		: Attribute
-	{
-		/// <summary>
-		/// The data transfer object type.
-		/// </summary>
-		public Type Type { get; private set; }
-
-		/// <summary>
-		/// Creates a new <see cref="DtoAttribute"/> instance.
-		/// </summary>
-		/// <param name="type">The data transfer object type.</param>
-		public DtoAttribute(Type type)
-		{
-			Type = type ?? throw new ArgumentNullException(nameof(type));
-		}
-
-		/// <summary>
-		/// Returns a <see cref="DtoAttribute"/> if found for a given view model type.
-		/// </summary>
-		/// <param name="viewModelType">The view model type.</param>
-		public static DtoAttribute? GetDtoAttribute(Type viewModelType)
-		{
-			if (viewModelType == null)
-				throw new ArgumentNullException(nameof(viewModelType));
-
-			return viewModelType.GetCustomAttributes(true).OfType<DtoAttribute>().FirstOrDefault();
-		}
-	}
-}
diff --git a/NetCore/DtoConverters/DtoConverterExtensions.cs b/NetCore/DtoConverters/DtoConverterExtensions.cs
deleted file mode 100644
index bc7edcf..0000000
--- a/NetCore/DtoConverters/DtoConverterExtensions.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using System;
-
-namespace PresentationBase.DtoConverters
-{
-	/// <summary>
-	/// Contains extension methods for converstion between view models and data transfer objects.
-	/// </summary>
-	public static class DtoConverterExtensions
-	{
-		/// <summary>
-		/// Creates a view model from a given data transfer object.
-		/// The view model must use <see cref="DtoAttribute"/> and <see cref="DtoPropertyAttribute"/> for the conversion to work.
-		/// </summary>
-		/// <typeparam name="TViewModel">The view model type to create.</typeparam>
-		/// <param name="dto">The data transfer object to convert.</param>
-		/// <returns>The converted view model.</returns>
-		public static TViewModel ToViewModel<TViewModel>(this object dto)
-			where TViewModel : ViewModel
-		{
-			if (dto == null)
-				throw new ArgumentNullException(nameof(dto));
-
-			var dtoAttr = DtoAttribute.GetDtoAttribute(typeof(TViewModel));
-			if (dtoAttr == null)
-				throw new InvalidOperationException("The given view model has no DtoAttribute defined.");
-
-			if (!dtoAttr.Type.IsAssignableFrom(dto.GetType()))
-				throw new InvalidCastException($"Cannot cast the data transfer object attribute type {dtoAttr.Type.Name} into the given type {dto.GetType().Name}.");
-
-			TViewModel result = (TViewModel)Activator.CreateInstance(typeof(TViewModel))!;
-
-			foreach (var propertyInfo in typeof(TViewModel).GetProperties())
-			{
-				var dtoPropertyAttr = DtoPropertyAttribute.GetDtoPropertyAttribute(propertyInfo);
-				if (dtoPropertyAttr == null)
-					continue;
-
-				var dtoPropertyInfo = dtoAttr.Type.GetProperty(dtoPropertyAttr.PropertyName);
-				if (dtoPropertyInfo == null)
-					throw new InvalidOperationException($"There is no property called {dtoPropertyAttr.PropertyName} for the data transfer object type {dtoAttr.Type.Name}.");
-
-				propertyInfo.SetValue(result, dtoPropertyInfo.GetValue(dto, null), null);
-			}
-
-			return result;
-		}
-
-		/// <summary>
-		/// Creates a data transfer object from a given view model.
-		/// The view model must use <see cref="DtoAttribute"/> and <see cref="DtoPropertyAttribute"/> for the conversion to work.
-		/// </summary>
-		/// <typeparam name="TDto">The data transfer object type to create.</typeparam>
-		/// <param name="viewModel">The view model to convert.</param>
-		/// <returns>The converted data transfer object.</returns>
-		public static TDto ToDto<TDto>(this ViewModel viewModel)
-			where TDto : class
-		{
-			if (viewModel == null)
-				throw new ArgumentNullException(nameof(viewModel));
-
-			var dtoAttr = DtoAttribute.GetDtoAttribute(viewModel.GetType());
-			if (dtoAttr == null)
-				throw new InvalidOperationException("The given view data transfer object has no DtoAttribute defined.");
-
-			if (!dtoAttr.Type.IsAssignableFrom(typeof(TDto)))
-				throw new InvalidCastException($"Cannot cast the data transfer object attribute type {dtoAttr.Type.Name} into the desired type {typeof(TDto).Name}.");
-
-			TDto result = (TDto)Activator.CreateInstance(dtoAttr.Type)!;
-
-			foreach (var propertyInfo in viewModel.GetType().GetProperties())
-			{
-				var dtoPropertyAttr = DtoPropertyAttribute.GetDtoPropertyAttribute(propertyInfo);
-				if (dtoPropertyAttr == null)
-					continue;
-
-				var dtoPropertyInfo = dtoAttr.Type.GetProperty(dtoPropertyAttr.PropertyName);
-				if (dtoPropertyInfo == null)
-					throw new InvalidOperationException($"There is no property called {dtoPropertyAttr.PropertyName} for the data transfer object type {dtoAttr.Type.Name}.");
-
-				dtoPropertyInfo.SetValue(result, propertyInfo.GetValue(viewModel, null), null);
-			}
-
-			return result;
-		}
-	}
-}
diff --git a/NetCore/DtoConverters/DtoPropertyAttribute.cs b/NetCore/DtoConverters/DtoPropertyAttribute.cs
deleted file mode 100644
index c2e2da8..0000000
--- a/NetCore/DtoConverters/DtoPropertyAttribute.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Reflection;
-
-namespace PresentationBase.DtoConverters
-{
-	/// <summary>
-	/// Links a view model property to a data transfer object property.
-	/// This enables conversion with <see cref="DtoConverterExtensions.ToDto{TModel}(ViewModel)"/> and <see cref="DtoConverterExtensions.ToViewModel{TViewModel}(object)"/>./>
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
-	public class DtoPropertyAttribute
-		: Attribute
-	{
-		/// <summary>
-		/// The data transfer object property name.
-		/// </summary>
-		public string PropertyName { get; private set; }
-
-		/// <summary>
-		/// Creates a new <see cref="DtoPropertyAttribute"/> instance.
-		/// </summary>
-		/// <param name="propertyName">The data transfer object property name.</param>
-		public DtoPropertyAttribute(string propertyName)
-		{
-			if (string.IsNullOrEmpty(propertyName))
-				throw new ArgumentNullException(nameof(propertyName));
-
-			PropertyName = propertyName;
-		}
-
-		/// <summary>
-		/// Returns a <see cref="DtoPropertyAttribute"/> if found for a given <see cref="PropertyInfo"/>.
-		/// </summary>
-		/// <param name="viewModelPropertyInfo">The property info.</param>
-		public static DtoPropertyAttribute? GetDtoPropertyAttribute(PropertyInfo viewModelPropertyInfo)
-		{
-			if (viewModelPropertyInfo == null)
-				throw new ArgumentNullException(nameof(viewModelPropertyInfo));
-
-			return viewModelPropertyInfo.GetCustomAttribute<DtoPropertyAttribute>(true);
-		}
-	}
-}
diff --git a/NetCore/HelperExtensions.cs b/NetCore/HelperExtensions.cs
deleted file mode 100644
index 2552e5c..0000000
--- a/NetCore/HelperExtensions.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace PresentationBase
-{
-    internal static class HelperExtensions
-    {
-        public static bool HasGenericTypeArgument(this Type type, Type genericType)
-        {
-            if (type.GenericTypeArguments.Length == 1 && genericType.IsAssignableFrom(type.GenericTypeArguments[0]))
-                return true;
-
-            if (type.BaseType == null)
-                return false;
-
-            return HasGenericTypeArgument(type.BaseType, genericType);
-        }
-    }
-}
diff --git a/NetCore/IViewModelCommand.cs b/NetCore/IViewModelCommand.cs
deleted file mode 100644
index 1af8c3f..0000000
--- a/NetCore/IViewModelCommand.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Windows.Input;
-
-namespace PresentationBase
-{
-	/// <summary>
-	/// The interface for view model commands.
-	/// </summary>
-	public interface IViewModelCommand
-		: ICommand
-	{
-		/// <summary>
-		/// Raises <see cref="ICommand.CanExecuteChanged"/> and causes <see cref="CanExecute"/> to be reevaluated.
-		/// </summary>
-		void RaiseCanExecuteChanged();
-
-		/// <summary>
-		/// Returns if the command can be executed for the given view model.
-		/// </summary>
-		/// <param name="parameter">The view model this command would be executed on.</param>
-		/// <returns>Returns if <see cref="Execute"/> is allowed for the given <paramref name="parameter"/>.</returns>
-		bool CanExecute(ViewModel parameter);
-
-		/// <summary>
-		/// Executes the command for the given view model.
-		/// </summary>
-		/// <param name="parameter">The view model this command is executed on.</param>
-		void Execute(ViewModel parameter);
-	}
-}
diff --git a/NetCore/IViewModelCommandAsync.cs b/NetCore/IViewModelCommandAsync.cs
deleted file mode 100644
index 6868157..0000000
--- a/NetCore/IViewModelCommandAsync.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace PresentationBase
-{
-	/// <summary>
-	/// The interface for <strong>asynchronous</strong> view model commands.
-	/// </summary>
-	public interface IViewModelCommandAsync
-		: IViewModelCommand
-	{
-		/// <summary>
-		/// Executes the command for the given view model <strong>asynchronously</strong>.
-		/// </summary>
-		/// <param name="parameter">The view model this command is executed on.</param>
-		Task ExecuteAsync(ViewModel parameter);
-
-		/// <summary>
-		/// Indicates if the command is running right now.
-		/// </summary>
-		bool IsWorking { get; }
-	}
-}
diff --git a/NetCore/Icon.png b/NetCore/Icon.png
deleted file mode 100644
index 42ac191..0000000
Binary files a/NetCore/Icon.png and /dev/null differ
diff --git a/NetCore/NetCore.csproj b/NetCore/NetCore.csproj
index f024444..c46e195 100644
--- a/NetCore/NetCore.csproj
+++ b/NetCore/NetCore.csproj
@@ -12,7 +12,7 @@
 
   <!-- NuGet -->
   <PropertyGroup>
-    <Version>2.3.1</Version>
+    <Version>3.0.0</Version>
     <Authors>David Sungaila</Authors>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -20,7 +20,7 @@
     <PackageProjectUrl>https://github.com/sungaila/PresentationBase</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/sungaila/PresentationBase/master/NuGet/Icon.png</PackageIconUrl>
     <Description>A lightweight MVVM implementation for WPF (Windows Presentation Foundation) targeting both .NET Framework and .NET Core.</Description>
-    <PackageReleaseNotes>Fixed an issue with instantiation of view model commands. Added a method to reinitialize view model commands (if needed).</PackageReleaseNotes>
+    <PackageReleaseNotes>Split into a WPF specific package (PresentationBase) and an independent MVVM package (PresentationBase.Core).</PackageReleaseNotes>
     <PackageTags>WPF MVVM ViewModel Converter IValueConverter Command INotifyPropertyChanged INotifyDataErrorInfo ICommand XAML Markup DTO C#</PackageTags>
     <RepositoryUrl>https://github.com/sungaila/PresentationBase.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
@@ -45,12 +45,12 @@
 
   <!-- NuGet Icon -->
   <ItemGroup>
-    <None Include="..\Icon.png">
+    <None Include="..\NuGet\Icon.png">
       <Pack>True</Pack>
       <PackagePath></PackagePath>
     </None>
   </ItemGroup>
-
+  
   <!-- Framework references -->
   <ItemGroup Condition="'$(TargetFramework)'=='net45' or '$(TargetFramework)'=='net48'">
     <Reference Include="System.Xaml" />
@@ -59,8 +59,9 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
 
-  <!-- SourceLink build steps -->
+  <!-- SourceLink build steps and PresentationBase.Core -->
   <ItemGroup>
+    <PackageReference Include="PresentationBase.Core" Version="3.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/NetCore/ObservableViewModelCollection.cs b/NetCore/ObservableViewModelCollection.cs
deleted file mode 100644
index 7ff638a..0000000
--- a/NetCore/ObservableViewModelCollection.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Linq;
-using System.Windows;
-using System.Windows.Threading;
-
-namespace PresentationBase
-{
-    /// <summary>
-    /// An <see cref="ObservableCollection{T}"/> for view models.
-    /// It ensures that the <see cref="ViewModel.ParentViewModel"/> property is correctly set when working on collections.
-    /// Also adds methods for collection manipulation which are dispatched to <see cref="Application.Current"/>.
-    /// </summary>
-    /// <typeparam name="TViewModel">The view model type of this collection.</typeparam>
-    public class ObservableViewModelCollection<TViewModel>
-        : ObservableCollection<TViewModel>
-        where TViewModel : ViewModel
-    {
-        private ViewModel OwnerViewModel { get; }
-
-        /// <summary>
-        /// Creates a new <see cref="ObservableCollection{T}"/> instance.
-        /// </summary>
-        /// <param name="viewModel">The parent view model.</param>
-        public ObservableViewModelCollection(ViewModel viewModel)
-        {
-            OwnerViewModel = viewModel ?? throw new ArgumentNullException(nameof(viewModel));
-            CollectionChanged += ObservableViewModelCollection_CollectionChanged;
-        }
-
-        private void ObservableViewModelCollection_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (e.OldItems != null)
-            {
-                foreach (TViewModel item in e.OldItems.OfType<TViewModel>())
-                    item.ParentViewModel = null;
-            }
-
-            if (e.NewItems != null)
-            {
-                foreach (TViewModel item in e.NewItems.OfType<TViewModel>())
-                    item.ParentViewModel = OwnerViewModel;
-            }
-        }
-
-        /// <summary>
-        /// Observes the child view models for changes to the properties defined in <paramref name="propertyNames"/>.
-        /// When changes are detected then <paramref name="action"/> is invoked.
-        /// </summary>
-        /// <param name="action">The action to invoke on observed change.</param>
-        /// <param name="propertyNames">The properties to observe for changes.</param>
-        public void Observe(Action action, params string[] propertyNames)
-        {
-            if (action == null || propertyNames == null)
-                return;
-
-            void propertyChangedHandler(object sender, PropertyChangedEventArgs e)
-            {
-                if (!propertyNames.Contains(e.PropertyName))
-                    return;
-
-                action.Invoke();
-            }
-
-            void collectionChangedHandler(object sender, NotifyCollectionChangedEventArgs e)
-            {
-                if (e.OldItems != null)
-                {
-                    foreach (var item in e.OldItems.OfType<ViewModel>())
-                        item.PropertyChanged -= propertyChangedHandler;
-                }
-
-                if (e.NewItems != null)
-                {
-                    foreach (var item in e.NewItems.OfType<ViewModel>())
-                        item.PropertyChanged += propertyChangedHandler;
-                }
-            }
-
-            CollectionChanged -= collectionChangedHandler;
-            CollectionChanged += collectionChangedHandler;
-
-            foreach (ViewModel item in this)
-            {
-                item.PropertyChanged -= propertyChangedHandler;
-                item.PropertyChanged += propertyChangedHandler;
-            }
-        }
-
-        /// <summary>
-        /// Adds a view model to the end of the collection.
-        /// This method is dispatched to <see cref="Application.Current"/>.
-        /// </summary>
-        /// <param name="item">The view model to add.</param>
-        new public void Add(TViewModel item)
-        {
-            Application.Current.Dispatcher.Invoke(() => base.Add(item), DispatcherPriority.Send);
-        }
-
-        /// <summary>
-        /// Adds multiple view models to the end of the collection.
-        /// This method is dispatched to <see cref="Application.Current"/>.
-        /// </summary>
-        /// <param name="collection">The view models to add.</param>
-        public void AddRange(IEnumerable<TViewModel> collection)
-        {
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                foreach (var item in collection)
-                {
-                    base.Add(item);
-                }
-            }, DispatcherPriority.Send);
-        }
-
-        /// <summary>
-        /// Clears the collection and adds the given view models.
-        /// This method is dispatched to <see cref="Application.Current"/>.
-        /// </summary>
-        /// <param name="collection">The replacement view models.</param>
-        public void Replace(params TViewModel[] collection)
-        {
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                base.Clear();
-                foreach (var item in collection)
-                {
-                    base.Add(item);
-                }
-            }, DispatcherPriority.Send);
-        }
-
-        /// <summary>
-        /// Clears the collection.
-        /// This method is dispatched to <see cref="Application.Current"/>.
-        /// </summary>
-        new public void Clear()
-        {
-            Application.Current.Dispatcher.Invoke(() => base.Clear(), DispatcherPriority.Send);
-        }
-
-        /// <summary>
-        /// Inserts a view model at the given <paramref name="index"/> to the collection.
-        /// This method is dispatched to <see cref="Application.Current"/>.
-        /// </summary>
-        /// <param name="index">The index at which the view model is inserted.</param>
-        /// <param name="item">The view model to insert.</param>
-        new public void Insert(int index, TViewModel item)
-        {
-            Application.Current.Dispatcher.Invoke(() => base.Insert(index, item), DispatcherPriority.Send);
-        }
-
-        /// <summary>
-        /// Removes a view model from the collection.
-        /// This method is dispatched to <see cref="Application.Current"/>.
-        /// </summary>
-        /// <param name="item">The view model to remove.</param>
-        /// <returns>Returns <c>true</c> if the view model was found and removed. Returns <c>false</c> otherwise.</returns>
-        new public bool Remove(TViewModel item)
-        {
-            bool result = false;
-            Application.Current.Dispatcher.Invoke(() => { result = base.Remove(item); }, DispatcherPriority.Send);
-            return result;
-        }
-
-        /// <summary>
-        /// Removes a view model at the given <paramref name="index"/>.
-        /// This method is dispatched to <see cref="Application.Current"/>.
-        /// </summary>
-        /// <param name="index">The index of the view model to remove.</param>
-        new public void RemoveAt(int index)
-        {
-            Application.Current.Dispatcher.Invoke(() => base.RemoveAt(index), DispatcherPriority.Send);
-        }
-    }
-}
diff --git a/NetCore/UiHelper.cs b/NetCore/UiHelper.cs
index f0be3ed..8711b6d 100644
--- a/NetCore/UiHelper.cs
+++ b/NetCore/UiHelper.cs
@@ -14,7 +14,7 @@ public static class UiHelper
 		/// <typeparam name="T">The type of the child to find</typeparam>
 		/// <param name="parent">The parent containing the child.</param>
 		/// <param name="childName">The <see cref="FrameworkElement.Name"/> of the child to find.</param>
-		public static T? TryFindChild<T>(this DependencyObject parent, string childName)
+		public static T? TryFindChild<T>(this DependencyObject parent, string? childName = null)
 			where T : DependencyObject
 		{
 			if (parent == null)
@@ -26,7 +26,7 @@ public static class UiHelper
 			for (int i = 0; i < childrenCount; i++)
 			{
 				var child = VisualTreeHelper.GetChild(parent, i);
-				if (!(child is T))
+				if (!(child is T t))
 				{
 					foundChild = TryFindChild<T>(child, childName);
 
@@ -37,13 +37,13 @@ public static class UiHelper
 				{
 					if (child is FrameworkElement frameworkElement && frameworkElement.Name == childName)
 					{
-						foundChild = (T)child;
+						foundChild = t;
 						break;
 					}
 				}
 				else
 				{
-					foundChild = (T)child;
+					foundChild = t;
 					break;
 				}
 			}
diff --git a/NetCore/ViewModel.cs b/NetCore/ViewModel.cs
deleted file mode 100644
index bb9c9f7..0000000
--- a/NetCore/ViewModel.cs
+++ /dev/null
@@ -1,430 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Windows.Input;
-
-namespace PresentationBase
-{
-	/// <summary>
-	/// The base implementation of every view model.
-	/// </summary>
-	public abstract class ViewModel
-		: INotifyPropertyChanged, INotifyDataErrorInfo
-	{
-		/// <summary>
-		/// Creates a new <see cref="ViewModel"/> instance.
-		/// </summary>
-		public ViewModel()
-		{
-			// add all matching commands found with reflection
-			AddCommands(KnownCommands.Where(cmd => cmd.GetType().HasGenericTypeArgument(GetType())).ToArray());
-		}
-
-		/// <summary>
-		/// Implementation of <see cref="INotifyPropertyChanged.PropertyChanged"/>.
-		/// Is used to support bindings between views and view model properties.
-		/// </summary>
-		public event PropertyChangedEventHandler? PropertyChanged;
-
-		/// <summary>
-		/// Implementation of <see cref="INotifyDataErrorInfo.ErrorsChanged"/>.
-		/// Is used to validate bound properties (or the view model itself) for bindings.
-		/// </summary>
-		public event EventHandler<DataErrorsChangedEventArgs>? ErrorsChanged;
-
-		/// <summary>
-		/// Raises the <see cref="PropertyChanged"/> event for all properties.
-		/// </summary>
-		protected void RaiseAllPropertiesChanged()
-		{
-			// setting PropertyChangedEventArgs.PropertyName to null or string.Empty indicates that all properties changed
-			// see: https://docs.microsoft.com/en-us/dotnet/api/system.componentmodel.inotifypropertychanged.propertychanged?redirectedfrom=MSDN&view=netframework-4.8#remarks
-			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(null));
-		}
-
-		/// <summary>
-		/// Raises the <see cref="PropertyChanged"/> event for the given property name.
-		/// </summary>
-		/// <param name="propertyName">The name of the property which has been changed. When omitted the property name will be the member name of the caller (which it is when called from the view model property setter).</param>
-		protected void RaisePropertyChanged([CallerMemberName]string? propertyName = null)
-		{
-			if (string.IsNullOrEmpty(propertyName))
-			{
-				Debug.Fail($"{nameof(ViewModel)}.{nameof(ViewModel.RaisePropertyChanged)} has been called with a null or empty {nameof(propertyName)}.");
-				return;
-			}
-
-			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-		}
-
-		/// <summary>
-		/// Sets the property value, ensures bindings are updated and validates (if <paramref name="propertyValidation"/> is set).<para/>
-		/// Updates will be skipped (except for validation) if the <paramref name="newValue"/> equals the previous property value.
-		/// </summary>
-		/// <typeparam name="T">The type of the changed property.</typeparam>
-		/// <param name="propertyField">The property field which contains the old value.</param>
-		/// <param name="newValue">The new value to set.</param>
-		/// <param name="propertyValidation">An optional function used for validation of the changed property. It must return a collection of error messages.</param>
-		/// <param name="propertyName">The name of the property which has been changed. When omitted the property name will be the member name of the caller (which it is when called from the view model property setter).</param>
-		/// <returns>Returns <c>true</c> if the new value was set.</returns>
-		protected bool SetProperty<T>(ref T propertyField, T newValue, Func<T, IEnumerable<string>>? propertyValidation = null, [CallerMemberName]string? propertyName = null)
-		{
-			if (string.IsNullOrEmpty(propertyName))
-			{
-				Debug.Fail($"{nameof(ViewModel)}.{nameof(SetProperty)} has been called with a null or empty {nameof(propertyName)}.");
-				return false;
-			}
-
-			// validate the new value if needed
-			AddPropertyErrors(propertyName!, propertyValidation?.Invoke(newValue));
-
-			// stop when the new and old value equal
-			if (EqualityComparer<T>.Default.Equals(propertyField, newValue))
-				return false;
-
-			// otherwise set the new value for the property
-			propertyField = newValue;
-
-			// if the value was a view model then make sure to update its ParentViewModel
-			if (propertyName != nameof(ParentViewModel) && typeof(ViewModel).IsAssignableFrom(typeof(T)) && newValue != null)
-				(newValue as ViewModel)!.ParentViewModel = this;
-
-			// inform bindings about the changed property
-			RaisePropertyChanged(propertyName);
-
-			// set the IsDirty flag to true (unless it is forbidden for this property name)
-			if (!AlwaysIgnoredDirtyProperties.Contains(propertyName) && IgnoredDirtyProperties != null && !IgnoredDirtyProperties.Contains(propertyName))
-			{
-				IsDirty = true;
-
-				// bubble the IsDirty flag to any ParentViewModel found
-				if (ParentViewModel != null)
-					ParentViewModel.IsDirty = true;
-			}
-
-			return true;
-		}
-
-		private ViewModel? _parentViewModel;
-
-		/// <summary>
-		/// The logical parent of this view model. Please note that circular references are not supported.
-		/// </summary>
-		/// <remarks>Every view model can have a single parent only.</remarks>
-		public ViewModel? ParentViewModel
-		{
-			get => _parentViewModel;
-			set => SetProperty(ref _parentViewModel, value);
-		}
-
-		/// <summary>
-		/// The top most parent of this view model.
-		/// </summary>
-		public ViewModel? RootViewModel
-		{
-			get
-			{
-				ViewModel? parent = ParentViewModel;
-
-				while (parent != null)
-				{
-					if (parent.ParentViewModel == null)
-						return parent;
-
-					parent = parent.ParentViewModel;
-				}
-
-				return null;
-			}
-		}
-
-		/// <summary>
-		/// Adds commands to this view model.
-		/// This ensures that <see cref="ICommand.CanExecute(object)"/> is called whenever a property was changed.
-		/// </summary>
-		/// <param name="commands">The commands to add.</param>
-		private void AddCommands(params IViewModelCommand[] commands)
-		{
-			foreach (var command in commands)
-			{
-				if (command == null)
-					continue;
-
-				Type key = command.GetType();
-
-				if (key == null || Commands.ContainsKey(key))
-					continue;
-
-				Commands.Add(key, command);
-				PropertyChanged += (sender, e) => command.RaiseCanExecuteChanged();
-			}
-		}
-
-		/// <summary>
-		/// Removes existing commands for this view model.
-		/// </summary>
-		/// <param name="commands">The commands to remove.</param>
-		private void RemoveCommands(params IViewModelCommand[] commands)
-		{
-			foreach (var command in commands)
-			{
-				if (command == null)
-					continue;
-
-				Type key = command.GetType();
-
-				if (key == null || !Commands.ContainsKey(key))
-					continue;
-
-				Commands.Remove(key);
-				PropertyChanged -= (sender, e) => command.RaiseCanExecuteChanged();
-			}
-		}
-
-		/// <summary>
-		/// A dictionary filled with commands for this view model. The key is the <see cref="Type"/> of the command.
-		/// </summary>
-		public Dictionary<Type, IViewModelCommand> Commands { get; private set; } = new Dictionary<Type, IViewModelCommand>();
-
-		/// <summary>
-		/// A multi purpose <see cref="object"/> tag for this view model.
-		/// Use it for e.g. identifying this view model.
-		/// </summary>
-		public object? Tag { get; set; }
-
-		private readonly Dictionary<string, List<string>> _errors = new Dictionary<string, List<string>>();
-
-		/// <summary>
-		/// If any property or the view model itself has failed validation.<para/>
-		/// </summary>
-		public bool HasErrors => _errors.Any();
-
-		/// <summary>
-		/// If all properties and the view model itself succeeded validation.<para/>
-		/// </summary>
-		/// <remarks>Overwrite this if e.g. children must be valid aswell.</remarks>
-		public virtual bool IsValid => !HasErrors;
-
-		/// <summary>
-		/// Returns all errors for a given <paramref name="propertyName"/> or for the entire view model.
-		/// </summary>
-		/// <param name="propertyName">The property name. Set to <see langword="null"/> to get all view model errors.</param>
-		public IEnumerable? GetErrors(string propertyName)
-		{
-			if (propertyName == null)
-				propertyName = string.Empty;
-
-			return _errors.ContainsKey(propertyName)
-				? _errors[propertyName]
-				: null;
-		}
-
-		/// <summary>
-		/// Clears both view model and all property errors.
-		/// </summary>
-		protected void ClearAllErrors()
-		{
-			ClearViewModelErrors();
-
-			foreach (var error in _errors)
-				ClearPropertyErrors(error.Key);
-		}
-
-		/// <summary>
-		/// Clears all view model errors.
-		/// </summary>
-		protected void ClearViewModelErrors()
-		{
-			if (!_errors.ContainsKey(string.Empty))
-				return;
-
-			_errors.Remove(string.Empty);
-			RaiseViewModelErrorsChanged();
-		}
-
-		/// <summary>
-		/// Clears all property errors for the given <paramref name="propertyName"/>.
-		/// </summary>
-		/// <param name="propertyName">The property name.</param>
-		protected void ClearPropertyErrors(string propertyName)
-		{
-			if (string.IsNullOrEmpty(propertyName) || !_errors.ContainsKey(propertyName))
-				return;
-
-			_errors.Remove(propertyName);
-			RaisePropertyErrorsChanged(propertyName);
-		}
-
-		private void AddError(string propertyName, string errorMessage)
-		{
-			if (!_errors.ContainsKey(propertyName))
-			{
-				_errors[propertyName] = new List<string>();
-			}
-
-			if (!_errors[propertyName].Contains(errorMessage))
-			{
-				_errors[propertyName].Add(errorMessage);
-				RaisePropertyErrorsChanged(propertyName);
-			}
-		}
-
-		/// <summary>
-		/// Adds a collection of error messages which invalidate the entire view model.
-		/// </summary>
-		/// <param name="errorMessages">The collection of error messages.</param>
-		/// <param name="clearPreviousErrors">If the previous errors should be cleared before adding the new ones.</param>
-		protected void AddViewModelErrors(IEnumerable<string>? errorMessages, bool clearPreviousErrors = true)
-		{
-			if (clearPreviousErrors)
-				ClearViewModelErrors();
-
-			if (errorMessages == null)
-				return;
-
-			foreach (string errorMessage in errorMessages)
-			{
-				AddError(string.Empty, errorMessage);
-			}
-		}
-
-		/// <summary>
-		/// Adds a collection of error messages for the given <paramref name="propertyName"/>.
-		/// </summary>
-		/// <param name="propertyName">The property name.</param>
-		/// <param name="errorMessages">The collection of error messages.</param>
-		/// <param name="clearPreviousErrors">If the previous errors should be cleared before adding the new ones.</param>
-		protected void AddPropertyErrors(string propertyName, IEnumerable<string>? errorMessages, bool clearPreviousErrors = true)
-		{
-			if (string.IsNullOrEmpty(propertyName))
-				return;
-
-			if (clearPreviousErrors)
-				ClearPropertyErrors(propertyName);
-
-			if (errorMessages == null)
-				return;
-
-			foreach (string errorMessage in errorMessages)
-				AddError(propertyName, errorMessage);
-		}
-
-		/// <summary>
-		/// Raises the <see cref="ErrorsChanged"/> event for view model errors.
-		/// </summary>
-		protected void RaiseViewModelErrorsChanged()
-		{
-			ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(null));
-			RaisePropertyChanged(nameof(HasErrors));
-			RaisePropertyChanged(nameof(IsValid));
-		}
-
-		/// <summary>
-		/// Raises the <see cref="ErrorsChanged"/> event for the given <paramref name="propertyName"/>.
-		/// </summary>
-		/// <param name="propertyName">The property name.</param>
-		protected void RaisePropertyErrorsChanged(string propertyName)
-		{
-			if (string.IsNullOrEmpty(propertyName))
-			{
-				Debug.Fail($"{nameof(ViewModel)}.{nameof(ViewModel.RaisePropertyErrorsChanged)} has been called with a null or empty {nameof(propertyName)}.");
-				return;
-			}
-
-			ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(propertyName));
-			RaisePropertyChanged(nameof(HasErrors));
-			RaisePropertyChanged(nameof(IsValid));
-		}
-
-		/// <summary>
-		/// A collection of properties which are always ignored (and cannot be overwritten like <see cref="IgnoredDirtyProperties"/>).
-		/// </summary>
-		/// <remarks>Overwrite this to ignore properties.</remarks>
-		private IEnumerable<string> AlwaysIgnoredDirtyProperties => new List<string> { nameof(IsDirty), nameof(IsRefreshing), nameof(Tag) };
-
-		/// <summary>
-		/// A collection of property names which do not set the <see cref="IsDirty"/> flag when changed.
-		/// </summary>
-		protected virtual IEnumerable<string> IgnoredDirtyProperties { get => new List<string>(); }
-
-		private bool _isDirty;
-
-		/// <summary>
-		/// Indicates that there are changes made to this view model since its creation.
-		/// </summary>
-		public bool IsDirty
-		{
-			get => _isDirty;
-			set => SetProperty(ref _isDirty, value);
-		}
-
-		private bool _isRefreshing;
-
-		/// <summary>
-		/// Indicates that this view model is changing and others should avoid interfering.
-		/// </summary>
-		public bool IsRefreshing
-		{
-			get => _isRefreshing;
-			set => SetProperty(ref _isRefreshing, value);
-		}
-
-		/// <summary>
-		/// A list containing all known commands found with reflection.
-		/// </summary>
-		private static readonly List<IViewModelCommand> KnownCommands = new List<IViewModelCommand>();
-
-		static ViewModel()
-		{
-			ReInitializeCommands();
-		}
-
-		/// <summary>
-		/// Reinitializes the <see cref="KnownCommands"/> list for command and view model interaction.
-		/// </summary>
-		public static void ReInitializeCommands()
-		{
-			ReInitializeCommands(
-				AppDomain.CurrentDomain
-					.GetAssemblies()
-					.SelectMany(a => a.GetTypes())
-					.Where(type => !type.IsAbstract && typeof(IViewModelCommand).IsAssignableFrom(type) && type.HasGenericTypeArgument(typeof(ViewModel)))
-					);
-		}
-
-		/// <summary>
-		/// Tries to instantiate the given types and adds them to <see cref="KnownCommands"/>.
-		/// The <see cref="KnownCommands"/> list will be cleared first.
-		/// </summary>
-		/// <param name="commandTypes">The command types to instantiate and add.</param>
-		private static void ReInitializeCommands(IEnumerable<Type> commandTypes)
-		{
-			KnownCommands.Clear();
-
-			foreach (var commandType in commandTypes)
-			{
-				if (commandType.IsAbstract)
-					throw new ArgumentException($"{commandType.FullName} cannot be abstract.", nameof(commandTypes));
-
-				if (!typeof(IViewModelCommand).IsAssignableFrom(commandType))
-					throw new ArgumentException($"{commandType.FullName} must implement {nameof(IViewModelCommand)}.", nameof(commandTypes));
-
-				if (!commandType.HasGenericTypeArgument(typeof(ViewModel)))
-					throw new ArgumentException($"{commandType.FullName} must have {nameof(ViewModel)} as its only generic type argument.", nameof(commandTypes));
-
-				try
-				{
-					KnownCommands.Add((IViewModelCommand)Activator.CreateInstance(commandType)!);
-				}
-				catch (Exception ex)
-				{
-					Debug.Fail($"Failed to add the command {commandType.FullName}: {ex}");
-				}
-			}
-		}
-	}
-}
diff --git a/NetCore/ViewModelCommand.cs b/NetCore/ViewModelCommand.cs
deleted file mode 100644
index 33bc099..0000000
--- a/NetCore/ViewModelCommand.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Windows;
-using System.Windows.Input;
-using System.Windows.Threading;
-
-namespace PresentationBase
-{
-	/// <summary>
-	/// The base implementation of commands for view models.
-	/// </summary>
-	/// <typeparam name="TViewModel">The type of the view model.</typeparam>
-	public abstract class ViewModelCommand<TViewModel>
-		: IViewModelCommand
-		where TViewModel : ViewModel
-	{
-		/// <summary>
-		/// Raised when changes to the view model were made and <see cref="CanExecute"/> should be reevaluated.
-		/// </summary>
-		public event EventHandler? CanExecuteChanged;
-
-		/// <summary>
-		/// Returns if the command can be executed for the given view model.
-		/// </summary>
-		/// <param name="parameter">The view model this command would be executed on.</param>
-		/// <returns>Returns if <see cref="Execute"/> is allowed for the given <paramref name="parameter"/>.</returns>
-		public virtual bool CanExecute(TViewModel parameter)
-		{
-			return parameter != null;
-		}
-
-		/// <summary>
-		/// Executes the command for the given view model.
-		/// </summary>
-		/// <param name="parameter">The view model this command is executed on.</param>
-		public abstract void Execute(TViewModel parameter);
-
-		/// <inheritdoc/>
-		public void RaiseCanExecuteChanged()
-		{
-			if (Application.Current == null)
-				return;
-
-			Application.Current.Dispatcher.Invoke(() => CanExecuteChanged?.Invoke(this, EventArgs.Empty), DispatcherPriority.Send);
-		}
-
-		#region Explicit interface implementations
-		bool ICommand.CanExecute(object parameter)
-		{
-			if (!(parameter is TViewModel viewModel))
-				return true;
-
-			return CanExecute(viewModel);
-		}
-
-		void ICommand.Execute(object parameter)
-		{
-			if (!(parameter is TViewModel viewModel))
-				return;
-
-			Execute(viewModel);
-		}
-
-		bool IViewModelCommand.CanExecute(ViewModel parameter)
-		{
-			return CanExecute((TViewModel)parameter);
-		}
-
-		void IViewModelCommand.Execute(ViewModel parameter)
-		{
-			Execute((TViewModel)parameter);
-		}
-		#endregion
-	}
-}
diff --git a/NetCore/ViewModelCommandAsync.cs b/NetCore/ViewModelCommandAsync.cs
deleted file mode 100644
index fb6a899..0000000
--- a/NetCore/ViewModelCommandAsync.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using PresentationBase;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PresentationBase
-{
-	/// <summary>
-	/// The base implementation of <strong>asynchronous</strong> commands for view models.
-	/// </summary>
-	/// <typeparam name="TViewModel">The type of the view model.</typeparam>
-	public abstract class ViewModelCommandAsync<TViewModel>
-		: ViewModelCommand<TViewModel>, IViewModelCommandAsync
-		where TViewModel : ViewModel
-	{
-		/// <summary>
-		/// The implementation of the asynchronous execution.
-		/// It should make use of the async/await pattern.
-		/// </summary>
-		/// <param name="parameter">The view model this command is executed on.</param>
-		protected abstract Task ExecutionAsync(TViewModel parameter);
-
-		/// <summary>
-		/// Executes the command asynchronously in a <strong>fire and forget</strong> way.<para/>
-		/// This means the command is executed and its result is forgotten.
-		/// Any uncaught exceptions will be handled in <see cref="HandleUncaughtException"/>.
-		/// </summary>
-		/// <param name="parameter">The view model this command is executed on.</param>
-		public sealed override async void Execute(TViewModel parameter)
-		{
-			try
-			{
-				IsWorking = true;
-				await ExecutionAsync(parameter);
-			}
-			catch (Exception ex)
-			{
-				HandleUncaughtException(parameter, ex);
-			}
-			finally
-			{
-				IsWorking = false;
-			}
-		}
-
-		/// <inheritdoc/>
-		public override bool CanExecute(TViewModel parameter)
-		{
-			return base.CanExecute(parameter) && !IsWorking;
-		}
-
-		/// <summary>
-		/// Executes the command for the given view model <strong>asynchronously</strong>.
-		/// </summary>
-		/// <param name="parameter">The view model this command is executed on.</param>
-		public async Task ExecuteAsync(TViewModel parameter)
-		{
-			try
-			{
-				IsWorking = true;
-				await ExecutionAsync(parameter);
-			}
-			finally
-			{
-				IsWorking = false;
-			}
-		}
-
-		/// <summary>
-		/// Handles any uncaught exceptions thrown by <see cref="Execute"/>.
-		/// </summary>
-		/// <param name="parameter">The view model this command was executed on.</param>
-		/// <param name="ex">The uncaught exception from execution.</param>
-		protected virtual void HandleUncaughtException(TViewModel parameter, Exception ex)
-		{
-			throw ex;
-		}
-
-		private bool _isWorking;
-
-		/// <inheritdoc/>
-		public bool IsWorking {
-			get
-			{
-				return _isWorking;
-			}
-			private set
-			{
-				_isWorking = value;
-				RaiseCanExecuteChanged();
-			}
-		}
-
-		#region Explicit interface implementations
-		async Task IViewModelCommandAsync.ExecuteAsync(ViewModel parameter)
-		{
-			await ExecuteAsync((TViewModel)parameter);
-		}
-		#endregion
-	}
-}
diff --git a/PresentationBase.sln b/PresentationBase.sln
index 45e75f8..d3d622d 100644
--- a/PresentationBase.sln
+++ b/PresentationBase.sln
@@ -7,6 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore", "NetCore\NetCore.
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BA209F08-E6AA-4928-A9DD-1DCAFB4DF1CB}"
 	ProjectSection(SolutionItems) = preProject
+		Icon.png = Icon.png
 		README.md = README.md
 	EndProjectSection
 EndProject
@@ -15,6 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{009BF7C6
 		NuGet\Icon.png = NuGet\Icon.png
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore.Tests", "NetCore.Tests\NetCore.Tests.csproj", "{D6F9906D-FC9C-4F6E-83FB-5361B38F3ECE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,6 +28,10 @@ Global
 		{2CB41A20-0315-49C9-8E76-C94BCF3C7442}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2CB41A20-0315-49C9-8E76-C94BCF3C7442}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2CB41A20-0315-49C9-8E76-C94BCF3C7442}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6F9906D-FC9C-4F6E-83FB-5361B38F3ECE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6F9906D-FC9C-4F6E-83FB-5361B38F3ECE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6F9906D-FC9C-4F6E-83FB-5361B38F3ECE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6F9906D-FC9C-4F6E-83FB-5361B38F3ECE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/README.md b/README.md
index 153e0ce..94a8258 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,8 @@ It contains base implementations for *view models* (and their *commands*), frequ
 
 A sample project can be found here: [SUBSTitute](https://github.com/sungaila/SUBSTitute). Feel free to grab it from [NuGet.org](https://www.nuget.org/packages/PresentationBase) or to fork it for your own needs!
 
+The independent MVVM package can be found here: [<img src="https://raw.githubusercontent.com/sungaila/PresentationBase.Core/master/Icon.png" align="center" width="16" height="16" alt="PresentationBase Logo"> PresentationBase.Core](https://www.nuget.org/packages/PresentationBase.Core).
+
 ## Examples
 Here are some examples for using PresentationBase in your project.