diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index adead3c88..145808045 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -13,7 +13,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)HandyControls\Attach\TreeViewAttach.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HandyControls\BindToEnum\EnumBindingSourceExtension.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HandyControls\BindToEnum\EnumDescriptionTypeConverter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HandyControls\Tools\Collection\RangeObservableCollection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HandyControls\Tools\Collection\OptimizedObservableCollection.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HandyControls\Tools\Collection\ThreadSafeObservableCollection.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HandyControls\Tools\Collection\ThreadSafe\DispatchedObservableCollection.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HandyControls\Tools\Collection\ThreadSafe\EventArgsCache.cs" />
diff --git a/src/Shared/HandyControl_Shared/HandyControls/Tools/Collection/RangeObservableCollection.cs b/src/Shared/HandyControl_Shared/HandyControls/Tools/Collection/OptimizedObservableCollection.cs
similarity index 96%
rename from src/Shared/HandyControl_Shared/HandyControls/Tools/Collection/RangeObservableCollection.cs
rename to src/Shared/HandyControl_Shared/HandyControls/Tools/Collection/OptimizedObservableCollection.cs
index 7a6953394..86210c48a 100644
--- a/src/Shared/HandyControl_Shared/HandyControls/Tools/Collection/RangeObservableCollection.cs
+++ b/src/Shared/HandyControl_Shared/HandyControls/Tools/Collection/OptimizedObservableCollection.cs
@@ -12,12 +12,12 @@ namespace HandyControl.Controls
 	/// Represents a dynamic data collection that provides notifications when items get added, removed, or when the whole list is refreshed. 
 	/// </summary> 
 	/// <typeparam name="T"></typeparam> 
-    public class RangeObservableCollection<T> : ObservableCollection<T>
+    public class OptimizedObservableCollection<T> : ObservableCollection<T>
     {
         /// <summary> 
         /// Initializes a new instance of the System.Collections.ObjectModel.ObservableCollection(Of T) class. 
         /// </summary> 
-        public RangeObservableCollection()
+        public OptimizedObservableCollection()
             : base()
         {
         }
@@ -27,7 +27,7 @@ public RangeObservableCollection()
         /// </summary> 
         /// <param name="collection">collection: The collection from which the elements are copied.</param> 
         /// <exception cref="System.ArgumentNullException">The collection parameter cannot be null.</exception> 
-        public RangeObservableCollection(IEnumerable<T> collection)
+        public OptimizedObservableCollection(IEnumerable<T> collection)
             : base(collection)
         {
         }
diff --git a/src/Shared/HandyControl_Shared/HandyControls/Tools/Helper/CryptographyHelper.cs b/src/Shared/HandyControl_Shared/HandyControls/Tools/Helper/CryptographyHelper.cs
index 01d57f54b..17e62c817 100644
--- a/src/Shared/HandyControl_Shared/HandyControls/Tools/Helper/CryptographyHelper.cs
+++ b/src/Shared/HandyControl_Shared/HandyControls/Tools/Helper/CryptographyHelper.cs
@@ -9,9 +9,6 @@ namespace HandyControl.Tools
 {
     public class CryptographyHelper
     {
-        [DllImport(InteropValues.ExternDll.Kernel32, EntryPoint = "RtlZeroMemory")]
-        public static extern bool ZeroMemory(IntPtr Destination, int Length);
-
         public static string GenerateMD5(string input)
         {
             using MD5 md5 = MD5.Create();
diff --git a/src/Shared/HandyControl_Shared/HandyControls/Tools/Logging/Logger.cs b/src/Shared/HandyControl_Shared/HandyControls/Tools/Logging/Logger.cs
index 63a92c5c8..3434f9c59 100644
--- a/src/Shared/HandyControl_Shared/HandyControls/Tools/Logging/Logger.cs
+++ b/src/Shared/HandyControl_Shared/HandyControls/Tools/Logging/Logger.cs
@@ -123,6 +123,31 @@ public static void Log(string message)
             Log(_defaultLevel, message);
         }
 
+        public static void Error(string message)
+        {
+            Log(Level.Error, message);
+        }
+
+        public static void Debug(string message)
+        {
+            Log(Level.Debug, message);
+        }
+
+        public static void Fine(string message)
+        {
+            Log(Level.Fine, message);
+        }
+
+        public static void Info(string message)
+        {
+            Log(Level.Info, message);
+        }
+
+        public static void Warning(string message)
+        {
+            Log(Level.Warning, message);
+        }
+
         public static void Log(Level level, string message)
         {
             var stackFrame = FindStackFrame();