diff --git a/Caching/FileDbCache/FileDbCache.cs b/Caching/FileDbCache/FileDbCache.cs
index e7f1d87d..a4e82fba 100644
--- a/Caching/FileDbCache/FileDbCache.cs
+++ b/Caching/FileDbCache/FileDbCache.cs
@@ -30,8 +30,8 @@ namespace Caching
         public FileDbCache(string name, NameValueCollection config)
             : this(name, config["directory"])
         {
-            string autoFlush = config["autoFlush"];
-            string autoCleanThreshold = config["autoCleanThreshold"];
+            var autoFlush = config["autoFlush"];
+            var autoCleanThreshold = config["autoCleanThreshold"];
 
             if (autoFlush != null)
             {
@@ -221,13 +221,13 @@ namespace Caching
             }
 
             object value = null;
-            Record record = GetRecord(key);
+            var record = GetRecord(key);
 
             if (record != null)
             {
                 try
                 {
-                    using (MemoryStream stream = new MemoryStream((byte[])record[0]))
+                    using (var stream = new MemoryStream((byte[])record[0]))
                     {
                         value = formatter.Deserialize(stream);
                     }
@@ -296,7 +296,7 @@ namespace Caching
 
                 try
                 {
-                    using (MemoryStream stream = new MemoryStream())
+                    using (var stream = new MemoryStream())
                     {
                         formatter.Serialize(stream, value);
                         valueBuffer = stream.ToArray();
@@ -309,7 +309,7 @@ namespace Caching
 
                 if (valueBuffer != null)
                 {
-                    DateTime expires = DateTime.MaxValue;
+                    var expires = DateTime.MaxValue;
 
                     if (policy.AbsoluteExpiration != InfiniteAbsoluteExpiration)
                     {
diff --git a/Caching/ImageFileCache/ImageFileCache.cs b/Caching/ImageFileCache/ImageFileCache.cs
index f69507c0..f6f422d5 100644
--- a/Caching/ImageFileCache/ImageFileCache.cs
+++ b/Caching/ImageFileCache/ImageFileCache.cs
@@ -112,10 +112,10 @@ namespace Caching
 
                     if (path != null)
                     {
-                        long creationTime = File.GetLastWriteTimeUtc(path).ToBinary();
+                        var creationTime = File.GetLastWriteTimeUtc(path).ToBinary();
 
-                        using (FileStream fileStream = new FileStream(path, FileMode.Open))
-                        using (MemoryStream memoryStream = new MemoryStream((int)(fileStream.Length + 8)))
+                        using (var fileStream = new FileStream(path, FileMode.Open))
+                        using (var memoryStream = new MemoryStream((int)(fileStream.Length + 8)))
                         {
                             memoryStream.Write(BitConverter.GetBytes(creationTime), 0, 8);
                             fileStream.CopyTo(memoryStream);
@@ -180,7 +180,7 @@ namespace Caching
                 {
                     Directory.CreateDirectory(Path.GetDirectoryName(path));
 
-                    using (FileStream fileStream = new FileStream(path, FileMode.Create))
+                    using (var fileStream = new FileStream(path, FileMode.Create))
                     {
                         fileStream.Write(buffer, 8, buffer.Length - 8);
                     }
@@ -278,7 +278,7 @@ namespace Caching
         private static string GetFileExtension(byte[] buffer)
         {
             string extension = null;
-            DateTime creationTime = DateTime.FromBinary(BitConverter.ToInt64(buffer, 0));
+            var creationTime = DateTime.FromBinary(BitConverter.ToInt64(buffer, 0));
 
             if (creationTime.Kind == DateTimeKind.Utc && creationTime <= DateTime.UtcNow)
             {
diff --git a/MapControl/MapControl.Silverlight.csproj b/MapControl/MapControl.Silverlight.csproj
index 0863860f..0c4864a5 100644
--- a/MapControl/MapControl.Silverlight.csproj
+++ b/MapControl/MapControl.Silverlight.csproj
@@ -75,7 +75,6 @@
     <Compile Include="MapBase.Silverlight.WinRT.cs" />
     <Compile Include="MapGraticule.cs" />
     <Compile Include="MapGraticule.Silverlight.WinRT.cs" />
-    <Compile Include="MapItem.cs" />
     <Compile Include="MapItem.Silverlight.WinRT.cs" />
     <Compile Include="MapItemsControl.cs" />
     <Compile Include="MapItemsControl.Silverlight.WinRT.cs" />
@@ -89,7 +88,6 @@
     <Compile Include="MatrixEx.cs" />
     <Compile Include="MercatorTransform.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Pushpin.cs" />
     <Compile Include="Pushpin.Silverlight.WinRT.cs" />
     <Compile Include="Tile.cs" />
     <Compile Include="Tile.Silverlight.WinRT.cs" />
diff --git a/MapControl/MapControl.WPF.csproj b/MapControl/MapControl.WPF.csproj
index ff119bf9..5a9ce143 100644
--- a/MapControl/MapControl.WPF.csproj
+++ b/MapControl/MapControl.WPF.csproj
@@ -57,7 +57,6 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="MapBase.WPF.cs" />
-    <Compile Include="MapItem.cs" />
     <Compile Include="MapItem.WPF.cs" />
     <Compile Include="MapItemsControl.cs" />
     <Compile Include="MapItemsControl.WPF.cs" />
@@ -68,7 +67,6 @@
     <Compile Include="MapTransform.cs" />
     <Compile Include="MercatorTransform.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Pushpin.cs" />
     <Compile Include="Pushpin.WPF.cs" />
     <Compile Include="Tile.cs" />
     <Compile Include="Tile.WPF.cs" />
diff --git a/MapControl/MapItem.Silverlight.WinRT.cs b/MapControl/MapItem.Silverlight.WinRT.cs
index 64945cb2..507df33b 100644
--- a/MapControl/MapItem.Silverlight.WinRT.cs
+++ b/MapControl/MapItem.Silverlight.WinRT.cs
@@ -2,9 +2,18 @@
 // Copyright © 2012 Clemens Fischer
 // Licensed under the Microsoft Public License (Ms-PL)
 
+#if WINRT
+using Windows.UI.Xaml.Controls;
+#else
+using System.Windows.Controls;
+#endif
+
 namespace MapControl
 {
-    public partial class MapItem
+    /// <summary>
+    /// Container class for an item in a MapItemsControl.
+    /// </summary>
+    public class MapItem : ListBoxItem
     {
         public MapItem()
         {
diff --git a/MapControl/MapItem.WPF.cs b/MapControl/MapItem.WPF.cs
index 441f822e..d58739c1 100644
--- a/MapControl/MapItem.WPF.cs
+++ b/MapControl/MapItem.WPF.cs
@@ -7,9 +7,12 @@ using System.Windows.Controls;
 
 namespace MapControl
 {
+    /// <summary>
+    /// Container class for an item in a MapItemsControl.
+    /// </summary>
     [TemplateVisualState(Name = "NotCurrent", GroupName = "CurrentStates")]
     [TemplateVisualState(Name = "Current", GroupName = "CurrentStates")]
-    public partial class MapItem
+    public class MapItem : ListBoxItem
     {
         public static readonly DependencyProperty IsCurrentProperty = MapItemsControl.IsCurrentProperty.AddOwner(
             typeof(MapItem),
diff --git a/MapControl/MapItem.cs b/MapControl/MapItem.cs
deleted file mode 100644
index 92a77e2d..00000000
--- a/MapControl/MapItem.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// XAML Map Control - http://xamlmapcontrol.codeplex.com/
-// Copyright © 2012 Clemens Fischer
-// Licensed under the Microsoft Public License (Ms-PL)
-
-#if WINRT
-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 LocationPathProperty = DependencyProperty.Register(
-            "LocationPath", typeof(string), typeof(MapItem), new PropertyMetadata(null, LocationPathPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets the property path that is used to bind the MapPanel.Location attached property.
-        /// </summary>
-        public string LocationPath
-        {
-            get { return (string)GetValue(LocationPathProperty); }
-            set { SetValue(LocationPathProperty, value); }
-        }
-
-        private static void LocationPathPropertyChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e)
-        {
-            string path = e.NewValue as string;
-
-            if (!string.IsNullOrWhiteSpace(path))
-            {
-                var binding = new Binding
-                {
-                    Path = new PropertyPath(path)
-                };
-
-                BindingOperations.SetBinding(obj, MapPanel.LocationProperty, binding);
-            }
-        }
-    }
-}
diff --git a/MapControl/Pushpin.Silverlight.WinRT.cs b/MapControl/Pushpin.Silverlight.WinRT.cs
index 883ead5a..c05a5939 100644
--- a/MapControl/Pushpin.Silverlight.WinRT.cs
+++ b/MapControl/Pushpin.Silverlight.WinRT.cs
@@ -2,9 +2,18 @@
 // Copyright © 2012 Clemens Fischer
 // Licensed under the Microsoft Public License (Ms-PL)
 
+#if WINRT
+using Windows.UI.Xaml.Controls;
+#else
+using System.Windows.Controls;
+#endif
+
 namespace MapControl
 {
-    public partial class Pushpin
+    /// <summary>
+    /// Displays a pushpin at a geographic location provided by the MapPanel.Location attached property.
+    /// </summary>
+    public class Pushpin : ContentControl
     {
         public Pushpin()
         {
diff --git a/MapControl/Pushpin.WPF.cs b/MapControl/Pushpin.WPF.cs
index 9b627af3..d15967f2 100644
--- a/MapControl/Pushpin.WPF.cs
+++ b/MapControl/Pushpin.WPF.cs
@@ -3,10 +3,14 @@
 // Licensed under the Microsoft Public License (Ms-PL)
 
 using System.Windows;
+using System.Windows.Controls;
 
 namespace MapControl
 {
-    public partial class Pushpin
+    /// <summary>
+    /// Displays a pushpin at a geographic location provided by the MapPanel.Location attached property.
+    /// </summary>
+    public class Pushpin : ContentControl
     {
         static Pushpin()
         {
diff --git a/MapControl/Pushpin.cs b/MapControl/Pushpin.cs
deleted file mode 100644
index c64948bb..00000000
--- a/MapControl/Pushpin.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// XAML Map Control - http://xamlmapcontrol.codeplex.com/
-// Copyright © 2012 Clemens Fischer
-// Licensed under the Microsoft Public License (Ms-PL)
-
-#if WINRT
-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>
-    /// Displays a pushpin at a geographic location provided by the MapPanel.Location attached property.
-    /// </summary>
-    public partial class Pushpin : ContentControl
-    {
-        public static readonly DependencyProperty LocationPathProperty = DependencyProperty.Register(
-            "LocationPath", typeof(string), typeof(Pushpin), new PropertyMetadata(null, LocationPathPropertyChanged));
-
-        /// <summary>
-        /// Gets or sets the property path that is used to bind the MapPanel.Location attached property.
-        /// </summary>
-        public string LocationPath
-        {
-            get { return (string)GetValue(LocationPathProperty); }
-            set { SetValue(LocationPathProperty, value); }
-        }
-
-        private static void LocationPathPropertyChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e)
-        {
-            string path = e.NewValue as string;
-
-            if (!string.IsNullOrWhiteSpace(path))
-            {
-                var binding = new Binding
-                {
-                    Path = new PropertyPath(path)
-                };
-
-                BindingOperations.SetBinding(obj, MapPanel.LocationProperty, binding);
-            }
-        }
-    }
-}
diff --git a/MapControl/TileImageLoader.WPF.cs b/MapControl/TileImageLoader.WPF.cs
index 2eee7b35..1c806d4a 100644
--- a/MapControl/TileImageLoader.WPF.cs
+++ b/MapControl/TileImageLoader.WPF.cs
@@ -217,8 +217,8 @@ namespace MapControl
                 var request = (HttpWebRequest)WebRequest.Create(uri);
                 request.UserAgent = typeof(TileImageLoader).ToString();
 
-                using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
-                using (Stream responseStream = response.GetResponseStream())
+                using (var response = (HttpWebResponse)request.GetResponse())
+                using (var responseStream = response.GetResponseStream())
                 {
                     var length = response.ContentLength;
                     var creationTime = DateTime.UtcNow.ToBinary();
diff --git a/MapControl/WinRT/MapControl.WinRT.csproj b/MapControl/WinRT/MapControl.WinRT.csproj
index 5525621b..e26e5a98 100644
--- a/MapControl/WinRT/MapControl.WinRT.csproj
+++ b/MapControl/WinRT/MapControl.WinRT.csproj
@@ -129,9 +129,6 @@
     <Compile Include="..\MapGraticule.Silverlight.WinRT.cs">
       <Link>MapGraticule.Silverlight.WinRT.cs</Link>
     </Compile>
-    <Compile Include="..\MapItem.cs">
-      <Link>MapItem.cs</Link>
-    </Compile>
     <Compile Include="..\MapItem.Silverlight.WinRT.cs">
       <Link>MapItem.Silverlight.WinRT.cs</Link>
     </Compile>
@@ -168,9 +165,6 @@
     <Compile Include="..\MercatorTransform.cs">
       <Link>MercatorTransform.cs</Link>
     </Compile>
-    <Compile Include="..\Pushpin.cs">
-      <Link>Pushpin.cs</Link>
-    </Compile>
     <Compile Include="..\Pushpin.Silverlight.WinRT.cs">
       <Link>Pushpin.Silverlight.WinRT.cs</Link>
     </Compile>
diff --git a/SampleApps/SilverlightApplication/MainPage.xaml b/SampleApps/SilverlightApplication/MainPage.xaml
index b0223373..70cdedb0 100644
--- a/SampleApps/SilverlightApplication/MainPage.xaml
+++ b/SampleApps/SilverlightApplication/MainPage.xaml
@@ -37,7 +37,7 @@
             </Setter>
         </Style>
         <Style x:Key="PointItemStyle" TargetType="map:MapItem">
-            <Setter Property="LocationPath" Value="Location"/>
+            <Setter Property="map:MapPanel.Location" Value="{Binding Location}"/>
             <Setter Property="HorizontalAlignment" Value="Left"/>
             <Setter Property="VerticalAlignment" Value="Bottom"/>
             <Setter Property="Template">
@@ -83,12 +83,12 @@
             </Setter>
         </Style>
         <Style x:Key="PushpinItemStyle" TargetType="map:MapItem">
-            <Setter Property="LocationPath" Value="Location"/>
+            <Setter Property="map:MapPanel.Location" Value="{Binding Location}"/>
             <Setter Property="HorizontalAlignment" Value="Left"/>
             <Setter Property="VerticalAlignment" Value="Bottom"/>
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate>
+                    <ControlTemplate TargetType="map:MapItem">
                         <map:Pushpin Content="{Binding Name}"/>
                     </ControlTemplate>
                 </Setter.Value>
diff --git a/SampleApps/StoreApplication/BindingHelper.cs b/SampleApps/StoreApplication/BindingHelper.cs
new file mode 100644
index 00000000..86c8c722
--- /dev/null
+++ b/SampleApps/StoreApplication/BindingHelper.cs
@@ -0,0 +1,36 @@
+using MapControl;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Data;
+
+namespace StoreApplication
+{
+    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/StoreApplication/MainPage.xaml b/SampleApps/StoreApplication/MainPage.xaml
index e3f7bfe1..98d440dc 100644
--- a/SampleApps/StoreApplication/MainPage.xaml
+++ b/SampleApps/StoreApplication/MainPage.xaml
@@ -35,7 +35,7 @@
             </Setter>
         </Style>
         <Style x:Key="PointItemStyle" TargetType="map:MapItem">
-            <Setter Property="LocationPath" Value="Location"/>
+            <Setter Property="local:BindingHelper.LocationPath" Value="Location"/>
             <Setter Property="HorizontalAlignment" Value="Left"/>
             <Setter Property="VerticalAlignment" Value="Bottom"/>
             <Setter Property="Foreground" Value="Black"/>
@@ -82,13 +82,13 @@
             </Setter>
         </Style>
         <Style x:Key="PushpinItemStyle" TargetType="map:MapItem">
-            <Setter Property="LocationPath" Value="Location"/>
+            <Setter Property="local:BindingHelper.LocationPath" Value="Location"/>
             <Setter Property="HorizontalAlignment" Value="Left"/>
             <Setter Property="VerticalAlignment" Value="Bottom"/>
             <Setter Property="Foreground" Value="Black"/>
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate>
+                    <ControlTemplate TargetType="map:MapItem">
                         <map:Pushpin Content="{Binding Name}"/>
                     </ControlTemplate>
                 </Setter.Value>
@@ -122,7 +122,8 @@
             <map:MapItemsControl ItemsSource="{StaticResource Pushpins}"
                                  ItemContainerStyle="{StaticResource PushpinItemStyle}"/>
 
-            <!--<map:Pushpin map:MapPanel.Location="53.5,8.2" Background="Yellow" Foreground="Blue" Content="N 53° 30' E 8° 12'"/>-->
+            <!-- No TypeConverter (yet?) for string to Location
+            <map:Pushpin map:MapPanel.Location="53.5,8.2" Background="Yellow" Foreground="Blue" Content="N 53° 30' E 8° 12'"/>-->
 
             <TextBlock HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="4" FontSize="10"
                        Text="{Binding TileLayer.Description, ElementName=map}"/>
diff --git a/SampleApps/StoreApplication/StoreApplication.csproj b/SampleApps/StoreApplication/StoreApplication.csproj
index 55054fcd..ebf607cf 100644
--- a/SampleApps/StoreApplication/StoreApplication.csproj
+++ b/SampleApps/StoreApplication/StoreApplication.csproj
@@ -103,6 +103,7 @@
     <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 94870f0b..a3e6cc52 100644
--- a/SampleApps/WpfApplication/MainWindow.xaml
+++ b/SampleApps/WpfApplication/MainWindow.xaml
@@ -127,7 +127,7 @@
             <Setter Property="VerticalAlignment" Value="Bottom"/>
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate>
+                    <ControlTemplate TargetType="map:MapItem">
                         <map:Pushpin Content="{Binding Name}"/>
                     </ControlTemplate>
                 </Setter.Value>