From 2f9003549443ead6e174a53109e4c8419b9c962d Mon Sep 17 00:00:00 2001
From: Chris Kaczor <chris@kaczorzoo.net>
Date: Mon, 14 Jul 2014 17:38:14 -0400
Subject: [PATCH] Update to EF6

---
 BrowserCommon.cs                    |    6 +-
 Category.cs                         |   27 +
 Data/Database.cs                    |   50 +-
 Data/Extensions.cs                  |   22 +-
 Entities.cs                         |   22 +-
 Feed.cs                             |   59 +
 FeedAction.cs                       |   26 +
 FeedCenter.csproj                   |   73 +-
 FeedErrorWindow.xaml.cs             |   22 +-
 FeedItem.cs                         |   38 +
 FeedParsers/AtomParser.cs           |   15 +-
 FeedParsers/FeedParserBase.cs       |   12 +-
 FeedParsers/RdfParser.cs            |   17 +-
 FeedParsers/RssParser.cs            |    9 +-
 Feeds/Category.cs                   |    8 +-
 Feeds/Feed.cs                       |   38 +-
 Feeds/FeedItem.cs                   |   12 +-
 MainWindow.xaml.cs                  |  191 ++--
 Model.Context.cs                    |   34 +
 Model.Context.tt                    |  636 +++++++++++
 Model.Designer.cs                   | 1543 +--------------------------
 Model.cs                            |    9 +
 Model.edmx                          |  101 +-
 Model.tt                            |  726 +++++++++++++
 NotificationIcon.cs                 |    9 +-
 Options/AboutOptionsPanel.xaml.cs   |    2 +-
 Options/BulkFeedWindow.xaml         |    5 +-
 Options/BulkFeedWindow.xaml.cs      |   11 +-
 Options/DisplayOptionsPanel.xaml.cs |   15 +-
 Options/FeedWindow.xaml             |    8 +-
 Options/FeedsOptionsPanel.xaml.cs   |   87 +-
 Options/Options.cs                  |   26 +-
 Options/UpdateOptionsPanel.xaml.cs  |    2 +-
 Setting.cs                          |   21 +
 SettingsStore.cs                    |   24 +-
 SplashWindow.xaml.cs                |   11 +-
 VersionCheck.cs                     |    8 +-
 app.config                          |   36 +-
 packages.config                     |    5 +-
 39 files changed, 2022 insertions(+), 1944 deletions(-)
 create mode 100644 Category.cs
 create mode 100644 Feed.cs
 create mode 100644 FeedAction.cs
 create mode 100644 FeedItem.cs
 create mode 100644 Model.Context.cs
 create mode 100644 Model.Context.tt
 create mode 100644 Model.cs
 create mode 100644 Model.tt
 create mode 100644 Setting.cs

diff --git a/BrowserCommon.cs b/BrowserCommon.cs
index d7739b8..0a85b66 100644
--- a/BrowserCommon.cs
+++ b/BrowserCommon.cs
@@ -1,8 +1,8 @@
-using System;
-using System.Diagnostics;
-using Common.Debug;
+using Common.Debug;
 using Common.Internet;
 using FeedCenter.Properties;
+using System;
+using System.Diagnostics;
 
 namespace FeedCenter
 {
diff --git a/Category.cs b/Category.cs
new file mode 100644
index 0000000..9083a4d
--- /dev/null
+++ b/Category.cs
@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FeedCenter
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Category
+    {
+        public Category()
+        {
+            this.Feeds = new HashSet<Feed>();
+        }
+    
+        public System.Guid ID { get; set; }
+        public string Name { get; set; }
+    
+        public virtual ICollection<Feed> Feeds { get; set; }
+    }
+}
diff --git a/Data/Database.cs b/Data/Database.cs
index 91cec9f..470798a 100644
--- a/Data/Database.cs
+++ b/Data/Database.cs
@@ -1,13 +1,11 @@
-using System;
+using Common.Debug;
+using FeedCenter.Properties;
+using System;
+using System.Collections.Generic;
 using System.Data.SqlServerCe;
 using System.IO;
-using System.Collections.Generic;
 using System.Linq;
 
