diff --git a/MapControl/Shared/MapItemsControl.cs b/MapControl/Shared/MapItemsControl.cs
index f43cd8e2..6903aef3 100644
--- a/MapControl/Shared/MapItemsControl.cs
+++ b/MapControl/Shared/MapItemsControl.cs
@@ -7,13 +7,45 @@ using System;
 using Windows.Foundation;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Data;
 #else
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
 #endif
 
 namespace MapControl
 {
+    /// <summary>
+    /// Container class for an item in a MapItemsControl.
+    /// </summary>
+    public partial class MapItem : ListBoxItem
+    {
+        public static readonly DependencyProperty LocationMemberPathProperty = DependencyProperty.Register(
+            nameof(LocationMemberPath), typeof(string), typeof(MapItem),
+            new PropertyMetadata(null, (o, e) => BindingOperations.SetBinding(
+                o, LocationProperty, new Binding { Path = new PropertyPath((string)e.NewValue) })));
+
+        public MapItem()
+        {
+            DefaultStyleKey = typeof(MapItem);
+
+            MapPanel.InitMapElement(this);
+        }
+
+        public Location Location
+        {
+            get { return (Location)GetValue(LocationProperty); }
+            set { SetValue(LocationProperty, value); }
+        }
+
+        public string LocationMemberPath
+        {
+            get { return (string)GetValue(LocationMemberPathProperty); }
+            set { SetValue(LocationMemberPathProperty, value); }
+        }
+    }
+
     /// <summary>
     /// Manages a collection of selectable items on a Map.
     /// </summary>
diff --git a/MapControl/Shared/MapPath.cs b/MapControl/Shared/MapPath.cs
index 71328e5e..d98a8744 100644
--- a/MapControl/Shared/MapPath.cs
+++ b/MapControl/Shared/MapPath.cs
@@ -83,7 +83,7 @@ namespace MapControl
             }
         }
 
