diff --git a/MPfm/MPfm.Android/Classes/Adapters/PlaylistListAdapter.cs b/MPfm/MPfm.Android/Classes/Adapters/PlaylistListAdapter.cs
index ed753ce9..2f750bfa 100644
--- a/MPfm/MPfm.Android/Classes/Adapters/PlaylistListAdapter.cs
+++ b/MPfm/MPfm.Android/Classes/Adapters/PlaylistListAdapter.cs
@@ -25,23 +25,24 @@
 using MPfm.Core;
 using MPfm.MVP.Models;
 using MPfm.Player.Objects;
+using MPfm.Sound.Playlists;
 
 namespace MPfm.Android.Classes.Adapters
 {
-    public class PlaylistListAdapter : BaseAdapter<PlaylistEntity>
+    public class PlaylistListAdapter : BaseAdapter<Playlist>
     {
         readonly Activity _context;
         readonly ListView _listView;
-        List<PlaylistEntity> _playlists;
+        List<Playlist> _playlists;
 
-        public PlaylistListAdapter(Activity context, ListView listView, List<PlaylistEntity> playlists)
+        public PlaylistListAdapter(Activity context, ListView listView, List<Playlist> playlists)
         {
             _context = context;
             _listView = listView;
             _playlists = playlists;
         }
 
-        public void SetData(List<PlaylistEntity> playlists)
+        public void SetData(List<Playlist> playlists)
         {
             _playlists = playlists;
             NotifyDataSetChanged();
@@ -52,7 +53,7 @@ public override long GetItemId(int position)
             return position;
         }
 
-        public override PlaylistEntity this[int position]
+        public override Playlist this[int position]
         {
             get { return _playlists[position]; }
         }
@@ -70,7 +71,7 @@ public override View GetView(int position, View convertView, ViewGroup parent)
                 view = _context.LayoutInflater.Inflate(Resource.Layout.PlaylistCell, null);
 
             var title = view.FindViewById<TextView>(Resource.Id.playlistcell_title);
-            title.Text = _playlists[position].Title;
+            title.Text = _playlists[position].Name;
 
             return view;
         }
diff --git a/MPfm/MPfm.Android/Classes/Fragments/AddNewPlaylistFragment.cs b/MPfm/MPfm.Android/Classes/Fragments/AddNewPlaylistFragment.cs
index e4ce8c41..12a38011 100644
--- a/MPfm/MPfm.Android/Classes/Fragments/AddNewPlaylistFragment.cs
+++ b/MPfm/MPfm.Android/Classes/Fragments/AddNewPlaylistFragment.cs
@@ -54,7 +54,11 @@ public override View OnCreateView(LayoutInflater inflater, ViewGroup container,
             _btnCancel = _view.FindViewById<Button>(Resource.Id.addNewPlaylist_btnCancel);
             _btnCreate = _view.FindViewById<Button>(Resource.Id.addNewPlaylist_btnCreate);
             _btnCancel.Click += (sender, args) => Dismiss();
-            _btnCreate.Click += (sender, args) => { };
+            _btnCreate.Click += (sender, args) =>
+            {
+                OnSavePlaylist(_txtName.Text);
+                Dismiss();
+            };
             _btnCreate.Enabled = false;
 
             _txtName.TextChanged += (sender, args) => _btnCreate.Enabled = _txtName.Text.Length > 0;
@@ -74,6 +78,14 @@ public override void OnCreate(Bundle savedInstanceState)
 
         public void AddNewPlaylistError(Exception ex)
         {
+            Activity.RunOnUiThread(() =>
+            {
+                AlertDialog ad = new AlertDialog.Builder(Activity).Create();
+                ad.SetCancelable(false);
+                ad.SetMessage(string.Format("An error has occured in AddNewPlaylist: {0}", ex));
+                ad.SetButton("OK", (sender, args) => ad.Dismiss());
+                ad.Show();
+            });
         }
 
         #endregion
diff --git a/MPfm/MPfm.Android/Classes/Fragments/SelectPlaylistFragment.cs b/MPfm/MPfm.Android/Classes/Fragments/SelectPlaylistFragment.cs
index 2c415f66..c07b83bf 100644
--- a/MPfm/MPfm.Android/Classes/Fragments/SelectPlaylistFragment.cs
+++ b/MPfm/MPfm.Android/Classes/Fragments/SelectPlaylistFragment.cs
@@ -28,12 +28,13 @@
 using MPfm.MVP.Models;
 using MPfm.MVP.Presenters;
 using MPfm.MVP.Views;
+using MPfm.Sound.Playlists;
 
 namespace MPfm.Android.Classes.Fragments
 {
     public class SelectPlaylistFragment : BaseDialogFragment, ISelectPlaylistView
     {
-        private List<PlaylistEntity> _playlists;
+        private List<Playlist> _playlists;
         private PlaylistListAdapter _listAdapter;
         private View _view;
         private ListView _listView;
@@ -66,13 +67,9 @@ public override View OnCreateView(LayoutInflater inflater, ViewGroup container,
                 //_parentFragment.OnAddItemToPlaylist(_position);
                 Dismiss();
             };
-            _btnAddNewPlaylist.Click += (sender, args) =>
-            {
-                var fragment = new AddNewPlaylistFragment();
-                fragment.Show(FragmentManager, "AddNewPlaylistFragment");
-            };
+            _btnAddNewPlaylist.Click += (sender, args) => OnAddNewPlaylist();
 
-            _playlists = new List<PlaylistEntity>();
+            _playlists = new List<Playlist>();
             _listAdapter = new PlaylistListAdapter(Activity, _listView, _playlists);
             _listView.SetAdapter(_listAdapter);
             _listView.ItemClick += ListViewOnItemClick;
@@ -94,7 +91,7 @@ public override void OnCreate(Bundle savedInstanceState)
         #region ISelectPlaylistView implementation
 
         public Action OnAddNewPlaylist { get; set; }
-        public Action<PlaylistEntity> OnSelectPlaylist { get; set; }
+        public Action<Playlist> OnSelectPlaylist { get; set; }
         
         public void SelectPlaylistError(Exception ex)
         {
@@ -108,7 +105,7 @@ public void SelectPlaylistError(Exception ex)
             });
         }
 
-        public void RefreshPlaylists(List<PlaylistEntity> playlists)
+        public void RefreshPlaylists(List<Playlist> playlists)
         {
             Activity.RunOnUiThread(() =>
             {
diff --git a/MPfm/MPfm.Android/Resources/Layout/AddNewPlaylist.axml b/MPfm/MPfm.Android/Resources/Layout/AddNewPlaylist.axml
index 40eda8af..2b05032e 100644
--- a/MPfm/MPfm.Android/Resources/Layout/AddNewPlaylist.axml
+++ b/MPfm/MPfm.Android/Resources/Layout/AddNewPlaylist.axml
@@ -7,20 +7,29 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:padding="12dp"      
+    android:paddingTop="12dp" 
+    android:paddingLeft="12dp" 
+    android:paddingRight="12dp" 
+    android:paddingBottom="0dp" 
     android:text="Please enter a name for the new playlist:"
     android:textColor="#AAAAAA"
     android:textSize="14dp" />
   <EditText
     android:id="@+id/addNewPlaylist_txtName"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:padding="12dp"
+    android:layout_height="wrap_content"    
+    android:paddingTop="2dp"
+    android:paddingBottom="0dp"
+    android:paddingLeft="12dp"
+    android:paddingRight="12dp"
+    android:singleLine="true"
+    android:lines="1"
     android:textSize="16dp"
     android:textColor="#FFFFFF" />
   <LinearLayout
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content"    
+    android:layout_height="wrap_content"
+    android:layout_marginTop="4dp"
     android:orientation="horizontal">
     <Button
       android:id="@+id/addNewPlaylist_btnCancel"
diff --git a/MPfm/MPfm.Android/Resources/Layout/LibraryPreferences.axml b/MPfm/MPfm.Android/Resources/Layout/LibraryPreferences.axml
index 4fe79ac5..7f5a0e32 100644
--- a/MPfm/MPfm.Android/Resources/Layout/LibraryPreferences.axml
+++ b/MPfm/MPfm.Android/Resources/Layout/LibraryPreferences.axml
@@ -41,6 +41,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"        
         android:layout_marginTop="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"        
         android:background="@drawable/button_selector"
         android:text="Reset Library"
         android:textColor="@color/button_textcolor"
@@ -51,6 +53,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
         android:background="@drawable/button_selector"
         android:text="Update Library"
         android:textColor="@color/button_textcolor"        
diff --git a/MPfm/MPfm.Core/DatabaseFieldMap.cs b/MPfm/MPfm.Core/DatabaseFieldMap.cs
new file mode 100644
index 00000000..0fc3e04f
--- /dev/null
+++ b/MPfm/MPfm.Core/DatabaseFieldMap.cs
@@ -0,0 +1,38 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+namespace MPfm.Core
+{
+    public class DatabaseFieldMap
+    {
+        public string PropertyName { get; set; }
+        public string FieldName { get; set; }
+        public bool SaveToDatabase { get; set; }
+
+        public DatabaseFieldMap()
+        {
+            SaveToDatabase = true;
+        }
+
+        public DatabaseFieldMap(string propertyName, string fieldName, bool saveToDatabase)
+        {
+            PropertyName = propertyName;
+            FieldName = fieldName;
+            SaveToDatabase = saveToDatabase;
+        }
+    }
+}
diff --git a/MPfm/MPfm.Core/MPfm.Core.Android.csproj b/MPfm/MPfm.Core/MPfm.Core.Android.csproj
index b1966a67..e051df1e 100644
--- a/MPfm/MPfm.Core/MPfm.Core.Android.csproj
+++ b/MPfm/MPfm.Core/MPfm.Core.Android.csproj
@@ -95,6 +95,7 @@
   <ItemGroup>
     <Compile Include="Conversion.cs" />
     <Compile Include="Attributes\DatabaseFieldAttribute.cs" />
+    <Compile Include="DatabaseFieldMap.cs" />
     <Compile Include="Extensions\DictionaryExtension.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Tracing.cs" />
diff --git a/MPfm/MPfm.Library/Database/DatabaseFacade.cs b/MPfm/MPfm.Library/Database/DatabaseFacade.cs
index cabe46c7..0550f6c2 100644
--- a/MPfm/MPfm.Library/Database/DatabaseFacade.cs
+++ b/MPfm/MPfm.Library/Database/DatabaseFacade.cs
@@ -23,6 +23,7 @@
 using MPfm.Library.Objects;
 using MPfm.Player.Objects;
 using MPfm.Sound.AudioFiles;
+using MPfm.Sound.Playlists;
 
 namespace MPfm.Library.Database
 {
@@ -609,8 +610,7 @@ public void UpdateLoop(Loop dto)
         /// </summary>
         /// <param name="loopId">Loop to delete</param>
         public void DeleteLoop(Guid loopId)
-        {
-            // Delete loop
+        {            
             _gateway.Delete("Loops", "LoopId", loopId);
         }
 
@@ -618,169 +618,53 @@ public void DeleteLoop(Guid loopId)
 
         #region Playlists
 
-        ///// <summary>
-        ///// Selects all the playlists from the database.
-        ///// </summary>
-        ///// <returns>List of playlists</returns>
-        //public static List<Playlist> SelectPlaylists()
-        //{
-        //    List<Playlist> playlists = null;
-
-        //    try
-        //    {
-        //        // Open the connection
-        //        using (MPFM_EF context = new MPFM_EF())
-        //        {
-        //            playlists = context.Playlists.OrderBy(x => x.PlaylistName).ToList();
-        //        }
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        Tracing.Log("MPfm.Library (DataAccess) --  Error in SelectPlaylists(): " + ex.Message);
-        //        throw ex;
-        //    }
-
-        //    return playlists;
-        //}
-
-        ///// <summary>
-        ///// Selects a playlist from the database, using its identifier.
-        ///// </summary>
-        ///// <param name="playlistId">Playlist identifier</param>
-        ///// <returns>Playlist</returns>
-        //public static Playlist SelectPlaylist(Guid playlistId)
-        //{
-        //    Playlist playlist = null;
-
-        //    try
-        //    {
-        //        // Open the connection
-        //        using (MPFM_EF context = new MPFM_EF())
-        //        {
-        //            string strId = playlistId.ToString();
-        //            playlist = context.Playlists.FirstOrDefault(x => x.PlaylistId == strId);
-        //        }
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        Tracing.Log("MPfm.Library (DataAccess) --  Error in SelectPlaylist(): " + ex.Message);
-        //        throw ex;
-        //    }
-
-        //    return playlist;
-        //}
-
-        ///// <summary>
-        ///// Selects a playlist from the database, using its name.
-        ///// </summary>
-        ///// <param name="playlistName">Playlist name</param>
-        ///// <returns>Playlist</returns>
-        //public static Playlist SelectPlaylist(string playlistName)
-        //{
-        //    Playlist playlist = null;
-
-        //    try
-        //    {
-        //        // Open the connection
-        //        using (MPFM_EF context = new MPFM_EF())
-        //        {
-        //            playlist = context.Playlists.FirstOrDefault(x => x.PlaylistName.ToUpper() == playlistName.ToUpper());
-        //        }
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        Tracing.Log("MPfm.Library (DataAccess) --  Error in SelectPlaylist(): " + ex.Message);
-        //        throw ex;
-        //    }
-
-        //    return playlist;
-        //}
-
-        ///// <summary>
-        ///// Checks if a playlist exists in the database, using its name.
-        ///// </summary>
-        ///// <param name="playlistName">Playlist name</param>
-        ///// <returns>True if the playlist exists</returns>
-        //public static bool PlaylistExists(string playlistName)
-        //{
-        //    // Check if playlist exists
-        //    if (SelectPlaylist(playlistName) != null)
-        //    {
-        //        return true;
-        //    }
+        /// <summary>
+        /// Selects all the playlists from the database.
+        /// </summary>
+        /// <returns>List of playlists</returns>
+        public List<Playlist> SelectPlaylists()
+        {
+            List<Playlist> playlists = _gateway.Select<Playlist>("SELECT * FROM Playlists");
+            return playlists;
+        }
 
-        //    return false;
-        //}
+        /// <summary>
+        /// Selects a playlist from the database, using its identifier.
+        /// </summary>
+        /// <param name="playlistId">Playlist identifier</param>
+        /// <returns>Playlist</returns>
+        public Playlist SelectPlaylist(Guid playlistId)
+        {
+            Playlist playlist = _gateway.SelectOne<Playlist>("SELECT * FROM Playlists WHERE PlaylistId = '" + playlistId.ToString() + "'");
+            return playlist;
+        }
 
-        ///// <summary>
-        ///// Inserts a playlist into the database.
-        ///// </summary>
-        ///// <param name="playlist">Playlist to insert</param>
-        //public static void InsertPlaylist(Playlist playlist)
-        //{
-        //    try
-        //    {
-        //        // Open the connection
-        //        using (MPFM_EF context = new MPFM_EF())
-        //        {
-        //            // Add to database
-        //            context.AddToPlaylists(playlist);
-        //            context.SaveChanges();
-        //        }
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        Tracing.Log("MPfm.Library (DataAccess) --  Error in InsertPlaylist(): " + ex.Message);
-        //        throw ex;
-        //    }
-        //}
+        /// <summary>
+        /// Inserts a playlist into the database.
+        /// </summary>
+        /// <param name="playlist">Playlist to insert</param>
+        public void InsertPlaylist(Playlist playlist)
+        {
+            _gateway.Insert<Playlist>(playlist, "Playlists");
+        }
 
-        ///// <summary>
-        ///// Updates a playlist in the database.
-        ///// </summary>
-        ///// <param name="playlist">Playlist to update</param>
-        //public static void UpdatePlaylist(Playlist playlist)
-        //{
-        //    try
-        //    {
-        //        // Open the connection
-        //        using (MPFM_EF context = new MPFM_EF())
-        //        {
-        //            Playlist playlistToModify = context.Playlists.FirstOrDefault(x => x.PlaylistId == playlist.PlaylistId);
-        //            if (playlistToModify != null)
-        //            {
-        //                playlistToModify.PlaylistName = playlist.PlaylistName;
-        //                context.SaveChanges();
-        //            }
-        //        }
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        Tracing.Log("MPfm.Library (DataAccess) --  Error in UpdatePlaylist(): " + ex.Message);
-        //        throw ex;
-        //    }
-        //}
+        /// <summary>
+        /// Updates a playlist in the database.
+        /// </summary>
+        /// <param name="playlist">Playlist to update</param>
+        public void UpdatePlaylist(Playlist playlist)
+        {
+            _gateway.Update<Playlist>(playlist, "Playlists", "PlaylistId", playlist.PlaylistId.ToString());
+        }
 
-        ///// <summary>
-        ///// Deletes a playlist from the database.
-        ///// </summary>
-        ///// <param name="playlistId">Playlist identifier to delete</param>
-        //public static void DeletePlaylist(Guid playlistId)
-        //{
-        //    try
-        //    {
-        //        // Open the connection
-        //        using (MPFM_EF context = new MPFM_EF())
-        //        {
-        //            ExecuteSql(context, "DELETE FROM Playlists WHERE PlaylistId = @PlaylistId", new SQLiteParameter("PlaylistId", playlistId.ToString()));
-        //        }
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        Tracing.Log("MPfm.Library (DataAccess) --  Error in DeletePlaylist(): " + ex.Message);
-        //        throw ex;
-        //    }
-        //}
+        /// <summary>
+        /// Deletes a playlist from the database.
+        /// </summary>
+        /// <param name="playlistId">Playlist identifier to delete</param>
+        public void DeletePlaylist(Guid playlistId)
+        {
+            _gateway.Delete("Playlists", "PlaylistId", playlistId);
+        }
 
         #endregion
 
diff --git a/MPfm/MPfm.Library/Database/Interfaces/IDatabaseFacade.cs b/MPfm/MPfm.Library/Database/Interfaces/IDatabaseFacade.cs
index 8b7b957f..9b2019ff 100644
--- a/MPfm/MPfm.Library/Database/Interfaces/IDatabaseFacade.cs
+++ b/MPfm/MPfm.Library/Database/Interfaces/IDatabaseFacade.cs
@@ -1,85 +1,92 @@
-// Copyright © 2011-2013 Yanick Castonguay
-//
-// This file is part of MPfm.
-//
-// MPfm is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// MPfm is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
-
-using System;
-using System.Collections.Generic;
-using MPfm.Library.Objects;
-using MPfm.Player.Objects;
-using MPfm.Sound.AudioFiles;
-
-namespace MPfm.Library.Database.Interfaces
-{
-    public interface IDatabaseFacade
-    {
-        void DeleteAudioFile(Guid audioFileId);
-        void DeleteAudioFiles(string basePath);
-        void DeleteAudioFiles(string artistName, string albumTitle);
-        void DeleteEQPreset(Guid eqPresetId);
-        void DeleteFolder(Guid folderId);
-        void DeleteFolders();
-        void DeleteLoop(Guid loopId);
-        void DeleteMarker(Guid markerId);
-        void DeletePlaylistFile(string filePath);
-        void DeleteSetting(Guid settingId);
-        void ExecuteSQL(string sql);
-        DateTime? GetAudioFileLastPlayedFromHistory(Guid audioFileId);
-        int GetAudioFilePlayCountFromHistory(Guid audioFileId);
-        void InsertAudioFile(AudioFile audioFile);
-        void InsertEQPreset(EQPreset eq);
-        void InsertFolder(string folderPath, bool recursive);
-        void InsertHistory(Guid audioFileId);
-        void InsertHistory(Guid audioFileId, DateTime eventDateTime);
-        void InsertLoop(Loop dto);
-        void InsertMarker(Marker dto);
-        void InsertPlaylistFile(PlaylistFile dto);
-        void InsertSetting(Setting dto);
-        void InsertSetting(string name, string value);
-        void ResetLibrary();
-		
-		IEnumerable<string> SelectFilePaths();
-        AudioFile SelectAudioFile(Guid audioFileId);
-        List<AudioFile> SelectAudioFiles();
-		List<AudioFile> SelectAudioFiles(AudioFileFormat format, string artistName, string albumTitle, string search);
-        Dictionary<string, List<string>> SelectDistinctAlbumTitles();
-        Dictionary<string, List<string>> SelectDistinctAlbumTitles(AudioFileFormat audioFileFormat);
-		Dictionary<string, List<string>> SelectDistinctAlbumTitles(AudioFileFormat audioFileFormat, string artistName);
-        List<string> SelectDistinctArtistNames();
-        List<string> SelectDistinctArtistNames(AudioFileFormat audioFileFormat);
-        EQPreset SelectEQPreset(string name);
-        EQPreset SelectEQPreset(Guid presetId);
-        List<EQPreset> SelectEQPresets();
-        Folder SelectFolderByPath(string path);
-        List<Folder> SelectFolders();
-        Loop SelectLoop(Guid loopId);
-        List<Loop> SelectLoops();
-        List<Loop> SelectLoops(Guid audioFileId);
-        Marker SelectMarker(Guid markerId);
-        List<Marker> SelectMarkers();
-        List<Marker> SelectMarkers(Guid audioFileId);
-        List<PlaylistFile> SelectPlaylistFiles();
-        Setting SelectSetting(string name);
-        List<Setting> SelectSettings();
-        void UpdateAudioFile(AudioFile audioFile);
-        void UpdateEQPreset(EQPreset eq);
-        void UpdateLoop(Loop dto);
-        void UpdateMarker(Marker dto);
-        void UpdatePlayCount(Guid audioFileId);
-        void UpdateSetting(Setting dto);
-
-		void CompactDatabase();
-    }
-}
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using System.Collections.Generic;
+using MPfm.Library.Objects;
+using MPfm.Player.Objects;
+using MPfm.Sound.AudioFiles;
+using MPfm.Sound.Playlists;
+
+namespace MPfm.Library.Database.Interfaces
+{
+    public interface IDatabaseFacade
+    {
+        void DeleteAudioFile(Guid audioFileId);
+        void DeleteAudioFiles(string basePath);
+        void DeleteAudioFiles(string artistName, string albumTitle);
+        void DeleteEQPreset(Guid eqPresetId);
+        void DeleteFolder(Guid folderId);
+        void DeleteFolders();
+        void DeleteLoop(Guid loopId);
+        void DeleteMarker(Guid markerId);
+        void DeletePlaylistFile(string filePath);
+        void DeleteSetting(Guid settingId);
+        void ExecuteSQL(string sql);
+        DateTime? GetAudioFileLastPlayedFromHistory(Guid audioFileId);
+        int GetAudioFilePlayCountFromHistory(Guid audioFileId);
+        void InsertAudioFile(AudioFile audioFile);
+        void InsertEQPreset(EQPreset eq);
+        void InsertFolder(string folderPath, bool recursive);
+        void InsertHistory(Guid audioFileId);
+        void InsertHistory(Guid audioFileId, DateTime eventDateTime);
+        void InsertLoop(Loop dto);
+        void InsertMarker(Marker dto);
+        void InsertPlaylistFile(PlaylistFile dto);
+        void InsertSetting(Setting dto);
+        void InsertSetting(string name, string value);
+        void ResetLibrary();
+		
+		IEnumerable<string> SelectFilePaths();
+        AudioFile SelectAudioFile(Guid audioFileId);
+        List<AudioFile> SelectAudioFiles();
+		List<AudioFile> SelectAudioFiles(AudioFileFormat format, string artistName, string albumTitle, string search);
+        Dictionary<string, List<string>> SelectDistinctAlbumTitles();
+        Dictionary<string, List<string>> SelectDistinctAlbumTitles(AudioFileFormat audioFileFormat);
+		Dictionary<string, List<string>> SelectDistinctAlbumTitles(AudioFileFormat audioFileFormat, string artistName);
+        List<string> SelectDistinctArtistNames();
+        List<string> SelectDistinctArtistNames(AudioFileFormat audioFileFormat);
+        EQPreset SelectEQPreset(string name);
+        EQPreset SelectEQPreset(Guid presetId);
+        List<EQPreset> SelectEQPresets();
+        Folder SelectFolderByPath(string path);
+        List<Folder> SelectFolders();
+        Loop SelectLoop(Guid loopId);
+        List<Loop> SelectLoops();
+        List<Loop> SelectLoops(Guid audioFileId);
+        Marker SelectMarker(Guid markerId);
+        List<Marker> SelectMarkers();
+        List<Marker> SelectMarkers(Guid audioFileId);
+        List<PlaylistFile> SelectPlaylistFiles();
+        Setting SelectSetting(string name);
+        List<Setting> SelectSettings();
+        void UpdateAudioFile(AudioFile audioFile);
+        void UpdateEQPreset(EQPreset eq);
+        void UpdateLoop(Loop dto);
+        void UpdateMarker(Marker dto);
+        void UpdatePlayCount(Guid audioFileId);
+        void UpdateSetting(Setting dto);
+
+        List<Playlist> SelectPlaylists();
+        Playlist SelectPlaylist(Guid playlistId);
+        void InsertPlaylist(Playlist playlist);
+        void UpdatePlaylist(Playlist playlist);
+        void DeletePlaylist(Guid playlistId);
+
+		void CompactDatabase();
+    }
+}
diff --git a/MPfm/MPfm.Library/Database/Interfaces/ISQLiteGateway.cs b/MPfm/MPfm.Library/Database/Interfaces/ISQLiteGateway.cs
index b524e0c7..62b79a6f 100644
--- a/MPfm/MPfm.Library/Database/Interfaces/ISQLiteGateway.cs
+++ b/MPfm/MPfm.Library/Database/Interfaces/ISQLiteGateway.cs
@@ -17,6 +17,8 @@
 
 using System;
 using System.Collections.Generic;
+using MPfm.Core;
+using MPfm.Core.Attributes;
 #if !WINDOWSSTORE && !WINDOWS_PHONE
 using System.Data.Common;
 #endif
@@ -32,7 +34,7 @@ public interface ISQLiteGateway
         DbConnection GenerateConnection();
         #endif
 
-        Dictionary<string, string> GetMap<T>();
+        List<DatabaseFieldMap> GetMap<T>();
         string FormatSQLValue(object value);
         int Execute(string sql);
         object ExecuteScalar(string sql);
diff --git a/MPfm/MPfm.Library/Database/MonoSQLiteGateway.cs b/MPfm/MPfm.Library/Database/MonoSQLiteGateway.cs
index 34a9b583..bc8bf629 100644
--- a/MPfm/MPfm.Library/Database/MonoSQLiteGateway.cs
+++ b/MPfm/MPfm.Library/Database/MonoSQLiteGateway.cs
@@ -1,769 +1,789 @@
-// Copyright © 2011-2013 Yanick Castonguay
-//
-// This file is part of MPfm.
-//
-// MPfm is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// MPfm is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
-
-#if IOS || ANDROID || MACOSX || LINUX
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.Common;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using MPfm.Core;
-using MPfm.Core.Attributes;
-using MPfm.Core.Extensions;
-using MPfm.Library.Database.Interfaces;
-using Mono.Data.Sqlite;
-
-namespace MPfm.Library.Database
-{
-    /// <summary>
-    /// The MonoSQLiteGateway class is a data adapter class which makes it easier to select, insert, update and delete
-    /// data from the database. It is based on Mono.Data.Sqlite rather than System.Data.SQLite. This gateway must be used
-    /// on Android devices.
-    ///
-    /// Notes: Mono.Data.SQLite doesn't like:    
-    /// - SingleOrDefault -- replaced with FirstOrDefault.
-    /// - compare database varchar to Guid.ToString() -- need to cast guid into string before using value in LIN
-    /// </summary>
-    public class MonoSQLiteGateway : ISQLiteGateway
-    {
-        /// <summary>
-        /// Private value for the DatabaseFilePath property.
-        /// </summary>
-        private string databaseFilePath = string.Empty;
-        /// <summary>
-        /// Database file path.
-        /// </summary>
-        public string DatabaseFilePath
-        {
-            get
-            {
-                return databaseFilePath;
-            }
-        }
-
-        /// <summary>
-        /// Default constructor for the MonoSQLiteGateway class.
-        /// </summary>
-        /// <param name="databaseFilePath">Database file path</param>
-        public MonoSQLiteGateway(string databaseFilePath)
-        {
-            // Initialize factory
-            Tracing.Log("SQLiteGateway init -- Initializing database factory (" + databaseFilePath + ")...");					
-            this.databaseFilePath = databaseFilePath;
-        }
-
-        /// <summary>
-        /// Creates a new database file.
-        /// </summary>
-        public static void CreateDatabaseFile(string databaseFilePath)
-        {
-            try
-            {
-                // Create new database file
-                SqliteConnection.CreateFile(databaseFilePath);
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e);
-            }
-        }
-
-        /// <summary>
-        /// Generates a DbConnection based on the current database file path.
-        /// </summary>
-        /// <returns>DbConnection</returns>
-        public DbConnection GenerateConnection()
-        {
-            // Open connection
-            SqliteConnection connection = new SqliteConnection();
-            connection.ConnectionString = "Data Source=" + databaseFilePath;                
-
-            return connection;
-        }
-
-        /// <summary>
-        /// Returns the list of properties which have different database field names.
-        /// </summary>
-        /// <typeparam name="T">Object to scan (generic)</typeparam>
-        /// <returns>Dictionary of DatabaseFieldName/PropertyName</returns>
-        public Dictionary<string, string> GetMap<T>()
-        {
-            // Create map by scanning properties
-            Dictionary<string, string> dictMap = new Dictionary<string, string>();
-            PropertyInfo[] propertyInfos = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
-            foreach (PropertyInfo propertyInfo in propertyInfos)
-            {
-                // Scan attributes
-                object[] attributes = propertyInfo.GetCustomAttributes(true);
-                foreach (object attribute in attributes)
-                {
-                    // Try to cast into attribute map
-                    DatabaseFieldAttribute attrMap = attribute as DatabaseFieldAttribute;
-                    if (attrMap != null)
-                    {
-                        // Add item to dictionary
-                        dictMap.Add(attrMap.DatabaseFieldName, propertyInfo.Name);
-                    }
-                }
-            }
-
-            return dictMap;
-        }
-
-        /// <summary>
-        /// Formats a value for a SQL command.
-        /// If the value type is String or Guid, quotes will be added to the value.
-        /// If the value type is DBNull, a null value will be added (without quotes).
-        /// </summary>
-        /// <param name="value">Value to format</param>
-        /// <returns>Formatted value</returns>
-        public string FormatSQLValue(object value)
-        {           
-            if (value == null)
-            {
-                return "null";
-            }
-            else if (value.GetType().FullName.ToUpper() == "SYSTEM.DATETIME")
-            {
-                return "'" + value.ToString() + "'";
-            }
-            else if (value.GetType().FullName.ToUpper() == "SYSTEM.BOOLEAN")
-            {
-                int newValue = ((bool)value) ? 1 : 0;
-                return newValue.ToString();
-            }
-            else if (value.GetType().FullName.ToUpper() == "SYSTEM.STRING" ||
-                     value.GetType().FullName.ToUpper() == "SYSTEM.GUID" ||
-                     value.GetType().IsEnum)
-            {
-                // Replace single quotes by two quotes
-                return "'" + value.ToString().Replace("'", "''") + "'";
-            }
-            else if (value.GetType().FullName.ToUpper() == "SYSTEM.FLOAT" ||
-                     value.GetType().FullName.ToUpper() == "SYSTEM.SINGLE" ||
-                     value.GetType().FullName.ToUpper() == "SYSTEM.DOUBLE" ||
-                     value.GetType().FullName.ToUpper() == "SYSTEM.DECIMAL")
-            {
-                // Make sure a dot is used for decimals
-                return value.ToString().Replace(",", ".");
-            }
-            else
-            {
-                return value.ToString();
-            }
-        }
-
-        /// <summary>
-        /// Executes a SQL query and returns the number of rows affected.
-        /// </summary>
-        /// <param name="sql">SQL query</param>
-        /// <returns>Number of rows affected</returns>
-        public int Execute(string sql)
-        {
-            // Declare variables
-            DbConnection connection = null;            
-            DbCommand command = null;            
-
-            try
-            {
-                // Create and open connection
-                connection = GenerateConnection();
-                connection.Open();
-
-                // Create and execute command
-                command = connection.CreateCommand();
-                command.CommandText = sql;
-                command.Connection = connection;
-                int rows = command.ExecuteNonQuery();
-
-                return rows;
-            }
-            catch
-            {
-                throw;
-            }
-            finally
-            {
-				// Dispose command
-                command.Dispose();
-				
-                // Close and clean up connection
-                if (connection.State == ConnectionState.Open)
-                {
-                    connection.Close();
-                    connection.Dispose();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Executes a scalar SQL query and returns the query value.
-        /// </summary>
-        /// <param name="sql">SQL query</param>
-        /// <returns>Scalar query value</returns>
-        public object ExecuteScalar(string sql)
-        {
-            // Declare variables
-            DbConnection connection = null;
-            DbCommand command = null;
-
-            try
-            {
-                // Create and open connection
-                connection = GenerateConnection();
-                connection.Open();
-
-                // Create and execute command
-                command = connection.CreateCommand();
-                command.CommandText = sql;
-                command.Connection = connection;
-                object obj = command.ExecuteScalar();
-
-                return obj;
-            }
-            catch
-            {
-                throw;
-            }
-            finally
-            {
-				// Dispose command
-                command.Dispose();
-				
-                // Close and clean up connection
-                if (connection.State == ConnectionState.Open)
-                {
-                    connection.Close();
-                    connection.Dispose();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Compacts the database.
-        /// </summary>
-        public void CompactDatabase()
-        {
-            // Compact database
-            Execute("VACUUM;");
-        }
-
-        /// <summary>
-        /// Selects a list of objects.
-        /// </summary>
-        /// <param name="sql">Query to execute (must have only one field in the select statement)</param>
-        /// <returns>List of objects</returns>
-        public IEnumerable<object> SelectList(string sql)
-        {
-            // Declare variables
-            DbConnection connection = null;
-            DbDataReader reader = null;
-            DbCommand command = null;
-            List<object> list = new List<object>();
-
-            try
-            {
-                // Create and open connection
-                connection = GenerateConnection();
-                connection.Open();
-
-                // Create command
-                command = connection.CreateCommand();
-                command.CommandText = sql;
-                command.Connection = connection;
-
-                // Create and execute reader
-                reader = command.ExecuteReader();
-                while (reader.Read())
-                {
-                    // Add key/value to dictionary
-                    object field = reader.GetValue(0);
-                    list.Add(field);
-                }
-
-                return list;
-            }
-            catch
-            {
-                throw;
-            }
-            finally
-            {
-                // Clean up reader and connection
-                if (reader != null)
-                {
-                    reader.Close();
-                    reader.Dispose();
-                }
-				
-				// Dispose command
-                command.Dispose();
-
-                // Close and clean up connection
-                if (connection.State == ConnectionState.Open)
-                {
-                    connection.Close();
-                    connection.Dispose();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Selects a list of tuples of two objects.
-        /// </summary>
-        /// <param name="sql">Query to execute (must have only two fields in the select statement)</param>
-        /// <returns>List of tuple</returns>
-        public List<Tuple<object, object>> SelectTuple(string sql)
-        {
-            // Declare variables
-            DbConnection connection = null;
-            DbDataReader reader = null;
-            DbCommand command = null;            
-            List<Tuple<object, object>> listTuple = new List<Tuple<object, object>>();
-
-            try
-            {
-                // Create and open connection
-                connection = GenerateConnection();
-                connection.Open();
-
-                // Create command
-                command = connection.CreateCommand();
-                command.CommandText = sql;
-                command.Connection = connection;
-
-                // Create and execute reader
-                reader = command.ExecuteReader();
-                while (reader.Read())
-                {
-                    // Add key/value to dictionary
-                    object field1 = reader.GetValue(0);
-                    object field2 = reader.GetValue(1);                    
-                    listTuple.Add(new Tuple<object, object>(field1, field2));
-                }
-
-                return listTuple;
-            }
-            catch
-            {
-                throw;
-            }
-            finally
-            {
-                // Clean up reader and connection
-                if (reader != null)
-                {
-                    reader.Close();
-                    reader.Dispose();
-                }
-				
-				// Dispose command
-                command.Dispose();
-
-                // Close and clean up connection
-                if (connection.State == ConnectionState.Open)
-                {
-                    connection.Close();
-                    connection.Dispose();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Executes a select query and returns the first item of a list of objects as specified in 
-        /// the generics type.
-        /// </summary>
-        /// <typeparam name="T">Object tye to fill</typeparam>
-        /// <param name="sql">Query to execute</param>
-        /// <returns>Object</returns>
-        public T SelectOne<T>(string sql) where T : new()
-        {
-            // Select first from list
-            List<T> list = Select<T>(sql);
-            if (list != null && list.Count > 0)
-            {
-                return list[0];
-            }
-            return default(T);
-        }
-
-        /// <summary>
-        /// Executes a select query and returns a list of objects as specified in the generics type.
-        /// </summary>
-        /// <typeparam name="T">Object tye to fill</typeparam>
-        /// <param name="sql">Query to execute</param>
-        /// <returns>List of objects</returns>
-        public List<T> Select<T>(string sql) where T : new()
-        {
-            // Declare variables
-            DbConnection connection = null;
-            DbDataReader reader = null;            
-            DbCommand command = null;
-            List<T> list = new List<T>();
-            Dictionary<string, string> dictMap = GetMap<T>();
-
-            try
-            {                
-                // Create and open connection
-                connection = GenerateConnection();
-                connection.Open();
-
-                // Create command
-                command = connection.CreateCommand();
-                command.CommandText = sql;
-                command.Connection = connection;
-
-                // Create and execute reader
-                reader = command.ExecuteReader();
-                while (reader.Read())
-                {
-                    // Create object and fill data
-                    T data = new T();
-
-                    // Cycle through columns
-                    for (int a = 0; a < reader.FieldCount; a++)
-                    {
-                        // Get column info
-                        string fieldName = reader.GetName(a);
-                        Type fieldType = reader.GetFieldType(a);
-                        object fieldValue = reader.GetValue(a);
-
-                        // Check for map
-                        string propertyName = fieldName;                        
-                        if(dictMap.ContainsKey(fieldName))
-                        {
-                            propertyName = dictMap[fieldName];
-                        }
-
-                        // Get property info and fill column if valid
-                        PropertyInfo info = typeof(T).GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.SetProperty);
-                        if (info != null)
-                        {
-                            try
-                            {                         
-                                // Set value to null
-                                if (fieldValue is System.DBNull)
-                                    fieldValue = null;                                
-
-                                // Check if the type is an enum                                    
-                                if (info.PropertyType.IsEnum)
-                                {
-                                    fieldValue = Enum.Parse(info.PropertyType, fieldValue.ToString());
-                                }                                
-                                else if (info.PropertyType.FullName.ToUpper() == "SYSTEM.GUID")
-                                {
-                                    // Guid aren't supported in SQLite, so they are stored as strings.
-                                    fieldValue = new Guid(fieldValue.ToString());                                    
-                                }
-                                else if (info.PropertyType.FullName != fieldType.FullName)
-                                {
-                                    // Call a convert method in the Convert static class, if available
-                                    MethodInfo castMethod = typeof(Convert).GetMethod("To" + info.PropertyType.Name, new Type[] { fieldType });
-                                    if (castMethod != null)
-                                    {
-                                        fieldValue = castMethod.Invoke(null, new object[] { fieldValue });                                        
-                                    }
-                                }
-
-                                // Set property value
-                                info.SetValue(data, fieldValue, null);
-                            }
-                            catch
-                            {
-                                throw;
-                            }
-                        }
-                    }
-
-                    // Add item to list
-                    list.Add(data);
-                }
-                
-                return list;
-            }
-            catch
-            {
-                throw;
-            }
-            finally
-            {
-                // Clean up reader and connection
-                if (reader != null)
-                {
-                    reader.Close();
-                    reader.Dispose();
-                }
-				
-				// Dispose command
-                command.Dispose();
-
-                // Close and clean up connection
-                if (connection.State == ConnectionState.Open)
-                {
-                    connection.Close();
-                    connection.Dispose();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Updates an object into the database.
-        /// </summary>
-        /// <typeparam name="T">Object type</typeparam>
-        /// <param name="obj">Object to update</param>
-        /// <param name="tableName">Database table name</param>
-        /// <param name="whereFieldName">Where clause field name (followed by equals to)</param>
-        /// <param name="whereValue">Where clause field value</param>
-        /// <returns>Number of rows affected</returns>
-        public int Update<T>(T obj, string tableName, string whereFieldName, object whereValue)
-        {
-            Dictionary<string, object> dict = new Dictionary<string, object>();
-            dict.Add(whereFieldName, whereValue);
-            return Update<T>(obj, tableName, dict);
-        }
-
-        /// <summary>
-        /// Updates an object into the database.
-        /// </summary>
-        /// <typeparam name="T">Object type</typeparam>
-        /// <param name="obj">Object to update</param>
-        /// <param name="tableName">Database table name</param>
-        /// <param name="where">Dictionary containing the where clause (equals to)</param>
-        /// <returns>Number of rows affected</returns>
-        public int Update<T>(T obj, string tableName, Dictionary<string, object> where)
-        {            
-            // Declare variables
-            DbConnection connection = null;            
-            DbCommand command = null;
-            Dictionary<string, string> dictMap = GetMap<T>();
-            StringBuilder sql = new StringBuilder();
-
-            try
-            {
-                // Generate query
-                sql.AppendLine("UPDATE [" + tableName + "] SET ");
-
-                // Scan through properties
-                PropertyInfo[] propertyInfos = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
-                bool addedOneItem = false;
-                for (int a = 0; a < propertyInfos.Length; a++)
-                {
-                    PropertyInfo propertyInfo = propertyInfos[a];
-                    if (propertyInfo.GetSetMethod() != null)
-                    {
-                        string fieldName = propertyInfo.Name;                    
-                        if (dictMap.ContainsValue(propertyInfo.Name))
-                            fieldName = dictMap.FindKeyByValue<string, string>(propertyInfo.Name); 
-
-                        // Add comma if an item was added previously
-                        if(!addedOneItem)
-                            addedOneItem = true;
-                        else
-                            sql.Append(", ");
-
-                        // Add database field name
-                        sql.Append("[" + fieldName + "]=");
-                        object value = propertyInfo.GetValue(obj, null);
-                        sql.Append(FormatSQLValue(value));
-                        sql.Append("\n");
-                    }
-                }
-
-                // Generate where clause
-                sql.AppendLine(" WHERE ");
-                addedOneItem = false;
-                for(int a = 0; a < where.Count; a++)
-                {
-                    // Add comma if an item was added previously
-                    if(!addedOneItem)
-                        addedOneItem = true;
-                    else
-                        sql.Append(", ");
-
-                    KeyValuePair<string, object> keyValue = where.ElementAt(a);
-                    sql.AppendLine("[" + keyValue.Key + "]=");
-                    sql.Append(FormatSQLValue(keyValue.Value));
-                    sql.Append("\n");
-                }
-
-                // Create and open connection
-                connection = GenerateConnection();
-                connection.Open();
-
-                // Create command
-                command = connection.CreateCommand();
-                command.CommandText = sql.ToString();
-                command.Connection = connection;
-
-                // Execute command
-                int count = command.ExecuteNonQuery();
-                return count;
-            }
-            catch
-            {
-                throw;
-            }
-            finally
-            {
-				// Dispose command
-                command.Dispose();
-				
-                // Close and clean up connection
-                if (connection.State == ConnectionState.Open)
-                {
-                    connection.Close();
-                    connection.Dispose();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Inserts an object into the database.
-        /// </summary>
-        /// <typeparam name="T">Object type</typeparam>
-        /// <param name="obj">Object to insert</param>
-        /// <param name="tableName">Database table name</param>        
-        /// <returns>Number of rows affected</returns>
-        public int Insert<T>(T obj, string tableName)
-        {
-            DbConnection connection = null;
-            DbCommand command = null;
-            Dictionary<string, string> dictMap = GetMap<T>();
-            StringBuilder sql = new StringBuilder();
-
-            try
-            {
-                // Generate query
-                sql.AppendLine("INSERT INTO [" + tableName + "] (");
-
-                // Scan through properties to set column names
-                PropertyInfo[] propertyInfos = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
-                bool addedOneItem = false;
-                for (int a = 0; a < propertyInfos.Length; a++)
-                {
-                    PropertyInfo propertyInfo = propertyInfos[a];
-                    //Console.WriteLine("Insert - Fields - Item {0} name: {1}", a, propertyInfo.Name);
-                    if (propertyInfo.GetSetMethod() != null)
-                    {
-                        string fieldName = propertyInfo.Name;
-                        if (dictMap.ContainsValue(propertyInfo.Name))
-                            fieldName = dictMap.FindKeyByValue<string, string>(propertyInfo.Name);
-
-                        // Add comma if an item was added previously
-                        if(!addedOneItem)
-                            addedOneItem = true;
-                        else
-                            sql.Append(", ");
-
-                        sql.Append("[" + fieldName + "]");
-                        sql.Append("\n");
-                    }
-                }
-                sql.AppendLine(") VALUES (");
-
-                // Scan through properties and set values
-                addedOneItem = false;
-                for (int a = 0; a < propertyInfos.Length; a++)
-                {
-                    PropertyInfo propertyInfo = propertyInfos[a];
-                    //Console.WriteLine("Insert - Values - Item {0} name: {1}", a, propertyInfo.Name);
-                    if (propertyInfo.GetSetMethod() != null)
-                    {
-                        string fieldName = propertyInfo.Name;
-                        if (dictMap.ContainsValue(propertyInfo.Name))
-                            fieldName = dictMap.FindKeyByValue<string, string>(propertyInfo.Name);
-
-                        // Add comma if an item was added previously
-                        if(!addedOneItem)
-                            addedOneItem = true;
-                        else
-                            sql.Append(", ");
-
-                        // Get value and determine how to add field value
-                        object value = propertyInfo.GetValue(obj, null);
-                        sql.Append(FormatSQLValue(value));
-                        sql.Append("\n");
-                    }
-                }
-                sql.AppendLine(") ");
-                //Console.WriteLine(sql);
-
-                // Create and open connection
-                connection = GenerateConnection();
-                connection.Open();
-
-                // Create command
-                command = connection.CreateCommand();
-                command.CommandText = sql.ToString();
-                command.Connection = connection;
-
-                // Execute command
-                int count = command.ExecuteNonQuery();
-                return count;
-            }
-            catch
-            {
-                throw;
-            }
-            finally
-            {
-				// Dispose command
-                command.Dispose();
-
-                // Close and clean up connection
-                if (connection.State == ConnectionState.Open)
-                {
-                    connection.Close();
-                    connection.Dispose();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Deletes an item from the database.
-        /// </summary>
-        /// <param name="tableName">Table name</param>
-        /// <param name="idFieldName">Id field name</param>
-        /// <param name="id">DTO id</param>
-        public void Delete(string tableName, string idFieldName, Guid id)
-        {
-            Execute("DELETE FROM " + tableName + " WHERE " + idFieldName + " = '" + id.ToString() + "'");
-        }
-
-        /// <summary>
-        /// Deletes all rows from a database table.
-        /// </summary>
-        /// <param name="tableName">Database table name</param>
-        public void Delete(string tableName)
-        {
-            Execute("DELETE FROM " + tableName);
-        }
-
-        /// <summary>
-        /// Deletes all rows from a database table using the specified Where clause.
-        /// </summary>
-        /// <param name="tableName">Database table name</param>
-        /// <param name="where">Where clause</param>
-        public void Delete(string tableName, string where)
-        {
-            Execute("DELETE FROM " + tableName + " WHERE " + where);
-        }
-    }
-}
-#endif
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+#if IOS || ANDROID || MACOSX || LINUX
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.Common;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using MPfm.Core;
+using MPfm.Core.Attributes;
+using MPfm.Core.Extensions;
+using MPfm.Library.Database.Interfaces;
+using Mono.Data.Sqlite;
+
+namespace MPfm.Library.Database
+{
+    /// <summary>
+    /// The MonoSQLiteGateway class is a data adapter class which makes it easier to select, insert, update and delete
+    /// data from the database. It is based on Mono.Data.Sqlite rather than System.Data.SQLite. This gateway must be used
+    /// on Android devices.
+    ///
+    /// Notes: Mono.Data.SQLite doesn't like:    
+    /// - SingleOrDefault -- replaced with FirstOrDefault.
+    /// - compare database varchar to Guid.ToString() -- need to cast guid into string before using value in LIN
+    /// </summary>
+    public class MonoSQLiteGateway : ISQLiteGateway
+    {
+        /// <summary>
+        /// Private value for the DatabaseFilePath property.
+        /// </summary>
+        private string databaseFilePath = string.Empty;
+        /// <summary>
+        /// Database file path.
+        /// </summary>
+        public string DatabaseFilePath
+        {
+            get
+            {
+                return databaseFilePath;
+            }
+        }
+
+        /// <summary>
+        /// Default constructor for the MonoSQLiteGateway class.
+        /// </summary>
+        /// <param name="databaseFilePath">Database file path</param>
+        public MonoSQLiteGateway(string databaseFilePath)
+        {
+            // Initialize factory
+            Tracing.Log("SQLiteGateway init -- Initializing database factory (" + databaseFilePath + ")...");					
+            this.databaseFilePath = databaseFilePath;
+        }
+
+        /// <summary>
+        /// Creates a new database file.
+        /// </summary>
+        public static void CreateDatabaseFile(string databaseFilePath)
+        {
+            try
+            {
+                // Create new database file
+                SqliteConnection.CreateFile(databaseFilePath);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+            }
+        }
+
+        /// <summary>
+        /// Generates a DbConnection based on the current database file path.
+        /// </summary>
+        /// <returns>DbConnection</returns>
+        public DbConnection GenerateConnection()
+        {
+            // Open connection
+            SqliteConnection connection = new SqliteConnection();
+            connection.ConnectionString = "Data Source=" + databaseFilePath;                
+
+            return connection;
+        }
+
+        /// <summary>
+        /// Returns the list of properties which have different database field names.
+        /// </summary>
+        /// <typeparam name="T">Object to scan (generic)</typeparam>
+        /// <returns>List of DatabaseFieldMap</returns>
+        public List<DatabaseFieldMap> GetMap<T>()
+        {
+            // Create map by scanning properties
+            List<DatabaseFieldMap> maps = new List<DatabaseFieldMap>();
+            PropertyInfo[] propertyInfos = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
+            foreach (PropertyInfo propertyInfo in propertyInfos)
+            {
+                // Scan attributes
+                object[] attributes = propertyInfo.GetCustomAttributes(true);
+                foreach (object attribute in attributes)
+                {
+                    // Try to cast into attribute map
+                    DatabaseFieldAttribute attrMap = attribute as DatabaseFieldAttribute;
+                    if (attrMap != null)
+                        maps.Add(new DatabaseFieldMap(propertyInfo.Name, attrMap.DatabaseFieldName, attrMap.SaveToDatabase));
+                }
+            }
+
+            return maps;
+        }
+
+        /// <summary>
+        /// Formats a value for a SQL command.
+        /// If the value type is String or Guid, quotes will be added to the value.
+        /// If the value type is DBNull, a null value will be added (without quotes).
+        /// </summary>
+        /// <param name="value">Value to format</param>
+        /// <returns>Formatted value</returns>
+        public string FormatSQLValue(object value)
+        {           
+            if (value == null)
+            {
+                return "null";
+            }
+            else if (value.GetType().FullName.ToUpper() == "SYSTEM.DATETIME")
+            {
+                return "'" + value.ToString() + "'";
+            }
+            else if (value.GetType().FullName.ToUpper() == "SYSTEM.BOOLEAN")
+            {
+                int newValue = ((bool)value) ? 1 : 0;
+                return newValue.ToString();
+            }
+            else if (value.GetType().FullName.ToUpper() == "SYSTEM.STRING" ||
+                     value.GetType().FullName.ToUpper() == "SYSTEM.GUID" ||
+                     value.GetType().IsEnum)
+            {
+                // Replace single quotes by two quotes
+                return "'" + value.ToString().Replace("'", "''") + "'";
+            }
+            else if (value.GetType().FullName.ToUpper() == "SYSTEM.FLOAT" ||
+                     value.GetType().FullName.ToUpper() == "SYSTEM.SINGLE" ||
+                     value.GetType().FullName.ToUpper() == "SYSTEM.DOUBLE" ||
+                     value.GetType().FullName.ToUpper() == "SYSTEM.DECIMAL")
+            {
+                // Make sure a dot is used for decimals
+                return value.ToString().Replace(",", ".");
+            }
+            else
+            {
+                return value.ToString();
+            }
+        }
+
+        /// <summary>
+        /// Executes a SQL query and returns the number of rows affected.
+        /// </summary>
+        /// <param name="sql">SQL query</param>
+        /// <returns>Number of rows affected</returns>
+        public int Execute(string sql)
+        {
+            // Declare variables
+            DbConnection connection = null;            
+            DbCommand command = null;            
+
+            try
+            {
+                // Create and open connection
+                connection = GenerateConnection();
+                connection.Open();
+
+                // Create and execute command
+                command = connection.CreateCommand();
+                command.CommandText = sql;
+                command.Connection = connection;
+                int rows = command.ExecuteNonQuery();
+
+                return rows;
+            }
+            catch
+            {
+                throw;
+            }
+            finally
+            {
+				// Dispose command
+                command.Dispose();
+				
+                // Close and clean up connection
+                if (connection.State == ConnectionState.Open)
+                {
+                    connection.Close();
+                    connection.Dispose();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Executes a scalar SQL query and returns the query value.
+        /// </summary>
+        /// <param name="sql">SQL query</param>
+        /// <returns>Scalar query value</returns>
+        public object ExecuteScalar(string sql)
+        {
+            // Declare variables
+            DbConnection connection = null;
+            DbCommand command = null;
+
+            try
+            {
+                // Create and open connection
+                connection = GenerateConnection();
+                connection.Open();
+
+                // Create and execute command
+                command = connection.CreateCommand();
+                command.CommandText = sql;
+                command.Connection = connection;
+                object obj = command.ExecuteScalar();
+
+                return obj;
+            }
+            catch
+            {
+                throw;
+            }
+            finally
+            {
+				// Dispose command
+                command.Dispose();
+				
+                // Close and clean up connection
+                if (connection.State == ConnectionState.Open)
+                {
+                    connection.Close();
+                    connection.Dispose();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Compacts the database.
+        /// </summary>
+        public void CompactDatabase()
+        {
+            // Compact database
+            Execute("VACUUM;");
+        }
+
+        /// <summary>
+        /// Selects a list of objects.
+        /// </summary>
+        /// <param name="sql">Query to execute (must have only one field in the select statement)</param>
+        /// <returns>List of objects</returns>
+        public IEnumerable<object> SelectList(string sql)
+        {
+            // Declare variables
+            DbConnection connection = null;
+            DbDataReader reader = null;
+            DbCommand command = null;
+            List<object> list = new List<object>();
+
+            try
+            {
+                // Create and open connection
+                connection = GenerateConnection();
+                connection.Open();
+
+                // Create command
+                command = connection.CreateCommand();
+                command.CommandText = sql;
+                command.Connection = connection;
+
+                // Create and execute reader
+                reader = command.ExecuteReader();
+                while (reader.Read())
+                {
+                    // Add key/value to dictionary
+                    object field = reader.GetValue(0);
+                    list.Add(field);
+                }
+
+                return list;
+            }
+            catch
+            {
+                throw;
+            }
+            finally
+            {
+                // Clean up reader and connection
+                if (reader != null)
+                {
+                    reader.Close();
+                    reader.Dispose();
+                }
+				
+				// Dispose command
+                command.Dispose();
+
+                // Close and clean up connection
+                if (connection.State == ConnectionState.Open)
+                {
+                    connection.Close();
+                    connection.Dispose();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Selects a list of tuples of two objects.
+        /// </summary>
+        /// <param name="sql">Query to execute (must have only two fields in the select statement)</param>
+        /// <returns>List of tuple</returns>
+        public List<Tuple<object, object>> SelectTuple(string sql)
+        {
+            // Declare variables
+            DbConnection connection = null;
+            DbDataReader reader = null;
+            DbCommand command = null;            
+            List<Tuple<object, object>> listTuple = new List<Tuple<object, object>>();
+
+            try
+            {
+                // Create and open connection
+                connection = GenerateConnection();
+                connection.Open();
+
+                // Create command
+                command = connection.CreateCommand();
+                command.CommandText = sql;
+                command.Connection = connection;
+
+                // Create and execute reader
+                reader = command.ExecuteReader();
+                while (reader.Read())
+                {
+                    // Add key/value to dictionary
+                    object field1 = reader.GetValue(0);
+                    object field2 = reader.GetValue(1);                    
+                    listTuple.Add(new Tuple<object, object>(field1, field2));
+                }
+
+                return listTuple;
+            }
+            catch
+            {
+                throw;
+            }
+            finally
+            {
+                // Clean up reader and connection
+                if (reader != null)
+                {
+                    reader.Close();
+                    reader.Dispose();
+                }
+				
+				// Dispose command
+                command.Dispose();
+
+                // Close and clean up connection
+                if (connection.State == ConnectionState.Open)
+                {
+                    connection.Close();
+                    connection.Dispose();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Executes a select query and returns the first item of a list of objects as specified in 
+        /// the generics type.
+        /// </summary>
+        /// <typeparam name="T">Object tye to fill</typeparam>
+        /// <param name="sql">Query to execute</param>
+        /// <returns>Object</returns>
+        public T SelectOne<T>(string sql) where T : new()
+        {
+            // Select first from list
+            List<T> list = Select<T>(sql);
+            if (list != null && list.Count > 0)
+            {
+                return list[0];
+            }
+            return default(T);
+        }
+
+        /// <summary>
+        /// Executes a select query and returns a list of objects as specified in the generics type.
+        /// </summary>
+        /// <typeparam name="T">Object tye to fill</typeparam>
+        /// <param name="sql">Query to execute</param>
+        /// <returns>List of objects</returns>
+        public List<T> Select<T>(string sql) where T : new()
+        {
+            // Declare variables
+            DbConnection connection = null;
+            DbDataReader reader = null;            
+            DbCommand command = null;
+            List<T> list = new List<T>();
+            List<DatabaseFieldMap> maps = GetMap<T>();
+
+            try
+            {                
+                // Create and open connection
+                connection = GenerateConnection();
+                connection.Open();
+
+                // Create command
+                command = connection.CreateCommand();
+                command.CommandText = sql;
+                command.Connection = connection;
+
+                // Create and execute reader
+                reader = command.ExecuteReader();
+                while (reader.Read())
+                {
+                    // Create object and fill data
+                    T data = new T();
+
+                    // Cycle through columns
+                    for (int a = 0; a < reader.FieldCount; a++)
+                    {
+                        // Get column info
+                        string fieldName = reader.GetName(a);
+                        Type fieldType = reader.GetFieldType(a);
+                        object fieldValue = reader.GetValue(a);
+
+                        // Check for map
+                        string propertyName = fieldName;                        
+                        var map = maps.FirstOrDefault(x => x.FieldName == fieldName);
+                        if (map != null)
+                            propertyName = map.PropertyName;
+
+                        // Get property info and fill column if valid
+                        PropertyInfo info = typeof(T).GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.SetProperty);
+                        if (info != null)
+                        {
+                            try
+                            {                         
+                                // Set value to null
+                                if (fieldValue is System.DBNull)
+                                    fieldValue = null;                                
+
+                                // Check if the type is an enum                                    
+                                if (info.PropertyType.IsEnum)
+                                {
+                                    fieldValue = Enum.Parse(info.PropertyType, fieldValue.ToString());
+                                }                                
+                                else if (info.PropertyType.FullName.ToUpper() == "SYSTEM.GUID")
+                                {
+                                    // Guid aren't supported in SQLite, so they are stored as strings.
+                                    fieldValue = new Guid(fieldValue.ToString());                                    
+                                }
+                                else if (info.PropertyType.FullName != fieldType.FullName)
+                                {
+                                    // Call a convert method in the Convert static class, if available
+                                    MethodInfo castMethod = typeof(Convert).GetMethod("To" + info.PropertyType.Name, new Type[] { fieldType });
+                                    if (castMethod != null)
+                                    {
+                                        fieldValue = castMethod.Invoke(null, new object[] { fieldValue });                                        
+                                    }
+                                }
+
+                                // Set property value
+                                info.SetValue(data, fieldValue, null);
+                            }
+                            catch
+                            {
+                                throw;
+                            }
+                        }
+                    }
+
+                    // Add item to list
+                    list.Add(data);
+                }
+                
+                return list;
+            }
+            catch
+            {
+                throw;
+            }
+            finally
+            {
+                // Clean up reader and connection
+                if (reader != null)
+                {
+                    reader.Close();
+                    reader.Dispose();
+                }
+				
+				// Dispose command
+                command.Dispose();
+
+                // Close and clean up connection
+                if (connection.State == ConnectionState.Open)
+                {
+                    connection.Close();
+                    connection.Dispose();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Updates an object into the database.
+        /// </summary>
+        /// <typeparam name="T">Object type</typeparam>
+        /// <param name="obj">Object to update</param>
+        /// <param name="tableName">Database table name</param>
+        /// <param name="whereFieldName">Where clause field name (followed by equals to)</param>
+        /// <param name="whereValue">Where clause field value</param>
+        /// <returns>Number of rows affected</returns>
+        public int Update<T>(T obj, string tableName, string whereFieldName, object whereValue)
+        {
+            Dictionary<string, object> dict = new Dictionary<string, object>();
+            dict.Add(whereFieldName, whereValue);
+            return Update<T>(obj, tableName, dict);
+        }
+
+        /// <summary>
+        /// Updates an object into the database.
+        /// </summary>
+        /// <typeparam name="T">Object type</typeparam>
+        /// <param name="obj">Object to update</param>
+        /// <param name="tableName">Database table name</param>
+        /// <param name="where">Dictionary containing the where clause (equals to)</param>
+        /// <returns>Number of rows affected</returns>
+        public int Update<T>(T obj, string tableName, Dictionary<string, object> where)
+        {            
+            // Declare variables
+            DbConnection connection = null;            
+            DbCommand command = null;
+            List<DatabaseFieldMap> maps = GetMap<T>();
+            StringBuilder sql = new StringBuilder();
+
+            try
+            {
+                // Generate query
+                sql.AppendLine("UPDATE [" + tableName + "] SET ");
+
+                // Scan through properties
+                PropertyInfo[] propertyInfos = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
+                bool addedOneItem = false;
+                for (int a = 0; a < propertyInfos.Length; a++)
+                {
+                    PropertyInfo propertyInfo = propertyInfos[a];
+                    if (propertyInfo.GetSetMethod() != null)
+                    {
+                        // Check mapping
+                        bool saveToDatabase = true;
+                        string fieldName = propertyInfo.Name;
+                        var map = maps.FirstOrDefault(x => x.PropertyName == propertyInfo.Name);
+                        if (map != null)
+                        {
+                            fieldName = map.FieldName;
+                            saveToDatabase = map.SaveToDatabase;
+                        }
+
+                        if (saveToDatabase)
+                        {
+                            // Add comma if an item was added previously
+                            if (!addedOneItem)
+                                addedOneItem = true;
+                            else
+                                sql.Append(", ");
+
+                            // Add database field name
+                            sql.Append("[" + fieldName + "]=");
+                            object value = propertyInfo.GetValue(obj, null);
+                            sql.Append(FormatSQLValue(value));
+                            sql.Append("\n");
+                        }
+                    }
+                }
+
+                // Generate where clause
+                sql.AppendLine(" WHERE ");
+                addedOneItem = false;
+                for(int a = 0; a < where.Count; a++)
+                {
+                    // Add comma if an item was added previously
+                    if(!addedOneItem)
+                        addedOneItem = true;
+                    else
+                        sql.Append(", ");
+
+                    KeyValuePair<string, object> keyValue = where.ElementAt(a);
+                    sql.AppendLine("[" + keyValue.Key + "]=");
+                    sql.Append(FormatSQLValue(keyValue.Value));
+                    sql.Append("\n");
+                }
+
+                // Create and open connection
+                connection = GenerateConnection();
+                connection.Open();
+
+                // Create command
+                command = connection.CreateCommand();
+                command.CommandText = sql.ToString();
+                command.Connection = connection;
+
+                // Execute command
+                int count = command.ExecuteNonQuery();
+                return count;
+            }
+            catch
+            {
+                throw;
+            }
+            finally
+            {
+				// Dispose command
+                command.Dispose();
+				
+                // Close and clean up connection
+                if (connection.State == ConnectionState.Open)
+                {
+                    connection.Close();
+                    connection.Dispose();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Inserts an object into the database.
+        /// </summary>
+        /// <typeparam name="T">Object type</typeparam>
+        /// <param name="obj">Object to insert</param>
+        /// <param name="tableName">Database table name</param>        
+        /// <returns>Number of rows affected</returns>
+        public int Insert<T>(T obj, string tableName)
+        {
+            DbConnection connection = null;
+            DbCommand command = null;
+            List<DatabaseFieldMap> maps = GetMap<T>();
+            StringBuilder sql = new StringBuilder();
+
+            try
+            {
+                // Generate query
+                sql.AppendLine("INSERT INTO [" + tableName + "] (");
+
+                // Scan through properties to set column names
+                PropertyInfo[] propertyInfos = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
+                bool addedOneItem = false;
+                for (int a = 0; a < propertyInfos.Length; a++)
+                {
+                    PropertyInfo propertyInfo = propertyInfos[a];
+                    //Console.WriteLine("Insert - Fields - Item {0} name: {1}", a, propertyInfo.Name);
+                    if (propertyInfo.GetSetMethod() != null)
+                    {
+                        // Check mapping
+                        bool saveToDatabase = true;
+                        string fieldName = propertyInfo.Name;
+                        var map = maps.FirstOrDefault(x => x.PropertyName == propertyInfo.Name);
+                        if (map != null)
+                        {
+                            fieldName = map.FieldName;
+                            saveToDatabase = map.SaveToDatabase;
+                        }
+
+                        if (saveToDatabase)
+                        {
+                            // Add comma if an item was added previously
+                            if (!addedOneItem)
+                                addedOneItem = true;
+                            else
+                                sql.Append(", ");
+
+                            sql.Append("[" + fieldName + "]");
+                            sql.Append("\n");
+                        }
+                    }
+                }
+                sql.AppendLine(") VALUES (");
+
+                // Scan through properties and set values
+                addedOneItem = false;
+                for (int a = 0; a < propertyInfos.Length; a++)
+                {
+                    PropertyInfo propertyInfo = propertyInfos[a];
+                    //Console.WriteLine("Insert - Values - Item {0} name: {1}", a, propertyInfo.Name);
+                    if (propertyInfo.GetSetMethod() != null)
+                    {
+                        // Check mapping
+                        bool saveToDatabase = true;
+                        string fieldName = propertyInfo.Name;
+                        var map = maps.FirstOrDefault(x => x.PropertyName == propertyInfo.Name);
+                        if (map != null)
+                            saveToDatabase = map.SaveToDatabase;
+
+                        if (saveToDatabase)
+                        {
+                            // Add comma if an item was added previously
+                            if (!addedOneItem)
+                                addedOneItem = true;
+                            else
+                                sql.Append(", ");
+
+                            // Get value and determine how to add field value
+                            object value = propertyInfo.GetValue(obj, null);
+                            sql.Append(FormatSQLValue(value));
+                            sql.Append("\n");
+                        }
+                    }
+                }
+                sql.AppendLine(") ");
+                //Console.WriteLine(sql);
+
+                // Create and open connection
+                connection = GenerateConnection();
+                connection.Open();
+
+                // Create command
+                command = connection.CreateCommand();
+                command.CommandText = sql.ToString();
+                command.Connection = connection;
+
+                // Execute command
+                int count = command.ExecuteNonQuery();
+                return count;
+            }
+            catch
+            {
+                throw;
+            }
+            finally
+            {
+				// Dispose command
+                command.Dispose();
+
+                // Close and clean up connection
+                if (connection.State == ConnectionState.Open)
+                {
+                    connection.Close();
+                    connection.Dispose();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Deletes an item from the database.
+        /// </summary>
+        /// <param name="tableName">Table name</param>
+        /// <param name="idFieldName">Id field name</param>
+        /// <param name="id">DTO id</param>
+        public void Delete(string tableName, string idFieldName, Guid id)
+        {
+            Execute("DELETE FROM " + tableName + " WHERE " + idFieldName + " = '" + id.ToString() + "'");
+        }
+
+        /// <summary>
+        /// Deletes all rows from a database table.
+        /// </summary>
+        /// <param name="tableName">Database table name</param>
+        public void Delete(string tableName)
+        {
+            Execute("DELETE FROM " + tableName);
+        }
+
+        /// <summary>
+        /// Deletes all rows from a database table using the specified Where clause.
+        /// </summary>
+        /// <param name="tableName">Database table name</param>
+        /// <param name="where">Where clause</param>
+        public void Delete(string tableName, string where)
+        {
+            Execute("DELETE FROM " + tableName + " WHERE " + where);
+        }
+    }
+}
+#endif
diff --git a/MPfm/MPfm.Library/MPfm.Library.Android.csproj b/MPfm/MPfm.Library/MPfm.Library.Android.csproj
index bd57f7e9..91663159 100644
--- a/MPfm/MPfm.Library/MPfm.Library.Android.csproj
+++ b/MPfm/MPfm.Library/MPfm.Library.Android.csproj
@@ -110,6 +110,7 @@
     <Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Scripts\1.05-1.06.sql" />
     <EmbeddedResource Include="Scripts\1.04-1.05.sql" />
     <EmbeddedResource Include="Scripts\1.03-1.04.sql" />
     <EmbeddedResource Include="Scripts\1.02-1.03.sql" />
diff --git a/MPfm/MPfm.Library/Scripts/1.05-1.06.sql b/MPfm/MPfm.Library/Scripts/1.05-1.06.sql
new file mode 100644
index 00000000..728751fd
--- /dev/null
+++ b/MPfm/MPfm.Library/Scripts/1.05-1.06.sql
@@ -0,0 +1,36 @@
+/*--
+   MIGRATION SCRIPT FOR THE MPFM DATABASE
+   Database version: 1.05 --> 1.06
+
+   SQLite doesn't support creating multiple tables in a single statement, so
+   the statements need to be separated with /**/ so that the MPfmGateway can split
+   the statements correctly.
+
+   Also, SQLite doesn't fully support ALTER TABLE.
+   http://www.sqlite.org/omitted.html
+
+   Changes:   
+   - Added columns to the AudioFile table
+
+--*/
+
+UPDATE Settings 
+SET SettingValue = '1.06'
+WHERE SettingName = 'DatabaseVersion'
+
+/**/
+
+CREATE TABLE [PlaylistItems] (
+[PlaylistItemId] varchar(50)  NOT NULL PRIMARY KEY,
+[PlaylistId] varchar(50)  NOT NULL,
+[AudioFileId] varchar(50)  NOT NULL,
+[Position] integer DEFAULT '0' NOT NULL
+)
+
+/**/
+
+CREATE TABLE [Playlists] (
+[PlaylistId] varchar(50)  UNIQUE NOT NULL,
+[Name] varchar(500)  NULL,
+[LastModified] date
+)
diff --git a/MPfm/MPfm.Library/Services/Interfaces/ILibraryService.cs b/MPfm/MPfm.Library/Services/Interfaces/ILibraryService.cs
index d82e83b3..db1a6d5f 100644
--- a/MPfm/MPfm.Library/Services/Interfaces/ILibraryService.cs
+++ b/MPfm/MPfm.Library/Services/Interfaces/ILibraryService.cs
@@ -20,6 +20,7 @@
 using MPfm.Library.Objects;
 using MPfm.Player.Objects;
 using MPfm.Sound.AudioFiles;
+using MPfm.Sound.Playlists;
 
 namespace MPfm.Library.Services.Interfaces
 {
@@ -50,6 +51,12 @@ public interface ILibraryService
 		Dictionary<string, List<string>> SelectDistinctAlbumTitles(AudioFileFormat format);
 		Dictionary<string, List<string>> SelectDistinctAlbumTitles(AudioFileFormat format, string artistName);
 
+        Playlist SelectPlaylist(Guid playlistId);
+        List<Playlist> SelectPlaylists();
+        void InsertPlaylist(Playlist playlist);
+        void UpdatePlaylist(Playlist playlist);
+        void DeletePlaylist(Guid playlistId);
+
         Marker SelectMarker(Guid markerId);
         List<Marker> SelectMarkers(Guid audioFileId);
         void InsertMarker(Marker marker);
diff --git a/MPfm/MPfm.Library/Services/LibraryService.cs b/MPfm/MPfm.Library/Services/LibraryService.cs
index a28d005c..a3fbf070 100644
--- a/MPfm/MPfm.Library/Services/LibraryService.cs
+++ b/MPfm/MPfm.Library/Services/LibraryService.cs
@@ -24,11 +24,11 @@
 using MPfm.Library.Database.Interfaces;
 using MPfm.Library.Objects;
 using MPfm.Library.Services.Interfaces;
-
 #if WINDOWSSTORE
 using Windows.Storage;
 using MPfm.Core.WinRT;
 #endif
+using MPfm.Sound.Playlists;
 
 namespace MPfm.Library.Services
 {
@@ -37,81 +37,81 @@ namespace MPfm.Library.Services
     /// </summary>
     public class LibraryService : ILibraryService
     {
-		private readonly IDatabaseFacade gateway = null;
+		private readonly IDatabaseFacade _gateway = null;
 		
 		public LibraryService(IDatabaseFacade gateway)
 		{
 			if(gateway == null)
 				throw new ArgumentNullException("The gateway parameter cannot be null!");
 				
-			this.gateway = gateway;
+			this._gateway = gateway;
 		}
 		
 		public void CompactDatabase()
 		{
-			gateway.CompactDatabase();
+			_gateway.CompactDatabase();
 		}
 
         public void ResetLibrary()
         {
-            gateway.ResetLibrary();
+            _gateway.ResetLibrary();
         }
 
         #region Audio Files
 		
 		public IEnumerable<Folder> SelectFolders()
 		{
-			return gateway.SelectFolders();
+			return _gateway.SelectFolders();
 		}
 		
 		public IEnumerable<string> SelectFilePaths()
 		{
-			return gateway.SelectFilePaths();
+			return _gateway.SelectFilePaths();
 		}
 		
 		public IEnumerable<AudioFile> SelectAudioFiles()
 		{
-			return gateway.SelectAudioFiles();			
+			return _gateway.SelectAudioFiles();			
 		}
 
         public IEnumerable<AudioFile> SelectAudioFiles(LibraryQuery query)
         {
-            return gateway.SelectAudioFiles(query.Format, query.ArtistName, query.AlbumTitle, query.SearchTerms);
+            return _gateway.SelectAudioFiles(query.Format, query.ArtistName, query.AlbumTitle, query.SearchTerms);
         }
 		
 		public IEnumerable<AudioFile> SelectAudioFiles(AudioFileFormat format, string artistName, string albumTitle, string search)
 		{
-			return gateway.SelectAudioFiles(format, artistName, albumTitle, search);			
+			return _gateway.SelectAudioFiles(format, artistName, albumTitle, search);			
 		}
 				
 		public void InsertAudioFile(AudioFile audioFile)
 		{
-			gateway.InsertAudioFile(audioFile);
+			_gateway.InsertAudioFile(audioFile);
 		}
 		
 		public void InsertPlaylistFile(PlaylistFile playlistFile)
 		{
-			gateway.InsertPlaylistFile(playlistFile);
+			_gateway.InsertPlaylistFile(playlistFile);
 		}
 
         public void DeleteAudioFile(Guid audioFileId)
         {
-            gateway.DeleteAudioFile(audioFileId);
+            _gateway.DeleteAudioFile(audioFileId);
         }
 
         public void DeleteAudioFiles(string basePath)
         {
-            gateway.DeleteAudioFiles(basePath);
+            _gateway.DeleteAudioFiles(basePath);
         }
 
         public void DeleteAudioFiles(string artistName, string albumTitle)
         {
-            gateway.DeleteAudioFiles(artistName, albumTitle);
+            _gateway.DeleteAudioFiles(artistName, albumTitle);
         }
 		
 		public void RemoveAudioFilesWithBrokenFilePaths()
 		{
-            List<AudioFile> files = gateway.SelectAudioFiles();
+            List<AudioFile> files = _gateway.SelectAudioFiles();
             for (int a = 0; a < files.Count; a++)
             {
                 // If the file doesn't exist, delete the audio file from the database
@@ -122,7 +122,7 @@ public void RemoveAudioFilesWithBrokenFilePaths()
                     gateway.DeleteAudioFile(files[a].Id);
                 #else
                 if (!File.Exists(files[a].FilePath))
-                    gateway.DeleteAudioFile(files[a].Id);
+                    _gateway.DeleteAudioFile(files[a].Id);
                 #endif
             }
 		}	
@@ -138,7 +138,7 @@ public void AddFolder(string folderPath, bool recursive)
             bool folderFound = false;
 
             // Get the list of folders from the database                
-            List<Folder> folders = gateway.SelectFolders();
+            List<Folder> folders = _gateway.SelectFolders();
 
             // Search through folders if the base found can be found
             foreach (Folder folder in folders)
@@ -158,56 +158,85 @@ public void AddFolder(string folderPath, bool recursive)
             {
                 // Check if the configured path is part of the specified path
                 if (folder.FolderPath.Contains(folderPath))
-                    gateway.DeleteFolder(folder.FolderId);
+                    _gateway.DeleteFolder(folder.FolderId);
             }
 
             // Add the folder to the list of configured folders
             if (!folderFound)
-                gateway.InsertFolder(folderPath, true);
+                _gateway.InsertFolder(folderPath, true);
 		}		
 		
 		public List<string> SelectDistinctArtistNames(AudioFileFormat format)
 		{
-			return gateway.SelectDistinctArtistNames(format);
+			return _gateway.SelectDistinctArtistNames(format);
 		}
 		
 		public Dictionary<string, List<string>> SelectDistinctAlbumTitles(AudioFileFormat format)
 		{
-			return gateway.SelectDistinctAlbumTitles(format);
+			return _gateway.SelectDistinctAlbumTitles(format);
 		}
 		
 		public Dictionary<string, List<string>> SelectDistinctAlbumTitles(AudioFileFormat format, string artistName)
 		{
-			return gateway.SelectDistinctAlbumTitles(format, artistName);
+			return _gateway.SelectDistinctAlbumTitles(format, artistName);
 		}
 
         #endregion
 
+        #region Playlists
+
+        public Playlist SelectPlaylist(Guid playlistId)
+        {
+            return _gateway.SelectPlaylist(playlistId);
+        }
+
+        public List<Playlist> SelectPlaylists()
+        {
+            return _gateway.SelectPlaylists();
+        }
+
+        public void InsertPlaylist(Playlist playlist)
+        {
+            _gateway.InsertPlaylist(playlist);
+        }
+
+        public void UpdatePlaylist(Playlist playlist)
+        {
+            _gateway.UpdatePlaylist(playlist);
+        }
+
+        public void DeletePlaylist(Guid playlistId)
+        {
+            _gateway.DeletePlaylist(playlistId);
+        }
+
+        #endregion
+
         #region Markers
 
         public void InsertMarker(Marker marker)
         {
-            gateway.InsertMarker(marker);
+            _gateway.InsertMarker(marker);
         }
 
         public Marker SelectMarker(Guid markerId)
         {
-            return gateway.SelectMarker(markerId);
+            return _gateway.SelectMarker(markerId);
         }
 
         public List<Marker> SelectMarkers(Guid audioFileId)
         {
-            return gateway.SelectMarkers(audioFileId);
+            return _gateway.SelectMarkers(audioFileId);
         }
 
         public void UpdateMarker(Marker marker)
         {
-            gateway.UpdateMarker(marker);
+            _gateway.UpdateMarker(marker);
         }
 
         public void DeleteMarker(Guid markerId)
         {
-            gateway.DeleteMarker(markerId);
+            _gateway.DeleteMarker(markerId);
         }
 
         #endregion
@@ -216,27 +245,27 @@ public void DeleteMarker(Guid markerId)
         
         public void InsertLoop(Loop loop)
         {
-            gateway.InsertLoop(loop);
+            _gateway.InsertLoop(loop);
         }
         
         public Loop SelectLoop(Guid loopId)
         {
-            return gateway.SelectLoop(loopId);
+            return _gateway.SelectLoop(loopId);
         }
         
         public List<Loop> SelectLoops(Guid audioFileId)
         {
-            return gateway.SelectLoops(audioFileId);
+            return _gateway.SelectLoops(audioFileId);
         }
         
         public void UpdateLoop(Loop loop)
         {
-            gateway.UpdateLoop(loop);
+            _gateway.UpdateLoop(loop);
         }
         
         public void DeleteLoop(Guid loopId)
         {
-            gateway.DeleteLoop(loopId);
+            _gateway.DeleteLoop(loopId);
         }
         
         #endregion
@@ -245,27 +274,27 @@ public void DeleteLoop(Guid loopId)
         
         public void InsertEQPreset(EQPreset preset)
         {
-            gateway.InsertEQPreset(preset);
+            _gateway.InsertEQPreset(preset);
         }
 
         public EQPreset SelectEQPreset(Guid presetId)
         {
-            return gateway.SelectEQPreset(presetId);
+            return _gateway.SelectEQPreset(presetId);
         }
 
         public IEnumerable<EQPreset> SelectEQPresets()
         {
-            return gateway.SelectEQPresets();
+            return _gateway.SelectEQPresets();
         }
 
         public void UpdateEQPreset(EQPreset preset)
         {
-            gateway.UpdateEQPreset(preset);
+            _gateway.UpdateEQPreset(preset);
         }
         
         public void DeleteEQPreset(Guid presetId)
         {
-            gateway.DeleteEQPreset(presetId);
+            _gateway.DeleteEQPreset(presetId);
         }
         
         #endregion
diff --git a/MPfm/MPfm.MVP/MPfm.MVP.Android.csproj b/MPfm/MPfm.MVP/MPfm.MVP.Android.csproj
index e4240f9e..50451939 100644
--- a/MPfm/MPfm.MVP/MPfm.MVP.Android.csproj
+++ b/MPfm/MPfm.MVP/MPfm.MVP.Android.csproj
@@ -130,9 +130,9 @@
     <Compile Include="Messages\ConnectionStatusChangedMessage.cs" />
     <Compile Include="Messages\ApplicationCloseMessage.cs" />
     <Compile Include="Messages\ActivateLockScreenMessage.cs" />
+    <Compile Include="Messages\PlaylistListUpdatedMessage.cs" />
     <Compile Include="Messages\PlayerSetPositionMessage.cs" />
     <Compile Include="Messages\MobileLibraryBrowserItemClickedMessage.cs" />
-    <Compile Include="Models\PlaylistEntity.cs" />
     <Compile Include="Navigation\MobileNavigationManager.cs" />
     <Compile Include="Presenters\AudioPreferencesPresenter.cs" />
     <Compile Include="Presenters\AddNewPlaylistPresenter.cs" />
diff --git a/MPfm/MPfm.MVP/Models/PlaylistEntity.cs b/MPfm/MPfm.MVP/Messages/PlaylistListUpdatedMessage.cs
similarity index 67%
rename from MPfm/MPfm.MVP/Models/PlaylistEntity.cs
rename to MPfm/MPfm.MVP/Messages/PlaylistListUpdatedMessage.cs
index 42b8177e..5937b996 100644
--- a/MPfm/MPfm.MVP/Models/PlaylistEntity.cs
+++ b/MPfm/MPfm.MVP/Messages/PlaylistListUpdatedMessage.cs
@@ -15,21 +15,19 @@
 // You should have received a copy of the GNU General Public License
 // along with MPfm. If not, see <http://www.gnu.org/licenses/>.
 
-using System.Collections.Generic;
-using MPfm.Sound.AudioFiles;
-using MPfm.Library.Objects;
+using TinyMessenger;
+using MPfm.Player.Events;
 
-namespace MPfm.MVP.Models
+namespace MPfm.MVP.Messages
 {
     /// <summary>
-    /// Data structure repesenting a playlist.
+    /// Message indicating playlist list has been updated (i.e. new playlist, removed playlist, etc.).
     /// </summary>
-	public class PlaylistEntity
-	{
-		public string Title { get; set; }
-
-        public PlaylistEntity()
-		{
-		}
-	}
+    public class PlaylistListUpdatedMessage : TinyMessageBase
+    {
+        public PlaylistListUpdatedMessage(object sender) 
+            : base(sender)
+        {
+        }
+    }
 }
diff --git a/MPfm/MPfm.MVP/Presenters/AddNewPlaylistPresenter.cs b/MPfm/MPfm.MVP/Presenters/AddNewPlaylistPresenter.cs
index 5b4af9b4..17bf3f52 100644
--- a/MPfm/MPfm.MVP/Presenters/AddNewPlaylistPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/AddNewPlaylistPresenter.cs
@@ -16,9 +16,14 @@
 // along with MPfm. If not, see <http://www.gnu.org/licenses/>.
 
 using System;
+using MPfm.Core;
+using MPfm.Library.Services.Interfaces;
+using MPfm.MVP.Messages;
 using MPfm.MVP.Models;
 using MPfm.MVP.Presenters.Interfaces;
 using MPfm.MVP.Views;
+using MPfm.Sound.Playlists;
+using TinyMessenger;
 
 namespace MPfm.MVP.Presenters
 {
@@ -27,19 +32,36 @@ namespace MPfm.MVP.Presenters
 	/// </summary>
     public class AddNewPlaylistPresenter : BasePresenter<IAddNewPlaylistView>, IAddNewPlaylistPresenter
 	{
-	    public AddNewPlaylistPresenter()
-        {
-        }
+	    private readonly ITinyMessengerHub _messengerHub;
+	    private readonly ILibraryService _libraryService;
 
-        public override void BindView(IAddNewPlaylistView view)
+	    public AddNewPlaylistPresenter(ITinyMessengerHub messengerHub, ILibraryService libraryService)
+	    {
+	        _messengerHub = messengerHub;
+	        _libraryService = libraryService;
+	    }
+
+	    public override void BindView(IAddNewPlaylistView view)
         {
-            base.BindView(view);
+            view.OnSavePlaylist = SavePlaylist;
 
-            view.OnSavePlaylist = SavePlaylist;            
+            base.BindView(view);
         }
 
 	    private void SavePlaylist(string title)
 	    {
+            try
+            {
+                var playlist = new Playlist();
+                playlist.Name = title;
+                _libraryService.InsertPlaylist(playlist);
+                _messengerHub.PublishAsync<PlaylistListUpdatedMessage>(new PlaylistListUpdatedMessage(this));
+            }
+            catch (Exception ex)
+            {
+                Tracing.Log("An error occured while saving playlist: " + ex.Message);
+                View.AddNewPlaylistError(ex);
+            }
 	    }
 	}
 }
diff --git a/MPfm/MPfm.MVP/Presenters/SelectPlaylistPresenter.cs b/MPfm/MPfm.MVP/Presenters/SelectPlaylistPresenter.cs
index 347a0b2c..5ea9b196 100644
--- a/MPfm/MPfm.MVP/Presenters/SelectPlaylistPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/SelectPlaylistPresenter.cs
@@ -17,11 +17,17 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using MPfm.Core;
+using MPfm.Library.Services.Interfaces;
 using MPfm.MVP.Bootstrap;
+using MPfm.MVP.Messages;
 using MPfm.MVP.Models;
 using MPfm.MVP.Navigation;
 using MPfm.MVP.Presenters.Interfaces;
 using MPfm.MVP.Views;
+using MPfm.Sound.Playlists;
+using TinyMessenger;
 
 namespace MPfm.MVP.Presenters
 {
@@ -32,12 +38,16 @@ public class SelectPlaylistPresenter : BasePresenter<ISelectPlaylistView>, ISele
 	{
         private readonly NavigationManager _navigationManager;
         private readonly MobileNavigationManager _mobileNavigationManager;
-        private LibraryBrowserEntity _item;
-	    private List<PlaylistEntity> _items;
+	    private readonly ITinyMessengerHub _messengerHub;
+	    private readonly ILibraryService _libraryService;
+	    private LibraryBrowserEntity _item;
+	    private List<Playlist> _items;
 
-	    public SelectPlaylistPresenter(LibraryBrowserEntity item)
+	    public SelectPlaylistPresenter(ITinyMessengerHub messengerHub, ILibraryService libraryService, LibraryBrowserEntity item)
         {
-            _item = item;
+	        _messengerHub = messengerHub;
+	        _libraryService = libraryService;
+	        _item = item;
 
 #if IOS || ANDROID
             _mobileNavigationManager = Bootstrapper.GetContainer().Resolve<MobileNavigationManager>();
@@ -53,55 +63,57 @@ public override void BindView(ISelectPlaylistView view)
 
             base.BindView(view);
 
+            _messengerHub.Subscribe<PlaylistListUpdatedMessage>(message => RefreshPlaylists());
+
             RefreshPlaylists();
         }
 
 	    private void RefreshPlaylists()
 	    {
-	        _items = new List<PlaylistEntity>();
-            _items.Add(new PlaylistEntity() { Title = "Bacon" });
-            _items.Add(new PlaylistEntity() { Title = "Cow" });
-            _items.Add(new PlaylistEntity() { Title = "Tenderloin" });
-            _items.Add(new PlaylistEntity() { Title = "Swine" });
-            _items.Add(new PlaylistEntity() { Title = "Ground" });
-            _items.Add(new PlaylistEntity() { Title = "Round" });
-            _items.Add(new PlaylistEntity() { Title = "Tail" });
-            _items.Add(new PlaylistEntity() { Title = "Pancetta" });
-            _items.Add(new PlaylistEntity() { Title = "Pig" });
-            _items.Add(new PlaylistEntity() { Title = "T-Bone" });
-            _items.Add(new PlaylistEntity() { Title = "Pork" });
-            _items.Add(new PlaylistEntity() { Title = "Chop" });
-            _items.Add(new PlaylistEntity() { Title = "Tongue" });
-            _items.Add(new PlaylistEntity() { Title = "Drumstick" });
-            _items.Add(new PlaylistEntity() { Title = "Jerky" });
-            _items.Add(new PlaylistEntity() { Title = "Steak" });
+	        _items = _libraryService.SelectPlaylists().ToList();
             View.RefreshPlaylists(_items);
 	    }        
 
-	    private void SelectPlaylist(PlaylistEntity playlistEntity)
+	    private void SelectPlaylist(Playlist playlist)
 	    {
-            //Task.Factory.StartNew(() =>
-            //{
-            //    // Check if adding a song or an album
-            //    if (_items[index].AudioFile != null)
-            //    {
-            //        _playerService.CurrentPlaylist.AddItem(_items[index].AudioFile);
-            //        View.NotifyNewPlaylistItems(string.Format("'{0}' was added at the end of the current playlist.", _items[index].Title));
-            //    }
-            //    else
-            //    {
-            //        var audioFiles = _libraryService.SelectAudioFiles(_items[index].Query).ToList();
-            //        _playerService.CurrentPlaylist.AddItems(audioFiles);
-            //        View.NotifyNewPlaylistItems(string.Format("'{0}' was added at the end of the current playlist ({1} songs).", _items[index].Title, audioFiles.Count));
-            //    }
-            //    _messengerHub.PublishAsync<PlayerPlaylistUpdatedMessage>(new PlayerPlaylistUpdatedMessage(this));
-            //}, _cancellationToken);
+            try
+            {
+                //Task.Factory.StartNew(() =>
+                //{
+                //    // Check if adding a song or an album
+                //    if (_items[index].AudioFile != null)
+                //    {
+                //        _playerService.CurrentPlaylist.AddItem(_items[index].AudioFile);
+                //        View.NotifyNewPlaylistItems(string.Format("'{0}' was added at the end of the current playlist.", _items[index].Title));
+                //    }
+                //    else
+                //    {
+                //        var audioFiles = _libraryService.SelectAudioFiles(_items[index].Query).ToList();
+                //        _playerService.CurrentPlaylist.AddItems(audioFiles);
+                //        View.NotifyNewPlaylistItems(string.Format("'{0}' was added at the end of the current playlist ({1} songs).", _items[index].Title, audioFiles.Count));
+                //    }
+                //    _messengerHub.PublishAsync<PlayerPlaylistUpdatedMessage>(new PlayerPlaylistUpdatedMessage(this));
+                //}, _cancellationToken);
+            }
+            catch (Exception ex)
+            {
+                Tracing.Log("An error occured while selecting playlist: " + ex.Message);
+                View.SelectPlaylistError(ex);
+            }
 	    }
 
 	    private void AddNewPlaylist()
 	    {
-	        var view = _mobileNavigationManager.CreateAddNewPlaylistView();
-            _mobileNavigationManager.PushDialogView("Add New Playlist", View, view);
+            try
+            {
+                var view = _mobileNavigationManager.CreateAddNewPlaylistView();
+                _mobileNavigationManager.PushDialogView("Add New Playlist", View, view);
+            }
+            catch (Exception ex)
+            {
+                Tracing.Log("An error occured while creating AddNewPlaylist view: " + ex.Message);
+                View.SelectPlaylistError(ex);
+            }
 	    }
 	}
 }
diff --git a/MPfm/MPfm.MVP/Services/InitializationService.cs b/MPfm/MPfm.MVP/Services/InitializationService.cs
index db0fcb30..360572f9 100644
--- a/MPfm/MPfm.MVP/Services/InitializationService.cs
+++ b/MPfm/MPfm.MVP/Services/InitializationService.cs
@@ -43,17 +43,15 @@ public class InitializationService : IInitializationService
         private TextWriterTraceListener textTraceListener = null;
 #endif
 
-        /// <summary>
-        /// Indicates what database major version is expected. Useful to update the database structure.
-        /// Needs to be used with the DatabaseVersionMinor property.
-        /// </summary>
-        public static int DatabaseVersionMajor { get; private set; }
+	    /// <summary>
+	    /// Indicates what database major version is expected. Useful to update the database structure.
+	    /// </summary>
+	    private int _databaseVersionMajor = 1;
 
-        /// <summary>
-        /// Indicates what database minor version is expected. Useful to update the database structure.
-        /// Needs to be used with the DatabaseVersionMajor property.
-        /// </summary>
-        public static int DatabaseVersionMinor { get; private set; }
+	    /// <summary>
+	    /// Indicates what database minor version is expected. Useful to update the database structure.
+	    /// </summary>
+	    private int _databaseVersionMinor = 6;
 
         public InitializationService(IAudioFileCacheService audioFileCacheService, ISyncListenerService syncListenerService)
         {
@@ -245,10 +243,10 @@ private void CheckIfDatabaseVersionNeedsToBeUpdated(string databaseFilePath)
             Tracing.Log("Main form init -- Database version is " + currentMajor.ToString() + "." + currentMinor.ToString("00"));
 
             // Check database version
-            if (DatabaseVersionMajor != currentMajor || DatabaseVersionMinor != currentMinor)
+            if (_databaseVersionMajor != currentMajor || _databaseVersionMinor != currentMinor)
             {
                 // Loop through versions to update (only minor versions for now)
-                for (int minor = currentMinor; minor < DatabaseVersionMinor; minor++)
+                for (int minor = currentMinor; minor < _databaseVersionMinor; minor++)
                 {
                     string sql = string.Empty;
                     string scriptFileName = "MPfm.Library.Scripts.1." + minor.ToString("00") + "-1." + (minor + 1).ToString("00") + ".sql";
diff --git a/MPfm/MPfm.MVP/Views/ISelectPlaylistView.cs b/MPfm/MPfm.MVP/Views/ISelectPlaylistView.cs
index 5b6f3787..99c8656f 100644
--- a/MPfm/MPfm.MVP/Views/ISelectPlaylistView.cs
+++ b/MPfm/MPfm.MVP/Views/ISelectPlaylistView.cs
@@ -19,6 +19,7 @@
 using System.Collections.Generic;
 using MPfm.MVP.Models;
 using MPfm.Player.Objects;
+using MPfm.Sound.Playlists;
 
 namespace MPfm.MVP.Views
 {
@@ -28,9 +29,9 @@ namespace MPfm.MVP.Views
 	public interface ISelectPlaylistView : IBaseView
 	{
         Action OnAddNewPlaylist { get; set; }
-        Action<PlaylistEntity> OnSelectPlaylist { get; set; }
+        Action<Playlist> OnSelectPlaylist { get; set; }
     
         void SelectPlaylistError(Exception ex);
-        void RefreshPlaylists(List<PlaylistEntity> playlists);
+        void RefreshPlaylists(List<Playlist> playlists);
 	}
 }
diff --git a/MPfm/MPfm.Sound/Playlists/Playlist.cs b/MPfm/MPfm.Sound/Playlists/Playlist.cs
index 99901172..c6f695db 100644
--- a/MPfm/MPfm.Sound/Playlists/Playlist.cs
+++ b/MPfm/MPfm.Sound/Playlists/Playlist.cs
@@ -19,6 +19,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using MPfm.Core;
+using MPfm.Core.Attributes;
 using MPfm.Sound.AudioFiles;
 
 namespace MPfm.Sound.Playlists
@@ -28,50 +29,71 @@ namespace MPfm.Sound.Playlists
     /// </summary>
     public class Playlist
     {
-        private List<PlaylistItem> items = null;
+        private List<PlaylistItem> _items = null;
         /// <summary>
-        /// List of playlist items.
+        /// List of playlist _items.
         /// </summary>
+        [DatabaseField(false)]
         public List<PlaylistItem> Items
         {
             get
             {
-                return items;
+                return _items;
             }
         }
 
-        private int currentItemIndex = 0;
+        private int _currentItemIndex = 0;
         /// <summary>
         /// Returns the current playlist item index.
         /// </summary>
+        [DatabaseField(false)]
         public int CurrentItemIndex
         {
             get
             {
-                return currentItemIndex;
+                return _currentItemIndex;
             }
         }
 
-        private PlaylistItem currentItem = null;
+        private PlaylistItem _currentItem = null;
         /// <summary>
         /// Returns the current item.
         /// </summary>
+        [DatabaseField(false)]
         public PlaylistItem CurrentItem
         {
             get
             {
-                return currentItem;
+                return _currentItem;
             }
         }
 
+        /// <summary>
+        /// Playlist name.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Playlist identifier.
+        /// </summary>
+        public Guid PlaylistId { get; set; }
+
+        /// <summary>
+        /// Playlist last modified.
+        /// </summary>
+        [DatabaseField(false)] // TODO: Save in database... causes an error in Android
+        public DateTime LastModified { get; set; }
+
         /// <summary>
         /// Playlist file path.
         /// </summary>
+        [DatabaseField(false)]
         public string FilePath { get; set; }
 
         /// <summary>
         /// Playlist format.
         /// </summary>
+        [DatabaseField(false)]
         public PlaylistFileFormat Format { get; set; }
 
         /// <summary>
@@ -79,9 +101,9 @@ public PlaylistItem CurrentItem
         /// </summary>
         public Playlist()
         {
-            items = new List<PlaylistItem>();
-            currentItemIndex = 0;            
-            FilePath = string.Empty;
+            _items = new List<PlaylistItem>();
+            PlaylistId = Guid.NewGuid();
+            LastModified = DateTime.Now;
             Format = PlaylistFileFormat.Unknown;
         }
 
@@ -136,9 +158,9 @@ public void Clear()
         {            
             FilePath = string.Empty;
             Format = PlaylistFileFormat.Unknown;
-            items = new List<PlaylistItem>();
-            currentItemIndex = 0;
-            currentItem = null;            
+            _items = new List<PlaylistItem>();
+            _currentItemIndex = 0;
+            _currentItem = null;            
         }
 
         /// <summary>
@@ -148,18 +170,18 @@ public void DisposeChannels()
         {
             #if !PCL && !WINDOWSSTORE && !WINDOWS_PHONE
             // Free current channel
-            if (currentItem.Channel != null)
+            if (_currentItem.Channel != null)
             {
-                currentItem.Dispose();
-                currentItem = null;
+                _currentItem.Dispose();
+                _currentItem = null;
             }
             #endif
 
-            // Go through items to set them load = false
-            for (int a = 0; a < items.Count; a++)
+            // Go through _items to set them load = false
+            for (int a = 0; a < _items.Count; a++)
             {
                 // Dispose channel, if not null (validation inside method)
-                items[a].Dispose();
+                _items[a].Dispose();
             }
         }
 
@@ -169,8 +191,8 @@ public void DisposeChannels()
         /// </summary>
         private void UpdateCurrentItem()
         {
-            if (currentItem == null && items.Count > 0)
-                currentItem = items[0];
+            if (_currentItem == null && _items.Count > 0)
+                _currentItem = _items[0];
         }
 
         /// <summary>
@@ -195,7 +217,7 @@ public void AddItem(AudioFile audioFile)
         }
 
         /// <summary>
-        /// Adds a list of items at the end of the playlist.
+        /// Adds a list of _items at the end of the playlist.
         /// </summary>
         /// <param name="filePaths">List of audio file paths</param>
         public void AddItems(List<string> filePaths)
@@ -214,7 +236,7 @@ public void AddItems(List<string> filePaths)
             //    numberOfFilesToReadMetadata = filePaths.Count;
             //}
 
-            // Loop through items
+            // Loop through _items
             for (int a = 0; a < filePaths.Count; a++)
             {
                 //// Check if metadata needs to be read
@@ -250,7 +272,7 @@ public void AddItems(List<string> filePaths)
         }
 
         /// <summary>
-        /// Adds a list of items at the end of the playlist.
+        /// Adds a list of _items at the end of the playlist.
         /// </summary>
         /// <param name="audioFiles">List of AudioFile instances</param>
         public void AddItems(List<AudioFile> audioFiles)
@@ -274,7 +296,7 @@ public void InsertItem(string filePath, int index)
 
             // Increment current item index if an item was inserted before the current item
             if (index <= CurrentItemIndex)
-                currentItemIndex++;
+                _currentItemIndex++;
 
             UpdateCurrentItem();
         }
@@ -291,7 +313,7 @@ public void InsertItem(AudioFile audioFile, int index)
 
             // Increment current item index if an item was inserted before the current item
             if (index <= CurrentItemIndex)
-                currentItemIndex++;
+                _currentItemIndex++;
 
             UpdateCurrentItem();
         }
@@ -311,11 +333,11 @@ public void RemoveItem(int index)
 
             // Decrement current item index if an item was removed before the current item
             if (index <= CurrentItemIndex)
-                currentItemIndex--;
+                _currentItemIndex--;
         }
 
         /// <summary>
-        /// Remove all playlist items matching the ids in the list.
+        /// Remove all playlist _items matching the ids in the list.
         /// </summary>
         /// <param name="playlistIds">List of playlist ids to remove</param>
         public void RemoveItems(List<Guid> playlistIds)
@@ -332,8 +354,8 @@ public void RemoveItems(List<Guid> playlistIds)
         /// </summary>
         public void First()
         {
-            currentItemIndex = 0;
-            currentItem = items[currentItemIndex];
+            _currentItemIndex = 0;
+            _currentItem = _items[_currentItemIndex];
         }
 
         /// <summary>
@@ -342,8 +364,8 @@ public void First()
         /// <param name="index">Playlist item index</param>
         public void GoTo(int index)
         {
-            currentItemIndex = index;
-            currentItem = items[currentItemIndex];
+            _currentItemIndex = index;
+            _currentItem = _items[_currentItemIndex];
         }
 
         /// <summary>
@@ -395,9 +417,9 @@ public void GoTo(string filePath)
         /// </summary>
         public void Previous()
         {
-            if (currentItemIndex > 0)
-                currentItemIndex--;
-            currentItem = items[currentItemIndex];
+            if (_currentItemIndex > 0)
+                _currentItemIndex--;
+            _currentItem = _items[_currentItemIndex];
         }
 
         /// <summary>
@@ -405,9 +427,9 @@ public void Previous()
         /// </summary>
         public void Next()
         {
-            if (currentItemIndex < items.Count - 1)
-                currentItemIndex++;                
-            currentItem = items[currentItemIndex];
+            if (_currentItemIndex < _items.Count - 1)
+                _currentItemIndex++;                
+            _currentItem = _items[_currentItemIndex];
         }
     }
 }