-using Common.Debug;
-
-using FeedCenter.Properties;
-
 namespace FeedCenter.Data
 {
     public static class Database
@@ -45,10 +43,10 @@ namespace FeedCenter.Data
             try
             {
                 // Open the database file
-                using (FileStream stream = new FileStream(databasePath, FileMode.Open, FileAccess.Read))
+                using (var stream = new FileStream(databasePath, FileMode.Open, FileAccess.Read))
                 {
                     // Read the file using the binary reader
-                    BinaryReader reader = new BinaryReader(stream);
+                    var reader = new BinaryReader(stream);
 
                     // Seek to the version signature
                     stream.Seek(16, SeekOrigin.Begin);
@@ -81,7 +79,7 @@ namespace FeedCenter.Data
             Tracer.WriteLine("Creating database engine");
 
             // Create the database engine
-            using (SqlCeEngine engine = new SqlCeEngine(string.Format("Data Source={0}", DatabasePath)))
+            using (var engine = new SqlCeEngine(string.Format("Data Source={0}", DatabasePath)))
             {
                 Tracer.WriteLine("Creating database");
 
@@ -95,20 +93,20 @@ namespace FeedCenter.Data
             }
         }
 
-        private static int getVersion(SqlCeConnection connection)
+        private static int GetVersion(SqlCeConnection connection)
         {
-            string versionString = string.Empty;
+            string versionString;
 
             try
             {
                 // Check the database version table
-                using (SqlCeCommand command = new SqlCeCommand("SELECT Value FROM DatabaseVersion", connection))
+                using (var command = new SqlCeCommand("SELECT Value FROM DatabaseVersion", connection))
                     versionString = command.ExecuteScalar().ToString();
             }
             catch (SqlCeException)
             {
                 // Check the setting table for the version
-                using (SqlCeCommand command = new SqlCeCommand("SELECT Value FROM Setting WHERE Name = 'DatabaseVersion'", connection))
+                using (var command = new SqlCeCommand("SELECT Value FROM Setting WHERE Name = 'DatabaseVersion'", connection))
                     versionString = command.ExecuteScalar().ToString();
             }
 
@@ -125,7 +123,7 @@ namespace FeedCenter.Data
             Tracer.WriteLine("Getting database file version");
 
             // Get the database file version
-            SqlServerCeFileVersion fileVersion = GetFileVersion(DatabasePath);
+            var fileVersion = GetFileVersion(DatabasePath);
 
             Tracer.WriteLine("Database file version: {0}", fileVersion);
 
@@ -135,7 +133,7 @@ namespace FeedCenter.Data
                 Tracer.WriteLine("Creating database engine");
 
                 // Create the database engine
-                using (SqlCeEngine engine = new SqlCeEngine(string.Format("Data Source={0}", DatabasePath)))
+                using (var engine = new SqlCeEngine(string.Format("Data Source={0}", DatabasePath)))
                 {
                     Tracer.WriteLine("Upgrading database");
 
@@ -147,13 +145,13 @@ namespace FeedCenter.Data
             Tracer.WriteLine("Getting database version");
 
             // Create a database connection
-            using (SqlCeConnection connection = new SqlCeConnection(string.Format("Data Source={0}", DatabasePath)))
+            using (var connection = new SqlCeConnection(string.Format("Data Source={0}", DatabasePath)))
             {
                 // Open the connection
                 connection.Open();
 
                 // Get the database version
-                int databaseVersion = getVersion(connection);
+                var databaseVersion = GetVersion(connection);
 
                 // Create a dictionary of database upgrade scripts and their version numbers
                 var scriptList = new Dictionary<int, string>();
@@ -162,10 +160,10 @@ namespace FeedCenter.Data
                 foreach (var property in typeof(Resources).GetProperties().Where(property => property.Name.StartsWith("DatabaseUpdate")))
                 {
                     // Get the name of the property
-                    string propertyName = property.Name;
+                    var propertyName = property.Name;
 
                     // Extract the version from the name
-                    int version = int.Parse(propertyName.Substring(propertyName.IndexOf("_", StringComparison.Ordinal) + 1));
+                    var version = int.Parse(propertyName.Substring(propertyName.IndexOf("_", StringComparison.Ordinal) + 1));
 
                     // Add to the script list
                     scriptList[version] = propertyName;
@@ -178,7 +176,7 @@ namespace FeedCenter.Data
                     if (databaseVersion <= pair.Key)
                     {
                         // Get the script text
-                        string scriptText = Resources.ResourceManager.GetString(pair.Value);
+                        var scriptText = Resources.ResourceManager.GetString(pair.Value);
 
                         // Run the script
                         ExecuteScript(scriptText);
@@ -192,7 +190,7 @@ namespace FeedCenter.Data
             Tracer.WriteLine("Creating database engine");
 
             // Create the database engine
-            using (SqlCeEngine engine = new SqlCeEngine(string.Format("Data Source={0}", DatabasePath)))
+            using (var engine = new SqlCeEngine(string.Format("Data Source={0}", DatabasePath)))
             {
                 Tracer.WriteLine("Shrinking database");
 
@@ -204,22 +202,22 @@ namespace FeedCenter.Data
         private static void ExecuteScript(string scriptText)
         {
             // Create a database connection
-            using (SqlCeConnection connection = new SqlCeConnection(string.Format("Data Source={0}", DatabasePath)))
+            using (var connection = new SqlCeConnection(string.Format("Data Source={0}", DatabasePath)))
             {
                 // Open the connection
                 connection.Open();
 
                 // Setup the delimiters
-                string[] delimiters = new[] { "\r\nGO\r\n" };
+                var delimiters = new[] { "\r\nGO\r\n" };
 
                 // Split the script at the delimiters
-                string[] statements = scriptText.Split(delimiters, StringSplitOptions.RemoveEmptyEntries);
+                var statements = scriptText.Split(delimiters, StringSplitOptions.RemoveEmptyEntries);
 
                 // Loop over each statement in the script
-                foreach (string statement in statements)
+                foreach (var statement in statements)
                 {
                     // Execute the statement
-                    using (SqlCeCommand command = new SqlCeCommand(statement, connection))
+                    using (var command = new SqlCeCommand(statement, connection))
                         command.ExecuteNonQuery();
                 }
             }
diff --git a/Data/Extensions.cs b/Data/Extensions.cs
index 450d561..3c1a021 100644
--- a/Data/Extensions.cs
+++ b/Data/Extensions.cs
@@ -26,7 +26,7 @@ namespace FeedCenter.Data
                 return null;
 
             // Get the first table
-            DataTable firstTable = dataSet.Tables[0];
+            var firstTable = dataSet.Tables[0];
 
             // If the table has no rows then return nothing
             if (firstTable.Rows.Count == 0)
@@ -43,13 +43,13 @@ namespace FeedCenter.Data
         public static void SetStatement(this SqlCeCommand command, string statement, params object[] parameters)
         {
             // Create a new array to hold the updated parameters
-            object[] formattedParameters = new object[parameters.Length];
+            var formattedParameters = new object[parameters.Length];
 
             // Initialize our position
-            int position = 0;
+            var position = 0;
 
             // Loop over each parameter
-            foreach (object parameter in parameters)
+            foreach (var parameter in parameters)
             {
                 // If the parameter is a DateTime then we need to reformat
                 if (parameter == null)
@@ -60,10 +60,10 @@ namespace FeedCenter.Data
                 else if (parameter is DateTime)
                 {
                     // Cast the parameter back to a DateTime
-                    DateTime dateTime = (DateTime) parameter;
+                    var dateTime = (DateTime) parameter;
 
                     // Convert the DateTime to sortable format
-                    string formatted = dateTime.ToString("s");
+                    var formatted = dateTime.ToString("s");
 
                     // Set into the formatted array
                     formattedParameters[position++] = formatted;
@@ -101,7 +101,7 @@ namespace FeedCenter.Data
         public static void ExecuteNonQuery(this SqlCeConnection connection, string query, params object[] parameters)
         {
             // Create the command object 
-            SqlCeCommand command = connection.CreateCommand();
+            var command = connection.CreateCommand();
 
             // Set the statement based on the query and parameters
             command.SetStatement(query, parameters);
@@ -115,16 +115,16 @@ namespace FeedCenter.Data
         public static DataSet ExecuteDataSet(this SqlCeConnection connection, string query, params object[] parameters)
         {
             // Create the command object
-            SqlCeCommand command = connection.CreateCommand();
+            var command = connection.CreateCommand();
 
             // Set the statement based on the query and parameters
             command.SetStatement(query, parameters);
 
             // Create a new data adapter
-            using (SqlCeDataAdapter adapter = new SqlCeDataAdapter(command))
+            using (var adapter = new SqlCeDataAdapter(command))
             {
                 // Create the new data set
-                using (DataSet dataSet = new DataSet())
+                using (var dataSet = new DataSet())
                 {
                     //Tracer.WriteLine("Executing SQL query: {0}", command.CommandText);
 
@@ -139,7 +139,7 @@ namespace FeedCenter.Data
         public static object ExecuteScalar(this SqlCeConnection connection, string query, params object[] parameters)
         {
             // Create the command object 
-            SqlCeCommand command = connection.CreateCommand();
+            var command = connection.CreateCommand();
 
             // Set the statement based on the query and parameters
             command.SetStatement(query, parameters);
diff --git a/Entities.cs b/Entities.cs
index 44960a6..d2f9315 100644
--- a/Entities.cs
+++ b/Entities.cs
@@ -1,5 +1,6 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.Data.Entity.Infrastructure;
 
 namespace FeedCenter
 {
@@ -11,7 +12,8 @@ namespace FeedCenter
         {
             if (disposing)
             {
-                ObjectStateManager.ObjectStateManagerChanged -= HandleObjectStateManagerObjectStateManagerChanged;
+                var manager = ((IObjectContextAdapter) this).ObjectContext.ObjectStateManager;
+                manager.ObjectStateManagerChanged -= HandleObjectStateManagerObjectStateManagerChanged;
                 _hookedStateManager = false;
             }
 
@@ -36,7 +38,8 @@ namespace FeedCenter
 
                     if (!_hookedStateManager)
                     {
-                        ObjectStateManager.ObjectStateManagerChanged += HandleObjectStateManagerObjectStateManagerChanged;
+                        var manager = ((IObjectContextAdapter) this).ObjectContext.ObjectStateManager;
+                        manager.ObjectStateManagerChanged += HandleObjectStateManagerObjectStateManagerChanged;
                         _hookedStateManager = true;
                     }
                 }
@@ -61,7 +64,8 @@ namespace FeedCenter
 
                     if (!_hookedStateManager)
                     {
-                        ObjectStateManager.ObjectStateManagerChanged += HandleObjectStateManagerObjectStateManagerChanged;
+                        var manager = ((IObjectContextAdapter) this).ObjectContext.ObjectStateManager;
+                        manager.ObjectStateManagerChanged += HandleObjectStateManagerObjectStateManagerChanged;
                         _hookedStateManager = true;
                     }
                 }
@@ -80,8 +84,8 @@ namespace FeedCenter
             {
                 if (_allCategories == null)
                     return;
-                
-                Category category = e.Element as Category;
+
+                var category = e.Element as Category;
 
                 switch (e.Action)
                 {
@@ -93,7 +97,7 @@ namespace FeedCenter
                         break;
                     case CollectionChangeAction.Refresh:
                         _allCategories.Clear();
-                        foreach (Category loopCategory in Categories)
+                        foreach (var loopCategory in Categories)
                             _allCategories.Add(loopCategory);
                         break;
                 }
@@ -103,7 +107,7 @@ namespace FeedCenter
                 if (_allFeeds == null)
                     return;
 
-                Feed feed = e.Element as Feed;
+                var feed = e.Element as Feed;
 
                 switch (e.Action)
                 {
@@ -115,10 +119,10 @@ namespace FeedCenter
                         break;
                     case CollectionChangeAction.Refresh:
                         _allFeeds.Clear();
-                        foreach (Feed loopfeed in Feeds)
+                        foreach (var loopfeed in Feeds)
                             _allFeeds.Add(loopfeed);
                         break;
-                }                
+                }
             }
         }
 
diff --git a/Feed.cs b/Feed.cs
new file mode 100644
index 0000000..e7dd4c0
--- /dev/null
+++ b/Feed.cs
@@ -0,0 +1,59 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FeedCenter
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Feed
+    {
+        public Feed()
+        {
+            this.Name = "";
+            this.Title = "";
+            this.Source = "";
+            this.Link = "";
+            this.Description = "";
+            this.LastChecked = new DateTime(599266080000000000, DateTimeKind.Unspecified);
+            this.CheckInterval = 60;
+            this.Enabled = true;
+            this.Authenticate = false;
+            this.Username = "";
+            this.Password = "";
+            this.Domain = "";
+            this.LastUpdated = new DateTime(599266080000000000, DateTimeKind.Unspecified);
+            this.Actions = new HashSet<FeedAction>();
+            this.Items = new HashSet<FeedItem>();
+        }
+    
+        public System.Guid ID { get; set; }
+        public string Name { get; set; }
+        public string Title { get; set; }
+        public string Source { get; set; }
+        public string Link { get; set; }
+        public string Description { get; set; }
+        public System.DateTime LastChecked { get; set; }
+        public int CheckInterval { get; set; }
+        public bool Enabled { get; set; }
+        public bool Authenticate { get; set; }
+        public string Username { get; set; }
+        public string Password { get; set; }
+        public string Domain { get; set; }
+        public FeedCenter.FeedReadResult LastReadResult { get; set; }
+        public System.DateTime LastUpdated { get; set; }
+        public FeedCenter.FeedItemComparison ItemComparison { get; set; }
+        public System.Guid CategoryID { get; set; }
+        public FeedCenter.MultipleOpenAction MultipleOpenAction { get; set; }
+    
+        public virtual Category Category { get; set; }
+        public virtual ICollection<FeedAction> Actions { get; set; }
+        public virtual ICollection<FeedItem> Items { get; set; }
+    }
+}
diff --git a/FeedAction.cs b/FeedAction.cs
new file mode 100644
index 0000000..d853061
--- /dev/null
+++ b/FeedAction.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FeedCenter
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class FeedAction
+    {
+        public System.Guid ID { get; set; }
+        public System.Guid FeedID { get; set; }
+        public int Field { get; set; }
+        public string Search { get; set; }
+        public string Replace { get; set; }
+        public int Sequence { get; set; }
+    
+        public virtual Feed Feed { get; set; }
+    }
+}
diff --git a/FeedCenter.csproj b/FeedCenter.csproj
index e27b036..9fd1893 100644
--- a/FeedCenter.csproj
+++ b/FeedCenter.csproj
@@ -132,17 +132,26 @@
     <Reference Include="Common.Wpf.MarkupExtensions">
       <HintPath>..\Common.Wpf.MarkupExtensions\bin\Release\Common.Wpf.MarkupExtensions.dll</HintPath>
     </Reference>
+    <Reference Include="EntityFramework">
+      <HintPath>packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServer">
+      <HintPath>packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServerCompact">
+      <HintPath>packages\EntityFramework.SqlServerCompact.6.1.1\lib\net45\EntityFramework.SqlServerCompact.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.Entity" />
-    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\Debug\System.Data.SqlServerCe.dll</HintPath>
+    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>packages\Microsoft.SqlServer.Compact.4.0.8854.1\lib\net40\System.Data.SqlServerCe.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\Debug\System.Data.SqlServerCe.Entity.dll</HintPath>
+    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>packages\Microsoft.SqlServer.Compact.4.0.8854.1\lib\net40\System.Data.SqlServerCe.Entity.dll</HintPath>
     </Reference>
     <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
@@ -168,12 +177,34 @@
       <SubType>Designer</SubType>
     </Page>
     <Compile Include="BrowserCommon.cs" />
+    <Compile Include="Category.cs">
+      <DependentUpon>Model.tt</DependentUpon>
+    </Compile>
     <Compile Include="Data\Extensions.cs" />
     <Compile Include="Entities.cs" />
+    <Compile Include="Feed.cs">
+      <DependentUpon>Model.tt</DependentUpon>
+    </Compile>
+    <Compile Include="FeedAction.cs">
+      <DependentUpon>Model.tt</DependentUpon>
+    </Compile>
     <Compile Include="FeedErrorWindow.xaml.cs">
       <DependentUpon>FeedErrorWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="FeedItem.cs">
+      <DependentUpon>Model.tt</DependentUpon>
+    </Compile>
     <Compile Include="Feeds\Category.cs" />
+    <Compile Include="Model.Context.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Model.Context.tt</DependentUpon>
+    </Compile>
+    <Compile Include="Model.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Model.tt</DependentUpon>
+    </Compile>
     <Compile Include="Model.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -212,6 +243,9 @@
     <Compile Include="Options\UpdateOptionsPanel.xaml.cs">
       <DependentUpon>UpdateOptionsPanel.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Setting.cs">
+      <DependentUpon>Model.tt</DependentUpon>
+    </Compile>
     <Compile Include="SettingsStore.cs" />
     <Compile Include="SplashWindow.xaml.cs">
       <DependentUpon>SplashWindow.xaml</DependentUpon>
@@ -326,6 +360,16 @@
     </EntityDeploy>
     <None Include="FeedCenter_1_TemporaryKey.pfx" />
     <None Include="FeedCenter_TemporaryKey.pfx" />
+    <None Include="Model.Context.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>Model.Context.cs</LastGenOutput>
+      <DependentUpon>Model.edmx</DependentUpon>
+    </None>
+    <None Include="Model.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>Model.cs</LastGenOutput>
+      <DependentUpon>Model.edmx</DependentUpon>
+    </None>
     <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
@@ -455,12 +499,17 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
-  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
-    <Error Condition="!Exists('packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
-    <Error Condition="Exists('packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
-  </Target>
+  <PropertyGroup>
+    <PostBuildEvent>
+    if not exist "$(TargetDir)x86" md "$(TargetDir)x86"
+    xcopy /s /y "$(SolutionDir)packages\Microsoft.SqlServer.Compact.4.0.8854.1\NativeBinaries\x86\*.*" "$(TargetDir)x86"
+    if not exist "$(TargetDir)amd64" md "$(TargetDir)amd64"
+    xcopy /s /y "$(SolutionDir)packages\Microsoft.SqlServer.Compact.4.0.8854.1\NativeBinaries\amd64\*.*" "$(TargetDir)amd64"</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/FeedErrorWindow.xaml.cs b/FeedErrorWindow.xaml.cs
index 9bf5520..ed32295 100644
--- a/FeedErrorWindow.xaml.cs
+++ b/FeedErrorWindow.xaml.cs
@@ -1,8 +1,8 @@
-using System.ComponentModel;
+using FeedCenter.Options;
+using System.ComponentModel;
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Input;
-using FeedCenter.Options;
 
 namespace FeedCenter
 {
@@ -38,9 +38,9 @@ namespace FeedCenter
 
         private void HandleCollectionViewSourceFilter(object sender, FilterEventArgs e)
         {
-            Feed feed = (Feed) e.Item;
+            var feed = (Feed) e.Item;
 
-            e.Accepted = (feed.LastReadResult != (int) FeedReadResult.Success);
+            e.Accepted = (feed.LastReadResult != FeedReadResult.Success);
         }
 
         private void HandleEditFeedButtonClick(object sender, RoutedEventArgs e)
@@ -58,18 +58,18 @@ namespace FeedCenter
             if (feedDataGrid.SelectedItem == null)
                 return;
 
-            Feed feed = (Feed) feedDataGrid.SelectedItem;
+            var feed = (Feed) feedDataGrid.SelectedItem;
 
-            FeedWindow feedWindow = new FeedWindow();
+            var feedWindow = new FeedWindow();
 
             feedWindow.Display(_database, feed, GetWindow(this));
         }
 
         private void DeleteSelectedFeed()
         {
-            Feed feed = (Feed) feedDataGrid.SelectedItem;
+            var feed = (Feed) feedDataGrid.SelectedItem;
 
-            _database.Feeds.DeleteObject(feed);
+            _database.Feeds.Remove(feed);
 
             SetFeedButtonStates();
         }
@@ -85,13 +85,13 @@ namespace FeedCenter
 
         private void HandleOpenPageButtonClick(object sender, RoutedEventArgs e)
         {
-            Feed feed = (Feed) feedDataGrid.SelectedItem;
+            var feed = (Feed) feedDataGrid.SelectedItem;
             BrowserCommon.OpenLink(feed.Link);
         }
 
         private void HandleOpenFeedButtonClick(object sender, RoutedEventArgs e)
         {
-            Feed feed = (Feed) feedDataGrid.SelectedItem;
+            var feed = (Feed) feedDataGrid.SelectedItem;
             BrowserCommon.OpenLink(feed.Source);
         }
 
@@ -109,7 +109,7 @@ namespace FeedCenter
         {
             Mouse.OverrideCursor = Cursors.Wait;
 
-            Feed feed = (Feed) feedDataGrid.SelectedItem;
+            var feed = (Feed) feedDataGrid.SelectedItem;
             feed.Read(_database, true);
 
             _collectionViewSource.View.Refresh();
diff --git a/FeedItem.cs b/FeedItem.cs
new file mode 100644
index 0000000..b7e3dee
--- /dev/null
+++ b/FeedItem.cs
@@ -0,0 +1,38 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FeedCenter
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class FeedItem
+    {
+        public FeedItem()
+        {
+            this.Title = "";
+            this.Link = "";
+            this.Description = "";
+            this.LastFound = new DateTime(599266080000000000, DateTimeKind.Unspecified);
+        }
+    
+        public System.Guid ID { get; set; }
+        public System.Guid FeedID { get; set; }
+        public string Title { get; set; }
+        public string Link { get; set; }
+        public string Description { get; set; }
+        public bool BeenRead { get; set; }
+        public System.DateTime LastFound { get; set; }
+        public bool New { get; set; }
+        public string Guid { get; set; }
+        public int Sequence { get; set; }
+    
+        public virtual Feed Feed { get; set; }
+    }
+}
diff --git a/FeedParsers/AtomParser.cs b/FeedParsers/AtomParser.cs
index 9cefd9d..220fb30 100644
--- a/FeedParsers/AtomParser.cs
+++ b/FeedParsers/AtomParser.cs
@@ -1,7 +1,6 @@
-using System.Xml;
-
-using Common.Debug;
+using Common.Debug;
 using Common.Xml;
+using System.Xml;
 
 namespace FeedCenter.FeedParsers
 {
@@ -14,13 +13,13 @@ namespace FeedCenter.FeedParsers
             try
             {
                 // Create the XML document
-                XmlDocument document = new XmlDocument { XmlResolver = null };
+                var document = new XmlDocument { XmlResolver = null };
 
                 // Load the XML document from the text
                 document.LoadXml(feedText);
 
                 // Create the namespace manager
-                XmlNamespaceManager namespaceManager = document.GetAllNamespaces();
+                var namespaceManager = document.GetAllNamespaces();
 
                 // Get the root node
                 XmlNode rootNode = document.DocumentElement;
@@ -30,7 +29,7 @@ namespace FeedCenter.FeedParsers
                     return FeedReadResult.UnknownError;
 
                 // Initialize the sequence number for items
-                int sequence = 0;
+                var sequence = 0;
 
                 // Loop over all nodes in the root node
                 foreach (XmlNode node in rootNode.ChildNodes)
@@ -81,7 +80,7 @@ namespace FeedCenter.FeedParsers
         protected override FeedItem ParseFeedItem(XmlNamespaceManager namespaceManager, XmlNode node)
         {
             // Create a new feed item
-            FeedItem feedItem = new FeedItem();
+            var feedItem = FeedItem.Create();
 
             // Loop over all nodes in the feed node
             foreach (XmlNode childNode in node.ChildNodes)
@@ -114,7 +113,7 @@ namespace FeedCenter.FeedParsers
 
                         if (string.IsNullOrEmpty(rel) || rel == "alternate")
                         {
-                            string link = childNode.Attributes["href"].InnerText;
+                            var link = childNode.Attributes["href"].InnerText;
 
                             if (link.StartsWith("/"))
                             {
diff --git a/FeedParsers/FeedParserBase.cs b/FeedParsers/FeedParserBase.cs
index a86087b..0fe9eaf 100644
--- a/FeedParsers/FeedParserBase.cs
+++ b/FeedParsers/FeedParserBase.cs
@@ -1,16 +1,16 @@
-using System;
+using Common.Debug;
+using System;
 using System.Linq;
 using System.Xml;
 
-using Common.Debug;
-
 namespace FeedCenter.FeedParsers
 {
     [Serializable]
     internal class InvalidFeedFormatException : ApplicationException
     {
-        internal InvalidFeedFormatException(Exception exception) : base(string.Empty, exception)
-        {            
+        internal InvalidFeedFormatException(Exception exception)
+            : base(string.Empty, exception)
+        {
         }
     }
 
@@ -124,7 +124,7 @@ namespace FeedCenter.FeedParsers
             try
             {
                 // Create the XML document
-                XmlDocument document = new XmlDocument { XmlResolver = null };
+                var document = new XmlDocument { XmlResolver = null };
 
                 // Load the XML document from the text
                 document.LoadXml(feedText);
diff --git a/FeedParsers/RdfParser.cs b/FeedParsers/RdfParser.cs
index 5d3dc1c..f119852 100644
--- a/FeedParsers/RdfParser.cs
+++ b/FeedParsers/RdfParser.cs
@@ -1,7 +1,6 @@
-using System.Xml;
-
-using Common.Debug;
+using Common.Debug;
 using Common.Xml;
+using System.Xml;
 
 namespace FeedCenter.FeedParsers
 {
@@ -14,13 +13,13 @@ namespace FeedCenter.FeedParsers
             try
             {
                 // Create the XML document
-                XmlDocument document = new XmlDocument { XmlResolver = null };
+                var document = new XmlDocument { XmlResolver = null };
 
                 // Load the XML document from the text
                 document.LoadXml(feedText);
 
                 // Create the namespace manager
-                XmlNamespaceManager namespaceManager = document.GetAllNamespaces();                    
+                XmlNamespaceManager namespaceManager = document.GetAllNamespaces();
 
                 // Get the root node
                 XmlNode rootNode = document.DocumentElement;
@@ -28,7 +27,7 @@ namespace FeedCenter.FeedParsers
                 // If we didn't find a root node then bail
                 if (rootNode == null)
                     return FeedReadResult.UnknownError;
-                
+
                 // Get the channel node
                 XmlNode channelNode = rootNode.SelectSingleNode("default:channel", namespaceManager);
 
@@ -83,7 +82,7 @@ namespace FeedCenter.FeedParsers
         protected override FeedItem ParseFeedItem(XmlNamespaceManager namespaceManager, XmlNode node)
         {
             // Create a new feed item
-            FeedItem feedItem = new FeedItem();
+            FeedItem feedItem = FeedItem.Create();
 
             // Loop over all nodes in the feed node
             foreach (XmlNode childNode in node.ChildNodes)
@@ -97,10 +96,10 @@ namespace FeedCenter.FeedParsers
 
                     case "link":
                         feedItem.Link = childNode.InnerText.Trim();
-                        
+
                         // RDF doesn't have a GUID node so we'll just use the link
                         feedItem.Guid = feedItem.Link;
-                        
+
                         break;
 
                     case "description":
diff --git a/FeedParsers/RssParser.cs b/FeedParsers/RssParser.cs
index 6cce94b..74f77cf 100644
--- a/FeedParsers/RssParser.cs
+++ b/FeedParsers/RssParser.cs
@@ -1,7 +1,6 @@
-using System.Xml;
-
-using Common.Debug;
+using Common.Debug;
 using Common.Xml;
+using System.Xml;
 
 namespace FeedCenter.FeedParsers
 {
@@ -14,7 +13,7 @@ namespace FeedCenter.FeedParsers
             try
             {
                 // Create the XML document
-                XmlDocument document = new XmlDocument { XmlResolver = null };
+                var document = new XmlDocument { XmlResolver = null };
 
                 // Load the XML document from the text
                 document.LoadXml(feedText);
@@ -75,7 +74,7 @@ namespace FeedCenter.FeedParsers
         protected override FeedItem ParseFeedItem(XmlNamespaceManager namespaceManager, XmlNode node)
         {
             // Create a new feed item
-            FeedItem feedItem = new FeedItem();
+            FeedItem feedItem = FeedItem.Create();
 
             // Loop over all nodes in the feed node
             foreach (XmlNode childNode in node.ChildNodes)
diff --git a/Feeds/Category.cs b/Feeds/Category.cs
index 4f7b6e6..ff2f03b 100644
--- a/Feeds/Category.cs
+++ b/Feeds/Category.cs
@@ -4,15 +4,11 @@ namespace FeedCenter
 {
     public partial class Category
     {
-        #region Constructor
-
-        public Category()
+        public static Category Create()
         {
-            ID = Guid.NewGuid();
+            return new Category { ID = Guid.NewGuid() };
         }
 
-        #endregion
-
         public bool IsDefault
         {
             get { return Name == "< default >"; }
diff --git a/Feeds/Feed.cs b/Feeds/Feed.cs
index c0f9cd7..5f51765 100644
--- a/Feeds/Feed.cs
+++ b/Feeds/Feed.cs
@@ -3,15 +3,23 @@ using Common.Xml;
 using FeedCenter.FeedParsers;
 using System;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Text;
+using System.Windows.Data;
 
 namespace FeedCenter
 {
     #region Enumerations
 
+    public enum MultipleOpenAction
+    {
+        IndividualPages,
+        SinglePage
+    }
+
     public enum FeedType
     {
         Unknown,
@@ -20,7 +28,7 @@ namespace FeedCenter
         Atom
     }
 
-    public enum FeedItemComparison
+    public enum FeedItemComparison : byte
     {
         Default,
         Title
@@ -44,16 +52,26 @@ namespace FeedCenter
 
     #endregion
 
-    public partial class Feed
+    [ValueConversion(typeof(int), typeof(MultipleOpenAction))]
+    public class MultipleOpenActionConverter : IValueConverter
     {
-        #region Constructor
-
-        public Feed()
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            ID = Guid.NewGuid();
+            return (MultipleOpenAction) value;
         }
 
-        #endregion
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return (int) value;
+        }
+    }
+
+    public partial class Feed
+    {
+        public static Feed Create()
+        {
+            return new Feed { ID = Guid.NewGuid() };
+        }
 
         #region Event delegates
 
@@ -81,7 +99,7 @@ namespace FeedCenter
 
                 default:
                     // Save as last result
-                    LastReadResult = (int) result;
+                    LastReadResult = result;
 
                     break;
             }
@@ -268,7 +286,7 @@ namespace FeedCenter
                 foreach (var itemToRemove in removedItems)
                 {
                     // Delete the item from the database
-                    database.FeedItems.DeleteObject(itemToRemove);
+                    database.FeedItems.Remove(itemToRemove);
 
                     // Remove the item from the list
                     Items.Remove(itemToRemove);
@@ -315,7 +333,7 @@ namespace FeedCenter
             get
             {
                 // Cast the last read result to the proper enum
-                var lastReadResult = (FeedReadResult) LastReadResult;
+                var lastReadResult = LastReadResult;
 
                 // Build the name of the resource using the enum name and the value
                 var resourceName = string.Format("{0}_{1}", typeof(FeedReadResult).Name, lastReadResult);
diff --git a/Feeds/FeedItem.cs b/Feeds/FeedItem.cs
index c391353..2b061e4 100644
--- a/Feeds/FeedItem.cs
+++ b/Feeds/FeedItem.cs
@@ -6,15 +6,11 @@ namespace FeedCenter
 {
     public partial class FeedItem
     {
-        #region Constructor
-
-        public FeedItem()
+        public static FeedItem Create()
         {
-            ID = System.Guid.NewGuid();
+            return new FeedItem { ID = System.Guid.NewGuid() };
         }
 
-        #endregion
-
         #region Methods
 
         public override string ToString()
@@ -31,7 +27,7 @@ namespace FeedCenter
                     break;
 
                 case Options.MultipleLineDisplay.FirstLine:
-                    
+
                     // Find the first newline
                     int newlineIndex = title.IndexOf("\n", StringComparison.Ordinal);
 
@@ -46,7 +42,7 @@ namespace FeedCenter
             title = Regex.Replace(title, @"[ ]{2,}", " ");
 
             // Condense tabs to one space
-            title = Regex.Replace(title, @"\t", " ");            
+            title = Regex.Replace(title, @"\t", " ");
 
             // If the title is blank then put in the "no title" title
             if (title.Length == 0)
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index dbf74da..a154fe9 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -1,24 +1,22 @@
-using System;
+using Common.Debug;
+using Common.Helpers;
+using Common.IO;
+using Common.Wpf.Extensions;
+using FeedCenter.Options;
+using FeedCenter.Properties;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Deployment.Application;
 using System.IO;
+using System.Linq;
+using System.Threading;
 using System.Web.UI;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
-using System.Linq;
-using System.Threading;
-
-using Common.Debug;
-using Common.Helpers;
-using Common.IO;
-using Common.Internet;
-using Common.Wpf.Extensions;
-using FeedCenter.Options;
-using FeedCenter.Properties;
 
 namespace FeedCenter
 {
@@ -180,14 +178,14 @@ namespace FeedCenter
         private void LoadWindowSettings()
         {
             // Get the last window location
-            Point windowLocation = Settings.Default.WindowLocation;
+            var windowLocation = Settings.Default.WindowLocation;
 
             // Set the window into position
             Left = windowLocation.X;
             Top = windowLocation.Y;
 
             // Get the last window size
-            Size windowSize = Settings.Default.WindowSize;
+            var windowSize = Settings.Default.WindowSize;
 
             // Set the window into the previous size if it is valid
             if (!windowSize.Width.Equals(0) && !windowSize.Height.Equals(0))
@@ -315,7 +313,7 @@ namespace FeedCenter
         private void InitializeFeed()
         {
             // Cache the feed count to save (a little) time
-            int feedCount = _database.Feeds.Count();
+            var feedCount = _database.Feeds.Count();
 
             // Set button states
             previousToolbarButton.IsEnabled = (feedCount > 1);
@@ -343,7 +341,7 @@ namespace FeedCenter
 
         private void NextFeed()
         {
-            int feedCount = _database.Feeds.Count();
+            var feedCount = _database.Feeds.Count();
 
             if (feedCount == 0)
                 return;
@@ -359,10 +357,10 @@ namespace FeedCenter
             else
             {
                 // Keep track if we found something
-                bool found = false;
+                var found = false;
 
                 // Remember our starting position
-                int startIndex = (_feedIndex == -1 ? 0 : _feedIndex);
+                var startIndex = (_feedIndex == -1 ? 0 : _feedIndex);
 
                 // Increment the index and adjust if we've gone around the end
                 _feedIndex = (_feedIndex + 1) % feedCount;
@@ -402,7 +400,7 @@ namespace FeedCenter
 
         private void PreviousFeed()
         {
-            int feedCount = _database.Feeds.Count();
+            var feedCount = _database.Feeds.Count();
 
             if (feedCount == 0)
                 return;
@@ -422,10 +420,10 @@ namespace FeedCenter
             else
             {
                 // Keep track if we found something
-                bool found = false;
+                var found = false;
 
                 // Remember our starting position
-                int startIndex = (_feedIndex == -1 ? 0 : _feedIndex);
+                var startIndex = (_feedIndex == -1 ? 0 : _feedIndex);
 
                 // Decrement the feed index
                 _feedIndex--;
@@ -473,7 +471,7 @@ namespace FeedCenter
 
         private void UpdateOpenAllButton()
         {
-            var multipleOpenAction = (MultipleOpenAction) _currentFeed.MultipleOpenAction;
+            var multipleOpenAction = _currentFeed.MultipleOpenAction;
 
             switch (multipleOpenAction)
             {
@@ -509,7 +507,7 @@ namespace FeedCenter
             var sortedItems = _currentFeed.Items.Where(item => !item.BeenRead).OrderBy(item => item.Sequence);
 
             // Loop over all items in the current feed
-            foreach (FeedItem feedItem in sortedItems)
+            foreach (var feedItem in sortedItems)
             {
                 // Add the list item
                 linkTextList.Items.Add(feedItem);
@@ -575,7 +573,7 @@ namespace FeedCenter
             SetProgressMode(true, 1);
 
             // Create the input class
-            FeedReadWorkerInput workerInput = new FeedReadWorkerInput { ForceRead = forceRead, Feed = _currentFeed };
+            var workerInput = new FeedReadWorkerInput { ForceRead = forceRead, Feed = _currentFeed };
 
             // Start the worker
             _feedReadWorker.RunWorkerAsync(workerInput);
@@ -595,7 +593,7 @@ namespace FeedCenter
             SetProgressMode(true, _database.Feeds.Count());
 
             // Create the input class
-            FeedReadWorkerInput workerInput = new FeedReadWorkerInput { ForceRead = forceRead, Feed = null };
+            var workerInput = new FeedReadWorkerInput { ForceRead = forceRead, Feed = null };
 
             // Start the worker
             _feedReadWorker.RunWorkerAsync(workerInput);
@@ -610,7 +608,7 @@ namespace FeedCenter
         private void HandleFeedReadWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
             // Get the state info
-            FeedReadWorkerOutput workerOutput = (FeedReadWorkerOutput) e.Result;
+            var workerOutput = (FeedReadWorkerOutput) e.Result;
 
             // Reset the database to current settings
             ResetDatabase();
@@ -628,7 +626,7 @@ namespace FeedCenter
             SetProgressMode(false, 0);
 
             // Check for update information
-            UpdateCheckInfo updateCheckInfo = workerOutput.UpdateResult;
+            var updateCheckInfo = workerOutput.UpdateResult;
 
             if (updateCheckInfo != null && updateCheckInfo.UpdateAvailable)
                 newVersionLink.Visibility = Visibility.Visible;
@@ -638,7 +636,7 @@ namespace FeedCenter
 
         private void UpdateErrorLink()
         {
-            var feedErrorCount = _database.Feeds.Count(f => f.LastReadResult != (int) FeedReadResult.Success);
+            var feedErrorCount = _database.Feeds.Count(f => f.LastReadResult != FeedReadResult.Success);
 
             // Set the visibility of the error link
             feedErrorsLink.Visibility = feedErrorCount == 0 ? Visibility.Collapsed : Visibility.Visible;
@@ -652,22 +650,22 @@ namespace FeedCenter
         private static void HandleFeedReadWorkerStart(object sender, DoWorkEventArgs e)
         {
             // Create a new database instance for just this thread
-            FeedCenterEntities database = new FeedCenterEntities();
+            var database = new FeedCenterEntities();
 
             // Get the worker
-            BackgroundWorker worker = (BackgroundWorker) sender;
+            var worker = (BackgroundWorker) sender;
 
             // Get the input information
-            FeedReadWorkerInput workerInput = (FeedReadWorkerInput) e.Argument;
+            var workerInput = (FeedReadWorkerInput) e.Argument;
 
             // Create the output 
-            FeedReadWorkerOutput workerOutput = new FeedReadWorkerOutput();
+            var workerOutput = new FeedReadWorkerOutput();
 
             // Setup for progress
-            int currentProgress = 0;
+            var currentProgress = 0;
 
             // Create the list of feeds to read
-            List<Feed> feedsToRead = new List<Feed>();
+            var feedsToRead = new List<Feed>();
 
             // If we have a single feed then add it to the list - otherwise add them all
             if (workerInput.Feed != null)
@@ -676,7 +674,7 @@ namespace FeedCenter
                 feedsToRead.AddRange(database.Feeds);
 
             // Loop over each feed and read it
-            foreach (Feed feed in feedsToRead)
+            foreach (var feed in feedsToRead)
             {
                 // Read the feed
                 feed.Read(database, workerInput.ForceRead);
@@ -743,10 +741,10 @@ namespace FeedCenter
                 return;
 
             // Pad the command line with a trailing space just to be lazy in parsing
-            string commandLine = e.Message + " ";
+            var commandLine = e.Message + " ";
 
             // Look for the feed URL in the command line
-            int startPosition = commandLine.IndexOf("feed://", StringComparison.Ordinal);
+            var startPosition = commandLine.IndexOf("feed://", StringComparison.Ordinal);
 
             // If we found one then we should extract and process it
             if (startPosition > 0)
@@ -755,10 +753,10 @@ namespace FeedCenter
                 startPosition += 7;
 
                 // Starting at the URL position look for the next space
-                int endPosition = commandLine.IndexOf(" ", startPosition, StringComparison.Ordinal);
+                var endPosition = commandLine.IndexOf(" ", startPosition, StringComparison.Ordinal);
 
                 // Extract the feed URL
-                string feedUrl = commandLine.Substring(startPosition, endPosition - startPosition);
+                var feedUrl = commandLine.Substring(startPosition, endPosition - startPosition);
 
                 // Add the HTTP protocol by default
                 feedUrl = "http://" + feedUrl;
@@ -772,14 +770,12 @@ namespace FeedCenter
         private void HandleNewFeed(string feedUrl)
         {
             // Create and configure the new feed
-            Feed feed = new Feed
-            {
-                Source = feedUrl,
-                Category = _database.Categories.ToList().First(category => category.IsDefault),
-            };
+            var feed = Feed.Create();
+            feed.Source = feedUrl;
+            feed.Category = _database.Categories.ToList().First(category => category.IsDefault);
 
             // Read the feed for the first time
-            FeedReadResult feedReadResult = feed.Read(_database);
+            var feedReadResult = feed.Read(_database);
 
             // See if we read the feed okay
             if (feedReadResult == FeedReadResult.Success)
@@ -788,7 +784,7 @@ namespace FeedCenter
                 feed.Name = feed.Title;
 
                 // Add the feed to the feed table
-                _database.Feeds.AddObject(feed);
+                _database.Feeds.Add(feed);
 
                 // Save the changes
                 _database.SaveChanges();
@@ -802,15 +798,15 @@ namespace FeedCenter
             else
             {
                 // Feed read failed - ceate a new feed window
-                FeedWindow feedForm = new FeedWindow();
+                var feedForm = new FeedWindow();
 
-                bool? dialogResult = feedForm.Display(_database, feed, this);
+                var dialogResult = feedForm.Display(_database, feed, this);
 
                 // Display the new feed form
                 if (dialogResult.HasValue && dialogResult.Value)
                 {
                     // Add the feed to the feed table
-                    _database.Feeds.AddObject(feed);
+                    _database.Feeds.Add(feed);
 
                     // Save the changes
                     _database.SaveChanges();
@@ -828,7 +824,7 @@ namespace FeedCenter
         private void ResetDatabase()
         {
             // Get the ID of the current feed
-            Guid currentId = _currentFeed.ID;
+            var currentId = _currentFeed.ID;
 
             // Create a new database object
             _database = new FeedCenterEntities();
@@ -872,7 +868,7 @@ namespace FeedCenter
                 return;
 
             // Get the data as a string
-            string data = (string) e.Data.GetData(DataFormats.Text);
+            var data = (string) e.Data.GetData(DataFormats.Text);
 
             // If the data doesn't look like a URI then it is not allowed
             if (!Uri.IsWellFormedUriString(data, UriKind.Absolute))
@@ -885,7 +881,7 @@ namespace FeedCenter
         private void HandleDragDrop(object sender, DragEventArgs e)
         {
             // Get the data as a string
-            string data = (string) e.Data.GetData(DataFormats.Text);
+            var data = (string) e.Data.GetData(DataFormats.Text);
 
             // Handle the new feed but allow the drag/drop to complete
             Dispatcher.BeginInvoke(new NewFeedDelegate(HandleNewFeed), data);
@@ -918,7 +914,7 @@ namespace FeedCenter
                 return;
 
             // Get the feed item
-            FeedItem feedItem = (FeedItem) ((ListBoxItem) sender).DataContext;
+            var feedItem = (FeedItem) ((ListBoxItem) sender).DataContext;
 
             // The feed item has been read and is no longer new
             feedItem.BeenRead = true;
@@ -935,7 +931,7 @@ namespace FeedCenter
         private void HandleLinkTextListListItemMouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
             // Get the feed item
-            FeedItem feedItem = (FeedItem) ((ListBoxItem) sender).DataContext;
+            var feedItem = (FeedItem) ((ListBoxItem) sender).DataContext;
 
             // Open the item link
             if (BrowserCommon.OpenLink(feedItem.Link))
@@ -959,16 +955,16 @@ namespace FeedCenter
         private void HandleFeedButtonClick(object sender, RoutedEventArgs e)
         {
             // Create a new context menu
-            ContextMenu contextMenu = new ContextMenu();
+            var contextMenu = new ContextMenu();
 
             // Loop over each feed
-            foreach (Feed feed in _database.Feeds.OrderBy(feed => feed.Name))
+            foreach (var feed in _database.Feeds.OrderBy(feed => feed.Name))
             {
                 // Build a string to display the feed name and the unread count
-                string display = string.Format("{0} ({1:d})", feed.Name, feed.Items.Count(item => !item.BeenRead));
+                var display = string.Format("{0} ({1:d})", feed.Name, feed.Items.Count(item => !item.BeenRead));
 
                 // Create a menu item
-                MenuItem menuItem = new MenuItem
+                var menuItem = new MenuItem
                                         {
                                             Header = display,
                                             Tag = feed,
@@ -995,14 +991,14 @@ namespace FeedCenter
         private void HandleFeedMenuItemClick(object sender, RoutedEventArgs e)
         {
             // Get the menu item clicked
-            MenuItem menuItem = (MenuItem) sender;
+            var menuItem = (MenuItem) sender;
 
             // Get the feed from the menu item tab
-            Feed feed = (Feed) menuItem.Tag;
+            var feed = (Feed) menuItem.Tag;
 
             // Loop over all feeds and look for the index of the new one		
-            int feedIndex = 0;
-            foreach (Feed loopFeed in _database.Feeds.OrderBy(loopFeed => loopFeed.Name))
+            var feedIndex = 0;
+            foreach (var loopFeed in _database.Feeds.OrderBy(loopFeed => loopFeed.Name))
             {
                 if (loopFeed == feed)
                 {
@@ -1029,11 +1025,11 @@ namespace FeedCenter
 
         private void UpdateBorder()
         {
-            WindowInteropHelper windowInteropHelper = new WindowInteropHelper(this);
+            var windowInteropHelper = new WindowInteropHelper(this);
 
-            System.Windows.Forms.Screen screen = System.Windows.Forms.Screen.FromHandle(windowInteropHelper.Handle);
+            var screen = System.Windows.Forms.Screen.FromHandle(windowInteropHelper.Handle);
 
-            System.Drawing.Rectangle rectangle = new System.Drawing.Rectangle
+            var rectangle = new System.Drawing.Rectangle
                                                      {
                                                          X = (int) Left,
                                                          Y = (int) Top,
@@ -1041,7 +1037,7 @@ namespace FeedCenter
                                                          Height = (int) Height
                                                      };
 
-            Thickness borderThickness = new Thickness();
+            var borderThickness = new Thickness();
 
             if (rectangle.Right != screen.WorkingArea.Right)
                 borderThickness.Right = 1;
@@ -1116,16 +1112,16 @@ namespace FeedCenter
             var feedItems = (from FeedItem feedItem in linkTextList.Items select feedItem).ToList();
 
             // Get the browser 
-            Browser browser = BrowserCommon.FindBrowser(Settings.Default.Browser);
+            var browser = BrowserCommon.FindBrowser(Settings.Default.Browser);
 
             // Cache the settings object
             var settings = Settings.Default;
 
             // Start with a longer sleep interval to give time for the browser to come up
-            int sleepInterval = settings.OpenAllSleepIntervalFirst;
+            var sleepInterval = settings.OpenAllSleepIntervalFirst;
 
             // Loop over all items 
-            foreach (FeedItem feedItem in feedItems)
+            foreach (var feedItem in feedItems)
             {
                 // Try to open the link
                 if (BrowserCommon.OpenLink(browser, feedItem.Link))
@@ -1151,10 +1147,10 @@ namespace FeedCenter
         private void HandleOptionsToolbarButtonClick(object sender, RoutedEventArgs e)
         {
             // Create the options form
-            OptionsWindow optionsWindow = new OptionsWindow { Owner = this };
+            var optionsWindow = new OptionsWindow { Owner = this };
 
             // Show the options form and get the result
-            bool? result = optionsWindow.ShowDialog();
+            var result = optionsWindow.ShowDialog();
 
             // If okay was selected
             if (result.HasValue && result.Value)
@@ -1175,10 +1171,10 @@ namespace FeedCenter
         private void HandleShowErrorsButtonClick(object sender, RoutedEventArgs e)
         {
             // Create the feed error window
-            FeedErrorWindow feedErrorWindow = new FeedErrorWindow();
+            var feedErrorWindow = new FeedErrorWindow();
 
             // Display the window
-            bool? result = feedErrorWindow.Display(this);
+            var result = feedErrorWindow.Display(this);
 
             // If okay was selected
             if (result.GetValueOrDefault())
@@ -1195,11 +1191,11 @@ namespace FeedCenter
 
         private void HandleRefreshMenuItemClick(object sender, RoutedEventArgs e)
         {
-            MenuItem menuItem = (MenuItem) e.Source;
+            var menuItem = (MenuItem) e.Source;
 
-            if (menuItem == menuRefresh)
+            if (Equals(menuItem, menuRefresh))
                 ReadCurrentFeed(true);
-            else if (menuItem == menuRefreshAll)
+            else if (Equals(menuItem, menuRefreshAll))
                 ReadFeeds(true);
         }
 
@@ -1210,11 +1206,11 @@ namespace FeedCenter
 
         private void HandleOpenAllMenuItemClick(object sender, RoutedEventArgs e)
         {
-            MenuItem menuItem = (MenuItem) e.Source;
+            var menuItem = (MenuItem) e.Source;
 
-            if (menuItem == menuOpenAllSinglePage)
+            if (Equals(menuItem, menuOpenAllSinglePage))
                 OpenAllFeedItemsOnSinglePage();
-            else if (menuItem == menuOpenAllMultiplePages)
+            else if (Equals(menuItem, menuOpenAllMultiplePages))
                 OpenAllFeedItemsIndividually();
         }
 
@@ -1236,10 +1232,10 @@ namespace FeedCenter
         private void HandleEditCurrentFeedMenuItemClick(object sender, RoutedEventArgs e)
         {
             // Create a new feed window
-            FeedWindow feedWindow = new FeedWindow();
+            var feedWindow = new FeedWindow();
 
             // Display the feed window and get the result
-            bool? result = feedWindow.Display(_database, _currentFeed, this);
+            var result = feedWindow.Display(_database, _currentFeed, this);
 
             // If OK was clicked...
             if (result.HasValue && result.Value)
@@ -1259,17 +1255,17 @@ namespace FeedCenter
                 return;
 
             // Get the current feed
-            Feed feedToDelete = _currentFeed;
+            var feedToDelete = _currentFeed;
 
             // Move to the next feed
             NextFeed();
 
             // Delete all items
             foreach (var item in feedToDelete.Items.ToList())
-                _database.FeedItems.DeleteObject(item);
+                _database.FeedItems.Remove(item);
 
             // Delete the feed
-            _database.Feeds.DeleteObject(feedToDelete);
+            _database.Feeds.Remove(feedToDelete);
 
             // Save
             _database.SaveChanges();
@@ -1281,10 +1277,10 @@ namespace FeedCenter
 
         private void OpenAllFeedItemsOnSinglePage()
         {
-            string fileName = Path.GetTempFileName() + ".html";
+            var fileName = Path.GetTempFileName() + ".html";
             TextWriter textWriter = new StreamWriter(fileName);
 
-            using (HtmlTextWriter htmlTextWriter = new HtmlTextWriter(textWriter))
+            using (var htmlTextWriter = new HtmlTextWriter(textWriter))
             {
                 htmlTextWriter.RenderBeginTag(HtmlTextWriterTag.Html);
 
@@ -1305,7 +1301,7 @@ namespace FeedCenter
 
                 var sortedItems = from item in _currentFeed.Items where !item.BeenRead orderby item.Sequence ascending select item;
 
-                bool firstItem = true;
+                var firstItem = true;
 
                 foreach (var item in sortedItems)
                 {
@@ -1351,28 +1347,5 @@ namespace FeedCenter
             // Display update information
             VersionCheck.DisplayUpdateInformation(true);
         }
-
-        #region Hover selection events
-
-        private void HandleListItemMouseEnter(object sender, MouseEventArgs e)
-        {
-            // Get the list box item
-            ListBoxItem listBoxItem = (ListBoxItem) sender;
-
-            // Select the data context
-            linkTextList.SelectedItem = listBoxItem.DataContext;
-
-            // Set the cursor
-            listBoxItem.Cursor = Cursors.Hand;
-        }
-
-        private void HandleListItemMouseLeave(object sender, MouseEventArgs e)
-        {
-            // Clear selection
-            linkTextList.SelectedItem = null;
-        }
-
-        #endregion
-
     }
 }
diff --git a/Model.Context.cs b/Model.Context.cs
new file mode 100644
index 0000000..45a3afc
--- /dev/null
+++ b/Model.Context.cs
@@ -0,0 +1,34 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FeedCenter
+{
+    using System;
+    using System.Data.Entity;
+    using System.Data.Entity.Infrastructure;
+    
+    public partial class FeedCenterEntities : DbContext
+    {
+        public FeedCenterEntities()
+            : base("name=FeedCenterEntities")
+        {
+        }
+    
+        protected override void OnModelCreating(DbModelBuilder modelBuilder)
+        {
+            throw new UnintentionalCodeFirstException();
+        }
+    
+        public virtual DbSet<Category> Categories { get; set; }
+        public virtual DbSet<Feed> Feeds { get; set; }
+        public virtual DbSet<FeedAction> FeedActions { get; set; }
+        public virtual DbSet<FeedItem> FeedItems { get; set; }
+        public virtual DbSet<Setting> Settings { get; set; }
+    }
+}
diff --git a/Model.Context.tt b/Model.Context.tt
new file mode 100644
index 0000000..cfb5c34
--- /dev/null
+++ b/Model.Context.tt
@@ -0,0 +1,636 @@
+<#@ template language="C#" debug="false" hostspecific="true"#>
+<#@ include file="EF6.Utility.CS.ttinclude"#><#@
+ output extension=".cs"#><#
+
+const string inputFile = @"Model.edmx";
+var textTransform = DynamicTextTransformation.Create(this);
+var code = new CodeGenerationTools(this);
+var ef = new MetadataTools(this);
+var typeMapper = new TypeMapper(code, ef, textTransform.Errors);
+var loader = new EdmMetadataLoader(textTransform.Host, textTransform.Errors);
+var itemCollection = loader.CreateEdmItemCollection(inputFile);
+var modelNamespace = loader.GetModelNamespace(inputFile);
+var codeStringGenerator = new CodeStringGenerator(code, typeMapper, ef);
+
+var container = itemCollection.OfType<EntityContainer>().FirstOrDefault();
+if (container == null)
+{
+    return string.Empty;
+}
+#>
+//------------------------------------------------------------------------------
+// <auto-generated>
+// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine1")#>
+//
+// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine2")#>
+// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine3")#>
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+<#
+
+var codeNamespace = code.VsNamespaceSuggestion();
+if (!String.IsNullOrEmpty(codeNamespace))
+{
+#>
+namespace <#=code.EscapeNamespace(codeNamespace)#>
+{
+<#
+    PushIndent("    ");
+}
+
+#>
+using System;
+using System.Data.Entity;
+using System.Data.Entity.Infrastructure;
+<#
+if (container.FunctionImports.Any())
+{
+#>
+using System.Data.Entity.Core.Objects;
+using System.Linq;
+<#
+}
+#>
+
+<#=Accessibility.ForType(container)#> partial class <#=code.Escape(container)#> : DbContext
+{
+    public <#=code.Escape(container)#>()
+        : base("name=<#=container.Name#>")
+    {
+<#
+if (!loader.IsLazyLoadingEnabled(container))
+{
+#>
+        this.Configuration.LazyLoadingEnabled = false;
+<#
+}
+
+foreach (var entitySet in container.BaseEntitySets.OfType<EntitySet>())
+{
+    // Note: the DbSet members are defined below such that the getter and
+    // setter always have the same accessibility as the DbSet definition
+    if (Accessibility.ForReadOnlyProperty(entitySet) != "public")
+    {
+#>
+        <#=codeStringGenerator.DbSetInitializer(entitySet)#>
+<#
+    }
+}
+#>
+    }
+
+    protected override void OnModelCreating(DbModelBuilder modelBuilder)
+    {
+        throw new UnintentionalCodeFirstException();
+    }
+
+<#
+    foreach (var entitySet in container.BaseEntitySets.OfType<EntitySet>())
+    {
+#>
+    <#=codeStringGenerator.DbSet(entitySet)#>
+<#
+    }
+
+    foreach (var edmFunction in container.FunctionImports)
+    {
+        WriteFunctionImport(typeMapper, codeStringGenerator, edmFunction, modelNamespace, includeMergeOption: false);
+    }
+#>
+}
+<#
+
+if (!String.IsNullOrEmpty(codeNamespace))
+{
+    PopIndent();
+#>
+}
+<#
+}
+#>
+<#+
+
+private void WriteFunctionImport(TypeMapper typeMapper, CodeStringGenerator codeStringGenerator, EdmFunction edmFunction, string modelNamespace, bool includeMergeOption)
+{
+    if (typeMapper.IsComposable(edmFunction))
+    {
+#>
+
+    [DbFunction("<#=edmFunction.NamespaceName#>", "<#=edmFunction.Name#>")]
+    <#=codeStringGenerator.ComposableFunctionMethod(edmFunction, modelNamespace)#>
+    {
+<#+
+        codeStringGenerator.WriteFunctionParameters(edmFunction, WriteFunctionParameter);
+#>
+        <#=codeStringGenerator.ComposableCreateQuery(edmFunction, modelNamespace)#>
+    }
+<#+
+    }
+    else
+    {
+#>
+
+    <#=codeStringGenerator.FunctionMethod(edmFunction, modelNamespace, includeMergeOption)#>
+    {
+<#+
+        codeStringGenerator.WriteFunctionParameters(edmFunction, WriteFunctionParameter);
+#>
+        <#=codeStringGenerator.ExecuteFunction(edmFunction, modelNamespace, includeMergeOption)#>
+    }
+<#+
+        if (typeMapper.GenerateMergeOptionFunction(edmFunction, includeMergeOption))
+        {
+            WriteFunctionImport(typeMapper, codeStringGenerator, edmFunction, modelNamespace, includeMergeOption: true);
+        }
+    }
+}
+
+public void WriteFunctionParameter(string name, string isNotNull, string notNullInit, string nullInit)
+{
+#>
+        var <#=name#> = <#=isNotNull#> ?
+            <#=notNullInit#> :
+            <#=nullInit#>;
+
+<#+
+}
+
+public const string TemplateId = "CSharp_DbContext_Context_EF6";
+
+public class CodeStringGenerator
+{
+    private readonly CodeGenerationTools _code;
+    private readonly TypeMapper _typeMapper;
+    private readonly MetadataTools _ef;
+
+    public CodeStringGenerator(CodeGenerationTools code, TypeMapper typeMapper, MetadataTools ef)
+    {
+        ArgumentNotNull(code, "code");
+        ArgumentNotNull(typeMapper, "typeMapper");
+        ArgumentNotNull(ef, "ef");
+
+        _code = code;
+        _typeMapper = typeMapper;
+        _ef = ef;
+    }
+
+    public string Property(EdmProperty edmProperty)
+    {
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "{0} {1} {2} {{ {3}get; {4}set; }}",
+            Accessibility.ForProperty(edmProperty),
+            _typeMapper.GetTypeName(edmProperty.TypeUsage),
+            _code.Escape(edmProperty),
+            _code.SpaceAfter(Accessibility.ForGetter(edmProperty)),
+            _code.SpaceAfter(Accessibility.ForSetter(edmProperty)));
+    }
+
+    public string NavigationProperty(NavigationProperty navProp)
+    {
+        var endType = _typeMapper.GetTypeName(navProp.ToEndMember.GetEntityType());
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "{0} {1} {2} {{ {3}get; {4}set; }}",
+            AccessibilityAndVirtual(Accessibility.ForNavigationProperty(navProp)),
+            navProp.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many ? ("ICollection<" + endType + ">") : endType,
+            _code.Escape(navProp),
+            _code.SpaceAfter(Accessibility.ForGetter(navProp)),
+            _code.SpaceAfter(Accessibility.ForSetter(navProp)));
+    }
+    
+    public string AccessibilityAndVirtual(string accessibility)
+    {
+        return accessibility + (accessibility != "private" ? " virtual" : "");
+    }
+    
+    public string EntityClassOpening(EntityType entity)
+    {
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "{0} {1}partial class {2}{3}",
+            Accessibility.ForType(entity),
+            _code.SpaceAfter(_code.AbstractOption(entity)),
+            _code.Escape(entity),
+            _code.StringBefore(" : ", _typeMapper.GetTypeName(entity.BaseType)));
+    }
+    
+    public string EnumOpening(SimpleType enumType)
+    {
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "{0} enum {1} : {2}",
+            Accessibility.ForType(enumType),
+            _code.Escape(enumType),
+            _code.Escape(_typeMapper.UnderlyingClrType(enumType)));
+        }
+    
+    public void WriteFunctionParameters(EdmFunction edmFunction, Action<string, string, string, string> writeParameter)
+    {
+        var parameters = FunctionImportParameter.Create(edmFunction.Parameters, _code, _ef);
+        foreach (var parameter in parameters.Where(p => p.NeedsLocalVariable))
+        {
+            var isNotNull = parameter.IsNullableOfT ? parameter.FunctionParameterName + ".HasValue" : parameter.FunctionParameterName + " != null";
+            var notNullInit = "new ObjectParameter(\"" + parameter.EsqlParameterName + "\", " + parameter.FunctionParameterName + ")";
+            var nullInit = "new ObjectParameter(\"" + parameter.EsqlParameterName + "\", typeof(" + TypeMapper.FixNamespaces(parameter.RawClrTypeName) + "))";
+            writeParameter(parameter.LocalVariableName, isNotNull, notNullInit, nullInit);
+        }
+    }
+    
+    public string ComposableFunctionMethod(EdmFunction edmFunction, string modelNamespace)
+    {
+        var parameters = _typeMapper.GetParameters(edmFunction);
+        
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "{0} IQueryable<{1}> {2}({3})",
+            AccessibilityAndVirtual(Accessibility.ForMethod(edmFunction)),
+            _typeMapper.GetTypeName(_typeMapper.GetReturnType(edmFunction), modelNamespace),
+            _code.Escape(edmFunction),
+            string.Join(", ", parameters.Select(p => TypeMapper.FixNamespaces(p.FunctionParameterType) + " " + p.FunctionParameterName).ToArray()));
+    }
+    
+    public string ComposableCreateQuery(EdmFunction edmFunction, string modelNamespace)
+    {
+        var parameters = _typeMapper.GetParameters(edmFunction);
+        
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "return ((IObjectContextAdapter)this).ObjectContext.CreateQuery<{0}>(\"[{1}].[{2}]({3})\"{4});",
+            _typeMapper.GetTypeName(_typeMapper.GetReturnType(edmFunction), modelNamespace),
+            edmFunction.NamespaceName,
+            edmFunction.Name,
+            string.Join(", ", parameters.Select(p => "@" + p.EsqlParameterName).ToArray()),
+            _code.StringBefore(", ", string.Join(", ", parameters.Select(p => p.ExecuteParameterName).ToArray())));
+    }
+    
+    public string FunctionMethod(EdmFunction edmFunction, string modelNamespace, bool includeMergeOption)
+    {
+        var parameters = _typeMapper.GetParameters(edmFunction);
+        var returnType = _typeMapper.GetReturnType(edmFunction);
+
+        var paramList = String.Join(", ", parameters.Select(p => TypeMapper.FixNamespaces(p.FunctionParameterType) + " " + p.FunctionParameterName).ToArray());
+        if (includeMergeOption)
+        {
+            paramList = _code.StringAfter(paramList, ", ") + "MergeOption mergeOption";
+        }
+
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "{0} {1} {2}({3})",
+            AccessibilityAndVirtual(Accessibility.ForMethod(edmFunction)),
+            returnType == null ? "int" : "ObjectResult<" + _typeMapper.GetTypeName(returnType, modelNamespace) + ">",
+            _code.Escape(edmFunction),
+            paramList);
+    }
+    
+    public string ExecuteFunction(EdmFunction edmFunction, string modelNamespace, bool includeMergeOption)
+    {
+        var parameters = _typeMapper.GetParameters(edmFunction);
+        var returnType = _typeMapper.GetReturnType(edmFunction);
+
+        var callParams = _code.StringBefore(", ", String.Join(", ", parameters.Select(p => p.ExecuteParameterName).ToArray()));
+        if (includeMergeOption)
+        {
+            callParams = ", mergeOption" + callParams;
+        }
+        
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction{0}(\"{1}\"{2});",
+            returnType == null ? "" : "<" + _typeMapper.GetTypeName(returnType, modelNamespace) + ">",
+            edmFunction.Name,
+            callParams);
+    }
+    
+    public string DbSet(EntitySet entitySet)
+    {
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "{0} virtual DbSet<{1}> {2} {{ get; set; }}",
+            Accessibility.ForReadOnlyProperty(entitySet),
+            _typeMapper.GetTypeName(entitySet.ElementType),
+            _code.Escape(entitySet));
+    }
+
+    public string DbSetInitializer(EntitySet entitySet)
+    {
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "{0} = Set<{1}>();",
+            _code.Escape(entitySet),
+            _typeMapper.GetTypeName(entitySet.ElementType));
+    }
+
+    public string UsingDirectives(bool inHeader, bool includeCollections = true)
+    {
+        return inHeader == string.IsNullOrEmpty(_code.VsNamespaceSuggestion())
+            ? string.Format(
+                CultureInfo.InvariantCulture,
+                "{0}using System;{1}" +
+                "{2}",
+                inHeader ? Environment.NewLine : "",
+                includeCollections ? (Environment.NewLine + "using System.Collections.Generic;") : "",
+                inHeader ? "" : Environment.NewLine)
+            : "";
+    }
+}
+
+public class TypeMapper
+{
+    private const string ExternalTypeNameAttributeName = @"http://schemas.microsoft.com/ado/2006/04/codegeneration:ExternalTypeName";
+
+    private readonly System.Collections.IList _errors;
+    private readonly CodeGenerationTools _code;
+    private readonly MetadataTools _ef;
+
+    public static string FixNamespaces(string typeName)
+    {
+        return typeName.Replace("System.Data.Spatial.", "System.Data.Entity.Spatial.");
+    }
+
+    public TypeMapper(CodeGenerationTools code, MetadataTools ef, System.Collections.IList errors)
+    {
+        ArgumentNotNull(code, "code");
+        ArgumentNotNull(ef, "ef");
+        ArgumentNotNull(errors, "errors");
+
+        _code = code;
+        _ef = ef;
+        _errors = errors;
+    }
+
+    public string GetTypeName(TypeUsage typeUsage)
+    {
+        return typeUsage == null ? null : GetTypeName(typeUsage.EdmType, _ef.IsNullable(typeUsage), modelNamespace: null);
+    }
+
+    public string GetTypeName(EdmType edmType)
+    {
+        return GetTypeName(edmType, isNullable: null, modelNamespace: null);
+    }
+
+    public string GetTypeName(TypeUsage typeUsage, string modelNamespace)
+    {
+        return typeUsage == null ? null : GetTypeName(typeUsage.EdmType, _ef.IsNullable(typeUsage), modelNamespace);
+    }
+
+    public string GetTypeName(EdmType edmType, string modelNamespace)
+    {
+        return GetTypeName(edmType, isNullable: null, modelNamespace: modelNamespace);
+    }
+
+    public string GetTypeName(EdmType edmType, bool? isNullable, string modelNamespace)
+    {
+        if (edmType == null)
+        {
+            return null;
+        }
+
+        var collectionType = edmType as CollectionType;
+        if (collectionType != null)
+        {
+            return String.Format(CultureInfo.InvariantCulture, "ICollection<{0}>", GetTypeName(collectionType.TypeUsage, modelNamespace));
+        }
+
+        var typeName = _code.Escape(edmType.MetadataProperties
+                                .Where(p => p.Name == ExternalTypeNameAttributeName)
+                                .Select(p => (string)p.Value)
+                                .FirstOrDefault())
+            ?? (modelNamespace != null && edmType.NamespaceName != modelNamespace ?
+                _code.CreateFullName(_code.EscapeNamespace(edmType.NamespaceName), _code.Escape(edmType)) :
+                _code.Escape(edmType));
+
+        if (edmType is StructuralType)
+        {
+            return typeName;
+        }
+
+        if (edmType is SimpleType)
+        {
+            var clrType = UnderlyingClrType(edmType);
+            if (!IsEnumType(edmType))
+            {
+                typeName = _code.Escape(clrType);
+            }
+
+            typeName = FixNamespaces(typeName);
+
+            return clrType.IsValueType && isNullable == true ?
+                String.Format(CultureInfo.InvariantCulture, "Nullable<{0}>", typeName) :
+                typeName;
+        }
+
+        throw new ArgumentException("edmType");
+    }
+    
+    public Type UnderlyingClrType(EdmType edmType)
+    {
+        ArgumentNotNull(edmType, "edmType");
+
+        var primitiveType = edmType as PrimitiveType;
+        if (primitiveType != null)
+        {
+            return primitiveType.ClrEquivalentType;
+        }
+
+        if (IsEnumType(edmType))
+        {
+            return GetEnumUnderlyingType(edmType).ClrEquivalentType;
+        }
+
+        return typeof(object);
+    }
+    
+    public object GetEnumMemberValue(MetadataItem enumMember)
+    {
+        ArgumentNotNull(enumMember, "enumMember");
+        
+        var valueProperty = enumMember.GetType().GetProperty("Value");
+        return valueProperty == null ? null : valueProperty.GetValue(enumMember, null);
+    }
+    
+    public string GetEnumMemberName(MetadataItem enumMember)
+    {
+        ArgumentNotNull(enumMember, "enumMember");
+        
+        var nameProperty = enumMember.GetType().GetProperty("Name");
+        return nameProperty == null ? null : (string)nameProperty.GetValue(enumMember, null);
+    }
+
+    public System.Collections.IEnumerable GetEnumMembers(EdmType enumType)
+    {
+        ArgumentNotNull(enumType, "enumType");
+
+        var membersProperty = enumType.GetType().GetProperty("Members");
+        return membersProperty != null 
+            ? (System.Collections.IEnumerable)membersProperty.GetValue(enumType, null)
+            : Enumerable.Empty<MetadataItem>();
+    }
+    
+    public bool EnumIsFlags(EdmType enumType)
+    {
+        ArgumentNotNull(enumType, "enumType");
+        
+        var isFlagsProperty = enumType.GetType().GetProperty("IsFlags");
+        return isFlagsProperty != null && (bool)isFlagsProperty.GetValue(enumType, null);
+    }
+
+    public bool IsEnumType(GlobalItem edmType)
+    {
+        ArgumentNotNull(edmType, "edmType");
+
+        return edmType.GetType().Name == "EnumType";
+    }
+
+    public PrimitiveType GetEnumUnderlyingType(EdmType enumType)
+    {
+        ArgumentNotNull(enumType, "enumType");
+
+        return (PrimitiveType)enumType.GetType().GetProperty("UnderlyingType").GetValue(enumType, null);
+    }
+
+    public string CreateLiteral(object value)
+    {
+        if (value == null || value.GetType() != typeof(TimeSpan))
+        {
+            return _code.CreateLiteral(value);
+        }
+
+        return string.Format(CultureInfo.InvariantCulture, "new TimeSpan({0})", ((TimeSpan)value).Ticks);
+    }
+    
+    public bool VerifyCaseInsensitiveTypeUniqueness(IEnumerable<string> types, string sourceFile)
+    {
+        ArgumentNotNull(types, "types");
+        ArgumentNotNull(sourceFile, "sourceFile");
+        
+        var hash = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
+        if (types.Any(item => !hash.Add(item)))
+        {
+            _errors.Add(
+                new CompilerError(sourceFile, -1, -1, "6023",
+                    String.Format(CultureInfo.CurrentCulture, CodeGenerationTools.GetResourceString("Template_CaseInsensitiveTypeConflict"))));
+            return false;
+        }
+        return true;
+    }
+    
+    public IEnumerable<SimpleType> GetEnumItemsToGenerate(IEnumerable<GlobalItem> itemCollection)
+    {
+        return GetItemsToGenerate<SimpleType>(itemCollection)
+            .Where(e => IsEnumType(e));
+    }
+    
+    public IEnumerable<T> GetItemsToGenerate<T>(IEnumerable<GlobalItem> itemCollection) where T: EdmType
+    {
+        return itemCollection
+            .OfType<T>()
+            .Where(i => !i.MetadataProperties.Any(p => p.Name == ExternalTypeNameAttributeName))
+            .OrderBy(i => i.Name);
+    }
+
+    public IEnumerable<string> GetAllGlobalItems(IEnumerable<GlobalItem> itemCollection)
+    {
+        return itemCollection
+            .Where(i => i is EntityType || i is ComplexType || i is EntityContainer || IsEnumType(i))
+            .Select(g => GetGlobalItemName(g));
+    }
+
+    public string GetGlobalItemName(GlobalItem item)
+    {
+        if (item is EdmType)
+        {
+            return ((EdmType)item).Name;
+        }
+        else
+        {
+            return ((EntityContainer)item).Name;
+        }
+    }
+
+    public IEnumerable<EdmProperty> GetSimpleProperties(EntityType type)
+    {
+        return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type);
+    }
+    
+    public IEnumerable<EdmProperty> GetSimpleProperties(ComplexType type)
+    {
+        return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type);
+    }
+    
+    public IEnumerable<EdmProperty> GetComplexProperties(EntityType type)
+    {
+        return type.Properties.Where(p => p.TypeUsage.EdmType is ComplexType && p.DeclaringType == type);
+    }
+    
+    public IEnumerable<EdmProperty> GetComplexProperties(ComplexType type)
+    {
+        return type.Properties.Where(p => p.TypeUsage.EdmType is ComplexType && p.DeclaringType == type);
+    }
+
+    public IEnumerable<EdmProperty> GetPropertiesWithDefaultValues(EntityType type)
+    {
+        return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type && p.DefaultValue != null);
+    }
+    
+    public IEnumerable<EdmProperty> GetPropertiesWithDefaultValues(ComplexType type)
+    {
+        return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type && p.DefaultValue != null);
+    }
+
+    public IEnumerable<NavigationProperty> GetNavigationProperties(EntityType type)
+    {
+        return type.NavigationProperties.Where(np => np.DeclaringType == type);
+    }
+    
+    public IEnumerable<NavigationProperty> GetCollectionNavigationProperties(EntityType type)
+    {
+        return type.NavigationProperties.Where(np => np.DeclaringType == type && np.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many);
+    }
+    
+    public FunctionParameter GetReturnParameter(EdmFunction edmFunction)
+    {
+        ArgumentNotNull(edmFunction, "edmFunction");
+
+        var returnParamsProperty = edmFunction.GetType().GetProperty("ReturnParameters");
+        return returnParamsProperty == null
+            ? edmFunction.ReturnParameter
+            : ((IEnumerable<FunctionParameter>)returnParamsProperty.GetValue(edmFunction, null)).FirstOrDefault();
+    }
+
+    public bool IsComposable(EdmFunction edmFunction)
+    {
+        ArgumentNotNull(edmFunction, "edmFunction");
+
+        var isComposableProperty = edmFunction.GetType().GetProperty("IsComposableAttribute");
+        return isComposableProperty != null && (bool)isComposableProperty.GetValue(edmFunction, null);
+    }
+
+    public IEnumerable<FunctionImportParameter> GetParameters(EdmFunction edmFunction)
+    {
+        return FunctionImportParameter.Create(edmFunction.Parameters, _code, _ef);
+    }
+
+    public TypeUsage GetReturnType(EdmFunction edmFunction)
+    {
+        var returnParam = GetReturnParameter(edmFunction);
+        return returnParam == null ? null : _ef.GetElementType(returnParam.TypeUsage);
+    }
+    
+    public bool GenerateMergeOptionFunction(EdmFunction edmFunction, bool includeMergeOption)
+    {
+        var returnType = GetReturnType(edmFunction);
+        return !includeMergeOption && returnType != null && returnType.EdmType.BuiltInTypeKind == BuiltInTypeKind.EntityType;
+    }
+}
+
+public static void ArgumentNotNull<T>(T arg, string name) where T : class
+{
+    if (arg == null)
+    {
+        throw new ArgumentNullException(name);
+    }
+}
+#>
\ No newline at end of file
diff --git a/Model.Designer.cs b/Model.Designer.cs
index 2aad020..5da3865 100644
--- a/Model.Designer.cs
+++ b/Model.Designer.cs
@@ -1,1535 +1,10 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//    This code was generated from a template.
-//
-//    Manual changes to this file may cause unexpected behavior in your application.
-//    Manual changes to this file will be overwritten if the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
+// T4 code generation is enabled for model 'D:\Code\Personal\FeedCenter\Model.edmx'. 
+// To enable legacy code generation, change the value of the 'Code Generation Strategy' designer
+// property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model
+// is open in the designer.
 
-using System;
-using System.ComponentModel;
-using System.Data.EntityClient;
-using System.Data.Objects;
-using System.Data.Objects.DataClasses;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Xml.Serialization;
-
-[assembly: EdmSchemaAttribute()]
-#region EDM Relationship Metadata
-
-[assembly: EdmRelationshipAttribute("FeedCenterModel", "FK_Feed_Category", "Category", System.Data.Metadata.Edm.RelationshipMultiplicity.One, typeof(FeedCenter.Category), "Feed", System.Data.Metadata.Edm.RelationshipMultiplicity.Many, typeof(FeedCenter.Feed), true)]
-[assembly: EdmRelationshipAttribute("FeedCenterModel", "FK_FeedAction_Feed", "Feed", System.Data.Metadata.Edm.RelationshipMultiplicity.One, typeof(FeedCenter.Feed), "FeedAction", System.Data.Metadata.Edm.RelationshipMultiplicity.Many, typeof(FeedCenter.FeedAction), true)]
-[assembly: EdmRelationshipAttribute("FeedCenterModel", "FK_FeedItem_Feed", "Feed", System.Data.Metadata.Edm.RelationshipMultiplicity.One, typeof(FeedCenter.Feed), "FeedItem", System.Data.Metadata.Edm.RelationshipMultiplicity.Many, typeof(FeedCenter.FeedItem), true)]
-
-#endregion
-
-namespace FeedCenter
-{
-    #region Contexts
-    
-    /// <summary>
-    /// No Metadata Documentation available.
-    /// </summary>
-    public partial class FeedCenterEntities : ObjectContext
-    {
-        #region Constructors
-    
-        /// <summary>
-        /// Initializes a new FeedCenterEntities object using the connection string found in the 'FeedCenterEntities' section of the application configuration file.
-        /// </summary>
-        public FeedCenterEntities() : base("name=FeedCenterEntities", "FeedCenterEntities")
-        {
-            this.ContextOptions.LazyLoadingEnabled = true;
-            OnContextCreated();
-        }
-    
-        /// <summary>
-        /// Initialize a new FeedCenterEntities object.
-        /// </summary>
-        public FeedCenterEntities(string connectionString) : base(connectionString, "FeedCenterEntities")
-        {
-            this.ContextOptions.LazyLoadingEnabled = true;
-            OnContextCreated();
-        }
-    
-        /// <summary>
-        /// Initialize a new FeedCenterEntities object.
-        /// </summary>
-        public FeedCenterEntities(EntityConnection connection) : base(connection, "FeedCenterEntities")
-        {
-            this.ContextOptions.LazyLoadingEnabled = true;
-            OnContextCreated();
-        }
-    
-        #endregion
-    
-        #region Partial Methods
-    
-        partial void OnContextCreated();
-    
-        #endregion
-    
-        #region ObjectSet Properties
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        public ObjectSet<Category> Categories
-        {
-            get
-            {
-                if ((_Categories == null))
-                {
-                    _Categories = base.CreateObjectSet<Category>("Categories");
-                }
-                return _Categories;
-            }
-        }
-        private ObjectSet<Category> _Categories;
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        public ObjectSet<Feed> Feeds
-        {
-            get
-            {
-                if ((_Feeds == null))
-                {
-                    _Feeds = base.CreateObjectSet<Feed>("Feeds");
-                }
-                return _Feeds;
-            }
-        }
-        private ObjectSet<Feed> _Feeds;
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        public ObjectSet<FeedAction> FeedActions
-        {
-            get
-            {
-                if ((_FeedActions == null))
-                {
-                    _FeedActions = base.CreateObjectSet<FeedAction>("FeedActions");
-                }
-                return _FeedActions;
-            }
-        }
-        private ObjectSet<FeedAction> _FeedActions;
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        public ObjectSet<FeedItem> FeedItems
-        {
-            get
-            {
-                if ((_FeedItems == null))
-                {
-                    _FeedItems = base.CreateObjectSet<FeedItem>("FeedItems");
-                }
-                return _FeedItems;
-            }
-        }
-        private ObjectSet<FeedItem> _FeedItems;
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        public ObjectSet<Setting> Settings
-        {
-            get
-            {
-                if ((_Settings == null))
-                {
-                    _Settings = base.CreateObjectSet<Setting>("Settings");
-                }
-                return _Settings;
-            }
-        }
-        private ObjectSet<Setting> _Settings;
-
-        #endregion
-
-        #region AddTo Methods
-    
-        /// <summary>
-        /// Deprecated Method for adding a new object to the Categories EntitySet. Consider using the .Add method of the associated ObjectSet&lt;T&gt; property instead.
-        /// </summary>
-        public void AddToCategories(Category category)
-        {
-            base.AddObject("Categories", category);
-        }
-    
-        /// <summary>
-        /// Deprecated Method for adding a new object to the Feeds EntitySet. Consider using the .Add method of the associated ObjectSet&lt;T&gt; property instead.
-        /// </summary>
-        public void AddToFeeds(Feed feed)
-        {
-            base.AddObject("Feeds", feed);
-        }
-    
-        /// <summary>
-        /// Deprecated Method for adding a new object to the FeedActions EntitySet. Consider using the .Add method of the associated ObjectSet&lt;T&gt; property instead.
-        /// </summary>
-        public void AddToFeedActions(FeedAction feedAction)
-        {
-            base.AddObject("FeedActions", feedAction);
-        }
-    
-        /// <summary>
-        /// Deprecated Method for adding a new object to the FeedItems EntitySet. Consider using the .Add method of the associated ObjectSet&lt;T&gt; property instead.
-        /// </summary>
-        public void AddToFeedItems(FeedItem feedItem)
-        {
-            base.AddObject("FeedItems", feedItem);
-        }
-    
-        /// <summary>
-        /// Deprecated Method for adding a new object to the Settings EntitySet. Consider using the .Add method of the associated ObjectSet&lt;T&gt; property instead.
-        /// </summary>
-        public void AddToSettings(Setting setting)
-        {
-            base.AddObject("Settings", setting);
-        }
-
-        #endregion
-
-    }
-
-    #endregion
-
-    #region Entities
-    
-    /// <summary>
-    /// No Metadata Documentation available.
-    /// </summary>
-    [EdmEntityTypeAttribute(NamespaceName="FeedCenterModel", Name="Category")]
-    [Serializable()]
-    [DataContractAttribute(IsReference=true)]
-    public partial class Category : EntityObject
-    {
-        #region Factory Method
-    
-        /// <summary>
-        /// Create a new Category object.
-        /// </summary>
-        /// <param name="id">Initial value of the ID property.</param>
-        /// <param name="name">Initial value of the Name property.</param>
-        public static Category CreateCategory(global::System.Guid id, global::System.String name)
-        {
-            Category category = new Category();
-            category.ID = id;
-            category.Name = name;
-            return category;
-        }
-
-        #endregion
-
-        #region Simple Properties
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=true, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.Guid ID
-        {
-            get
-            {
-                return _ID;
-            }
-            set
-            {
-                if (_ID != value)
-                {
-                    OnIDChanging(value);
-                    ReportPropertyChanging("ID");
-                    _ID = StructuralObject.SetValidValue(value, "ID");
-                    ReportPropertyChanged("ID");
-                    OnIDChanged();
-                }
-            }
-        }
-        private global::System.Guid _ID;
-        partial void OnIDChanging(global::System.Guid value);
-        partial void OnIDChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.String Name
-        {
-            get
-            {
-                return _Name;
-            }
-            set
-            {
-                OnNameChanging(value);
-                ReportPropertyChanging("Name");
-                _Name = StructuralObject.SetValidValue(value, false, "Name");
-                ReportPropertyChanged("Name");
-                OnNameChanged();
-            }
-        }
-        private global::System.String _Name;
-        partial void OnNameChanging(global::System.String value);
-        partial void OnNameChanged();
-
-        #endregion
-
-        #region Navigation Properties
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [XmlIgnoreAttribute()]
-        [SoapIgnoreAttribute()]
-        [DataMemberAttribute()]
-        [EdmRelationshipNavigationPropertyAttribute("FeedCenterModel", "FK_Feed_Category", "Feed")]
-        public EntityCollection<Feed> Feeds
-        {
-            get
-            {
-                return ((IEntityWithRelationships)this).RelationshipManager.GetRelatedCollection<Feed>("FeedCenterModel.FK_Feed_Category", "Feed");
-            }
-            set
-            {
-                if ((value != null))
-                {
-                    ((IEntityWithRelationships)this).RelationshipManager.InitializeRelatedCollection<Feed>("FeedCenterModel.FK_Feed_Category", "Feed", value);
-                }
-            }
-        }
-
-        #endregion
-
-    }
-    
-    /// <summary>
-    /// No Metadata Documentation available.
-    /// </summary>
-    [EdmEntityTypeAttribute(NamespaceName="FeedCenterModel", Name="Feed")]
-    [Serializable()]
-    [DataContractAttribute(IsReference=true)]
-    public partial class Feed : EntityObject
-    {
-        #region Factory Method
-    
-        /// <summary>
-        /// Create a new Feed object.
-        /// </summary>
-        /// <param name="id">Initial value of the ID property.</param>
-        /// <param name="lastReadResult">Initial value of the LastReadResult property.</param>
-        /// <param name="categoryID">Initial value of the CategoryID property.</param>
-        public static Feed CreateFeed(global::System.Guid id, global::System.Int32 lastReadResult, global::System.Guid categoryID)
-        {
-            Feed feed = new Feed();
-            feed.ID = id;
-            feed.LastReadResult = lastReadResult;
-            feed.CategoryID = categoryID;
-            return feed;
-        }
-
-        #endregion
-
-        #region Simple Properties
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=true, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.Guid ID
-        {
-            get
-            {
-                return _ID;
-            }
-            set
-            {
-                if (_ID != value)
-                {
-                    OnIDChanging(value);
-                    ReportPropertyChanging("ID");
-                    _ID = StructuralObject.SetValidValue(value, "ID");
-                    ReportPropertyChanged("ID");
-                    OnIDChanged();
-                }
-            }
-        }
-        private global::System.Guid _ID;
-        partial void OnIDChanging(global::System.Guid value);
-        partial void OnIDChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.String Name
-        {
-            get
-            {
-                return _Name;
-            }
-            set
-            {
-                OnNameChanging(value);
-                ReportPropertyChanging("Name");
-                _Name = StructuralObject.SetValidValue(value, false, "Name");
-                ReportPropertyChanged("Name");
-                OnNameChanged();
-            }
-        }
-        private global::System.String _Name = "";
-        partial void OnNameChanging(global::System.String value);
-        partial void OnNameChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.String Title
-        {
-            get
-            {
-                return _Title;
-            }
-            set
-            {
-                OnTitleChanging(value);
-                ReportPropertyChanging("Title");
-                _Title = StructuralObject.SetValidValue(value, false, "Title");
-                ReportPropertyChanged("Title");
-                OnTitleChanged();
-            }
-        }
-        private global::System.String _Title = "";
-        partial void OnTitleChanging(global::System.String value);
-        partial void OnTitleChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.String Source
-        {
-            get
-            {
-                return _Source;
-            }
-            set
-            {
-                OnSourceChanging(value);
-                ReportPropertyChanging("Source");
-                _Source = StructuralObject.SetValidValue(value, false, "Source");
-                ReportPropertyChanged("Source");
-                OnSourceChanged();
-            }
-        }
-        private global::System.String _Source = "";
-        partial void OnSourceChanging(global::System.String value);
-        partial void OnSourceChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.String Link
-        {
-            get
-            {
-                return _Link;
-            }
-            set
-            {
-                OnLinkChanging(value);
-                ReportPropertyChanging("Link");
-                _Link = StructuralObject.SetValidValue(value, false, "Link");
-                ReportPropertyChanged("Link");
-                OnLinkChanged();
-            }
-        }
-        private global::System.String _Link = "";
-        partial void OnLinkChanging(global::System.String value);
-        partial void OnLinkChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.String Description
-        {
-            get
-            {
-                return _Description;
-            }
-            set
-            {
-                OnDescriptionChanging(value);
-                ReportPropertyChanging("Description");
-                _Description = StructuralObject.SetValidValue(value, false, "Description");
-                ReportPropertyChanged("Description");
-                OnDescriptionChanged();
-            }
-        }
-        private global::System.String _Description = "";
-        partial void OnDescriptionChanging(global::System.String value);
-        partial void OnDescriptionChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.DateTime LastChecked
-        {
-            get
-            {
-                return _LastChecked;
-            }
-            set
-            {
-                OnLastCheckedChanging(value);
-                ReportPropertyChanging("LastChecked");
-                _LastChecked = StructuralObject.SetValidValue(value, "LastChecked");
-                ReportPropertyChanged("LastChecked");
-                OnLastCheckedChanged();
-            }
-        }
-        private global::System.DateTime _LastChecked = new DateTime(599266080000000000, DateTimeKind.Unspecified);
-        partial void OnLastCheckedChanging(global::System.DateTime value);
-        partial void OnLastCheckedChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.Int32 CheckInterval
-        {
-            get
-            {
-                return _CheckInterval;
-            }
-            set
-            {
-                OnCheckIntervalChanging(value);
-                ReportPropertyChanging("CheckInterval");
-                _CheckInterval = StructuralObject.SetValidValue(value, "CheckInterval");
-                ReportPropertyChanged("CheckInterval");
-                OnCheckIntervalChanged();
-            }
-        }
-        private global::System.Int32 _CheckInterval = 60;
-        partial void OnCheckIntervalChanging(global::System.Int32 value);
-        partial void OnCheckIntervalChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.Boolean Enabled
-        {
-            get
-            {
-                return _Enabled;
-            }
-            set
-            {
-                OnEnabledChanging(value);
-                ReportPropertyChanging("Enabled");
-                _Enabled = StructuralObject.SetValidValue(value, "Enabled");
-                ReportPropertyChanged("Enabled");
-                OnEnabledChanged();
-            }
-        }
-        private global::System.Boolean _Enabled = true;
-        partial void OnEnabledChanging(global::System.Boolean value);
-        partial void OnEnabledChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.Boolean Authenticate
-        {
-            get
-            {
-                return _Authenticate;
-            }
-            set
-            {
-                OnAuthenticateChanging(value);
-                ReportPropertyChanging("Authenticate");
-                _Authenticate = StructuralObject.SetValidValue(value, "Authenticate");
-                ReportPropertyChanged("Authenticate");
-                OnAuthenticateChanged();
-            }
-        }
-        private global::System.Boolean _Authenticate = false;
-        partial void OnAuthenticateChanging(global::System.Boolean value);
-        partial void OnAuthenticateChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.String Username
-        {
-            get
-            {
-                return _Username;
-            }
-            set
-            {
-                OnUsernameChanging(value);
-                ReportPropertyChanging("Username");
-                _Username = StructuralObject.SetValidValue(value, false, "Username");
-                ReportPropertyChanged("Username");
-                OnUsernameChanged();
-            }
-        }
-        private global::System.String _Username = "";
-        partial void OnUsernameChanging(global::System.String value);
-        partial void OnUsernameChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.String Password
-        {
-            get
-            {
-                return _Password;
-            }
-            set
-            {
-                OnPasswordChanging(value);
-                ReportPropertyChanging("Password");
-                _Password = StructuralObject.SetValidValue(value, false, "Password");
-                ReportPropertyChanged("Password");
-                OnPasswordChanged();
-            }
-        }
-        private global::System.String _Password = "";
-        partial void OnPasswordChanging(global::System.String value);
-        partial void OnPasswordChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.String Domain
-        {
-            get
-            {
-                return _Domain;
-            }
-            set
-            {
-                OnDomainChanging(value);
-                ReportPropertyChanging("Domain");
-                _Domain = StructuralObject.SetValidValue(value, false, "Domain");
-                ReportPropertyChanged("Domain");
-                OnDomainChanged();
-            }
-        }
-        private global::System.String _Domain = "";
-        partial void OnDomainChanging(global::System.String value);
-        partial void OnDomainChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.Int32 LastReadResult
-        {
-            get
-            {
-                return _LastReadResult;
-            }
-            set
-            {
-                OnLastReadResultChanging(value);
-                ReportPropertyChanging("LastReadResult");
-                _LastReadResult = StructuralObject.SetValidValue(value, "LastReadResult");
-                ReportPropertyChanged("LastReadResult");
-                OnLastReadResultChanged();
-            }
-        }
-        private global::System.Int32 _LastReadResult;
-        partial void OnLastReadResultChanging(global::System.Int32 value);
-        partial void OnLastReadResultChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.DateTime LastUpdated
-        {
-            get
-            {
-                return _LastUpdated;
-            }
-            set
-            {
-                OnLastUpdatedChanging(value);
-                ReportPropertyChanging("LastUpdated");
-                _LastUpdated = StructuralObject.SetValidValue(value, "LastUpdated");
-                ReportPropertyChanged("LastUpdated");
-                OnLastUpdatedChanged();
-            }
-        }
-        private global::System.DateTime _LastUpdated = new DateTime(599266080000000000, DateTimeKind.Unspecified);
-        partial void OnLastUpdatedChanging(global::System.DateTime value);
-        partial void OnLastUpdatedChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.Byte ItemComparison
-        {
-            get
-            {
-                return _ItemComparison;
-            }
-            set
-            {
-                OnItemComparisonChanging(value);
-                ReportPropertyChanging("ItemComparison");
-                _ItemComparison = StructuralObject.SetValidValue(value, "ItemComparison");
-                ReportPropertyChanged("ItemComparison");
-                OnItemComparisonChanged();
-            }
-        }
-        private global::System.Byte _ItemComparison = 0;
-        partial void OnItemComparisonChanging(global::System.Byte value);
-        partial void OnItemComparisonChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.Guid CategoryID
-        {
-            get
-            {
-                return _CategoryID;
-            }
-            set
-            {
-                OnCategoryIDChanging(value);
-                ReportPropertyChanging("CategoryID");
-                _CategoryID = StructuralObject.SetValidValue(value, "CategoryID");
-                ReportPropertyChanged("CategoryID");
-                OnCategoryIDChanged();
-            }
-        }
-        private global::System.Guid _CategoryID;
-        partial void OnCategoryIDChanging(global::System.Guid value);
-        partial void OnCategoryIDChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.Int32 MultipleOpenAction
-        {
-            get
-            {
-                return _MultipleOpenAction;
-            }
-            set
-            {
-                OnMultipleOpenActionChanging(value);
-                ReportPropertyChanging("MultipleOpenAction");
-                _MultipleOpenAction = StructuralObject.SetValidValue(value, "MultipleOpenAction");
-                ReportPropertyChanged("MultipleOpenAction");
-                OnMultipleOpenActionChanged();
-            }
-        }
-        private global::System.Int32 _MultipleOpenAction = 0;
-        partial void OnMultipleOpenActionChanging(global::System.Int32 value);
-        partial void OnMultipleOpenActionChanged();
-
-        #endregion
-
-        #region Navigation Properties
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [XmlIgnoreAttribute()]
-        [SoapIgnoreAttribute()]
-        [DataMemberAttribute()]
-        [EdmRelationshipNavigationPropertyAttribute("FeedCenterModel", "FK_Feed_Category", "Category")]
-        public Category Category
-        {
-            get
-            {
-                return ((IEntityWithRelationships)this).RelationshipManager.GetRelatedReference<Category>("FeedCenterModel.FK_Feed_Category", "Category").Value;
-            }
-            set
-            {
-                ((IEntityWithRelationships)this).RelationshipManager.GetRelatedReference<Category>("FeedCenterModel.FK_Feed_Category", "Category").Value = value;
-            }
-        }
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [BrowsableAttribute(false)]
-        [DataMemberAttribute()]
-        public EntityReference<Category> CategoryReference
-        {
-            get
-            {
-                return ((IEntityWithRelationships)this).RelationshipManager.GetRelatedReference<Category>("FeedCenterModel.FK_Feed_Category", "Category");
-            }
-            set
-            {
-                if ((value != null))
-                {
-                    ((IEntityWithRelationships)this).RelationshipManager.InitializeRelatedReference<Category>("FeedCenterModel.FK_Feed_Category", "Category", value);
-                }
-            }
-        }
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [XmlIgnoreAttribute()]
-        [SoapIgnoreAttribute()]
-        [DataMemberAttribute()]
-        [EdmRelationshipNavigationPropertyAttribute("FeedCenterModel", "FK_FeedAction_Feed", "FeedAction")]
-        public EntityCollection<FeedAction> Actions
-        {
-            get
-            {
-                return ((IEntityWithRelationships)this).RelationshipManager.GetRelatedCollection<FeedAction>("FeedCenterModel.FK_FeedAction_Feed", "FeedAction");
-            }
-            set
-            {
-                if ((value != null))
-                {
-                    ((IEntityWithRelationships)this).RelationshipManager.InitializeRelatedCollection<FeedAction>("FeedCenterModel.FK_FeedAction_Feed", "FeedAction", value);
-                }
-            }
-        }
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [XmlIgnoreAttribute()]
-        [SoapIgnoreAttribute()]
-        [DataMemberAttribute()]
-        [EdmRelationshipNavigationPropertyAttribute("FeedCenterModel", "FK_FeedItem_Feed", "FeedItem")]
-        public EntityCollection<FeedItem> Items
-        {
-            get
-            {
-                return ((IEntityWithRelationships)this).RelationshipManager.GetRelatedCollection<FeedItem>("FeedCenterModel.FK_FeedItem_Feed", "FeedItem");
-            }
-            set
-            {
-                if ((value != null))
-                {
-                    ((IEntityWithRelationships)this).RelationshipManager.InitializeRelatedCollection<FeedItem>("FeedCenterModel.FK_FeedItem_Feed", "FeedItem", value);
-                }
-            }
-        }
-
-        #endregion
-
-    }
-    
-    /// <summary>
-    /// No Metadata Documentation available.
-    /// </summary>
-    [EdmEntityTypeAttribute(NamespaceName="FeedCenterModel", Name="FeedAction")]
-    [Serializable()]
-    [DataContractAttribute(IsReference=true)]
-    public partial class FeedAction : EntityObject
-    {
-        #region Factory Method
-    
-        /// <summary>
-        /// Create a new FeedAction object.
-        /// </summary>
-        /// <param name="id">Initial value of the ID property.</param>
-        /// <param name="feedID">Initial value of the FeedID property.</param>
-        /// <param name="field">Initial value of the Field property.</param>
-        /// <param name="search">Initial value of the Search property.</param>
-        /// <param name="replace">Initial value of the Replace property.</param>
-        /// <param name="sequence">Initial value of the Sequence property.</param>
-        public static FeedAction CreateFeedAction(global::System.Guid id, global::System.Guid feedID, global::System.Int32 field, global::System.String search, global::System.String replace, global::System.Int32 sequence)
-        {
-            FeedAction feedAction = new FeedAction();
-            feedAction.ID = id;
-            feedAction.FeedID = feedID;
-            feedAction.Field = field;
-            feedAction.Search = search;
-            feedAction.Replace = replace;
-            feedAction.Sequence = sequence;
-            return feedAction;
-        }
-
-        #endregion
-
-        #region Simple Properties
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=true, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.Guid ID
-        {
-            get
-            {
-                return _ID;
-            }
-            set
-            {
-                if (_ID != value)
-                {
-                    OnIDChanging(value);
-                    ReportPropertyChanging("ID");
-                    _ID = StructuralObject.SetValidValue(value, "ID");
-                    ReportPropertyChanged("ID");
-                    OnIDChanged();
-                }
-            }
-        }
-        private global::System.Guid _ID;
-        partial void OnIDChanging(global::System.Guid value);
-        partial void OnIDChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.Guid FeedID
-        {
-            get
-            {
-                return _FeedID;
-            }
-            set
-            {
-                OnFeedIDChanging(value);
-                ReportPropertyChanging("FeedID");
-                _FeedID = StructuralObject.SetValidValue(value, "FeedID");
-                ReportPropertyChanged("FeedID");
-                OnFeedIDChanged();
-            }
-        }
-        private global::System.Guid _FeedID;
-        partial void OnFeedIDChanging(global::System.Guid value);
-        partial void OnFeedIDChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.Int32 Field
-        {
-            get
-            {
-                return _Field;
-            }
-            set
-            {
-                OnFieldChanging(value);
-                ReportPropertyChanging("Field");
-                _Field = StructuralObject.SetValidValue(value, "Field");
-                ReportPropertyChanged("Field");
-                OnFieldChanged();
-            }
-        }
-        private global::System.Int32 _Field;
-        partial void OnFieldChanging(global::System.Int32 value);
-        partial void OnFieldChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.String Search
-        {
-            get
-            {
-                return _Search;
-            }
-            set
-            {
-                OnSearchChanging(value);
-                ReportPropertyChanging("Search");
-                _Search = StructuralObject.SetValidValue(value, false, "Search");
-                ReportPropertyChanged("Search");
-                OnSearchChanged();
-            }
-        }
-        private global::System.String _Search;
-        partial void OnSearchChanging(global::System.String value);
-        partial void OnSearchChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.String Replace
-        {
-            get
-            {
-                return _Replace;
-            }
-            set
-            {
-                OnReplaceChanging(value);
-                ReportPropertyChanging("Replace");
-                _Replace = StructuralObject.SetValidValue(value, false, "Replace");
-                ReportPropertyChanged("Replace");
-                OnReplaceChanged();
-            }
-        }
-        private global::System.String _Replace;
-        partial void OnReplaceChanging(global::System.String value);
-        partial void OnReplaceChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.Int32 Sequence
-        {
-            get
-            {
-                return _Sequence;
-            }
-            set
-            {
-                OnSequenceChanging(value);
-                ReportPropertyChanging("Sequence");
-                _Sequence = StructuralObject.SetValidValue(value, "Sequence");
-                ReportPropertyChanged("Sequence");
-                OnSequenceChanged();
-            }
-        }
-        private global::System.Int32 _Sequence;
-        partial void OnSequenceChanging(global::System.Int32 value);
-        partial void OnSequenceChanged();
-
-        #endregion
-
-        #region Navigation Properties
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [XmlIgnoreAttribute()]
-        [SoapIgnoreAttribute()]
-        [DataMemberAttribute()]
-        [EdmRelationshipNavigationPropertyAttribute("FeedCenterModel", "FK_FeedAction_Feed", "Feed")]
-        public Feed Feed
-        {
-            get
-            {
-                return ((IEntityWithRelationships)this).RelationshipManager.GetRelatedReference<Feed>("FeedCenterModel.FK_FeedAction_Feed", "Feed").Value;
-            }
-            set
-            {
-                ((IEntityWithRelationships)this).RelationshipManager.GetRelatedReference<Feed>("FeedCenterModel.FK_FeedAction_Feed", "Feed").Value = value;
-            }
-        }
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [BrowsableAttribute(false)]
-        [DataMemberAttribute()]
-        public EntityReference<Feed> FeedReference
-        {
-            get
-            {
-                return ((IEntityWithRelationships)this).RelationshipManager.GetRelatedReference<Feed>("FeedCenterModel.FK_FeedAction_Feed", "Feed");
-            }
-            set
-            {
-                if ((value != null))
-                {
-                    ((IEntityWithRelationships)this).RelationshipManager.InitializeRelatedReference<Feed>("FeedCenterModel.FK_FeedAction_Feed", "Feed", value);
-                }
-            }
-        }
-
-        #endregion
-
-    }
-    
-    /// <summary>
-    /// No Metadata Documentation available.
-    /// </summary>
-    [EdmEntityTypeAttribute(NamespaceName="FeedCenterModel", Name="FeedItem")]
-    [Serializable()]
-    [DataContractAttribute(IsReference=true)]
-    public partial class FeedItem : EntityObject
-    {
-        #region Factory Method
-    
-        /// <summary>
-        /// Create a new FeedItem object.
-        /// </summary>
-        /// <param name="id">Initial value of the ID property.</param>
-        /// <param name="feedID">Initial value of the FeedID property.</param>
-        /// <param name="beenRead">Initial value of the BeenRead property.</param>
-        /// <param name="new">Initial value of the New property.</param>
-        /// <param name="guid">Initial value of the Guid property.</param>
-        /// <param name="sequence">Initial value of the Sequence property.</param>
-        public static FeedItem CreateFeedItem(global::System.Guid id, global::System.Guid feedID, global::System.Boolean beenRead, global::System.Boolean @new, global::System.String guid, global::System.Int32 sequence)
-        {
-            FeedItem feedItem = new FeedItem();
-            feedItem.ID = id;
-            feedItem.FeedID = feedID;
-            feedItem.BeenRead = beenRead;
-            feedItem.New = @new;
-            feedItem.Guid = guid;
-            feedItem.Sequence = sequence;
-            return feedItem;
-        }
-
-        #endregion
-
-        #region Simple Properties
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=true, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.Guid ID
-        {
-            get
-            {
-                return _ID;
-            }
-            set
-            {
-                if (_ID != value)
-                {
-                    OnIDChanging(value);
-                    ReportPropertyChanging("ID");
-                    _ID = StructuralObject.SetValidValue(value, "ID");
-                    ReportPropertyChanged("ID");
-                    OnIDChanged();
-                }
-            }
-        }
-        private global::System.Guid _ID;
-        partial void OnIDChanging(global::System.Guid value);
-        partial void OnIDChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.Guid FeedID
-        {
-            get
-            {
-                return _FeedID;
-            }
-            set
-            {
-                OnFeedIDChanging(value);
-                ReportPropertyChanging("FeedID");
-                _FeedID = StructuralObject.SetValidValue(value, "FeedID");
-                ReportPropertyChanged("FeedID");
-                OnFeedIDChanged();
-            }
-        }
-        private global::System.Guid _FeedID;
-        partial void OnFeedIDChanging(global::System.Guid value);
-        partial void OnFeedIDChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.String Title
-        {
-            get
-            {
-                return _Title;
-            }
-            set
-            {
-                OnTitleChanging(value);
-                ReportPropertyChanging("Title");
-                _Title = StructuralObject.SetValidValue(value, false, "Title");
-                ReportPropertyChanged("Title");
-                OnTitleChanged();
-            }
-        }
-        private global::System.String _Title = "";
-        partial void OnTitleChanging(global::System.String value);
-        partial void OnTitleChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.String Link
-        {
-            get
-            {
-                return _Link;
-            }
-            set
-            {
-                OnLinkChanging(value);
-                ReportPropertyChanging("Link");
-                _Link = StructuralObject.SetValidValue(value, false, "Link");
-                ReportPropertyChanged("Link");
-                OnLinkChanged();
-            }
-        }
-        private global::System.String _Link = "";
-        partial void OnLinkChanging(global::System.String value);
-        partial void OnLinkChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.String Description
-        {
-            get
-            {
-                return _Description;
-            }
-            set
-            {
-                OnDescriptionChanging(value);
-                ReportPropertyChanging("Description");
-                _Description = StructuralObject.SetValidValue(value, false, "Description");
-                ReportPropertyChanged("Description");
-                OnDescriptionChanged();
-            }
-        }
-        private global::System.String _Description = "";
-        partial void OnDescriptionChanging(global::System.String value);
-        partial void OnDescriptionChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.Boolean BeenRead
-        {
-            get
-            {
-                return _BeenRead;
-            }
-            set
-            {
-                OnBeenReadChanging(value);
-                ReportPropertyChanging("BeenRead");
-                _BeenRead = StructuralObject.SetValidValue(value, "BeenRead");
-                ReportPropertyChanged("BeenRead");
-                OnBeenReadChanged();
-            }
-        }
-        private global::System.Boolean _BeenRead;
-        partial void OnBeenReadChanging(global::System.Boolean value);
-        partial void OnBeenReadChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.DateTime LastFound
-        {
-            get
-            {
-                return _LastFound;
-            }
-            set
-            {
-                OnLastFoundChanging(value);
-                ReportPropertyChanging("LastFound");
-                _LastFound = StructuralObject.SetValidValue(value, "LastFound");
-                ReportPropertyChanged("LastFound");
-                OnLastFoundChanged();
-            }
-        }
-        private global::System.DateTime _LastFound = new DateTime(599266080000000000, DateTimeKind.Unspecified);
-        partial void OnLastFoundChanging(global::System.DateTime value);
-        partial void OnLastFoundChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.Boolean New
-        {
-            get
-            {
-                return _New;
-            }
-            set
-            {
-                OnNewChanging(value);
-                ReportPropertyChanging("New");
-                _New = StructuralObject.SetValidValue(value, "New");
-                ReportPropertyChanged("New");
-                OnNewChanged();
-            }
-        }
-        private global::System.Boolean _New;
-        partial void OnNewChanging(global::System.Boolean value);
-        partial void OnNewChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.String Guid
-        {
-            get
-            {
-                return _Guid;
-            }
-            set
-            {
-                OnGuidChanging(value);
-                ReportPropertyChanging("Guid");
-                _Guid = StructuralObject.SetValidValue(value, false, "Guid");
-                ReportPropertyChanged("Guid");
-                OnGuidChanged();
-            }
-        }
-        private global::System.String _Guid;
-        partial void OnGuidChanging(global::System.String value);
-        partial void OnGuidChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.Int32 Sequence
-        {
-            get
-            {
-                return _Sequence;
-            }
-            set
-            {
-                OnSequenceChanging(value);
-                ReportPropertyChanging("Sequence");
-                _Sequence = StructuralObject.SetValidValue(value, "Sequence");
-                ReportPropertyChanged("Sequence");
-                OnSequenceChanged();
-            }
-        }
-        private global::System.Int32 _Sequence;
-        partial void OnSequenceChanging(global::System.Int32 value);
-        partial void OnSequenceChanged();
-
-        #endregion
-
-        #region Navigation Properties
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [XmlIgnoreAttribute()]
-        [SoapIgnoreAttribute()]
-        [DataMemberAttribute()]
-        [EdmRelationshipNavigationPropertyAttribute("FeedCenterModel", "FK_FeedItem_Feed", "Feed")]
-        public Feed Feed
-        {
-            get
-            {
-                return ((IEntityWithRelationships)this).RelationshipManager.GetRelatedReference<Feed>("FeedCenterModel.FK_FeedItem_Feed", "Feed").Value;
-            }
-            set
-            {
-                ((IEntityWithRelationships)this).RelationshipManager.GetRelatedReference<Feed>("FeedCenterModel.FK_FeedItem_Feed", "Feed").Value = value;
-            }
-        }
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [BrowsableAttribute(false)]
-        [DataMemberAttribute()]
-        public EntityReference<Feed> FeedReference
-        {
-            get
-            {
-                return ((IEntityWithRelationships)this).RelationshipManager.GetRelatedReference<Feed>("FeedCenterModel.FK_FeedItem_Feed", "Feed");
-            }
-            set
-            {
-                if ((value != null))
-                {
-                    ((IEntityWithRelationships)this).RelationshipManager.InitializeRelatedReference<Feed>("FeedCenterModel.FK_FeedItem_Feed", "Feed", value);
-                }
-            }
-        }
-
-        #endregion
-
-    }
-    
-    /// <summary>
-    /// No Metadata Documentation available.
-    /// </summary>
-    [EdmEntityTypeAttribute(NamespaceName="FeedCenterModel", Name="Setting")]
-    [Serializable()]
-    [DataContractAttribute(IsReference=true)]
-    public partial class Setting : EntityObject
-    {
-        #region Factory Method
-    
-        /// <summary>
-        /// Create a new Setting object.
-        /// </summary>
-        /// <param name="name">Initial value of the Name property.</param>
-        /// <param name="value">Initial value of the Value property.</param>
-        /// <param name="version">Initial value of the Version property.</param>
-        public static Setting CreateSetting(global::System.String name, global::System.String value, global::System.String version)
-        {
-            Setting setting = new Setting();
-            setting.Name = name;
-            setting.Value = value;
-            setting.Version = version;
-            return setting;
-        }
-
-        #endregion
-
-        #region Simple Properties
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=true, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.String Name
-        {
-            get
-            {
-                return _Name;
-            }
-            set
-            {
-                if (_Name != value)
-                {
-                    OnNameChanging(value);
-                    ReportPropertyChanging("Name");
-                    _Name = StructuralObject.SetValidValue(value, false, "Name");
-                    ReportPropertyChanged("Name");
-                    OnNameChanged();
-                }
-            }
-        }
-        private global::System.String _Name;
-        partial void OnNameChanging(global::System.String value);
-        partial void OnNameChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.String Value
-        {
-            get
-            {
-                return _Value;
-            }
-            set
-            {
-                OnValueChanging(value);
-                ReportPropertyChanging("Value");
-                _Value = StructuralObject.SetValidValue(value, false, "Value");
-                ReportPropertyChanged("Value");
-                OnValueChanged();
-            }
-        }
-        private global::System.String _Value;
-        partial void OnValueChanging(global::System.String value);
-        partial void OnValueChanged();
-    
-        /// <summary>
-        /// No Metadata Documentation available.
-        /// </summary>
-        [EdmScalarPropertyAttribute(EntityKeyProperty=true, IsNullable=false)]
-        [DataMemberAttribute()]
-        public global::System.String Version
-        {
-            get
-            {
-                return _Version;
-            }
-            set
-            {
-                if (_Version != value)
-                {
-                    OnVersionChanging(value);
-                    ReportPropertyChanging("Version");
-                    _Version = StructuralObject.SetValidValue(value, false, "Version");
-                    ReportPropertyChanged("Version");
-                    OnVersionChanged();
-                }
-            }
-        }
-        private global::System.String _Version;
-        partial void OnVersionChanging(global::System.String value);
-        partial void OnVersionChanged();
-
-        #endregion
-
-    }
-
-    #endregion
-
-}
+// If no context and entity classes have been generated, it may be because you created an empty model but
+// have not yet chosen which version of Entity Framework to use. To generate a context class and entity
+// classes for your model, open the model in the designer, right-click on the designer surface, and
+// select 'Update Model from Database...', 'Generate Database from Model...', or 'Add Code Generation
+// Item...'.
\ No newline at end of file
diff --git a/Model.cs b/Model.cs
new file mode 100644
index 0000000..7cc0662
--- /dev/null
+++ b/Model.cs
@@ -0,0 +1,9 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
diff --git a/Model.edmx b/Model.edmx
index ed3f6a9..73ae131 100644
--- a/Model.edmx
+++ b/Model.edmx
@@ -4,55 +4,36 @@
   <edmx:Runtime>
     <!-- SSDL content -->
     <edmx:StorageModels>
-    <Schema Namespace="FeedCenterModel.Store" Alias="Self" Provider="System.Data.SqlServerCe.4.0" ProviderManifestToken="4.0" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
-        <EntityContainer Name="FeedCenterModelStoreContainer">
-          <EntitySet Name="Category" EntityType="FeedCenterModel.Store.Category" store:Type="Tables" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" />
-          <EntitySet Name="Feed" EntityType="FeedCenterModel.Store.Feed" store:Type="Tables" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" />
-          <EntitySet Name="FeedAction" EntityType="FeedCenterModel.Store.FeedAction" store:Type="Tables" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" />
-          <EntitySet Name="FeedItem" EntityType="FeedCenterModel.Store.FeedItem" store:Type="Tables" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" />
-          <EntitySet Name="Setting" EntityType="FeedCenterModel.Store.Setting" store:Type="Tables" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" />
-          <AssociationSet Name="FK_Feed_Category" Association="FeedCenterModel.Store.FK_Feed_Category">
-            <End Role="Category" EntitySet="Category" />
-            <End Role="Feed" EntitySet="Feed" />
-          </AssociationSet>
-          <AssociationSet Name="FK_FeedAction_Feed" Association="FeedCenterModel.Store.FK_FeedAction_Feed">
-            <End Role="Feed" EntitySet="Feed" />
-            <End Role="FeedAction" EntitySet="FeedAction" />
-          </AssociationSet>
-          <AssociationSet Name="FK_FeedItem_Feed" Association="FeedCenterModel.Store.FK_FeedItem_Feed">
-            <End Role="Feed" EntitySet="Feed" />
-            <End Role="FeedItem" EntitySet="FeedItem" />
-          </AssociationSet>
-        </EntityContainer>
+    <Schema Namespace="FeedCenterModel.Store" Provider="System.Data.SqlServerCe.4.0" ProviderManifestToken="4.0" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
         <EntityType Name="Category">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="Name" Type="nvarchar" Nullable="false" MaxLength="1000" />
+          <Property Name="Name" Type="nvarchar" MaxLength="1000" Nullable="false" />
         </EntityType>
         <EntityType Name="Feed">
           <Key>
             <PropertyRef Name="ID" />
           </Key>
           <Property Name="ID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="Name" Type="nvarchar" Nullable="false" MaxLength="1000" />
-          <Property Name="Title" Type="nvarchar" Nullable="false" MaxLength="1000" />
-          <Property Name="Source" Type="nvarchar" Nullable="false" MaxLength="1000" />
-          <Property Name="Link" Type="nvarchar" Nullable="false" MaxLength="1000" />
+          <Property Name="Name" Type="nvarchar" MaxLength="1000" Nullable="false" />
+          <Property Name="Title" Type="nvarchar" MaxLength="1000" Nullable="false" />
+          <Property Name="Source" Type="nvarchar" MaxLength="1000" Nullable="false" />
+          <Property Name="Link" Type="nvarchar" MaxLength="1000" Nullable="false" />
           <Property Name="Description" Type="ntext" Nullable="false" />
           <Property Name="LastChecked" Type="datetime" Nullable="false" />
           <Property Name="CheckInterval" Type="int" Nullable="false" />
           <Property Name="Enabled" Type="bit" Nullable="false" />
           <Property Name="Authenticate" Type="bit" Nullable="false" />
-          <Property Name="Username" Type="nvarchar" Nullable="false" MaxLength="1000" />
-          <Property Name="Password" Type="nvarchar" Nullable="false" MaxLength="1000" />
-          <Property Name="Domain" Type="nvarchar" Nullable="false" MaxLength="1000" />
+          <Property Name="Username" Type="nvarchar" MaxLength="1000" Nullable="false" />
+          <Property Name="Password" Type="nvarchar" MaxLength="1000" Nullable="false" />
+          <Property Name="Domain" Type="nvarchar" MaxLength="1000" Nullable="false" />
           <Property Name="LastReadResult" Type="int" Nullable="false" />
           <Property Name="LastUpdated" Type="datetime" Nullable="false" />
           <Property Name="ItemComparison" Type="tinyint" Nullable="false" />
           <Property Name="CategoryID" Type="uniqueidentifier" Nullable="false" />
-          <Property Name="MultipleOpenAction" Type="int" Nullable="false" />          
+          <Property Name="MultipleOpenAction" Type="int" Nullable="false" />
         </EntityType>
         <EntityType Name="FeedAction">
           <Key>
@@ -61,8 +42,8 @@
           <Property Name="ID" Type="uniqueidentifier" Nullable="false" />
           <Property Name="FeedID" Type="uniqueidentifier" Nullable="false" />
           <Property Name="Field" Type="int" Nullable="false" />
-          <Property Name="Search" Type="nvarchar" Nullable="false" MaxLength="1000" />
-          <Property Name="Replace" Type="nvarchar" Nullable="false" MaxLength="1000" />
+          <Property Name="Search" Type="nvarchar" MaxLength="1000" Nullable="false" />
+          <Property Name="Replace" Type="nvarchar" MaxLength="1000" Nullable="false" />
           <Property Name="Sequence" Type="int" Nullable="false" />
         </EntityType>
         <EntityType Name="FeedItem">
@@ -72,26 +53,26 @@
           <Property Name="ID" Type="uniqueidentifier" Nullable="false" />
           <Property Name="FeedID" Type="uniqueidentifier" Nullable="false" />
           <Property Name="Title" Type="ntext" Nullable="false" />
-          <Property Name="Link" Type="nvarchar" Nullable="false" MaxLength="1000" />
+          <Property Name="Link" Type="nvarchar" MaxLength="1000" Nullable="false" />
           <Property Name="Description" Type="ntext" Nullable="false" />
           <Property Name="BeenRead" Type="bit" Nullable="false" />
           <Property Name="LastFound" Type="datetime" Nullable="false" />
           <Property Name="New" Type="bit" Nullable="false" />
           <Property Name="Sequence" Type="int" Nullable="false" />
-          <Property Name="Guid" Type="nvarchar" Nullable="false" MaxLength="1000" />
+          <Property Name="Guid" Type="nvarchar" MaxLength="1000" Nullable="false" />
         </EntityType>
         <EntityType Name="Setting">
           <Key>
             <PropertyRef Name="Name" />
             <PropertyRef Name="Version" />
           </Key>
-          <Property Name="Name" Type="nvarchar" Nullable="false" MaxLength="500" />
-          <Property Name="Value" Type="nvarchar" Nullable="false" MaxLength="3500" />
-          <Property Name="Version" Type="nvarchar" Nullable="false" MaxLength="50" />
+          <Property Name="Name" Type="nvarchar" MaxLength="500" Nullable="false" />
+          <Property Name="Value" Type="nvarchar" MaxLength="3500" Nullable="false" />
+          <Property Name="Version" Type="nvarchar" MaxLength="50" Nullable="false" />
         </EntityType>
         <Association Name="FK_Feed_Category">
-          <End Role="Category" Type="FeedCenterModel.Store.Category" Multiplicity="1" />
-          <End Role="Feed" Type="FeedCenterModel.Store.Feed" Multiplicity="*" />
+          <End Role="Category" Type="Self.Category" Multiplicity="1" />
+          <End Role="Feed" Type="Self.Feed" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="Category">
               <PropertyRef Name="ID" />
@@ -102,10 +83,10 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_FeedAction_Feed">
-          <End Role="Feed" Type="FeedCenterModel.Store.Feed" Multiplicity="1">
+          <End Role="Feed" Type="Self.Feed" Multiplicity="1">
             <OnDelete Action="Cascade" />
           </End>
-          <End Role="FeedAction" Type="FeedCenterModel.Store.FeedAction" Multiplicity="*" />
+          <End Role="FeedAction" Type="Self.FeedAction" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="Feed">
               <PropertyRef Name="ID" />
@@ -116,10 +97,10 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_FeedItem_Feed">
-          <End Role="Feed" Type="FeedCenterModel.Store.Feed" Multiplicity="1">
+          <End Role="Feed" Type="Self.Feed" Multiplicity="1">
             <OnDelete Action="Cascade" />
           </End>
-          <End Role="FeedItem" Type="FeedCenterModel.Store.FeedItem" Multiplicity="*" />
+          <End Role="FeedItem" Type="Self.FeedItem" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="Feed">
               <PropertyRef Name="ID" />
@@ -129,6 +110,25 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <EntityContainer Name="FeedCenterModelStoreContainer">
+          <EntitySet Name="Category" EntityType="Self.Category" store:Type="Tables" />
+          <EntitySet Name="Feed" EntityType="Self.Feed" store:Type="Tables" />
+          <EntitySet Name="FeedAction" EntityType="Self.FeedAction" store:Type="Tables" />
+          <EntitySet Name="FeedItem" EntityType="Self.FeedItem" store:Type="Tables" />
+          <EntitySet Name="Setting" EntityType="Self.Setting" store:Type="Tables" />
+          <AssociationSet Name="FK_Feed_Category" Association="Self.FK_Feed_Category">
+            <End Role="Category" EntitySet="Category" />
+            <End Role="Feed" EntitySet="Feed" />
+          </AssociationSet>
+          <AssociationSet Name="FK_FeedAction_Feed" Association="Self.FK_FeedAction_Feed">
+            <End Role="Feed" EntitySet="Feed" />
+            <End Role="FeedAction" EntitySet="FeedAction" />
+          </AssociationSet>
+          <AssociationSet Name="FK_FeedItem_Feed" Association="Self.FK_FeedItem_Feed">
+            <End Role="Feed" EntitySet="Feed" />
+            <End Role="FeedItem" EntitySet="FeedItem" />
+          </AssociationSet>
+        </EntityContainer>
       </Schema></edmx:StorageModels>
     <!-- CSDL content -->
     <edmx:ConceptualModels>
@@ -170,21 +170,21 @@
           <Property Type="String" Name="Source" Nullable="false" MaxLength="1000" FixedLength="false" Unicode="true" DefaultValue="" />
           <Property Type="String" Name="Link" Nullable="false" MaxLength="1000" FixedLength="false" Unicode="true" DefaultValue="" />
           <Property Type="String" Name="Description" Nullable="false" MaxLength="Max" FixedLength="false" Unicode="true" DefaultValue="" />
-          <Property Type="DateTime" Name="LastChecked" Nullable="false" DefaultValue="1900-01-01 00:00:00.000Z" />
+          <Property Type="DateTime" Name="LastChecked" Nullable="false" DefaultValue="1900-01-01 00:00:00.000Z" Precision="3" />
           <Property Type="Int32" Name="CheckInterval" Nullable="false" DefaultValue="60" />
           <Property Type="Boolean" Name="Enabled" Nullable="false" DefaultValue="True" />
           <Property Type="Boolean" Name="Authenticate" Nullable="false" DefaultValue="False" />
           <Property Type="String" Name="Username" Nullable="false" MaxLength="1000" FixedLength="false" Unicode="true" DefaultValue="" />
           <Property Type="String" Name="Password" Nullable="false" MaxLength="1000" FixedLength="false" Unicode="true" DefaultValue="" />
           <Property Type="String" Name="Domain" Nullable="false" MaxLength="1000" FixedLength="false" Unicode="true" DefaultValue="" />
-          <Property Type="Int32" Name="LastReadResult" Nullable="false" />
-          <Property Type="DateTime" Name="LastUpdated" Nullable="false" DefaultValue="1900-01-01 00:00:00.000Z" />
-          <Property Type="Byte" Name="ItemComparison" Nullable="false" DefaultValue="0" />
+          <Property Type="FeedCenterModel.FeedReadResult" Name="LastReadResult" Nullable="false" />
+          <Property Type="DateTime" Name="LastUpdated" Nullable="false" DefaultValue="1900-01-01 00:00:00.000Z" Precision="3" />
+          <Property Type="FeedCenterModel.FeedItemComparison" Name="ItemComparison" Nullable="false" />
           <Property Type="Guid" Name="CategoryID" Nullable="false" />
           <NavigationProperty Name="Category" Relationship="FeedCenterModel.FK_Feed_Category" FromRole="Feed" ToRole="Category" />
           <NavigationProperty Name="Actions" Relationship="FeedCenterModel.FK_FeedAction_Feed" FromRole="Feed" ToRole="FeedAction" />
           <NavigationProperty Name="Items" Relationship="FeedCenterModel.FK_FeedItem_Feed" FromRole="Feed" ToRole="FeedItem" />
-          <Property Type="Int32" Name="MultipleOpenAction" Nullable="false" DefaultValue="0" />
+          <Property Type="FeedCenterModel.MultipleOpenAction" Name="MultipleOpenAction" Nullable="false" />
         </EntityType>
         <EntityType Name="FeedAction">
           <Key>
@@ -208,7 +208,7 @@
           <Property Type="String" Name="Link" Nullable="false" MaxLength="1000" FixedLength="false" Unicode="true" DefaultValue="" />
           <Property Type="String" Name="Description" Nullable="false" MaxLength="Max" FixedLength="false" Unicode="true" DefaultValue="" />
           <Property Type="Boolean" Name="BeenRead" Nullable="false" />
-          <Property Type="DateTime" Name="LastFound" Nullable="false" DefaultValue="1900-01-01 00:00:00.000Z" />
+          <Property Type="DateTime" Name="LastFound" Nullable="false" DefaultValue="1900-01-01 00:00:00.000Z" Precision="3" />
           <Property Type="Boolean" Name="New" Nullable="false" />
           <NavigationProperty Name="Feed" Relationship="FeedCenterModel.FK_FeedItem_Feed" FromRole="FeedItem" ToRole="Feed" />
           <Property Type="String" Name="Guid" Nullable="false" MaxLength="1000" FixedLength="false" Unicode="true" />
@@ -259,6 +259,9 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <EnumType Name="FeedReadResult" a:ExternalTypeName="FeedCenter.FeedReadResult" xmlns:a="http://schemas.microsoft.com/ado/2006/04/codegeneration" />
+        <EnumType Name="FeedItemComparison" UnderlyingType="Byte" a:ExternalTypeName="FeedCenter.FeedItemComparison" xmlns:a="http://schemas.microsoft.com/ado/2006/04/codegeneration" />
+        <EnumType Name="MultipleOpenAction" a:ExternalTypeName="FeedCenter.MultipleOpenAction" xmlns:a="http://schemas.microsoft.com/ado/2006/04/codegeneration" />
         </Schema>
     </edmx:ConceptualModels>
     <!-- C-S mapping content -->
@@ -350,6 +353,8 @@
         <DesignerProperty Name="ValidateOnBuild" Value="true" />
         <DesignerProperty Name="EnablePluralization" Value="True" />
         <DesignerProperty Name="IncludeForeignKeysInModel" Value="True" />
+        <DesignerProperty Name="CodeGenerationStrategy" Value="None" />
+        <DesignerProperty Name="UseLegacyProvider" Value="False" />
       </DesignerInfoPropertySet>
     </Options>
     <!-- Diagram content (shape and connector positions) -->
diff --git a/Model.tt b/Model.tt
new file mode 100644
index 0000000..1205534
--- /dev/null
+++ b/Model.tt
@@ -0,0 +1,726 @@
+<#@ template language="C#" debug="false" hostspecific="true"#>
+<#@ include file="EF6.Utility.CS.ttinclude"#><#@ 
+ output extension=".cs"#><#
+
+const string inputFile = @"Model.edmx";
+var textTransform = DynamicTextTransformation.Create(this);
+var code = new CodeGenerationTools(this);
+var ef = new MetadataTools(this);
+var typeMapper = new TypeMapper(code, ef, textTransform.Errors);
+var	fileManager = EntityFrameworkTemplateFileManager.Create(this);
+var itemCollection = new EdmMetadataLoader(textTransform.Host, textTransform.Errors).CreateEdmItemCollection(inputFile);
+var codeStringGenerator = new CodeStringGenerator(code, typeMapper, ef);
+
+if (!typeMapper.VerifyCaseInsensitiveTypeUniqueness(typeMapper.GetAllGlobalItems(itemCollection), inputFile))
+{
+    return string.Empty;
+}
+
+WriteHeader(codeStringGenerator, fileManager);
+
+foreach (var entity in typeMapper.GetItemsToGenerate<EntityType>(itemCollection))
+{
+    fileManager.StartNewFile(entity.Name + ".cs");
+    BeginNamespace(code);
+#>
+<#=codeStringGenerator.UsingDirectives(inHeader: false)#>
+<#=codeStringGenerator.EntityClassOpening(entity)#>
+{
+<#
+    var propertiesWithDefaultValues = typeMapper.GetPropertiesWithDefaultValues(entity);
+    var collectionNavigationProperties = typeMapper.GetCollectionNavigationProperties(entity);
+    var complexProperties = typeMapper.GetComplexProperties(entity);
+
+    if (propertiesWithDefaultValues.Any() || collectionNavigationProperties.Any() || complexProperties.Any())
+    {
+#>
+    public <#=code.Escape(entity)#>()
+    {
+<#
+        foreach (var edmProperty in propertiesWithDefaultValues)
+        {
+#>
+        this.<#=code.Escape(edmProperty)#> = <#=typeMapper.CreateLiteral(edmProperty.DefaultValue)#>;
+<#
+        }
+
+        foreach (var navigationProperty in collectionNavigationProperties)
+        {
+#>
+        this.<#=code.Escape(navigationProperty)#> = new HashSet<<#=typeMapper.GetTypeName(navigationProperty.ToEndMember.GetEntityType())#>>();
+<#
+        }
+
+        foreach (var complexProperty in complexProperties)
+        {
+#>
+        this.<#=code.Escape(complexProperty)#> = new <#=typeMapper.GetTypeName(complexProperty.TypeUsage)#>();
+<#
+        }
+#>
+    }
+
+<#
+    }
+
+    var simpleProperties = typeMapper.GetSimpleProperties(entity);
+    if (simpleProperties.Any())
+    {
+        foreach (var edmProperty in simpleProperties)
+        {
+#>
+    <#=codeStringGenerator.Property(edmProperty)#>
+<#
+        }
+    }
+
+    if (complexProperties.Any())
+    {
+#>
+
+<#
+        foreach(var complexProperty in complexProperties)
+        {
+#>
+    <#=codeStringGenerator.Property(complexProperty)#>
+<#
+        }
+    }
+
+    var navigationProperties = typeMapper.GetNavigationProperties(entity);
+    if (navigationProperties.Any())
+    {
+#>
+
+<#
+        foreach (var navigationProperty in navigationProperties)
+        {
+#>
+    <#=codeStringGenerator.NavigationProperty(navigationProperty)#>
+<#
+        }
+    }
+#>
+}
+<#
+    EndNamespace(code);
+}
+
+foreach (var complex in typeMapper.GetItemsToGenerate<ComplexType>(itemCollection))
+{
+    fileManager.StartNewFile(complex.Name + ".cs");
+    BeginNamespace(code);
+#>
+<#=codeStringGenerator.UsingDirectives(inHeader: false, includeCollections: false)#>
+<#=Accessibility.ForType(complex)#> partial class <#=code.Escape(complex)#>
+{
+<#
+    var complexProperties = typeMapper.GetComplexProperties(complex);
+    var propertiesWithDefaultValues = typeMapper.GetPropertiesWithDefaultValues(complex);
+
+    if (propertiesWithDefaultValues.Any() || complexProperties.Any())
+    {
+#>
+    public <#=code.Escape(complex)#>()
+    {
+<#
+        foreach (var edmProperty in propertiesWithDefaultValues)
+        {
+#>
+        this.<#=code.Escape(edmProperty)#> = <#=typeMapper.CreateLiteral(edmProperty.DefaultValue)#>;
+<#
+        }
+
+        foreach (var complexProperty in complexProperties)
+        {
+#>
+        this.<#=code.Escape(complexProperty)#> = new <#=typeMapper.GetTypeName(complexProperty.TypeUsage)#>();
+<#
+        }
+#>
+    }
+
+<#
+    }
+
+    var simpleProperties = typeMapper.GetSimpleProperties(complex);
+    if (simpleProperties.Any())
+    {
+        foreach(var edmProperty in simpleProperties)
+        {
+#>
+    <#=codeStringGenerator.Property(edmProperty)#>
+<#
+        }
+    }
+
+    if (complexProperties.Any())
+    {
+#>
+
+<#
+        foreach(var edmProperty in complexProperties)
+        {
+#>
+    <#=codeStringGenerator.Property(edmProperty)#>
+<#
+        }
+    }
+#>
+}
+<#
+    EndNamespace(code);
+}
+
+foreach (var enumType in typeMapper.GetEnumItemsToGenerate(itemCollection))
+{
+    fileManager.StartNewFile(enumType.Name + ".cs");
+    BeginNamespace(code);
+#>
+<#=codeStringGenerator.UsingDirectives(inHeader: false, includeCollections: false)#>
+<#
+    if (typeMapper.EnumIsFlags(enumType))
+    {
+#>
+[Flags]
+<#
+    }
+#>
+<#=codeStringGenerator.EnumOpening(enumType)#>
+{
+<#
+    var foundOne = false;
+    
+    foreach (MetadataItem member in typeMapper.GetEnumMembers(enumType))
+    {
+        foundOne = true;
+#>
+    <#=code.Escape(typeMapper.GetEnumMemberName(member))#> = <#=typeMapper.GetEnumMemberValue(member)#>,
+<#
+    }
+
+    if (foundOne)
+    {
+        this.GenerationEnvironment.Remove(this.GenerationEnvironment.Length - 3, 1);
+    }
+#>
+}
+<#
+    EndNamespace(code);
+}
+
+fileManager.Process();
+
+#>
+<#+
+
+public void WriteHeader(CodeStringGenerator codeStringGenerator, EntityFrameworkTemplateFileManager fileManager)
+{
+    fileManager.StartHeader();
+#>
+//------------------------------------------------------------------------------
+// <auto-generated>
+// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine1")#>
+//
+// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine2")#>
+// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine3")#>
+// </auto-generated>
+//------------------------------------------------------------------------------
+<#=codeStringGenerator.UsingDirectives(inHeader: true)#>
+<#+
+    fileManager.EndBlock();
+}
+
+public void BeginNamespace(CodeGenerationTools code)
+{
+    var codeNamespace = code.VsNamespaceSuggestion();
+    if (!String.IsNullOrEmpty(codeNamespace))
+    {
+#>
+namespace <#=code.EscapeNamespace(codeNamespace)#>
+{
+<#+
+        PushIndent("    ");
+    }
+}
+
+public void EndNamespace(CodeGenerationTools code)
+{
+    if (!String.IsNullOrEmpty(code.VsNamespaceSuggestion()))
+    {
+        PopIndent();
+#>
+}
+<#+
+    }
+}
+
+public const string TemplateId = "CSharp_DbContext_Types_EF6";
+
+public class CodeStringGenerator
+{
+    private readonly CodeGenerationTools _code;
+    private readonly TypeMapper _typeMapper;
+    private readonly MetadataTools _ef;
+
+    public CodeStringGenerator(CodeGenerationTools code, TypeMapper typeMapper, MetadataTools ef)
+    {
+        ArgumentNotNull(code, "code");
+        ArgumentNotNull(typeMapper, "typeMapper");
+        ArgumentNotNull(ef, "ef");
+
+        _code = code;
+        _typeMapper = typeMapper;
+        _ef = ef;
+    }
+
+    public string Property(EdmProperty edmProperty)
+    {
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "{0} {1} {2} {{ {3}get; {4}set; }}",
+            Accessibility.ForProperty(edmProperty),
+            _typeMapper.GetTypeName(edmProperty.TypeUsage),
+            _code.Escape(edmProperty),
+            _code.SpaceAfter(Accessibility.ForGetter(edmProperty)),
+            _code.SpaceAfter(Accessibility.ForSetter(edmProperty)));
+    }
+
+    public string NavigationProperty(NavigationProperty navProp)
+    {
+        var endType = _typeMapper.GetTypeName(navProp.ToEndMember.GetEntityType());
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "{0} {1} {2} {{ {3}get; {4}set; }}",
+            AccessibilityAndVirtual(Accessibility.ForNavigationProperty(navProp)),
+            navProp.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many ? ("ICollection<" + endType + ">") : endType,
+            _code.Escape(navProp),
+            _code.SpaceAfter(Accessibility.ForGetter(navProp)),
+            _code.SpaceAfter(Accessibility.ForSetter(navProp)));
+    }
+    
+    public string AccessibilityAndVirtual(string accessibility)
+    {
+        return accessibility + (accessibility != "private" ? " virtual" : "");
+    }
+    
+    public string EntityClassOpening(EntityType entity)
+    {
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "{0} {1}partial class {2}{3}",
+            Accessibility.ForType(entity),
+            _code.SpaceAfter(_code.AbstractOption(entity)),
+            _code.Escape(entity),
+            _code.StringBefore(" : ", _typeMapper.GetTypeName(entity.BaseType)));
+    }
+    
+    public string EnumOpening(SimpleType enumType)
+    {
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "{0} enum {1} : {2}",
+            Accessibility.ForType(enumType),
+            _code.Escape(enumType),
+            _code.Escape(_typeMapper.UnderlyingClrType(enumType)));
+        }
+    
+    public void WriteFunctionParameters(EdmFunction edmFunction, Action<string, string, string, string> writeParameter)
+    {
+        var parameters = FunctionImportParameter.Create(edmFunction.Parameters, _code, _ef);
+        foreach (var parameter in parameters.Where(p => p.NeedsLocalVariable))
+        {
+            var isNotNull = parameter.IsNullableOfT ? parameter.FunctionParameterName + ".HasValue" : parameter.FunctionParameterName + " != null";
+            var notNullInit = "new ObjectParameter(\"" + parameter.EsqlParameterName + "\", " + parameter.FunctionParameterName + ")";
+            var nullInit = "new ObjectParameter(\"" + parameter.EsqlParameterName + "\", typeof(" + TypeMapper.FixNamespaces(parameter.RawClrTypeName) + "))";
+            writeParameter(parameter.LocalVariableName, isNotNull, notNullInit, nullInit);
+        }
+    }
+    
+    public string ComposableFunctionMethod(EdmFunction edmFunction, string modelNamespace)
+    {
+        var parameters = _typeMapper.GetParameters(edmFunction);
+        
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "{0} IQueryable<{1}> {2}({3})",
+            AccessibilityAndVirtual(Accessibility.ForMethod(edmFunction)),
+            _typeMapper.GetTypeName(_typeMapper.GetReturnType(edmFunction), modelNamespace),
+            _code.Escape(edmFunction),
+            string.Join(", ", parameters.Select(p => TypeMapper.FixNamespaces(p.FunctionParameterType) + " " + p.FunctionParameterName).ToArray()));
+    }
+    
+    public string ComposableCreateQuery(EdmFunction edmFunction, string modelNamespace)
+    {
+        var parameters = _typeMapper.GetParameters(edmFunction);
+        
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "return ((IObjectContextAdapter)this).ObjectContext.CreateQuery<{0}>(\"[{1}].[{2}]({3})\"{4});",
+            _typeMapper.GetTypeName(_typeMapper.GetReturnType(edmFunction), modelNamespace),
+            edmFunction.NamespaceName,
+            edmFunction.Name,
+            string.Join(", ", parameters.Select(p => "@" + p.EsqlParameterName).ToArray()),
+            _code.StringBefore(", ", string.Join(", ", parameters.Select(p => p.ExecuteParameterName).ToArray())));
+    }
+    
+    public string FunctionMethod(EdmFunction edmFunction, string modelNamespace, bool includeMergeOption)
+    {
+        var parameters = _typeMapper.GetParameters(edmFunction);
+        var returnType = _typeMapper.GetReturnType(edmFunction);
+
+        var paramList = String.Join(", ", parameters.Select(p => TypeMapper.FixNamespaces(p.FunctionParameterType) + " " + p.FunctionParameterName).ToArray());
+        if (includeMergeOption)
+        {
+            paramList = _code.StringAfter(paramList, ", ") + "MergeOption mergeOption";
+        }
+
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "{0} {1} {2}({3})",
+            AccessibilityAndVirtual(Accessibility.ForMethod(edmFunction)),
+            returnType == null ? "int" : "ObjectResult<" + _typeMapper.GetTypeName(returnType, modelNamespace) + ">",
+            _code.Escape(edmFunction),
+            paramList);
+    }
+    
+    public string ExecuteFunction(EdmFunction edmFunction, string modelNamespace, bool includeMergeOption)
+    {
+        var parameters = _typeMapper.GetParameters(edmFunction);
+        var returnType = _typeMapper.GetReturnType(edmFunction);
+
+        var callParams = _code.StringBefore(", ", String.Join(", ", parameters.Select(p => p.ExecuteParameterName).ToArray()));
+        if (includeMergeOption)
+        {
+            callParams = ", mergeOption" + callParams;
+        }
+        
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction{0}(\"{1}\"{2});",
+            returnType == null ? "" : "<" + _typeMapper.GetTypeName(returnType, modelNamespace) + ">",
+            edmFunction.Name,
+            callParams);
+    }
+    
+    public string DbSet(EntitySet entitySet)
+    {
+        return string.Format(
+            CultureInfo.InvariantCulture,
+            "{0} virtual DbSet<{1}> {2} {{ get; set; }}",
+            Accessibility.ForReadOnlyProperty(entitySet),
+            _typeMapper.GetTypeName(entitySet.ElementType),
+            _code.Escape(entitySet));
+    }
+
+    public string UsingDirectives(bool inHeader, bool includeCollections = true)
+    {
+        return inHeader == string.IsNullOrEmpty(_code.VsNamespaceSuggestion())
+            ? string.Format(
+                CultureInfo.InvariantCulture,
+                "{0}using System;{1}" +
+                "{2}",
+                inHeader ? Environment.NewLine : "",
+                includeCollections ? (Environment.NewLine + "using System.Collections.Generic;") : "",
+                inHeader ? "" : Environment.NewLine)
+            : "";
+    }
+}
+
+public class TypeMapper
+{
+    private const string ExternalTypeNameAttributeName = @"http://schemas.microsoft.com/ado/2006/04/codegeneration:ExternalTypeName";
+
+    private readonly System.Collections.IList _errors;
+    private readonly CodeGenerationTools _code;
+    private readonly MetadataTools _ef;
+
+    public TypeMapper(CodeGenerationTools code, MetadataTools ef, System.Collections.IList errors)
+    {
+        ArgumentNotNull(code, "code");
+        ArgumentNotNull(ef, "ef");
+        ArgumentNotNull(errors, "errors");
+
+        _code = code;
+        _ef = ef;
+        _errors = errors;
+    }
+
+    public static string FixNamespaces(string typeName)
+    {
+        return typeName.Replace("System.Data.Spatial.", "System.Data.Entity.Spatial.");
+    }
+
+    public string GetTypeName(TypeUsage typeUsage)
+    {
+        return typeUsage == null ? null : GetTypeName(typeUsage.EdmType, _ef.IsNullable(typeUsage), modelNamespace: null);
+    }
+
+    public string GetTypeName(EdmType edmType)
+    {
+        return GetTypeName(edmType, isNullable: null, modelNamespace: null);
+    }
+
+    public string GetTypeName(TypeUsage typeUsage, string modelNamespace)
+    {
+        return typeUsage == null ? null : GetTypeName(typeUsage.EdmType, _ef.IsNullable(typeUsage), modelNamespace);
+    }
+
+    public string GetTypeName(EdmType edmType, string modelNamespace)
+    {
+        return GetTypeName(edmType, isNullable: null, modelNamespace: modelNamespace);
+    }
+
+    public string GetTypeName(EdmType edmType, bool? isNullable, string modelNamespace)
+    {
+        if (edmType == null)
+        {
+            return null;
+        }
+
+        var collectionType = edmType as CollectionType;
+        if (collectionType != null)
+        {
+            return String.Format(CultureInfo.InvariantCulture, "ICollection<{0}>", GetTypeName(collectionType.TypeUsage, modelNamespace));
+        }
+
+        var typeName = _code.Escape(edmType.MetadataProperties
+                                .Where(p => p.Name == ExternalTypeNameAttributeName)
+                                .Select(p => (string)p.Value)
+                                .FirstOrDefault())
+            ?? (modelNamespace != null && edmType.NamespaceName != modelNamespace ?
+                _code.CreateFullName(_code.EscapeNamespace(edmType.NamespaceName), _code.Escape(edmType)) :
+                _code.Escape(edmType));
+
+        if (edmType is StructuralType)
+        {
+            return typeName;
+        }
+
+        if (edmType is SimpleType)
+        {
+            var clrType = UnderlyingClrType(edmType);
+            if (!IsEnumType(edmType))
+            {
+                typeName = _code.Escape(clrType);
+            }
+
+            typeName = FixNamespaces(typeName);
+
+            return clrType.IsValueType && isNullable == true ?
+                String.Format(CultureInfo.InvariantCulture, "Nullable<{0}>", typeName) :
+                typeName;
+        }
+
+        throw new ArgumentException("edmType");
+    }
+    
+    public Type UnderlyingClrType(EdmType edmType)
+    {
+        ArgumentNotNull(edmType, "edmType");
+
+        var primitiveType = edmType as PrimitiveType;
+        if (primitiveType != null)
+        {
+            return primitiveType.ClrEquivalentType;
+        }
+
+        if (IsEnumType(edmType))
+        {
+            return GetEnumUnderlyingType(edmType).ClrEquivalentType;
+        }
+
+        return typeof(object);
+    }
+    
+    public object GetEnumMemberValue(MetadataItem enumMember)
+    {
+        ArgumentNotNull(enumMember, "enumMember");
+        
+        var valueProperty = enumMember.GetType().GetProperty("Value");
+        return valueProperty == null ? null : valueProperty.GetValue(enumMember, null);
+    }
+    
+    public string GetEnumMemberName(MetadataItem enumMember)
+    {
+        ArgumentNotNull(enumMember, "enumMember");
+        
+        var nameProperty = enumMember.GetType().GetProperty("Name");
+        return nameProperty == null ? null : (string)nameProperty.GetValue(enumMember, null);
+    }
+
+    public System.Collections.IEnumerable GetEnumMembers(EdmType enumType)
+    {
+        ArgumentNotNull(enumType, "enumType");
+
+        var membersProperty = enumType.GetType().GetProperty("Members");
+        return membersProperty != null 
+            ? (System.Collections.IEnumerable)membersProperty.GetValue(enumType, null)
+            : Enumerable.Empty<MetadataItem>();
+    }
+    
+    public bool EnumIsFlags(EdmType enumType)
+    {
+        ArgumentNotNull(enumType, "enumType");
+        
+        var isFlagsProperty = enumType.GetType().GetProperty("IsFlags");
+        return isFlagsProperty != null && (bool)isFlagsProperty.GetValue(enumType, null);
+    }
+
+    public bool IsEnumType(GlobalItem edmType)
+    {
+        ArgumentNotNull(edmType, "edmType");
+
+        return edmType.GetType().Name == "EnumType";
+    }
+
+    public PrimitiveType GetEnumUnderlyingType(EdmType enumType)
+    {
+        ArgumentNotNull(enumType, "enumType");
+
+        return (PrimitiveType)enumType.GetType().GetProperty("UnderlyingType").GetValue(enumType, null);
+    }
+
+    public string CreateLiteral(object value)
+    {
+        if (value == null || value.GetType() != typeof(TimeSpan))
+        {
+            return _code.CreateLiteral(value);
+        }
+
+        return string.Format(CultureInfo.InvariantCulture, "new TimeSpan({0})", ((TimeSpan)value).Ticks);
+    }
+    
+    public bool VerifyCaseInsensitiveTypeUniqueness(IEnumerable<string> types, string sourceFile)
+    {
+        ArgumentNotNull(types, "types");
+        ArgumentNotNull(sourceFile, "sourceFile");
+        
+        var hash = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase);
+        if (types.Any(item => !hash.Add(item)))
+        {
+            _errors.Add(
+                new CompilerError(sourceFile, -1, -1, "6023",
+                    String.Format(CultureInfo.CurrentCulture, CodeGenerationTools.GetResourceString("Template_CaseInsensitiveTypeConflict"))));
+            return false;
+        }
+        return true;
+    }
+    
+    public IEnumerable<SimpleType> GetEnumItemsToGenerate(IEnumerable<GlobalItem> itemCollection)
+    {
+        return GetItemsToGenerate<SimpleType>(itemCollection)
+            .Where(e => IsEnumType(e));
+    }
+    
+    public IEnumerable<T> GetItemsToGenerate<T>(IEnumerable<GlobalItem> itemCollection) where T: EdmType
+    {
+        return itemCollection
+            .OfType<T>()
+            .Where(i => !i.MetadataProperties.Any(p => p.Name == ExternalTypeNameAttributeName))
+            .OrderBy(i => i.Name);
+    }
+
+    public IEnumerable<string> GetAllGlobalItems(IEnumerable<GlobalItem> itemCollection)
+    {
+        return itemCollection
+            .Where(i => i is EntityType || i is ComplexType || i is EntityContainer || IsEnumType(i))
+            .Select(g => GetGlobalItemName(g));
+    }
+
+    public string GetGlobalItemName(GlobalItem item)
+    {
+        if (item is EdmType)
+        {
+            return ((EdmType)item).Name;
+        }
+        else
+        {
+            return ((EntityContainer)item).Name;
+        }
+    }
+
+    public IEnumerable<EdmProperty> GetSimpleProperties(EntityType type)
+    {
+        return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type);
+    }
+    
+    public IEnumerable<EdmProperty> GetSimpleProperties(ComplexType type)
+    {
+        return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type);
+    }
+    
+    public IEnumerable<EdmProperty> GetComplexProperties(EntityType type)
+    {
+        return type.Properties.Where(p => p.TypeUsage.EdmType is ComplexType && p.DeclaringType == type);
+    }
+    
+    public IEnumerable<EdmProperty> GetComplexProperties(ComplexType type)
+    {
+        return type.Properties.Where(p => p.TypeUsage.EdmType is ComplexType && p.DeclaringType == type);
+    }
+
+    public IEnumerable<EdmProperty> GetPropertiesWithDefaultValues(EntityType type)
+    {
+        return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type && p.DefaultValue != null);
+    }
+    
+    public IEnumerable<EdmProperty> GetPropertiesWithDefaultValues(ComplexType type)
+    {
+        return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type && p.DefaultValue != null);
+    }
+
+    public IEnumerable<NavigationProperty> GetNavigationProperties(EntityType type)
+    {
+        return type.NavigationProperties.Where(np => np.DeclaringType == type);
+    }
+    
+    public IEnumerable<NavigationProperty> GetCollectionNavigationProperties(EntityType type)
+    {
+        return type.NavigationProperties.Where(np => np.DeclaringType == type && np.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many);
+    }
+    
+    public FunctionParameter GetReturnParameter(EdmFunction edmFunction)
+    {
+        ArgumentNotNull(edmFunction, "edmFunction");
+
+        var returnParamsProperty = edmFunction.GetType().GetProperty("ReturnParameters");
+        return returnParamsProperty == null
+            ? edmFunction.ReturnParameter
+            : ((IEnumerable<FunctionParameter>)returnParamsProperty.GetValue(edmFunction, null)).FirstOrDefault();
+    }
+
+    public bool IsComposable(EdmFunction edmFunction)
+    {
+        ArgumentNotNull(edmFunction, "edmFunction");
+
+        var isComposableProperty = edmFunction.GetType().GetProperty("IsComposableAttribute");
+        return isComposableProperty != null && (bool)isComposableProperty.GetValue(edmFunction, null);
+    }
+
+    public IEnumerable<FunctionImportParameter> GetParameters(EdmFunction edmFunction)
+    {
+        return FunctionImportParameter.Create(edmFunction.Parameters, _code, _ef);
+    }
+
+    public TypeUsage GetReturnType(EdmFunction edmFunction)
+    {
+        var returnParam = GetReturnParameter(edmFunction);
+        return returnParam == null ? null : _ef.GetElementType(returnParam.TypeUsage);
+    }
+    
+    public bool GenerateMergeOptionFunction(EdmFunction edmFunction, bool includeMergeOption)
+    {
+        var returnType = GetReturnType(edmFunction);
+        return !includeMergeOption && returnType != null && returnType.EdmType.BuiltInTypeKind == BuiltInTypeKind.EntityType;
+    }
+}
+
+public static void ArgumentNotNull<T>(T arg, string name) where T : class
+{
+    if (arg == null)
+    {
+        throw new ArgumentNullException(name);
+    }
+}
+#>
\ No newline at end of file
diff --git a/NotificationIcon.cs b/NotificationIcon.cs
index 0b70c66..1e26970 100644
--- a/NotificationIcon.cs
+++ b/NotificationIcon.cs
@@ -1,6 +1,5 @@
-using System.Windows.Forms;
-
-using FeedCenter.Properties;
+using FeedCenter.Properties;
+using System.Windows.Forms;
 
 namespace FeedCenter
 {
@@ -19,9 +18,9 @@ namespace FeedCenter
             _notificationIcon.DoubleClick += HandleNotificationIconDoubleClick;
 
             // Setup the menu
-            ContextMenuStrip contextMenuStrip = new ContextMenuStrip();
+            var contextMenuStrip = new ContextMenuStrip();
 
-            ToolStripMenuItem toolStripMenuItem = new ToolStripMenuItem(Resources.NotificationIconContextMenuLocked, null, HandleLockWindowClicked)
+            var toolStripMenuItem = new ToolStripMenuItem(Resources.NotificationIconContextMenuLocked, null, HandleLockWindowClicked)
                                                       {
                                                           Checked = Settings.Default.WindowLocked
                                                       };
diff --git a/Options/AboutOptionsPanel.xaml.cs b/Options/AboutOptionsPanel.xaml.cs
index 6716d69..0e99ef1 100644
--- a/Options/AboutOptionsPanel.xaml.cs
+++ b/Options/AboutOptionsPanel.xaml.cs
@@ -3,7 +3,7 @@ using System.Reflection;
 
 namespace FeedCenter.Options
 {
-    public partial class AboutOptionsPanel 
+    public partial class AboutOptionsPanel
     {
         public AboutOptionsPanel()
         {
diff --git a/Options/BulkFeedWindow.xaml b/Options/BulkFeedWindow.xaml
index af6cd70..7817c57 100644
--- a/Options/BulkFeedWindow.xaml
+++ b/Options/BulkFeedWindow.xaml
@@ -7,6 +7,7 @@
         xmlns:my="clr-namespace:FeedCenter.Properties"
         xmlns:Options="clr-namespace:FeedCenter.Options"
         xmlns:LinkControl="clr-namespace:Common.Wpf.LinkControl;assembly=Common.Wpf"
+        xmlns:feedCenter="clr-namespace:FeedCenter"
         WindowStartupLocation="CenterOwner"
         Icon="/FeedCenter;component/Resources/Application.ico"
         FocusManager.FocusedElement="{Binding ElementName=feedLinkFilterText}">
@@ -97,9 +98,9 @@
                       ToolTip="{x:Static my:Resources.DisableHint}"
                       IsEnabled="False">
                 <ComboBoxItem Content="{x:Static my:Resources.openAllMultipleToolbarButton}"
-                              Tag="{x:Static Options:MultipleOpenAction.IndividualPages}" />
+                              Tag="{x:Static feedCenter:MultipleOpenAction.IndividualPages}" />
                 <ComboBoxItem Content="{x:Static my:Resources.openAllSingleToolbarButton}"
-                              Tag="{x:Static Options:MultipleOpenAction.SinglePage}" />
+                              Tag="{x:Static feedCenter:MultipleOpenAction.SinglePage}" />
             </ComboBox>
         </Grid>
         <Button Content="{x:Static my:Resources.OkayButton}"
diff --git a/Options/BulkFeedWindow.xaml.cs b/Options/BulkFeedWindow.xaml.cs
index 38210f0..2858968 100644
--- a/Options/BulkFeedWindow.xaml.cs
+++ b/Options/BulkFeedWindow.xaml.cs
@@ -1,12 +1,11 @@
-using System.Collections.Generic;
+using Common.Wpf;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 
-using Common.Wpf;
-
 namespace FeedCenter.Options
 {
     public partial class BulkFeedWindow
@@ -39,9 +38,9 @@ namespace FeedCenter.Options
 
         void HandleCollectionViewSourceFilter(object sender, FilterEventArgs e)
         {
-            CheckedListItem<Feed> checkedListBoxItem = (CheckedListItem<Feed>) e.Item;
+            var checkedListBoxItem = (CheckedListItem<Feed>) e.Item;
 
-            Feed feed = checkedListBoxItem.Item;
+            var feed = checkedListBoxItem.Item;
 
             e.Accepted = feed.Link.Contains(feedLinkFilterText.Text);
         }
@@ -56,7 +55,7 @@ namespace FeedCenter.Options
             foreach (var item in _checkedListBoxItems.Where(i => i.IsChecked))
             {
                 if (openComboBox.IsEnabled)
-                    item.Item.MultipleOpenAction = (int) ((ComboBoxItem) openComboBox.SelectedItem).Tag;
+                    item.Item.MultipleOpenAction = (MultipleOpenAction) ((ComboBoxItem) openComboBox.SelectedItem).Tag;
             }
 
             DialogResult = true;
diff --git a/Options/DisplayOptionsPanel.xaml.cs b/Options/DisplayOptionsPanel.xaml.cs
index 5b63228..9efef11 100644
--- a/Options/DisplayOptionsPanel.xaml.cs
+++ b/Options/DisplayOptionsPanel.xaml.cs
@@ -1,8 +1,7 @@
-using System.Linq;
+using FeedCenter.Properties;
+using System.Linq;
 using System.Windows.Controls;
 
-using FeedCenter.Properties;
-
 namespace FeedCenter.Options
 {
     public partial class DisplayOptionsPanel
@@ -35,13 +34,11 @@ namespace FeedCenter.Options
             if (displayEmptyFeedsCheckBox.IsChecked.HasValue && Settings.Default.DisplayEmptyFeeds != displayEmptyFeedsCheckBox.IsChecked.Value)
                 Settings.Default.DisplayEmptyFeeds = displayEmptyFeedsCheckBox.IsChecked.Value;
 
-            Dock dock = (Dock) ((ComboBoxItem) toolbarLocationComboBox.SelectedItem).Tag;
-            if (Settings.Default.ToolbarLocation != dock)
-                Settings.Default.ToolbarLocation = dock;
+            var dock = (Dock) ((ComboBoxItem) toolbarLocationComboBox.SelectedItem).Tag;
+            Settings.Default.ToolbarLocation = dock;
 
-            MultipleLineDisplay multipleLineDisplay = (MultipleLineDisplay) ((ComboBoxItem) multipleLineDisplayComboBox.SelectedItem).Tag;
-            if (Settings.Default.MultipleLineDisplay != multipleLineDisplay)
-                Settings.Default.MultipleLineDisplay = multipleLineDisplay;
+            var multipleLineDisplay = (MultipleLineDisplay) ((ComboBoxItem) multipleLineDisplayComboBox.SelectedItem).Tag;
+            Settings.Default.MultipleLineDisplay = multipleLineDisplay;
         }
 
         public override string CategoryName
diff --git a/Options/FeedWindow.xaml b/Options/FeedWindow.xaml
index cb2f81d..55c735d 100644
--- a/Options/FeedWindow.xaml
+++ b/Options/FeedWindow.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:Properties="clr-namespace:FeedCenter.Properties"
-        xmlns:Options="clr-namespace:FeedCenter.Options"
+        xmlns:feedCenter="clr-namespace:FeedCenter"
         Title="FeedWindow"
         Height="300"
         Width="450"
@@ -10,7 +10,7 @@
         Icon="/FeedCenter;component/Resources/Application.ico"
         FocusManager.FocusedElement="{Binding ElementName=urlTextBox}">
     <Window.Resources>
-        <Options:MultipleOpenActionConverter x:Key="multipleOpenActionConverter" />
+        <feedCenter:MultipleOpenActionConverter x:Key="multipleOpenActionConverter" />
     </Window.Resources>
     <Grid Name="mainGrid">
         <TabControl Name="optionsTabControl"
@@ -116,9 +116,9 @@
                               Margin="6">
 
                         <ComboBoxItem Content="{x:Static Properties:Resources.openAllSingleToolbarButton}"
-                                      Tag="{x:Static Options:MultipleOpenAction.SinglePage}" />
+                                      Tag="{x:Static feedCenter:MultipleOpenAction.SinglePage}" />
                         <ComboBoxItem Content="{x:Static Properties:Resources.openAllMultipleToolbarButton}"
-                                      Tag="{x:Static Options:MultipleOpenAction.IndividualPages}" />
+                                      Tag="{x:Static feedCenter:MultipleOpenAction.IndividualPages}" />
                     </ComboBox>
                 </Grid>
             </TabItem>
diff --git a/Options/FeedsOptionsPanel.xaml.cs b/Options/FeedsOptionsPanel.xaml.cs
index 1e33d46..81fc2ea 100644
--- a/Options/FeedsOptionsPanel.xaml.cs
+++ b/Options/FeedsOptionsPanel.xaml.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using Microsoft.Win32;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Windows;
@@ -6,7 +7,6 @@ using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Xml;
-using Microsoft.Win32;
 
 namespace FeedCenter.Options
 {
@@ -27,7 +27,7 @@ namespace FeedCenter.Options
         {
             base.LoadPanel(database);
 
-            CollectionViewSource collectionViewSource = new CollectionViewSource { Source = Database.AllCategories };
+            var collectionViewSource = new CollectionViewSource { Source = Database.AllCategories };
             collectionViewSource.SortDescriptions.Add(new SortDescription("SortKey", ListSortDirection.Ascending));
             collectionViewSource.SortDescriptions.Add(new SortDescription("Name", ListSortDirection.Ascending));
 
@@ -61,15 +61,15 @@ namespace FeedCenter.Options
 
         private void AddFeed()
         {
-            Feed feed = new Feed();
+            var feed = Feed.Create();
 
-            FeedWindow feedWindow = new FeedWindow();
+            var feedWindow = new FeedWindow();
 
-            bool? result = feedWindow.Display(Database, feed, Window.GetWindow(this));
+            var result = feedWindow.Display(Database, feed, Window.GetWindow(this));
 
             if (result.HasValue && result.Value)
             {
-                Database.Feeds.AddObject(feed);
+                Database.Feeds.Add(feed);
 
                 feedListBox.SelectedItem = feed;
 
@@ -82,18 +82,18 @@ namespace FeedCenter.Options
             if (feedListBox.SelectedItem == null)
                 return;
 
-            Feed feed = (Feed) feedListBox.SelectedItem;
+            var feed = (Feed) feedListBox.SelectedItem;
 
-            FeedWindow feedWindow = new FeedWindow();
+            var feedWindow = new FeedWindow();
 
             feedWindow.Display(Database, feed, Window.GetWindow(this));
         }
 
         private void DeleteSelectedFeed()
         {
-            Feed feed = (Feed) feedListBox.SelectedItem;
+            var feed = (Feed) feedListBox.SelectedItem;
 
-            Database.Feeds.DeleteObject(feed);
+            Database.Feeds.Remove(feed);
 
             SetFeedButtonStates();
         }
@@ -134,20 +134,20 @@ namespace FeedCenter.Options
         private void ExportFeeds()
         {
             // Setup the save file dialog
-            SaveFileDialog saveFileDialog = new SaveFileDialog
+            var saveFileDialog = new SaveFileDialog
             {
                 Filter = Properties.Resources.ImportExportFilter,
                 FilterIndex = 0,
                 OverwritePrompt = true
             };
 
-            bool? result = saveFileDialog.ShowDialog();
+            var result = saveFileDialog.ShowDialog();
 
-            if (!result.Value)
+            if (!result.GetValueOrDefault(false))
                 return;
 
             // Setup the writer settings
-            XmlWriterSettings writerSettings = new XmlWriterSettings
+            var writerSettings = new XmlWriterSettings
             {
                 Indent = true,
                 CheckCharacters = true,
@@ -155,7 +155,7 @@ namespace FeedCenter.Options
             };
 
             // Create an XML writer for the file chosen
-            XmlWriter xmlWriter = XmlWriter.Create(saveFileDialog.FileName, writerSettings);
+            var xmlWriter = XmlWriter.Create(saveFileDialog.FileName, writerSettings);
 
             // Start the opml element
             xmlWriter.WriteStartElement("opml");
@@ -164,7 +164,7 @@ namespace FeedCenter.Options
             xmlWriter.WriteStartElement("body");
 
             // Loop over each feed
-            foreach (Feed feed in Database.Feeds.OrderBy(feed => feed.Name))
+            foreach (var feed in Database.Feeds.OrderBy(feed => feed.Name))
             {
                 // Start the outline element
                 xmlWriter.WriteStartElement("outline");
@@ -196,22 +196,22 @@ namespace FeedCenter.Options
         private void ImportFeeds()
         {
             // Setup the open file dialog
-            OpenFileDialog openFileDialog = new OpenFileDialog
+            var openFileDialog = new OpenFileDialog
             {
                 Filter = Properties.Resources.ImportExportFilter,
                 FilterIndex = 0
             };
 
-            bool? result = openFileDialog.ShowDialog();
+            var result = openFileDialog.ShowDialog();
 
-            if (!result.Value)
+            if (!result.GetValueOrDefault(false))
                 return;
 
             // Setup the reader settings
-            XmlReaderSettings xmlReaderSettings = new XmlReaderSettings { IgnoreWhitespace = true };
+            var xmlReaderSettings = new XmlReaderSettings { IgnoreWhitespace = true };
 
             // Create an XML reader for the file chosen
-            XmlReader xmlReader = XmlReader.Create(openFileDialog.FileName, xmlReaderSettings);
+            var xmlReader = XmlReader.Create(openFileDialog.FileName, xmlReaderSettings);
 
             try
             {
@@ -228,7 +228,8 @@ namespace FeedCenter.Options
                 while (xmlReader.NodeType != XmlNodeType.EndElement)
                 {
                     // Create a new feed
-                    Feed feed = new Feed { Category = Database.Categories.ToList().First(c => c.IsDefault) };
+                    var feed = Feed.Create();
+                    feed.Category = Database.Categories.ToList().First(c => c.IsDefault);
 
                     // Loop over all attributes
                     while (xmlReader.MoveToNextAttribute())
@@ -259,7 +260,7 @@ namespace FeedCenter.Options
                         feed.Name = feed.Title;
 
                     // Add the feed to the main list
-                    Database.Feeds.AddObject(feed);
+                    Database.Feeds.Add(feed);
 
                     // Move back to the element node
                     xmlReader.MoveToElement();
@@ -293,15 +294,15 @@ namespace FeedCenter.Options
 
         private void AddCategory()
         {
-            Category category = new Category();
+            var category = Category.Create();
 
-            CategoryWindow categoryWindow = new CategoryWindow();
+            var categoryWindow = new CategoryWindow();
 
-            bool? result = categoryWindow.Display(category, Window.GetWindow(this));
+            var result = categoryWindow.Display(category, Window.GetWindow(this));
 
             if (result.HasValue && result.Value)
             {
-                Database.Categories.AddObject(category);
+                Database.Categories.Add(category);
 
                 categoryListBox.SelectedItem = category;
 
@@ -314,18 +315,18 @@ namespace FeedCenter.Options
             if (categoryListBox.SelectedItem == null)
                 return;
 
-            Category category = (Category) categoryListBox.SelectedItem;
+            var category = (Category) categoryListBox.SelectedItem;
 
-            CategoryWindow categoryWindow = new CategoryWindow();
+            var categoryWindow = new CategoryWindow();
 
             categoryWindow.Display(category, Window.GetWindow(this));
         }
 
         private void DeleteSelectedCategory()
         {
-            Category category = (Category) categoryListBox.SelectedItem;
+            var category = (Category) categoryListBox.SelectedItem;
 
-            Database.Categories.DeleteObject(category);
+            Database.Categories.Remove(category);
 
             SetCategoryButtonStates();
         }
@@ -357,14 +358,14 @@ namespace FeedCenter.Options
         {
             if (_collectionViewSource == null)
             {
-                _collectionViewSource = new CollectionViewSource {Source = Database.AllFeeds};
+                _collectionViewSource = new CollectionViewSource { Source = Database.AllFeeds };
                 _collectionViewSource.SortDescriptions.Add(new SortDescription("Name", ListSortDirection.Ascending));
                 _collectionViewSource.Filter += HandleCollectionViewSourceFilter;
 
                 feedListBox.ItemsSource = _collectionViewSource.View;
             }
 
-            _collectionViewSource.View.Refresh();            
+            _collectionViewSource.View.Refresh();
 
             if (feedListBox.Items.Count > 0)
                 feedListBox.SelectedIndex = 0;
@@ -374,20 +375,20 @@ namespace FeedCenter.Options
 
         private void HandleCollectionViewSourceFilter(object sender, FilterEventArgs e)
         {
-            Category selectedCategory = (Category) categoryListBox.SelectedItem;
+            var selectedCategory = (Category) categoryListBox.SelectedItem;
 
-            Feed feed = (Feed) e.Item;
+            var feed = (Feed) e.Item;
 
             e.Accepted = (feed.Category == selectedCategory);
         }
 
         private void HandleTextBlockDrop(object sender, DragEventArgs e)
         {
-            List<Feed> feedList = (List<Feed>) e.Data.GetData(typeof(List<Feed>));
+            var feedList = (List<Feed>) e.Data.GetData(typeof(List<Feed>));
 
-            Category category = (Category) ((DataGridRow) sender).Item;
+            var category = (Category) ((DataGridRow) sender).Item;
 
-            foreach (Feed feed in feedList)
+            foreach (var feed in feedList)
                 feed.Category = category;
 
             _collectionViewSource.View.Refresh();
@@ -399,7 +400,7 @@ namespace FeedCenter.Options
         {
             if (e.LeftButton == MouseButtonState.Pressed)
             {
-                List<Feed> selectedItems = feedListBox.SelectedItems.Cast<Feed>().ToList();
+                var selectedItems = feedListBox.SelectedItems.Cast<Feed>().ToList();
 
                 DragDrop.DoDragDrop(feedListBox, selectedItems, DragDropEffects.Move);
             }
@@ -407,14 +408,14 @@ namespace FeedCenter.Options
 
         private void HandleTextBlockDragEnter(object sender, DragEventArgs e)
         {
-            DataGridRow dataGridRow = (DataGridRow) sender;
+            var dataGridRow = (DataGridRow) sender;
 
             dataGridRow.FontWeight = FontWeights.Bold;
         }
 
         private void HandleTextBlockDragLeave(object sender, DragEventArgs e)
         {
-            DataGridRow dataGridRow = (DataGridRow) sender;
+            var dataGridRow = (DataGridRow) sender;
 
             dataGridRow.FontWeight = FontWeights.Normal;
         }
@@ -426,7 +427,7 @@ namespace FeedCenter.Options
 
         private void HandleMultipleEditClick(object sender, RoutedEventArgs e)
         {
-            BulkFeedWindow bulkFeedWindow = new BulkFeedWindow();
+            var bulkFeedWindow = new BulkFeedWindow();
             bulkFeedWindow.Display(Window.GetWindow(this), Database);
         }
     }
diff --git a/Options/Options.cs b/Options/Options.cs
index 7c46bd9..63426e2 100644
--- a/Options/Options.cs
+++ b/Options/Options.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace FeedCenter.Options
+namespace FeedCenter.Options
 {
     public enum MultipleLineDisplay
     {
@@ -10,24 +6,4 @@ namespace FeedCenter.Options
         SingleLine,
         FirstLine
     }
-
-    public enum MultipleOpenAction
-    {
-        IndividualPages,
-        SinglePage
-    }
-
-    [ValueConversion(typeof(int), typeof(MultipleOpenAction))]
-    public class MultipleOpenActionConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return (MultipleOpenAction) value;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return (int) value;
-        }
-    }
 }
diff --git a/Options/UpdateOptionsPanel.xaml.cs b/Options/UpdateOptionsPanel.xaml.cs
index f136de6..27ac9c2 100644
--- a/Options/UpdateOptionsPanel.xaml.cs
+++ b/Options/UpdateOptionsPanel.xaml.cs
@@ -1,6 +1,6 @@
 namespace FeedCenter.Options
 {
-    public partial class UpdateOptionsPanel 
+    public partial class UpdateOptionsPanel
     {
         public UpdateOptionsPanel()
         {
diff --git a/Setting.cs b/Setting.cs
new file mode 100644
index 0000000..da4192b
--- /dev/null
+++ b/Setting.cs
@@ -0,0 +1,21 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FeedCenter
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class Setting
+    {
+        public string Name { get; set; }
+        public string Value { get; set; }
+        public string Version { get; set; }
+    }
+}
diff --git a/SettingsStore.cs b/SettingsStore.cs
index 8bf6102..0d815aa 100644
--- a/SettingsStore.cs
+++ b/SettingsStore.cs
@@ -7,14 +7,14 @@ namespace FeedCenter
     {
         public static object OpenDataStore()
         {
-            FeedCenterEntities entities = new FeedCenterEntities();
+            var entities = new FeedCenterEntities();
 
-            return entities.DatabaseExists() ? entities : null;
+            return entities.Database.Exists() ? entities : null;
         }
 
         public static void CloseDataStore(object dataStore)
         {
-            FeedCenterEntities entities = (FeedCenterEntities) dataStore;
+            var entities = (FeedCenterEntities) dataStore;
 
             if (entities == null)
                 return;
@@ -26,25 +26,25 @@ namespace FeedCenter
 
         public static string GetSettingValue(object dataStore, string name, string version)
         {
-            FeedCenterEntities entities = (FeedCenterEntities) dataStore;
+            var entities = (FeedCenterEntities) dataStore;
 
             if (entities == null)
                 return null;
 
-            Setting setting = entities.Settings.FirstOrDefault(s => s.Name == name && s.Version == version);
+            var setting = entities.Settings.FirstOrDefault(s => s.Name == name && s.Version == version);
 
             return setting == null ? null : setting.Value;
         }
 
         public static void SetSettingValue(object dataStore, string name, string version, string value)
         {
-            FeedCenterEntities entities = (FeedCenterEntities) dataStore;
+            var entities = (FeedCenterEntities) dataStore;
 
             if (entities == null)
                 return;
 
             // Try to get the setting from the database that matches the name and version
-            Setting setting = entities.Settings.FirstOrDefault(s => s.Name == name && s.Version == version);
+            var setting = entities.Settings.FirstOrDefault(s => s.Name == name && s.Version == version);
 
             // If there was no setting we need to create it
             if (setting == null)
@@ -53,7 +53,7 @@ namespace FeedCenter
                 setting = new Setting { Name = name, Version = version };
 
                 // Add the setting to the database
-                entities.Settings.AddObject(setting);
+                entities.Settings.Add(setting);
             }
 
             // Set the value into the setting
@@ -62,7 +62,7 @@ namespace FeedCenter
 
         public static List<string> GetVersionList(object dataStore)
         {
-            FeedCenterEntities entities = (FeedCenterEntities) dataStore;
+            var entities = (FeedCenterEntities) dataStore;
 
             if (entities == null)
                 return null;
@@ -73,7 +73,7 @@ namespace FeedCenter
 
         public static void DeleteSettingsForVersion(object dataStore, string version)
         {
-            FeedCenterEntities entities = (FeedCenterEntities) dataStore;
+            var entities = (FeedCenterEntities) dataStore;
 
             if (entities == null)
                 return;
@@ -82,8 +82,8 @@ namespace FeedCenter
             var settings = entities.Settings.Where(setting => setting.Version == version);
 
             // Delete each setting
-            foreach (Setting setting in settings)
-                entities.Settings.DeleteObject(setting);
+            foreach (var setting in settings)
+                entities.Settings.Remove(setting);
         }
     }
 }
diff --git a/SplashWindow.xaml.cs b/SplashWindow.xaml.cs
index d265c66..b4d1679 100644
--- a/SplashWindow.xaml.cs
+++ b/SplashWindow.xaml.cs
@@ -1,4 +1,7 @@
-using System;
+using Common.Debug;
+using FeedCenter.Data;
+using FeedCenter.Properties;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Deployment.Application;
@@ -6,10 +9,6 @@ using System.Threading;
 using System.Windows;
 using System.Windows.Threading;
 
-using Common.Debug;
-using FeedCenter.Data;
-using FeedCenter.Properties;
-
 namespace FeedCenter
 {
     public partial class SplashWindow
@@ -103,7 +102,7 @@ namespace FeedCenter
             progressBar.Value += e.ProgressPercentage;
 
             // Get the message
-            string message = (string) e.UserState;
+            var message = (string) e.UserState;
 
             // Update the status label if one was supplied
             if (!string.IsNullOrEmpty(message))
diff --git a/VersionCheck.cs b/VersionCheck.cs
index ac91603..97cab28 100644
--- a/VersionCheck.cs
+++ b/VersionCheck.cs
@@ -1,11 +1,9 @@
-using System;
+using Common.Debug;
+using FeedCenter.Properties;
+using System;
 using System.ComponentModel;
 using System.Deployment.Application;
 using System.Windows;
-
-using Common.Debug;
-
-using FeedCenter.Properties;
 using Application = System.Windows.Forms.Application;
 
 namespace FeedCenter
diff --git a/app.config b/app.config
index 0f37a9b..58576ca 100644
--- a/app.config
+++ b/app.config
@@ -1,12 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="FeedCenter.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+      <section name="FeedCenter.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     </sectionGroup>
     <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="FeedCenter.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+      <section name="FeedCenter.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     </sectionGroup>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
   <userSettings>
     <FeedCenter.Properties.Settings>
@@ -32,7 +35,7 @@
         <value>True</value>
       </setting>
       <setting name="LastVersionCheck" serializeAs="String">
-        <value/>
+        <value />
       </setting>
       <setting name="StartWithWindows" serializeAs="String">
         <value>False</value>
@@ -50,7 +53,7 @@
         <value>False</value>
       </setting>
       <setting name="Browser" serializeAs="String">
-        <value/>
+        <value />
       </setting>
       <setting name="OpenAllSleepIntervalFirst" serializeAs="String">
         <value>1500</value>
@@ -80,7 +83,7 @@
     </FeedCenter.Properties.Settings>
   </applicationSettings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />
   </startup>
   <!--<system.data>
     <DbProviderFactories>
@@ -89,6 +92,23 @@
     </DbProviderFactories>
   </system.data>-->
   <connectionStrings>
-    <add name="FeedCenterEntities" connectionString="metadata=res://*/Model.csdl|res://*/Model.ssdl|res://*/Model.msl;provider=System.Data.SqlServerCe.4.0;provider connection string=&quot;Data Source=|DataDirectory|\FeedCenter.sdf&quot;" providerName="System.Data.EntityClient"/>
+    <add name="FeedCenterEntities" connectionString="metadata=res://*/Model.csdl|res://*/Model.ssdl|res://*/Model.msl;provider=System.Data.SqlServerCe.4.0;provider connection string=&quot;Data Source=|DataDirectory|\FeedCenter.sdf&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
-</configuration>
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlCeConnectionFactory, EntityFramework">
+      <parameters>
+        <parameter value="System.Data.SqlServerCe.4.0" />
+      </parameters>
+    </defaultConnectionFactory>
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+      <provider invariantName="System.Data.SqlServerCe.4.0" type="System.Data.Entity.SqlServerCompact.SqlCeProviderServices, EntityFramework.SqlServerCompact" />
+    </providers>
+  </entityFramework>
+  <system.data>
+    <DbProviderFactories>
+      <remove invariant="System.Data.SqlServerCe.4.0" />
+      <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
+    </DbProviderFactories>
+  </system.data>
+</configuration>
\ No newline at end of file
diff --git a/packages.config b/packages.config
index d489f05..025c4e5 100644
--- a/packages.config
+++ b/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Bcl" version="1.1.8" targetFramework="net45" />
-  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
+  <package id="EntityFramework" version="6.1.1" targetFramework="net451" />
+  <package id="EntityFramework.SqlServerCompact" version="6.1.1" targetFramework="net451" />
+  <package id="Microsoft.SqlServer.Compact" version="4.0.8854.1" targetFramework="net451" />
 </packages>
\ No newline at end of file