-        #region Method used only by derived classes MapPolyline, MapPolygon and MapMultiPolygon
+        #region Methods used only by derived classes MapPolyline, MapPolygon and MapMultiPolygon
 
         protected double GetLongitudeOffset(Location location)
         {
diff --git a/MapControl/Shared/Pushpin.cs b/MapControl/Shared/Pushpin.cs
index b5a1b3e9..a46d8401 100644
--- a/MapControl/Shared/Pushpin.cs
+++ b/MapControl/Shared/Pushpin.cs
@@ -3,18 +3,28 @@
 // Licensed under the Microsoft Public License (Ms-PL)
 
 #if WINDOWS_UWP
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 #else
+using System.Windows;
 using System.Windows.Controls;
 #endif
 
 namespace MapControl
 {
     /// <summary>
-    /// Pushpin at a geographic location specified by the MapPanel.Location attached property.
+    /// Pushpin at a geographic location specified by the Location property.
     /// </summary>
     public class Pushpin : ContentControl
     {
+        public static readonly DependencyProperty LocationProperty =
+#if WINDOWS_UWP
+            DependencyProperty.Register(
+                nameof(Location), typeof(Location), typeof(Pushpin),
+                new PropertyMetadata(null, (o, e) => MapPanel.SetLocation((FrameworkElement)o, (Location)e.NewValue)));
+#else
+            MapPanel.LocationProperty.AddOwner(typeof(Pushpin));
+#endif
         public Pushpin()
         {
             DefaultStyleKey = typeof(Pushpin);
@@ -24,8 +34,8 @@ namespace MapControl
 
         public Location Location
         {
-            get { return MapPanel.GetLocation(this); }
-            set { MapPanel.SetLocation(this, value); }
+            get { return (Location)GetValue(LocationProperty); }
+            set { SetValue(LocationProperty, value); }
         }
     }
 }
diff --git a/MapControl/UWP/MapItemsControl.UWP.cs b/MapControl/UWP/MapItemsControl.UWP.cs
index 8254a4dd..941c7e99 100644
--- a/MapControl/UWP/MapItemsControl.UWP.cs
+++ b/MapControl/UWP/MapItemsControl.UWP.cs
@@ -9,17 +9,11 @@ using Windows.UI.Xaml.Input;
 
 namespace MapControl
 {
-    /// <summary>
-    /// Container class for an item in a MapItemsControl.
-    /// </summary>
-    public class MapItem : ListBoxItem
+    public partial class MapItem
     {
-        public MapItem()
-        {
-            DefaultStyleKey = typeof(MapItem);
-
-            MapPanel.InitMapElement(this);
-        }
+        public static readonly DependencyProperty LocationProperty = DependencyProperty.Register(
+            nameof(Location), typeof(Location), typeof(MapItem),
+            new PropertyMetadata(null, (o, e) => MapPanel.SetLocation((FrameworkElement)o, (Location)e.NewValue)));
 
         protected override void OnPointerPressed(PointerRoutedEventArgs e)
         {
diff --git a/MapControl/UWP/MapPath.UWP.cs b/MapControl/UWP/MapPath.UWP.cs
index a4ef5722..2822eba7 100644
--- a/MapControl/UWP/MapPath.UWP.cs
+++ b/MapControl/UWP/MapPath.UWP.cs
@@ -14,7 +14,7 @@ namespace MapControl
 {
     public partial class MapPath : Path
     {
-        #region Method used only by derived classes MapPolyline and MapPolygon
+        #region Methods used only by derived classes MapPolyline and MapPolygon
 
         protected void DataCollectionPropertyChanged(DependencyPropertyChangedEventArgs e)
         {
diff --git a/MapControl/WPF/MapItemsControl.WPF.cs b/MapControl/WPF/MapItemsControl.WPF.cs
index d9d80af5..950bb891 100644
--- a/MapControl/WPF/MapItemsControl.WPF.cs
+++ b/MapControl/WPF/MapItemsControl.WPF.cs
@@ -9,17 +9,9 @@ using System.Windows.Media;
 
 namespace MapControl
 {
-    /// <summary>
-    /// Container class for an item in a MapItemsControl.
-    /// </summary>
-    public class MapItem : ListBoxItem
+    public partial class MapItem
     {
-        public MapItem()
-        {
-            DefaultStyleKey = typeof(MapItem);
-
-            MapPanel.InitMapElement(this);
-        }
+        public static readonly DependencyProperty LocationProperty = MapPanel.LocationProperty.AddOwner(typeof(MapItem));
 
         protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
         {
diff --git a/MapControl/WPF/MapPath.WPF.cs b/MapControl/WPF/MapPath.WPF.cs
index a2d8f3f6..7e79ad85 100644
--- a/MapControl/WPF/MapPath.WPF.cs
+++ b/MapControl/WPF/MapPath.WPF.cs
@@ -27,7 +27,7 @@ namespace MapControl
             get { return Data; }
         }
 
-        #region Method used only by derived classes MapPolyline, MapPolygon and MapMultiPolygon
+        #region Methods used only by derived classes MapPolyline, MapPolygon and MapMultiPolygon
 
         protected void DataCollectionPropertyChanged(DependencyPropertyChangedEventArgs e)
         {
diff --git a/SampleApps/UniversalApp/BindingHelper.cs b/SampleApps/UniversalApp/BindingHelper.cs
deleted file mode 100644
index abef67a9..00000000
--- a/SampleApps/UniversalApp/BindingHelper.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using MapControl;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Data;
-
-namespace UniversalApp
-{
-    public class BindingHelper
-    {
-        public static readonly DependencyProperty LocationPathProperty = DependencyProperty.RegisterAttached(
-            "LocationPath", typeof(string), typeof(BindingHelper),
-            new PropertyMetadata(null, LocationPathPropertyChanged));
-
-        public static string GetLocationPath(DependencyObject obj)
-        {
-            return (string)obj.GetValue(LocationPathProperty);
-        }
-
-        public static void SetLocationPath(DependencyObject obj, string value)
-        {
-            obj.SetValue(LocationPathProperty, value);
-        }
-
-        private static void LocationPathPropertyChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e)
-        {
-            var propertyPath = e.NewValue as string;
-
-            if (propertyPath != null)
-            {
-                BindingOperations.SetBinding(
-                    obj,
-                    MapPanel.LocationProperty,
-                    new Binding { Path = new PropertyPath(propertyPath) });
-            }
-        }
-    }
-}
diff --git a/SampleApps/UniversalApp/MainPage.xaml b/SampleApps/UniversalApp/MainPage.xaml
index 3c72eb44..3828fc48 100644
--- a/SampleApps/UniversalApp/MainPage.xaml
+++ b/SampleApps/UniversalApp/MainPage.xaml
@@ -21,7 +21,7 @@
         </Style>
 
         <Style x:Key="PointItemStyle" TargetType="map:MapItem">
-            <Setter Property="local:BindingHelper.LocationPath" Value="Location"/>
+            <Setter Property="LocationMemberPath" Value="Location"/>
             <Setter Property="Foreground" Value="Black"/>
             <Setter Property="Template">
                 <Setter.Value>
@@ -76,7 +76,7 @@
         </Style>
 
         <Style x:Key="PushpinItemStyle" TargetType="map:MapItem">
-            <Setter Property="local:BindingHelper.LocationPath" Value="Location"/>
+            <Setter Property="LocationMemberPath" Value="Location"/>
             <Setter Property="VerticalAlignment" Value="Bottom"/>
             <Setter Property="Foreground" Value="Black"/>
             <Setter Property="Template">
diff --git a/SampleApps/UniversalApp/UniversalApp.csproj b/SampleApps/UniversalApp/UniversalApp.csproj
index c1946cea..e2b51538 100644
--- a/SampleApps/UniversalApp/UniversalApp.csproj
+++ b/SampleApps/UniversalApp/UniversalApp.csproj
@@ -109,7 +109,6 @@
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
-    <Compile Include="BindingHelper.cs" />
     <Compile Include="MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
diff --git a/SampleApps/WpfApplication/MainWindow.xaml b/SampleApps/WpfApplication/MainWindow.xaml
index ea7ca7d9..8118c144 100644
--- a/SampleApps/WpfApplication/MainWindow.xaml
+++ b/SampleApps/WpfApplication/MainWindow.xaml
@@ -25,7 +25,7 @@
 
         <Style x:Key="PointItemStyle" TargetType="map:MapItem">
             <EventSetter Event="TouchDown" Handler="MapItemTouchDown"/>
-            <Setter Property="map:MapPanel.Location" Value="{Binding Location}"/>
+            <Setter Property="Location" Value="{Binding Location}"/>
             <Setter Property="Foreground" Value="Black"/>
             <Setter Property="Template">
                 <Setter.Value>
@@ -80,7 +80,7 @@
 
         <Style x:Key="PushpinItemStyle" TargetType="map:MapItem">
             <EventSetter Event="TouchDown" Handler="MapItemTouchDown"/>
-            <Setter Property="map:MapPanel.Location" Value="{Binding Location}"/>
+            <Setter Property="Location" Value="{Binding Location}"/>
             <Setter Property="VerticalAlignment" Value="Bottom"/>
             <Setter Property="Foreground" Value="Black"/>
             <Setter Property="Visibility">
@@ -123,7 +123,7 @@
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <map:Map x:Name="map" ZoomLevel="11" MaxZoomLevel="21"
+        <map:Map x:Name="map" ZoomLevel="11" MaxZoomLevel="21" MouseWheelZoomDelta="0.5"
                  Center="{Binding MapCenter}"
                  MapLayer="{Binding MapLayers.CurrentMapLayer}"
                  MapProjection="{Binding SelectedValue, ElementName=projectionComboBox,