diff --git a/MPfm/branches/current/MPfm.Android/Classes/Activities/BaseActivity.cs b/MPfm/branches/current/MPfm.Android/Classes/Activities/BaseActivity.cs
new file mode 100644
index 00000000..5921cbce
--- /dev/null
+++ b/MPfm/branches/current/MPfm.Android/Classes/Activities/BaseActivity.cs
@@ -0,0 +1,18 @@
+using System;
+using Android.App;
+using MPfm.MVP.Views;
+
+namespace MPfm.Android
+{
+    [Activity(Icon = "@drawable/icon")]
+    public class BaseActivity : Activity, IBaseView
+    {
+        public Action OnViewDestroy { get; set; }
+
+        public void ShowView(bool shown)
+        {
+            // Ignore on Android
+        }
+    }
+}
+
diff --git a/MPfm/branches/current/MPfm.Android/Classes/Activities/MainActivity.cs b/MPfm/branches/current/MPfm.Android/Classes/Activities/MainActivity.cs
index 84b0e42c..6557cfdb 100644
--- a/MPfm/branches/current/MPfm.Android/Classes/Activities/MainActivity.cs
+++ b/MPfm/branches/current/MPfm.Android/Classes/Activities/MainActivity.cs
@@ -1,61 +1,109 @@
 using System;
+using System.Collections.Generic;
 using Android.App;
+using Android.Content.PM;
 using Android.Runtime;
 using Android.Support.V4.View;
 using Android.Views;
 using Android.OS;
+using Android.Widget;
+using MPfm.Android.Classes;
 using MPfm.Android.Classes.Adapters;
 using MPfm.Android.Classes.Fragments;
 using MPfm.Android.Classes.Listeners;
+using MPfm.Android.Classes.Objects;
+using MPfm.Library.UpdateLibrary;
+using MPfm.MVP.Models;
+using MPfm.MVP.Views;
+using Environment = Android.OS.Environment;
 
 namespace MPfm.Android
 {
-    [Activity(Icon = "@drawable/icon")]
-    public class MainActivity : Activity
+    [Activity(MainLauncher = true, NoHistory = true, ScreenOrientation = ScreenOrientation.Portrait, Theme = "@style/MyAppTheme")]
+    public class MainActivity : BaseActivity, ISplashView, IUpdateLibraryView, View.IOnClickListener
     {
-        //NavigationManager navigationManager;
         private ViewPager _viewPager;
         private TabPagerAdapter _tabPagerAdapter;
+        private Dialog _splashDialog;
+        private Dialog _updateLibraryDialog;
+        private AndroidNavigationManager _navigationManager;
+        private Button _updateLibraryDialog_button;
+        private TextView _updateLibraryDialog_lblTitle;
+        private TextView _updateLibraryDialog_lblSubtitle;
 
         protected override void OnCreate(Bundle bundle)
         {
             base.OnCreate(bundle);
 
+            // Get application state
+            ApplicationState state = (ApplicationState) LastNonConfigurationInstance;
+            if (state != null)
+            {
+                // Restore state here
+            }
+
+            // Load navigation manager and other important stuff before showing splash screen
+            _navigationManager = new AndroidNavigationManager();
             RequestWindowFeature(WindowFeatures.ActionBar);
+            //RequestWindowFeature(WindowFeatures.Progress);
             SetContentView(Resource.Layout.Main);
             ActionBar.NavigationMode = ActionBarNavigationMode.Tabs;
-            
-            _viewPager = FindViewById<ViewPager>(Resource.Id.main_pager);
-            _tabPagerAdapter = new TabPagerAdapter(FragmentManager, _viewPager, ActionBar);
-            _viewPager.Adapter = _tabPagerAdapter;
-            _viewPager.SetOnPageChangeListener(_tabPagerAdapter);
-
-            var playerTab = ActionBar.NewTab();
-            playerTab.SetTabListener(_tabPagerAdapter);
-            playerTab.SetText("Player");
-            ActionBar.AddTab(playerTab);
-            var playlistsTab = ActionBar.NewTab();
-            playlistsTab.SetTabListener(_tabPagerAdapter);
-            playlistsTab.SetText("Playlists");
-            ActionBar.AddTab(playlistsTab);
-            var artistsTab = ActionBar.NewTab();
-            artistsTab.SetTabListener(_tabPagerAdapter);
-            artistsTab.SetText("Artists");
-            ActionBar.AddTab(artistsTab);
-            var albumsTab = ActionBar.NewTab();
-            albumsTab.SetTabListener(_tabPagerAdapter);
-            albumsTab.SetText("Albums");
-            ActionBar.AddTab(albumsTab);
-            var songsTab = ActionBar.NewTab();
-            songsTab.SetTabListener(_tabPagerAdapter);
-            songsTab.SetText("Songs");
-            ActionBar.AddTab(songsTab);
-
-            // Create and start navigation manager
-            //navigationManager = Bootstrapper.GetContainer().Resolve<NavigationManager>();
-            //navigationManager.Start();
-
-            //button.Click += delegate { button.Text = string.Format("{0} clicks!", count++); };
+            //SetProgressBarVisibility(true);
+            //SetProgress(5000);
+        }
+
+        protected override void OnStart()
+        {
+            base.OnStart();
+
+            // Bind this activity to splash and update library views
+            _navigationManager.BindSplashView(this, ContinueInitialize);
+            _navigationManager.BindUpdateLibraryView(this);
+
+            // Show splash screen; then bind this activity to the Splash presenter
+            ShowSplashScreen();
+        }
+
+        private void ContinueInitialize()
+        {
+            RunOnUiThread(() =>
+                {
+                    // Stuff has finished loading; load layout
+                    _viewPager = FindViewById<ViewPager>(Resource.Id.main_pager);
+                    _tabPagerAdapter = new TabPagerAdapter(FragmentManager, _viewPager, ActionBar);
+                    _viewPager.Adapter = _tabPagerAdapter;
+                    _viewPager.SetOnPageChangeListener(_tabPagerAdapter);
+
+                    var playerTab = ActionBar.NewTab();
+                    playerTab.SetTabListener(_tabPagerAdapter);
+                    playerTab.SetText("Player");
+                    ActionBar.AddTab(playerTab);
+                    var playlistsTab = ActionBar.NewTab();
+                    playlistsTab.SetTabListener(_tabPagerAdapter);
+                    playlistsTab.SetText("Playlists");
+                    ActionBar.AddTab(playlistsTab);
+                    var artistsTab = ActionBar.NewTab();
+                    artistsTab.SetTabListener(_tabPagerAdapter);
+                    artistsTab.SetText("Artists");
+                    ActionBar.AddTab(artistsTab);
+                    var albumsTab = ActionBar.NewTab();
+                    albumsTab.SetTabListener(_tabPagerAdapter);
+                    albumsTab.SetText("Albums");
+                    ActionBar.AddTab(albumsTab);
+                    var songsTab = ActionBar.NewTab();
+                    songsTab.SetTabListener(_tabPagerAdapter);
+                    songsTab.SetText("Songs");
+                    ActionBar.AddTab(songsTab);
+
+                    RemoveSplashScreen();
+                });
+        }
+
+        public override Java.Lang.Object OnRetainNonConfigurationInstance()
+        {
+            // Save stuff here
+            ApplicationState state = new ApplicationState();
+            return state;
         }
 
         public override bool OnCreateOptionsMenu(IMenu menu)
@@ -67,8 +115,127 @@ public override bool OnCreateOptionsMenu(IMenu menu)
         public override bool OnOptionsItemSelected(IMenuItem menuItem)
         {
             string text = menuItem.TitleFormatted.ToString();
+
+            if (text.ToUpper() == "EFFECTS")
+            {
+                ProgressDialog progressDialog = ProgressDialog.Show(this, "Update Library", "Updating library...", true);                
+            }
+            else if (text.ToUpper() == "UPDATE LIBRARY")
+            {
+                ShowUpdateLibrary();
+            }
+            else if (text.ToUpper() == "SETTINGS")
+            {
+                // Seperate activity?
+            }
+            else if (text.ToUpper() == "ABOUT MPFM")
+            {
+                ShowSplashScreen();
+            }
             return base.OnOptionsItemSelected(menuItem);
         }
+
+        private void ShowSplashScreen()
+        {
+            _splashDialog = new Dialog(this, Resource.Style.SplashTheme);
+            _splashDialog.SetContentView(Resource.Layout.Splash);
+            _splashDialog.SetCancelable(false);            
+            _splashDialog.Show();
+        }
+
+        private void RemoveSplashScreen()
+        {
+            if (_splashDialog != null)
+            {
+                _splashDialog.Dismiss();
+                _splashDialog = null;
+            }
+        }
+
+        private void ShowUpdateLibrary()
+        {
+            // Configure dialog for Update Library
+            _updateLibraryDialog = new Dialog(this, Resource.Style.UpdateLibraryTheme);
+            _updateLibraryDialog.SetContentView(Resource.Layout.Fragment_UpdateLibrary);
+            _updateLibraryDialog.SetCancelable(false);
+            _updateLibraryDialog.SetTitle("Update Library");
+
+            // Get controls from dialog
+            _updateLibraryDialog_button = (Button)_updateLibraryDialog.FindViewById(Resource.Id.fragment_updateLibrary_button);
+            _updateLibraryDialog_button.SetOnClickListener(this);
+            _updateLibraryDialog_lblTitle = (TextView) _updateLibraryDialog.FindViewById(Resource.Id.fragment_updateLibrary_lblTitle);
+            _updateLibraryDialog_lblSubtitle = (TextView)_updateLibraryDialog.FindViewById(Resource.Id.fragment_updateLibrary_lblSubtitle);
+            _updateLibraryDialog.Show();
+
+            // Start update library process
+            string musicPath = Environment.GetExternalStoragePublicDirectory(Environment.DirectoryMusic).ToString();
+            OnStartUpdateLibrary(UpdateLibraryMode.SpecificFolder, null, musicPath);
+            //OnStartUpdateLibrary(UpdateLibraryMode.WholeLibrary, null, null);
+        }
+
+        private void RemoveUpdateLibrary()
+        {
+            if (_updateLibraryDialog != null)
+            {
+                _updateLibraryDialog.Dismiss();
+                _updateLibraryDialog = null;
+            }
+        }
+
+        #region ISplashView implementation
+
+        public void RefreshStatus(string message)
+        {
+            RunOnUiThread(() =>
+                {
+                    TextView splashTextView = (TextView)_splashDialog.FindViewById(Resource.Id.splash_text);
+                    splashTextView.Text = message;
+                });
+        }
+
+        public void InitDone()
+        {
+        }
+
+        #endregion
+
+        #region IUpdateLibraryView implementation
+
+        public Action<UpdateLibraryMode, List<string>, string> OnStartUpdateLibrary { get; set; }
+
+        public void RefreshStatus(UpdateLibraryEntity entity)
+        {
+            RunOnUiThread(() =>
+            {                
+                _updateLibraryDialog_lblTitle.Text = entity.Title;
+                _updateLibraryDialog_lblSubtitle.Text = entity.Subtitle;
+            });
+        }
+
+        public void AddToLog(string entry)
+        {
+        }
+
+        public void ProcessEnded(bool canceled)
+        {
+            RunOnUiThread(() =>
+            {
+                _updateLibraryDialog_lblTitle.Text = "Update successful.";
+                _updateLibraryDialog_lblSubtitle.Text = string.Empty;
+                _updateLibraryDialog_button.Text = "OK";
+            });
+        }
+
+        #endregion
+
+        public void OnClick(View v)
+        {
+            if (_updateLibraryDialog_button.Text == "Cancel")
+            {
+                // TODO: Cancel update
+            }
+
+            RemoveUpdateLibrary();
+        }
     }
 }
-
diff --git a/MPfm/branches/current/MPfm.Android/Classes/Activities/SplashActivity.cs b/MPfm/branches/current/MPfm.Android/Classes/Activities/SplashActivity.cs
deleted file mode 100644
index 5cd03f1b..00000000
--- a/MPfm/branches/current/MPfm.Android/Classes/Activities/SplashActivity.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using Android.App;
-using Android.Content.PM;
-using Android.OS;
-
-namespace MPfm.Android
-{
-    [Activity(MainLauncher = true, NoHistory = true, ScreenOrientation = ScreenOrientation.Portrait, Theme = "@style/Theme.Splash")]
-    public class SplashActivity : Activity
-    {
-        //TextView textViewStatus;
-
-        public SplashActivity()
-        {
-        }
-
-        protected override void OnCreate(Bundle bundle)
-        {
-            base.OnCreate(bundle);
-
-            //SetContentView(Resource.Layout.Splash);
-            //textViewStatus = FindViewById<TextView>(Resource.Id.textViewStatus);
-
-            StartActivity(typeof(MainActivity));
-        }
-
-        //public void ShowError(Exception ex)
-        //{
-        //    RunOnUiThread(() =>
-        //    {
-        //        textViewStatus.Text = "Error: " + ex.Message;
-        //    });
-        //}
-
-        //public void RefreshMessage(string message)
-        //{
-        //    RunOnUiThread(() =>
-        //    {
-        //        textViewStatus.Text = message;
-        //    });
-        //}
-
-        //public void InitializeDone()
-        //{
-        //    RunOnUiThread(() =>
-        //    {
-        //        textViewStatus.Text = "Chargement complet.";
-        //        StartActivity(typeof(MainActivity));
-        //    });
-        //}
-    }
-}
-
diff --git a/MPfm/branches/current/MPfm.Android/Classes/Adapters/TabPagerAdapter.cs b/MPfm/branches/current/MPfm.Android/Classes/Adapters/TabPagerAdapter.cs
index 287ef988..feb76fe7 100644
--- a/MPfm/branches/current/MPfm.Android/Classes/Adapters/TabPagerAdapter.cs
+++ b/MPfm/branches/current/MPfm.Android/Classes/Adapters/TabPagerAdapter.cs
@@ -40,6 +40,11 @@ public void OnTabUnselected(ActionBar.Tab tab, FragmentTransaction ft)
         {
         }
 
+        public override int GetItemPosition(Java.Lang.Object p0)
+        {
+            return base.GetItemPosition(p0);
+        }
+
         public override Fragment GetItem(int p0)
         {
             return new GenericListFragment();
diff --git a/MPfm/branches/current/MPfm.Android/Classes/AndroidNavigationManager.cs b/MPfm/branches/current/MPfm.Android/Classes/AndroidNavigationManager.cs
new file mode 100644
index 00000000..2b9641ef
--- /dev/null
+++ b/MPfm/branches/current/MPfm.Android/Classes/AndroidNavigationManager.cs
@@ -0,0 +1,8 @@
+using MPfm.MVP;
+
+namespace MPfm.Android.Classes
+{
+    public class AndroidNavigationManager : NavigationManager
+    {
+    }
+}
\ No newline at end of file
diff --git a/MPfm/branches/current/MPfm.Android/Classes/Fragments/BaseFragment.cs b/MPfm/branches/current/MPfm.Android/Classes/Fragments/BaseFragment.cs
new file mode 100644
index 00000000..d5959df5
--- /dev/null
+++ b/MPfm/branches/current/MPfm.Android/Classes/Fragments/BaseFragment.cs
@@ -0,0 +1,11 @@
+using Android.App;
+using Android.OS;
+using Android.Views;
+
+namespace MPfm.Android.Classes.Fragments
+{
+    public class BaseFragment : Fragment
+    {        
+        
+    }
+}
\ No newline at end of file
diff --git a/MPfm/branches/current/MPfm.Android/Classes/Fragments/UpdateLibraryFragment.cs b/MPfm/branches/current/MPfm.Android/Classes/Fragments/UpdateLibraryFragment.cs
new file mode 100644
index 00000000..7edbc209
--- /dev/null
+++ b/MPfm/branches/current/MPfm.Android/Classes/Fragments/UpdateLibraryFragment.cs
@@ -0,0 +1,29 @@
+using Android.App;
+using Android.OS;
+using Android.Views;
+using Android.Widget;
+
+namespace MPfm.Android.Classes.Fragments
+{
+    public class UpdateLibraryFragment : Fragment, View.IOnClickListener
+    {        
+        private View _view;
+        private ProgressBar _progressBar;
+        private TextView _lblSubtitle;
+        private TextView _lblTitle;
+
+        public override View OnCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
+        {
+            _view = inflater.Inflate(Resource.Layout.Fragment_UpdateLibrary, container, false);
+            _progressBar = _view.FindViewById<ProgressBar>(Resource.Id.fragment_updateLibrary_progressBar);
+            _lblTitle = _view.FindViewById<TextView>(Resource.Id.fragment_updateLibrary_lblTitle);
+            _lblSubtitle = _view.FindViewById<TextView>(Resource.Id.fragment_updateLibrary_lblSubtitle);
+            return _view;
+        }
+
+        public void OnClick(View v)
+        {
+            
+        }
+    }
+}
\ No newline at end of file
diff --git a/MPfm/branches/current/MPfm.Android/Classes/Objects/ApplicationState.cs b/MPfm/branches/current/MPfm.Android/Classes/Objects/ApplicationState.cs
new file mode 100644
index 00000000..3a286642
--- /dev/null
+++ b/MPfm/branches/current/MPfm.Android/Classes/Objects/ApplicationState.cs
@@ -0,0 +1,7 @@
+namespace MPfm.Android.Classes.Objects
+{
+    public class ApplicationState : Java.Lang.Object
+    {
+        public string Test { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/MPfm/branches/current/MPfm.Android/Classes/Objects/GenericListItem.cs b/MPfm/branches/current/MPfm.Android/Classes/Objects/GenericListItem.cs
index 59bc3045..f02a79ca 100644
--- a/MPfm/branches/current/MPfm.Android/Classes/Objects/GenericListItem.cs
+++ b/MPfm/branches/current/MPfm.Android/Classes/Objects/GenericListItem.cs
@@ -1,9 +1,3 @@
-using System.Collections.Generic;
-using Android.App;
-using Android.Graphics;
-using Android.Views;
-using Android.Widget;
-
 namespace MPfm.Android.Classes.Objects
 {
     public class GenericListItem
diff --git a/MPfm/branches/current/MPfm.Android/MPfm.Android.csproj b/MPfm/branches/current/MPfm.Android/MPfm.Android.csproj
index 822653ff..28e1b166 100644
--- a/MPfm/branches/current/MPfm.Android/MPfm.Android.csproj
+++ b/MPfm/branches/current/MPfm.Android/MPfm.Android.csproj
@@ -31,6 +31,8 @@
     <WarningLevel>4</WarningLevel>
     <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
     <AndroidLinkMode>None</AndroidLinkMode>
+    <AndroidLinkSkip />
+    <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -56,16 +58,20 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Classes\Activities\SplashActivity.cs" />
+    <Compile Include="Classes\Activities\BaseActivity.cs" />
     <Compile Include="Classes\Activities\MainActivity.cs" />
     <Compile Include="Classes\Adapters\TabPagerAdapter.cs" />
     <Compile Include="Classes\Adapters\GenericListAdapter.cs" />
     <Compile Include="Classes\Application.cs" />
+    <Compile Include="Classes\AndroidNavigationManager.cs" />
+    <Compile Include="Classes\Fragments\BaseFragment.cs" />
+    <Compile Include="Classes\Fragments\UpdateLibraryFragment.cs" />
     <Compile Include="Classes\Fragments\GenericListFragment.cs" />
     <Compile Include="Classes\Fragments\PlayerFragment.cs" />
     <Compile Include="Classes\Helpers\BitmapHelper.cs" />
     <Compile Include="Classes\Helpers\BitmapCache.cs" />
     <Compile Include="Classes\Listeners\TabListener.cs" />
+    <Compile Include="Classes\Objects\ApplicationState.cs" />
     <Compile Include="Classes\Objects\GenericListItem.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -87,6 +93,12 @@
     <AndroidResource Include="Resources\Layout\GenericCell.axml">
       <SubType>Designer</SubType>
     </AndroidResource>
+    <AndroidResource Include="Resources\Layout\Fragment_UpdateLibrary.axml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+    <AndroidResource Include="Resources\Layout\Splash.axml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\Layout\Main.axml">
@@ -125,6 +137,8 @@
     <AndroidResource Include="Resources\Values\Colors.xml" />
     <AndroidResource Include="Resources\Drawable\Splash.png" />
     <AndroidResource Include="Resources\Drawable\Icon.png" />
+    <AndroidResource Include="Resources\Anim\fade_in.xml" />
+    <AndroidResource Include="Resources\Anim\fade_out.xml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Lib\armeabi\" />
diff --git a/MPfm/branches/current/MPfm.Android/Resources/Anim/fade_in.xml b/MPfm/branches/current/MPfm.Android/Resources/Anim/fade_in.xml
new file mode 100644
index 00000000..e8c93847
--- /dev/null
+++ b/MPfm/branches/current/MPfm.Android/Resources/Anim/fade_in.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="150" />
\ No newline at end of file
diff --git a/MPfm/branches/current/MPfm.Android/Resources/Anim/fade_out.xml b/MPfm/branches/current/MPfm.Android/Resources/Anim/fade_out.xml
new file mode 100644
index 00000000..e844ca4d
--- /dev/null
+++ b/MPfm/branches/current/MPfm.Android/Resources/Anim/fade_out.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:fromAlpha="1.0" android:toAlpha="0.0" android:duration="150" />
\ No newline at end of file
diff --git a/MPfm/branches/current/MPfm.Android/Resources/Layout/Fragment_UpdateLibrary.axml b/MPfm/branches/current/MPfm.Android/Resources/Layout/Fragment_UpdateLibrary.axml
new file mode 100644
index 00000000..977b382b
--- /dev/null
+++ b/MPfm/branches/current/MPfm.Android/Resources/Layout/Fragment_UpdateLibrary.axml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fragment_updateLibrary_mainLayout"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+  <TextView
+    android:id="@+id/fragment_updateLibrary_lblTitle"
+    android:text="[Title]"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:padding="6dip" />
+  <TextView
+    android:id="@+id/fragment_updateLibrary_lblSubtitle"
+    android:text="[Subtitle]"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:padding="6dip" />
+  <ProgressBar
+    android:id="@+id/fragment_updateLibrary_progressBar"
+    android:max="100"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+  />
+  <Button
+    android:id="@+id/fragment_updateLibrary_button"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:text="Cancel"
+    />
+</LinearLayout>
\ No newline at end of file
diff --git a/MPfm/branches/current/MPfm.Android/Resources/Layout/GenericCell.axml b/MPfm/branches/current/MPfm.Android/Resources/Layout/GenericCell.axml
index fb12bbca..6705409f 100644
--- a/MPfm/branches/current/MPfm.Android/Resources/Layout/GenericCell.axml
+++ b/MPfm/branches/current/MPfm.Android/Resources/Layout/GenericCell.axml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
-   android:layout_height="30dp"              
+   android:layout_height="70dp"              
    android:orientation="horizontal">
   <ImageView
     android:id="@+id/genericcell_image"
@@ -14,6 +14,6 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:textColor="#FF000000"
-      android:textSize="20dip"
+      android:textSize="30dip"
      />
 </LinearLayout>
\ No newline at end of file
diff --git a/MPfm/branches/current/MPfm.Android/Resources/Layout/Splash.axml b/MPfm/branches/current/MPfm.Android/Resources/Layout/Splash.axml
new file mode 100644
index 00000000..1ef026de
--- /dev/null
+++ b/MPfm/branches/current/MPfm.Android/Resources/Layout/Splash.axml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/splash_layout"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+  <TextView
+    android:id="@+id/splash_text"
+    android:text="Loading..."
+    android:background="#AA000000"
+    android:textColor="#ffffffff"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:padding="6dip" />
+</LinearLayout>
diff --git a/MPfm/branches/current/MPfm.Android/Resources/Menu/main_menu.xml b/MPfm/branches/current/MPfm.Android/Resources/Menu/main_menu.xml
index 56558b2e..f972252b 100644
--- a/MPfm/branches/current/MPfm.Android/Resources/Menu/main_menu.xml
+++ b/MPfm/branches/current/MPfm.Android/Resources/Menu/main_menu.xml
@@ -3,8 +3,11 @@
   <item android:id="@+id/menu_item_effects"
       android:title="Effects"
       android:showAsAction="ifRoom|withText" />
+  <item android:id="@+id/menu_item_updateLibrary"
+      android:title="Update Library"
+      android:showAsAction="ifRoom|withText" />
   <item android:id="@+id/menu_item_settings"
-      android:showAsAction="ifRoom|withText"
+      android:showAsAction="never"
       android:title="Settings" />
   <item android:id="@+id/menu_item_about"
       android:showAsAction="never"
diff --git a/MPfm/branches/current/MPfm.Android/Resources/Resource.Designer.cs b/MPfm/branches/current/MPfm.Android/Resources/Resource.Designer.cs
index 7d0e36d4..bdd4f45a 100644
--- a/MPfm/branches/current/MPfm.Android/Resources/Resource.Designer.cs
+++ b/MPfm/branches/current/MPfm.Android/Resources/Resource.Designer.cs
@@ -23,6 +23,20 @@ public static void UpdateIdValues()
 		{
 		}
 		
+		public partial class Animation
+		{
+			
+			// aapt resource value: 0x7f040000
+			public const int fade_in = 2130968576;
+			
+			// aapt resource value: 0x7f040001
+			public const int fade_out = 2130968577;
+			
+			private Animation()
+			{
+			}
+		}
+		
 		public partial class Attribute
 		{
 			
@@ -34,8 +48,8 @@ private Attribute()
 		public partial class Color
 		{
 			
-			// aapt resource value: 0x7f040000
-			public const int color_black = 2130968576;
+			// aapt resource value: 0x7f050000
+			public const int color_black = 2131034112;
 			
 			private Color()
 			{
@@ -59,71 +73,95 @@ private Drawable()
 		public partial class Id
 		{
 			
-			// aapt resource value: 0x7f08000d
-			public const int fragment_player_btnNext = 2131230733;
+			// aapt resource value: 0x7f09000d
+			public const int fragment_player_btnNext = 2131296269;
 			
-			// aapt resource value: 0x7f08000c
-			public const int fragment_player_btnPlayPause = 2131230732;
+			// aapt resource value: 0x7f09000c
+			public const int fragment_player_btnPlayPause = 2131296268;
 			
-			// aapt resource value: 0x7f08000b
-			public const int fragment_player_btnPrevious = 2131230731;
+			// aapt resource value: 0x7f09000b
+			public const int fragment_player_btnPrevious = 2131296267;
 			
-			// aapt resource value: 0x7f080001
-			public const int fragment_player_frameLayout = 2131230721;
+			// aapt resource value: 0x7f090001
+			public const int fragment_player_frameLayout = 2131296257;
 			
-			// aapt resource value: 0x7f080002
-			public const int fragment_player_imageViewAlbumArt = 2131230722;
+			// aapt resource value: 0x7f090002
+			public const int fragment_player_imageViewAlbumArt = 2131296258;
 			
-			// aapt resource value: 0x7f080005
-			public const int fragment_player_lblAlbumTitle = 2131230725;
+			// aapt resource value: 0x7f090005
+			public const int fragment_player_lblAlbumTitle = 2131296261;
 			
-			// aapt resource value: 0x7f080004
-			public const int fragment_player_lblArtistName = 2131230724;
+			// aapt resource value: 0x7f090004
+			public const int fragment_player_lblArtistName = 2131296260;
 			
-			// aapt resource value: 0x7f080008
-			public const int fragment_player_lblLength = 2131230728;
+			// aapt resource value: 0x7f090008
+			public const int fragment_player_lblLength = 2131296264;
 			
-			// aapt resource value: 0x7f080007
-			public const int fragment_player_lblPosition = 2131230727;
+			// aapt resource value: 0x7f090007
+			public const int fragment_player_lblPosition = 2131296263;
 			
-			// aapt resource value: 0x7f080006
-			public const int fragment_player_lblSongTitle = 2131230726;
+			// aapt resource value: 0x7f090006
+			public const int fragment_player_lblSongTitle = 2131296262;
 			
-			// aapt resource value: 0x7f080003
-			public const int fragment_player_linearLayout = 2131230723;
+			// aapt resource value: 0x7f090003
+			public const int fragment_player_linearLayout = 2131296259;
 			
-			// aapt resource value: 0x7f08000a
-			public const int fragment_player_linearLayoutButtons = 2131230730;
+			// aapt resource value: 0x7f09000a
+			public const int fragment_player_linearLayoutButtons = 2131296266;
 			
-			// aapt resource value: 0x7f080000
-			public const int fragment_player_mainLayout = 2131230720;
+			// aapt resource value: 0x7f090000
+			public const int fragment_player_mainLayout = 2131296256;
+			
+			// aapt resource value: 0x7f090009
+			public const int fragment_player_seekBar = 2131296265;
+			
+			// aapt resource value: 0x7f090012
+			public const int fragment_updateLibrary_button = 2131296274;
+			
+			// aapt resource value: 0x7f090010
+			public const int fragment_updateLibrary_lblSubtitle = 2131296272;
+			
+			// aapt resource value: 0x7f09000f
+			public const int fragment_updateLibrary_lblTitle = 2131296271;
 			
-			// aapt resource value: 0x7f080009
-			public const int fragment_player_seekBar = 2131230729;
+			// aapt resource value: 0x7f09000e
+			public const int fragment_updateLibrary_mainLayout = 2131296270;
 			
-			// aapt resource value: 0x7f08000e
-			public const int genericcell_image = 2131230734;
+			// aapt resource value: 0x7f090011
+			public const int fragment_updateLibrary_progressBar = 2131296273;
 			
-			// aapt resource value: 0x7f08000f
-			public const int genericcell_title = 2131230735;
+			// aapt resource value: 0x7f090013
+			public const int genericcell_image = 2131296275;
 			
-			// aapt resource value: 0x7f080010
-			public const int main_layout = 2131230736;
+			// aapt resource value: 0x7f090014
+			public const int genericcell_title = 2131296276;
 			
-			// aapt resource value: 0x7f080011
-			public const int main_pager = 2131230737;
+			// aapt resource value: 0x7f090015
+			public const int main_layout = 2131296277;
 			
-			// aapt resource value: 0x7f080012
-			public const int main_pager_title_strip = 2131230738;
+			// aapt resource value: 0x7f090016
+			public const int main_pager = 2131296278;
 			
-			// aapt resource value: 0x7f080015
-			public const int menu_item_about = 2131230741;
+			// aapt resource value: 0x7f090017
+			public const int main_pager_title_strip = 2131296279;
 			
-			// aapt resource value: 0x7f080013
-			public const int menu_item_effects = 2131230739;
+			// aapt resource value: 0x7f09001d
+			public const int menu_item_about = 2131296285;
 			
-			// aapt resource value: 0x7f080014
-			public const int menu_item_settings = 2131230740;
+			// aapt resource value: 0x7f09001a
+			public const int menu_item_effects = 2131296282;
+			
+			// aapt resource value: 0x7f09001c
+			public const int menu_item_settings = 2131296284;
+			
+			// aapt resource value: 0x7f09001b
+			public const int menu_item_updateLibrary = 2131296283;
+			
+			// aapt resource value: 0x7f090018
+			public const int splash_layout = 2131296280;
+			
+			// aapt resource value: 0x7f090019
+			public const int splash_text = 2131296281;
 			
 			private Id()
 			{
@@ -137,10 +175,16 @@ public partial class Layout
 			public const int Fragment_Player = 2130903040;
 			
 			// aapt resource value: 0x7f030001
-			public const int GenericCell = 2130903041;
+			public const int Fragment_UpdateLibrary = 2130903041;
 			
 			// aapt resource value: 0x7f030002
-			public const int Main = 2130903042;
+			public const int GenericCell = 2130903042;
+			
+			// aapt resource value: 0x7f030003
+			public const int Main = 2130903043;
+			
+			// aapt resource value: 0x7f030004
+			public const int Splash = 2130903044;
 			
 			private Layout()
 			{
@@ -150,8 +194,8 @@ private Layout()
 		public partial class Menu
 		{
 			
-			// aapt resource value: 0x7f070000
-			public const int main_menu = 2131165184;
+			// aapt resource value: 0x7f080000
+			public const int main_menu = 2131230720;
 			
 			private Menu()
 			{
@@ -161,11 +205,11 @@ private Menu()
 		public partial class String
 		{
 			
-			// aapt resource value: 0x7f050001
-			public const int ApplicationName = 2131034113;
+			// aapt resource value: 0x7f060001
+			public const int ApplicationName = 2131099649;
 			
-			// aapt resource value: 0x7f050000
-			public const int Hello = 2131034112;
+			// aapt resource value: 0x7f060000
+			public const int Hello = 2131099648;
 			
 			private String()
 			{
@@ -175,14 +219,20 @@ private String()
 		public partial class Style
 		{
 			
-			// aapt resource value: 0x7f060002
-			public const int MyActionBar = 2131099650;
+			// aapt resource value: 0x7f070004
+			public const int DialogAnimation = 2131165188;
 			
-			// aapt resource value: 0x7f060001
-			public const int MyAppTheme = 2131099649;
+			// aapt resource value: 0x7f070001
+			public const int MyActionBar = 2131165185;
 			
-			// aapt resource value: 0x7f060000
-			public const int Theme_Splash = 2131099648;
+			// aapt resource value: 0x7f070000
+			public const int MyAppTheme = 2131165184;
+			
+			// aapt resource value: 0x7f070002
+			public const int SplashTheme = 2131165186;
+			
+			// aapt resource value: 0x7f070003
+			public const int UpdateLibraryTheme = 2131165187;
 			
 			private Style()
 			{
diff --git a/MPfm/branches/current/MPfm.Android/Resources/Values/Styles.xml b/MPfm/branches/current/MPfm.Android/Resources/Values/Styles.xml
index 6194ceab..bd12bafa 100644
--- a/MPfm/branches/current/MPfm.Android/Resources/Values/Styles.xml
+++ b/MPfm/branches/current/MPfm.Android/Resources/Values/Styles.xml
@@ -1,15 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <style name="Theme.Splash" parent="android:Theme.Holo.Light.DarkActionBar">
-    <item name="android:icon">@drawable/icon</item>
-    <item name="android:windowBackground">@drawable/splash</item>
-    <item name="android:windowNoTitle">true</item>
-  </style>
   <style name="MyAppTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
-    <item name="android:logo">@drawable/icon</item>
+    <item name="android:icon">@drawable/icon</item>
+    <item name="android:logo">@drawable/icon</item>    
     <!--<item name="android:actionBarStyle">@style/MyActionBar</item>-->
   </style>
   <style name="MyActionBar" parent="@android:style/Widget.Holo.Light.ActionBar">
     <item name="android:background">#FF000000</item>
   </style>
+  <style name="SplashTheme">
+    <item name="android:icon">@drawable/icon</item>
+    <item name="android:padding">0dp</item>
+    <item name="android:windowBackground">@drawable/splash</item>
+    <item name="android:windowFrame">@null</item>
+    <item name="android:windowNoTitle">true</item>
+  </style>
+  <style name="UpdateLibraryTheme" parent="@android:style/Theme.Holo.Dialog">
+    <item name="android:icon">@drawable/icon</item>
+    <!--<item name="android:padding">8dp</item>-->
+    <item name="android:windowAnimationStyle">@style/DialogAnimation</item>
+  </style>
+  <style name="DialogAnimation">    
+    <item name="android:windowEnterAnimation">@anim/fade_in</item>
+    <item name="android:windowExitAnimation">@anim/fade_out</item>
+  </style>
 </resources>
\ No newline at end of file
diff --git a/MPfm/branches/current/MPfm.Library/Database/DatabaseFacade.cs b/MPfm/branches/current/MPfm.Library/Database/DatabaseFacade.cs
new file mode 100644
index 00000000..7498cb1c
--- /dev/null
+++ b/MPfm/branches/current/MPfm.Library/Database/DatabaseFacade.cs
@@ -0,0 +1,1013 @@
+//
+// DatabaseFacade.cs: MPfm implementation of the Gateway class.
+//
+// Copyright © 2011-2012 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 System.Linq;
+using System.Text;
+using MPfm.Library.Database.Interfaces;
+using MPfm.Library.Objects;
+using MPfm.Player.Objects;
+using MPfm.Sound.AudioFiles;
+
+namespace MPfm.Library.Database
+{
+    /// <summary>
+    /// The DatabaseFacade class implements the SQLiteGateway class.
+    /// It acts as a facade to select, insert, update and delete data from the
+    /// MPfm database.
+    /// </summary>
+    public class DatabaseFacade : IDatabaseFacade
+    {
+        private readonly ISQLiteGateway _gateway;
+
+        /// <summary>
+        /// Default constructor for the DatabaseFacade class.
+        /// </summary>
+        /// <param name="databaseFilePath">Database file path</param>
+        public DatabaseFacade(string databaseFilePath)
+        {
+
+#if ANDROID
+            _gateway = new MonoSQLiteGateway(databaseFilePath);
+#else
+            _gateway = new SQLiteGateway(databaseFilePath);
+#endif
+        }
+		
+        /// <summary>
+        /// Executes an SQL statement.
+        /// </summary>
+        /// <param name="sql">SQL statement to execute</param>
+        public void ExecuteSQL(string sql)
+        {
+            _gateway.Execute(sql);
+        }
+
+        /// <summary>
+        /// Resets the library.
+        /// </summary>
+        public void ResetLibrary()
+        {
+            // Delete all table content
+            _gateway.Delete("AudioFiles");
+            _gateway.Delete("PlaylistFiles");
+            _gateway.Delete("Loops");
+            _gateway.Delete("Markers");
+        }
+
+        #region Audio Files
+        
+        /// <summary>
+        /// Selects all audio files from the database.
+        /// </summary>
+        /// <returns>List of AudioFiles</returns>
+        public List<AudioFile> SelectAudioFiles()
+        {
+            List<AudioFile> audioFiles = _gateway.Select<AudioFile>("SELECT * FROM AudioFiles");
+            return audioFiles;
+        }
+		
+		public List<AudioFile> SelectAudioFiles(AudioFileFormat format, string artistName, string albumTitle, string search)
+		{
+			StringBuilder sql = new StringBuilder();
+			sql.AppendLine("SELECT * FROM AudioFiles ");
+			
+			if(format != AudioFileFormat.All || !String.IsNullOrEmpty(artistName) || !String.IsNullOrEmpty(albumTitle) || !String.IsNullOrEmpty(search))
+			{
+				sql.AppendLine(" WHERE ");
+				
+				int count = 0;
+				if(format != AudioFileFormat.All)
+				{
+					count++;
+					sql.AppendLine(" [FileType] = '" + format.ToString() + "'");
+				}
+				if(!String.IsNullOrEmpty(artistName))
+				{
+					count++;
+					if(count > 1)
+					{
+						sql.AppendLine(" AND ");
+					}
+					sql.AppendLine(" [ArtistName] = '" + artistName + "' ");
+				}
+				if(!String.IsNullOrEmpty(albumTitle))
+				{
+					count++;
+					if(count > 1)
+					{
+						sql.AppendLine(" AND ");
+					}
+					sql.AppendLine(" [ArtistName] = '" + albumTitle + "' ");
+				}
+				if(!String.IsNullOrEmpty(search))
+				{
+
+				}			
+			}
+
+            List<AudioFile> audioFiles = _gateway.Select<AudioFile>(sql.ToString());
+			return audioFiles;
+		}
+
+        /// <summary>
+        /// Selects a specific audio file from the database by its identifier.
+        /// </summary>
+        /// <param name="audioFileId">Audio file unique identifier</param>
+        /// <returns>AudioFile</returns>
+        public AudioFile SelectAudioFile(Guid audioFileId)
+        {
+            AudioFile audioFile = _gateway.SelectOne<AudioFile>("SELECT * FROM AudioFiles WHERE AudioFileId = '" + audioFileId.ToString() + "'");
+            return audioFile;
+        }
+
+        /// <summary>
+        /// Inserts a new audio file into the database.
+        /// </summary>
+        /// <param name="audioFile">AudioFile to insert</param>
+        public void InsertAudioFile(AudioFile audioFile)
+        {
+            _gateway.Insert<AudioFile>(audioFile, "AudioFiles");            
+        }
+
+        ///// <summary>
+        ///// Inserts new audio files into the database.
+        ///// </summary>
+        ///// <param name="audioFiles">List of AudioFiles to insert</param>
+        //public void InsertAudioFiles(List<AudioFile> audioFiles)
+        //{
+        //    // Insert song
+        //    //Insert("AudioFiles", "AudioFileId", audioFiles);
+        //    string tableName = "AudioFiles";
+        //    string idFieldName = "AudioFileId";
+
+        //    // Get empty result set
+        //    string baseQuery = "SELECT * FROM " + tableName;
+        //    DataTable table = Select(baseQuery + " WHERE " + idFieldName + " = ''");
+
+        //    // Loop through objects
+        //    foreach (AudioFile audioFile in audioFiles)
+        //    {
+        //        // Add new row to data table
+        //        DataRow newRow = table.NewRow();
+        //        table.Rows.Add(newRow);
+        //        ConvertLibrary.ToRow(ref newRow, audioFile);
+        //    }
+
+        //    // Insert new row into database
+        //    UpdateDataTableTransaction(table, baseQuery);
+        //}
+
+        /// <summary>
+        /// Updates an existing audio file to the database.
+        /// </summary>
+        /// <param name="audioFile">AudioFile to update</param>
+        public void UpdateAudioFile(AudioFile audioFile)
+        {
+            _gateway.Update<AudioFile>(audioFile, "AudioFiles", "AudioFileId", audioFile.Id.ToString());
+        }
+
+        /// <summary>
+        /// Deletes an audio file from the database.
+        /// </summary>
+        /// <param name="audioFileId">AudioFile to delete</param>
+        public void DeleteAudioFile(Guid audioFileId)
+        {
+            _gateway.Delete("AudioFiles", "AudioFileId", audioFileId);
+        }
+
+        /// <summary>
+        /// Deletes audio files from the database based on their file path.
+        /// </summary>
+        /// <param name="basePath">Base audio file path</param>
+        public void DeleteAudioFiles(string basePath)
+        {
+            _gateway.Delete("AudioFiles", "FilePath LIKE '" + basePath + "%'");
+        }
+
+        /// <summary>
+        /// Returns the distinct list of artist names from the database.        
+        /// </summary>        
+        /// <returns>List of distinct artist names</returns>
+        public List<string> SelectDistinctArtistNames()
+        {
+            return SelectDistinctArtistNames(AudioFileFormat.All);
+        }
+
+        /// <summary>
+        /// Returns the distinct list of artist names from the database, using the sound format
+        /// filter passed in the soundFormat parameter.
+        /// </summary>
+        /// <param name="audioFileFormat">Audio file format filter</param>
+        /// <returns>List of distinct artist names</returns>
+        public List<string> SelectDistinctArtistNames(AudioFileFormat audioFileFormat)
+        {
+            // Create list
+            List<string> artists = new List<string>();
+
+            // Set query
+            string sql = "SELECT DISTINCT ArtistName FROM AudioFiles ORDER BY ArtistName";
+
+            // Check for audio file format filter
+            if (audioFileFormat != AudioFileFormat.All)
+            {
+                sql = "SELECT DISTINCT ArtistName FROM AudioFiles WHERE FileType = '" + audioFileFormat.ToString() + "' ORDER BY ArtistName";
+            }
+
+            // Select distinct
+            IEnumerable<object> list = _gateway.SelectList(sql);
+            foreach (object obj in list)
+            {
+                artists.Add(obj.ToString());
+            }
+
+            return artists;
+        }
+
+        /// <summary>
+        /// Returns the distinct list of album titles per artist from the database.        
+        /// </summary>        
+        /// <returns>List of distinct album titles per artist</returns>
+        public Dictionary<string, List<string>> SelectDistinctAlbumTitles()
+        {
+            return SelectDistinctAlbumTitles(AudioFileFormat.All, string.Empty);
+        }
+		
+        /// <summary>
+        /// Returns the distinct list of album titles per artist from the database.        
+        /// </summary>        
+        /// <returns>List of distinct album titles per artist</returns>
+        public Dictionary<string, List<string>> SelectDistinctAlbumTitles(AudioFileFormat audioFileFormat)
+        {
+            return SelectDistinctAlbumTitles(audioFileFormat, string.Empty);
+        }		
+
+        /// <summary>
+        /// Returns the distinct list of album titles per artist from the database, using the sound format
+        /// filter passed in the soundFormat parameter.
+        /// </summary>
+        /// <param name="audioFileFormat">Audio file format filter</param>
+        /// <param name="artistName">Artist name filter</param>
+        /// <returns>List of distinct album titles per artist</returns>
+        public Dictionary<string, List<string>> SelectDistinctAlbumTitles(AudioFileFormat audioFileFormat, string artistName)
+        {
+            // Create dictionary
+            Dictionary<string, List<string>> albums = new Dictionary<string, List<string>>();
+
+            // Set query
+            StringBuilder sql = new StringBuilder();
+			sql.AppendLine("SELECT DISTINCT ArtistName, AlbumTitle FROM AudioFiles ");
+			if (audioFileFormat != AudioFileFormat.All && !String.IsNullOrEmpty(artistName))
+			{				
+				sql.AppendLine(" WHERE FileType = '" + audioFileFormat.ToString() + "' AND ArtistName = '" + artistName.Replace("'", "''") + "'");
+			}
+            else if (audioFileFormat != AudioFileFormat.All)
+            {
+                sql.AppendLine(" WHERE FileType = '" + audioFileFormat.ToString() + "' ");
+            }
+			else if(!String.IsNullOrEmpty(artistName))
+			{
+				sql.AppendLine(" WHERE ArtistName = '" + artistName.Replace("'", "''").ToString() + "' ");
+			}
+			sql.AppendLine(" ORDER BY ArtistName");
+
+            // Select distinct
+            List<Tuple<object, object>> listTuple = _gateway.SelectTuple(sql.ToString());
+            foreach (Tuple<object, object> tuple in listTuple)
+            {
+                // Get values
+                string artistNameDistinct = tuple.Item1.ToString();
+                string albumTitleDistinct = tuple.Item2.ToString();
+
+                // Add value to dictionary
+                if (albums.ContainsKey(artistNameDistinct))
+                {
+                    albums[artistNameDistinct].Add(albumTitleDistinct);
+                }
+                else
+                {
+                    albums.Add(artistNameDistinct, new List<string>() { albumTitleDistinct });
+                }
+            }      
+
+            return albums;
+        }
+		
+		/// <summary>
+		/// Returns the list of file paths in the Song table.
+		/// </summary>
+		/// <returns>List of file paths</returns>
+		public IEnumerable<string> SelectFilePaths()
+		{
+            IEnumerable<object> listObjects = _gateway.SelectList("SELECT FilePath FROM AudioFiles");
+			return listObjects.Select(x => x.ToString());
+		}
+
+        ///// <summary>
+        ///// Returns the distinct list of album titles with the path of at least one song of the album from the database, 
+        ///// using the sound format filter passed in the soundFormat parameter. This is useful for displaying album art
+        ///// for example (no need to return all songs from every album).
+        ///// </summary>
+        ///// <param name="audioFileFormat">Audio file format filter (use Unknown to skip filter)</param>
+        ///// <returns>List of distinct album titles with file paths</returns>
+        //public Dictionary<string, string> SelectDistinctAlbumTitlesWithFilePaths(AudioFileFormat audioFileFormat)
+        //{
+        //    // Create dictionary
+        //    Dictionary<string, string> albums = new Dictionary<string, string>();
+
+        //    // Set query
+        //    string sql = "SELECT DISTINCT AlbumTitle, FilePath FROM AudioFiles";
+        //    if (audioFileFormat != AudioFileFormat.All)
+        //    {
+        //        sql = "SELECT DISTINCT AlbumTitle, FilePath FROM AudioFiles WHERE FileType = '" + audioFileFormat.ToString() + "' ORDER BY ArtistName";
+        //    }
+
+        //    // Select distinct
+        //    DataTable table = Select(sql);
+
+        //    // Convert into a list of strings
+        //    for (int a = 0; a < table.Rows.Count; a++)
+        //    {
+        //        // Get values                
+        //        string albumTitle = table.Rows[a]["AlbumTitle"].ToString();
+        //        string filePath = table.Rows[a]["FilePath"].ToString();
+
+        //        // Add item to dictionary
+        //        if (!albums.ContainsKey(albumTitle))
+        //        {
+        //            albums.Add(albumTitle, filePath);
+        //        }
+        //    }
+
+        //    return albums;
+        //}
+
+        /// <summary>
+        /// Updates the play count of an audio file and sets the last playback datetime.
+        /// </summary>
+        /// <param name="audioFileId">AudioFile identifier</param>
+        public void UpdatePlayCount(Guid audioFileId)
+        {
+            // Get play count
+            AudioFile audioFile = SelectAudioFile(audioFileId);
+
+            // Check if the audiofile was found
+            if (audioFile == null)
+            {
+                throw new Exception("Error; The audiofile was not found!");
+            }
+
+            string lastPlayed = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
+            _gateway.Execute("UPDATE AudioFiles SET PlayCount = " + (audioFile.PlayCount + 1).ToString() + ", LastPlayedDateTime = '" + lastPlayed + "' WHERE AudioFileId = '" + audioFileId.ToString() + "'");
+        }
+
+        #endregion
+
+        #region Folders
+
+        /// <summary>
+        /// Selects a folder from a path.
+        /// </summary>
+        /// <param name="path">Path to the folder</param>
+        /// <returns>Folder</returns>
+        public Folder SelectFolderByPath(string path)
+        {
+            Folder folder = _gateway.SelectOne<Folder>("SELECT * FROM Folders WHERE FolderPath = '" + path + "'");
+            return folder;
+        }
+
+        /// <summary>
+        /// Selects a folders.
+        /// </summary>        
+        /// <returns>List of folders</returns>
+        public List<Folder> SelectFolders()
+        {
+            List<Folder> folders = _gateway.Select<Folder>("SELECT * FROM Folders");
+            return folders;
+        }
+
+        /// <summary>
+        /// Inserts a folder in the database. Configuration for library location.
+        /// </summary>
+        /// <param name="folderPath">Path of the folder to add</param>
+        /// <param name="recursive">If resursive</param>
+        public void InsertFolder(string folderPath, bool recursive)
+        {
+            // Insert new folder
+            Folder folder = new Folder();
+            folder.FolderPath = folderPath;
+            folder.IsRecursive = recursive;
+            _gateway.Insert<Folder>(folder, "Folders");
+        }
+
+        /// <summary>
+        /// Deletes a specific folder.
+        /// </summary>
+        /// <param name="folderId">FolderId</param>
+        public void DeleteFolder(Guid folderId)
+        {
+            // Delete folder
+            _gateway.Delete("Folders", "FolderId", folderId);
+        }
+
+        /// <summary>
+        /// Deletes all folders.
+        /// </summary>
+        public void DeleteFolders()
+        {
+            // Delete all folders
+            _gateway.Delete("Folders");
+        }
+
+        #endregion
+
+        #region Equalizers
+
+        /// <summary>
+        /// Select all EQ presets from the database.
+        /// </summary>
+        /// <returns>List of EQPresets</returns>
+        public List<EQPreset> SelectEQPresets()
+        {
+            List<EQPreset> eqs = _gateway.Select<EQPreset>("SELECT * FROM EQPresets");
+            return eqs;
+        }
+
+        /// <summary>
+        /// Selects an EQ preset from the database.
+        /// </summary>
+        /// <param name="name">EQ preset name</param>
+        /// <returns>EQPreset</returns>
+        public EQPreset SelectEQPreset(string name)
+        {
+            EQPreset preset = _gateway.SelectOne<EQPreset>("SELECT * FROM EQPresets WHERE Name = '" + name + "'");
+            return preset;
+        }
+
+        /// <summary>
+        /// Inserts a new EQ preset into the database.
+        /// </summary>
+        /// <param name="eq">EQ preset to insert</param>
+        public void InsertEqualizer(EQPreset eq)
+        {
+            _gateway.Insert<EQPreset>(eq, "EQPresets");            
+        }
+
+        /// <summary>
+        /// Updates an existing EQ preset in the database.
+        /// </summary>
+        /// <param name="eq">EQ preset to update</param>
+        public void UpdateEqualizer(EQPreset eq)
+        {
+            _gateway.Update<EQPreset>(eq, "EQPresets", "EQPresetId", eq.EQPresetId);            
+        }
+
+        /// <summary>
+        /// Deletes an EQ preset from the database.
+        /// </summary>
+        /// <param name="eqPresetId">EQ preset identifier</param>
+        public void DeleteEqualizer(Guid eqPresetId)
+        {
+            // Delete item
+            _gateway.Delete("EQPresets", "EQPresetId", eqPresetId);
+        }
+
+        #endregion
+
+        #region Markers
+
+        /// <summary>
+        /// Selects all markers from the database.
+        /// </summary>
+        /// <returns>List of Markers</returns>
+        public List<Marker> SelectMarkers()
+        {
+            List<Marker> markers = _gateway.Select<Marker>("SELECT * FROM Markers");
+            return markers;
+        }
+
+        /// <summary>
+        /// Selects markers related to an audio file from the database.
+        /// </summary>
+        /// <param name="audioFileId">AudioFile identifier</param>
+        /// <returns>List of Markers</returns>
+        public List<Marker> SelectMarkers(Guid audioFileId)
+        {
+            List<Marker> markers = _gateway.Select<Marker>("SELECT * FROM Markers");
+            return markers;
+        }
+
+        /// <summary>
+        /// Selects a marker from the database.
+        /// </summary>
+        /// <param name="markerId">Marker Id</param>
+        /// <returns>Marker</returns>
+        public Marker SelectMarker(Guid markerId)
+        {
+            Marker marker = _gateway.SelectOne<Marker>("SELECT * FROM Markers WHERE MarkerId = '" + markerId.ToString() + "'");
+            return marker;
+        }
+
+        /// <summary>
+        /// Inserts a new marker into the database.
+        /// </summary>
+        /// <param name="dto">Marker to insert</param>
+        public void InsertMarker(Marker dto)
+        {
+            _gateway.Insert<Marker>(dto, "Markers");
+        }
+
+        /// <summary>
+        /// Updates an existing marker from the database.
+        /// </summary>
+        /// <param name="dto">Marker to update</param>
+        public void UpdateMarker(Marker dto)
+        {
+            _gateway.Update<Marker>(dto, "Markers", "MarkerId", dto.MarkerId.ToString());
+        }
+
+        /// <summary>
+        /// Deletes a marker from the database.
+        /// </summary>
+        /// <param name="markerId">Marker to delete</param>
+        public void DeleteMarker(Guid markerId)
+        {
+            // Delete marker
+            _gateway.Delete("Markers", "MarkerId", markerId);
+        }
+
+        #endregion
+
+        #region Loops
+
+        /// <summary>
+        /// Selects all loops from the database.
+        /// </summary>
+        /// <returns>List of Loops</returns>
+        public List<Loop> SelectLoops()
+        {
+            List<Loop> loops = _gateway.Select<Loop>("SELECT * FROM Loops");
+            return loops;
+        }
+
+        /// <summary>
+        /// Selects loops related to an audio file from the database.
+        /// </summary>
+        /// <param name="audioFileId">AudioFile identifier</param>
+        /// <returns>List of Loops</returns>
+        public List<Loop> SelectLoops(Guid audioFileId)
+        {
+            List<Loop> loops = _gateway.Select<Loop>("SELECT * FROM Loops  WHERE AudioFileId = '" + audioFileId.ToString() + "' ORDER BY LengthBytes");
+            return loops;
+        }
+
+        /// <summary>
+        /// Selects a loop from the database.
+        /// </summary>
+        /// <param name="loopId">Loop identifier</param>
+        /// <returns>Loop</returns>
+        public Loop SelectLoop(Guid loopId)
+        {
+            Loop loop = _gateway.SelectOne<Loop>("SELECT * FROM Loops WHERE LoopId = '" + loopId.ToString() + "'");
+            return loop;
+        }
+
+        /// <summary>
+        /// Inserts a new loop into the database.
+        /// </summary>
+        /// <param name="dto">Loop to insert</param>
+        public void InsertLoop(Loop dto)
+        {
+            _gateway.Insert<Loop>(dto, "Loops");
+        }
+
+        /// <summary>
+        /// Updates an existing loop from the database.
+        /// </summary>
+        /// <param name="dto">Loop to update</param>
+        public void UpdateLoop(Loop dto)
+        {
+            _gateway.Update<Loop>(dto, "Loops", "LoopId", dto.LoopId.ToString());
+        }
+
+        /// <summary>
+        /// Deletes a loop from the database.
+        /// </summary>
+        /// <param name="loopId">Loop to delete</param>
+        public void DeleteLoop(Guid loopId)
+        {
+            // Delete loop
+            _gateway.Delete("Loops", "LoopId", loopId);
+        }
+
+        #endregion
+
+        #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;
+        //    }
+
+        //    return false;
+        //}
+
+        ///// <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>
+        ///// 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>
+        ///// 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;
+        //    }
+        //}
+
+        #endregion
+
+        #region Settings
+
+        /// <summary>
+        /// Selects all settings.
+        /// </summary>        
+        /// <returns>List of settings</returns>
+        public List<Setting> SelectSettings()
+        {
+            List<Setting> settings = _gateway.Select<Setting>("SELECT * FROM Settings");
+            return settings;
+        }
+
+        /// <summary>
+        /// Selects a setting by its name.
+        /// </summary>
+        /// <param name="name">Setting name</param>
+        /// <returns>Setting object</returns>
+        public Setting SelectSetting(string name)
+        {
+            Setting setting = _gateway.SelectOne<Setting>("SELECT * FROM Settings WHERE SettingName = '" + name + "'");
+            return setting;
+        }
+
+        /// <summary>
+        /// Inserts a new setting into the database.
+        /// </summary>
+        /// <param name="name">Setting name</param>
+        /// <param name="value">Setting value</param>
+        public void InsertSetting(string name, string value)
+        {
+            // Create setting
+            Setting setting = new Setting();
+            setting.SettingName = name;
+            setting.SettingValue = value;
+
+            // Insert setting
+            InsertSetting(setting);
+        }
+
+        /// <summary>
+        /// Inserts a new setting into the database.
+        /// </summary>
+        /// <param name="dto">Setting to insert</param>
+        public void InsertSetting(Setting dto)
+        {
+            _gateway.Insert<Setting>(dto, "Settings");
+        }
+
+        /// <summary>
+        /// Updates an existing setting from the database.
+        /// </summary>
+        /// <param name="dto">Setting to update</param>
+        public void UpdateSetting(Setting dto)
+        {
+            _gateway.Update<Setting>(dto, "Settings", "SettingId", dto.SettingId.ToString());
+        }
+
+        /// <summary>
+        /// Deletes a setting from the database.
+        /// </summary>
+        /// <param name="settingId">Setting to delete</param>
+        public void DeleteSetting(Guid settingId)
+        {
+            // Delete loop
+            _gateway.Delete("Settings", "SettingId", settingId);
+        }
+
+        #endregion
+
+        #region Playlist Files
+
+        /// <summary>
+        /// Selects all playlist files.
+        /// </summary>        
+        /// <returns>List of playlist files</returns>
+        public List<PlaylistFile> SelectPlaylistFiles()
+        {
+            List<PlaylistFile> playlistFiles = _gateway.Select<PlaylistFile>("SELECT * FROM PlaylistFiles");
+            return playlistFiles;
+        }
+
+        /// <summary>
+        /// Inserts a new playlist file into the database.
+        /// </summary>
+        /// <param name="dto">Playlist file</param>
+        public void InsertPlaylistFile(PlaylistFile dto)
+        {
+            _gateway.Insert<PlaylistFile>(dto, "PlaylistFiles");
+        }
+
+        /// <summary>
+        /// Deletes a playlist file from the database.
+        /// </summary>
+        /// <param name="filePath">Playlist file path to delete</param>
+        public void DeletePlaylistFile(string filePath)
+        {
+            // Delete loop
+            _gateway.Delete("PlaylistFiles", "FilePath = '" + filePath + "'");
+        }
+
+        #endregion
+
+        #region History
+
+        /// <summary>
+        /// Returns the number of times the audio file has been played.
+        /// </summary>
+        /// <param name="audioFileId">Audio file identifier</param>
+        /// <returns>Play count</returns>
+        public int GetAudioFilePlayCountFromHistory(Guid audioFileId)
+        {
+            // Declare variables
+            int playCount = 0;
+
+            // Execute scalar query
+            string query = "SELECT COUNT(*) FROM History WHERE AudioFileId = '" + audioFileId.ToString() + "'";
+            object value = _gateway.ExecuteScalar(query);
+
+            // Check value for null
+            if (value == DBNull.Value)
+            {
+                // No play count
+                return 0;
+            }
+            else
+            {                
+                try
+                {
+                    // Try to cast into an integer       
+                    playCount = (int)value;
+                }
+                catch
+                {
+                    // Return no play count
+                    return 0;
+                }
+            }
+            
+            return playCount;
+        }
+
+        /// <summary>
+        /// Returns the last time the audio file has been played.
+        /// The value is null if the file has never been played.
+        /// </summary>
+        /// <param name="audioFileId">Audio file identifier</param>
+        /// <returns>Nullable date/time</returns>
+        public DateTime? GetAudioFileLastPlayedFromHistory(Guid audioFileId)
+        {
+            // Declare variables
+            DateTime? lastPlayed = null;
+
+            // Execute scalar query
+            string query = "SELECT TOP 1 FROM History WHERE AudioFileId = '" + audioFileId.ToString() + "' ORDER BY EventDateTime";
+            object value = _gateway.ExecuteScalar(query);
+
+            // Check value for null
+            if (value == DBNull.Value)
+            {
+                // No last played value
+                return null;
+            }
+            else
+            {
+                try
+                {
+                    // Try to cast into a DateTime       
+                    DateTime valueDateTime;
+                    bool success = DateTime.TryParse(value.ToString(), out valueDateTime);
+                    if (success)
+                    {
+                        lastPlayed = valueDateTime;
+                    }
+                }
+                catch
+                {
+                    // No last played value
+                    return null;
+                }
+            }
+
+            return lastPlayed;
+        }
+
+        /// <summary>
+        /// Inserts an history item into the database using the current datetime.
+        /// </summary>
+        /// <param name="audioFileId">Audio file identifier</param>
+        public void InsertHistory(Guid audioFileId)
+        {
+            // Create history object
+            History history = new History();
+            history.AudioFileId = audioFileId;
+            history.EventDateTime = DateTime.Now;
+
+            // Insert history
+            _gateway.Insert<History>(history, "History");
+        }
+
+        /// <summary>
+        /// Inserts an history item into the database.
+        /// </summary>
+        /// <param name="audioFileId">Audio file identifier</param>
+        /// <param name="eventDateTime">Event date/time</param>
+        public void InsertHistory(Guid audioFileId, DateTime eventDateTime)
+        {
+            // Create history object
+            History history = new History();
+            history.AudioFileId = audioFileId;
+            history.EventDateTime = eventDateTime;
+
+            // Insert history            
+            _gateway.Insert<History>(history, "History");
+        }
+
+        #endregion
+
+		public void CompactDatabase()
+		{
+			_gateway.CompactDatabase();
+		}
+    }
+}
diff --git a/MPfm/branches/current/MPfm.Library/Gateway/IMPfmGateway.cs b/MPfm/branches/current/MPfm.Library/Database/IMPfmGateway.cs
similarity index 100%
rename from MPfm/branches/current/MPfm.Library/Gateway/IMPfmGateway.cs
rename to MPfm/branches/current/MPfm.Library/Database/IMPfmGateway.cs
diff --git a/MPfm/branches/current/MPfm.Library/Database/Interfaces/IDatabaseFacade.cs b/MPfm/branches/current/MPfm.Library/Database/Interfaces/IDatabaseFacade.cs
new file mode 100644
index 00000000..38687747
--- /dev/null
+++ b/MPfm/branches/current/MPfm.Library/Database/Interfaces/IDatabaseFacade.cs
@@ -0,0 +1,89 @@
+//
+// IDatabaseFacade.cs: Interface for the DatabaseFacade class.
+//
+// Copyright © 2011-2012 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
+{
+    /// <summary>
+    /// Interface for the DatabaseFacade class.
+    /// </summary>
+    public interface IDatabaseFacade
+    {
+        void DeleteAudioFile(Guid audioFileId);
+        void DeleteAudioFiles(string basePath);
+        void DeleteEqualizer(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 InsertEqualizer(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);
+        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 UpdateEqualizer(EQPreset eq);
+        void UpdateLoop(Loop dto);
+        void UpdateMarker(Marker dto);
+        void UpdatePlayCount(Guid audioFileId);
+        void UpdateSetting(Setting dto);
+
+		void CompactDatabase();
+    }
+}
diff --git a/MPfm/branches/current/MPfm.Library/Gateway/ISQLiteGateway.cs b/MPfm/branches/current/MPfm.Library/Database/Interfaces/ISQLiteGateway.cs
similarity index 97%
rename from MPfm/branches/current/MPfm.Library/Gateway/ISQLiteGateway.cs
rename to MPfm/branches/current/MPfm.Library/Database/Interfaces/ISQLiteGateway.cs
index f3a5f90c..7514f8b8 100644
--- a/MPfm/branches/current/MPfm.Library/Gateway/ISQLiteGateway.cs
+++ b/MPfm/branches/current/MPfm.Library/Database/Interfaces/ISQLiteGateway.cs
@@ -21,9 +21,10 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
+
 //using System.Data.Linq;
 
-namespace MPfm.Library.Gateway
+namespace MPfm.Library.Database.Interfaces
 {
     /// <summary>
     /// Interface for the SQLiteGateway class.
diff --git a/MPfm/branches/current/MPfm.Library/Gateway/MPfmGateway.cs b/MPfm/branches/current/MPfm.Library/Database/MPfmGateway.cs
similarity index 100%
rename from MPfm/branches/current/MPfm.Library/Gateway/MPfmGateway.cs
rename to MPfm/branches/current/MPfm.Library/Database/MPfmGateway.cs
diff --git a/MPfm/branches/current/MPfm.Library/Database/MonoSQLiteGateway.cs b/MPfm/branches/current/MPfm.Library/Database/MonoSQLiteGateway.cs
new file mode 100644
index 00000000..d51e1f02
--- /dev/null
+++ b/MPfm/branches/current/MPfm.Library/Database/MonoSQLiteGateway.cs
@@ -0,0 +1,778 @@
+//
+// SQLiteGateway.cs: Data adapter class for SQLite.
+//
+// Copyright © 2011-2012 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)
+        {           
+            // Check value type
+            if (value == null)
+            {
+                return "null";
+            }
+            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
+            {
+                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)
+                                {
+                                    // Try to cast dynamically
+                                    MethodInfo castMethod = typeof(Conversion).GetMethod("GetEnumValue").MakeGenericMethod(info.PropertyType);
+                                    fieldValue = castMethod.Invoke(null, new object[] { 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);
+                for (int a = 0; a < propertyInfos.Length; a++)
+                {
+                    // Get property info
+                    PropertyInfo propertyInfo = propertyInfos[a];
+
+                    // Make sure the property has a setter
+                    if (propertyInfo.GetSetMethod() != null)
+                    {
+                        // Check for map
+                        string fieldName = propertyInfo.Name;                    
+                        if (dictMap.ContainsValue(propertyInfo.Name))
+                        {
+                            fieldName = dictMap.FindKeyByValue<string, string>(propertyInfo.Name); 
+                        }
+
+                        // Add database field name
+                        sql.Append("[" + fieldName + "]=");
+
+                        // Get value and determine how to add field value
+                        object value = propertyInfo.GetValue(obj, null);
+                        sql.Append(FormatSQLValue(value));
+
+                        // Add a comma if this isn't the last item
+                        if (a < propertyInfos.Length - 1)
+                        {
+                            sql.Append(", ");
+                        }
+                        sql.Append("\n");
+                    }
+                }
+
+                // Generate where clause
+                sql.AppendLine(" WHERE ");
+                for(int a = 0; a < where.Count; a++)
+                {
+                    KeyValuePair<string, object> keyValue = where.ElementAt(a);
+                    sql.AppendLine("[" + keyValue.Key + "]=");
+                    sql.Append(FormatSQLValue(keyValue.Value));
+
+                    // Add an AND keyword if this isn't the last item
+                    if (a < where.Count - 1)
+                    {
+                        sql.Append(" AND ");
+                    }
+                    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)
+        {
+            // Declare variables
+            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);
+                for (int a = 0; a < propertyInfos.Length; a++)
+                {
+                    // Get property info
+                    PropertyInfo propertyInfo = propertyInfos[a];
+
+                    // Make sure the property has a setter
+                    if (propertyInfo.GetSetMethod() != null)
+                    {
+                        // Check for map
+                        string fieldName = propertyInfo.Name;
+                        if (dictMap.ContainsValue(propertyInfo.Name))
+                        {
+                            fieldName = dictMap.FindKeyByValue<string, string>(propertyInfo.Name);
+                        }
+
+                        // Add database field name
+                        sql.Append("[" + fieldName + "]");
+
+                        // Add a comma if this isn't the last item
+                        if (a < propertyInfos.Length - 1)
+                        {
+                            sql.Append(", ");
+                        }
+                        sql.Append("\n");
+                    }
+                }
+                sql.AppendLine(") VALUES (");
+
+                // Scan through properties and set values
+                for (int a = 0; a < propertyInfos.Length; a++)
+                {
+                    // Get property info
+                    PropertyInfo propertyInfo = propertyInfos[a];
+
+                    // Make sure the property has a setter
+                    if (propertyInfo.GetSetMethod() != null)
+                    {
+                        // Check for map
+                        string fieldName = propertyInfo.Name;
+                        if (dictMap.ContainsValue(propertyInfo.Name))
+                        {
+                            fieldName = dictMap.FindKeyByValue<string, string>(propertyInfo.Name);
+                        }
+
+                        // Get value and determine how to add field value
+                        object value = propertyInfo.GetValue(obj, null);
+                        sql.Append(FormatSQLValue(value));
+
+                        // Add a comma if this isn't the last item
+                        if (a < propertyInfos.Length - 1)
+                        {
+                            sql.Append(", ");
+                        }
+                        sql.Append("\n");
+                    }
+                }
+                sql.AppendLine(") ");
+
+                // 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/branches/current/MPfm.Library/Gateway/SQLiteGateway.cs b/MPfm/branches/current/MPfm.Library/Database/SQLiteGateway.cs
similarity index 99%
rename from MPfm/branches/current/MPfm.Library/Gateway/SQLiteGateway.cs
rename to MPfm/branches/current/MPfm.Library/Database/SQLiteGateway.cs
index 534d45fd..8afe1d4b 100644
--- a/MPfm/branches/current/MPfm.Library/Gateway/SQLiteGateway.cs
+++ b/MPfm/branches/current/MPfm.Library/Database/SQLiteGateway.cs
@@ -29,10 +29,9 @@
 using MPfm.Core;
 using MPfm.Core.Attributes;
 using MPfm.Core.Extensions;
-//using System.Data.Linq;
-//using Mono.Data.Sqlite;
+using MPfm.Library.Database.Interfaces;
 
-namespace MPfm.Library.Gateway
+namespace MPfm.Library.Database
 {
     /// <summary>
     /// The SQLiteGateway class is a data adapter class which makes it easier to select, insert, update and delete
@@ -45,9 +44,9 @@ namespace MPfm.Library.Gateway
     public class SQLiteGateway : ISQLiteGateway
     {
         // Private variables        
-        private DbProviderFactory factory = null;
-		private SQLiteConnection connection = null;
-
+        private DbProviderFactory factory = null;
+        private SQLiteConnection connection = null;
+
         /// <summary>
         /// Private value for the DatabaseFilePath property.
         /// </summary>
@@ -74,7 +73,7 @@ public SQLiteGateway(string databaseFilePath)
 						
 #if (!MACOSX && !LINUX && !IOS && !ANDROID)			
         	factory = DbProviderFactories.GetFactory("System.Data.SQLite");
-#elif (MACOSX || LINUX)			
+#elif (MACOSX || LINUX)	
 			factory = DbProviderFactories.GetFactory("Mono.Data.SQLite");			
 #endif
 			
@@ -85,9 +84,9 @@ public SQLiteGateway(string databaseFilePath)
         /// Creates a new database file.
         /// </summary>
         public static void CreateDatabaseFile(string databaseFilePath)
-        {
-            // Create new database file
-            SQLiteConnection.CreateFile(databaseFilePath);            
+        {
+            // Create new database file
+            SQLiteConnection.CreateFile(databaseFilePath);
         }
 
         /// <summary>
diff --git a/MPfm/branches/current/MPfm.Library/ILibrary.cs b/MPfm/branches/current/MPfm.Library/ILibrary.cs
index 26a1010b..f2cdcd1f 100644
--- a/MPfm/branches/current/MPfm.Library/ILibrary.cs
+++ b/MPfm/branches/current/MPfm.Library/ILibrary.cs
@@ -20,9 +20,8 @@
 
 using System;
 using System.Collections.Generic;
-using MPfm.Library.Gateway;
+using MPfm.Library.Database;
 using MPfm.Library.UpdateLibrary;
-using MPfm.Sound;
 using MPfm.Sound.AudioFiles;
 
 namespace MPfm.Library
@@ -32,10 +31,6 @@ namespace MPfm.Library
     /// </summary>
     interface ILibrary
     {        
-        List<AudioFile> AudioFiles { get; }
-        bool CancelUpdateLibrary { get; set; }
-        MPfmGateway Gateway { get; }
-		
         event Library.UpdateLibraryFinished OnUpdateLibraryFinished;
         event Library.UpdateLibraryProgress OnUpdateLibraryProgress;
 		
diff --git a/MPfm/branches/current/MPfm.Library/Lib/AsyncCtpLibrary.dll b/MPfm/branches/current/MPfm.Library/Lib/AsyncCtpLibrary.dll
deleted file mode 100644
index 6db1c1fc..00000000
Binary files a/MPfm/branches/current/MPfm.Library/Lib/AsyncCtpLibrary.dll and /dev/null differ
diff --git a/MPfm/branches/current/MPfm.Library/Lib/AsyncCtpLibrary.xml b/MPfm/branches/current/MPfm.Library/Lib/AsyncCtpLibrary.xml
deleted file mode 100644
index 7b6c9811..00000000
--- a/MPfm/branches/current/MPfm.Library/Lib/AsyncCtpLibrary.xml
+++ /dev/null
@@ -1,2341 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>AsyncCtpLibrary</name>
-    </assembly>
-    <members>
-        <member name="T:System.IProgress`1">
-            <summary>Defines a provider for progress updates.</summary>
-            <typeparam name="T">The type of progress update value.</typeparam>
-        </member>
-        <member name="M:System.IProgress`1.Report(`0)">
-            <summary>Reports a progress update.</summary>
-            <param name="value">The value of the updated progress.</param>
-        </member>
-        <member name="T:AsyncCtpExtensions">
-            <summary>Asynchronous wrappers for .NET Framework operations.</summary>
-        </member>
-        <member name="M:AsyncCtpExtensions.DownloadStringTaskAsync(System.Net.WebClient,System.String)">
-            <summary>Downloads the resource with the specified URI as a string, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI from which to download data.</param>
-            <returns>A Task that contains the downloaded string.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.DownloadStringTaskAsync(System.Net.WebClient,System.Uri)">
-            <summary>Downloads the resource with the specified URI as a string, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI from which to download data.</param>
-            <returns>A Task that contains the downloaded string.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.DownloadStringTaskAsync(System.Net.WebClient,System.Uri,System.Threading.CancellationToken)">
-            <summary>Downloads the resource with the specified URI as a string, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI from which to download data.</param>
-            <param name="cancellationToken">A token used to signal cancellation.</param>
-            <returns>A Task that contains the downloaded string.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.DownloadStringTaskAsync(System.Net.WebClient,System.Uri,System.Threading.CancellationToken,System.IProgress{System.Net.DownloadProgressChangedEventArgs})">
-            <summary>Downloads the resource with the specified URI as a string, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI from which to download data.</param>
-            <param name="cancellationToken">A token used to signal cancellation.</param>
-            <param name="progress">An object into which progress is stored.</param>
-            <returns>A Task that contains the downloaded string.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.OpenReadTaskAsync(System.Net.WebClient,System.String)">
-            <summary>Opens a readable stream for the data downloaded from a resource, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI for which the stream should be opened.</param>
-            <returns>A Task that contains the opened stream.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.OpenReadTaskAsync(System.Net.WebClient,System.Uri)">
-            <summary>Opens a readable stream for the data downloaded from a resource, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI for which the stream should be opened.</param>
-            <returns>A Task that contains the opened stream.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.OpenWriteTaskAsync(System.Net.WebClient,System.String)">
-            <summary>Opens a writeable stream for uploading data to a resource, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI for which the stream should be opened.</param>
-            <returns>A Task that contains the opened stream.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.OpenWriteTaskAsync(System.Net.WebClient,System.Uri)">
-            <summary>Opens a writeable stream for uploading data to a resource, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI for which the stream should be opened.</param>
-            <returns>A Task that contains the opened stream.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.OpenWriteTaskAsync(System.Net.WebClient,System.String,System.String)">
-            <summary>Opens a writeable stream for uploading data to a resource, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI for which the stream should be opened.</param>
-            <param name="method">The HTTP method that should be used to open the stream.</param>
-            <returns>A Task that contains the opened stream.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.OpenWriteTaskAsync(System.Net.WebClient,System.Uri,System.String)">
-            <summary>Opens a writeable stream for uploading data to a resource, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI for which the stream should be opened.</param>
-            <param name="method">The HTTP method that should be used to open the stream.</param>
-            <returns>A Task that contains the opened stream.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.UploadStringTaskAsync(System.Net.WebClient,System.String,System.String)">
-            <summary>Uploads data in a string to the specified resource, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI to which the data should be uploaded.</param>
-            <param name="data">The data to upload.</param>
-            <returns>A Task containing the data in the response from the upload.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.UploadStringTaskAsync(System.Net.WebClient,System.Uri,System.String)">
-            <summary>Uploads data in a string to the specified resource, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI to which the data should be uploaded.</param>
-            <param name="data">The data to upload.</param>
-            <returns>A Task containing the data in the response from the upload.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.UploadStringTaskAsync(System.Net.WebClient,System.String,System.String,System.String)">
-            <summary>Uploads data in a string to the specified resource, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI to which the data should be uploaded.</param>
-            <param name="method">The HTTP method that should be used to upload the data.</param>
-            <param name="data">The data to upload.</param>
-            <returns>A Task containing the data in the response from the upload.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.DownloadDataTaskAsync(System.Net.WebClient,System.String)">
-            <summary>Downloads the resource with the specified URI as a byte array, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI from which to download data.</param>
-            <returns>A Task that contains the downloaded data.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.DownloadDataTaskAsync(System.Net.WebClient,System.Uri)">
-            <summary>Downloads the resource with the specified URI as a byte array, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI from which to download data.</param>
-            <returns>A Task that contains the downloaded data.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.DownloadDataTaskAsync(System.Net.WebClient,System.Uri,System.Threading.CancellationToken)">
-            <summary>Downloads the resource with the specified URI as a byte array, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI from which to download data.</param>
-            <param name="cancellationToken">The cancellation token to observe for cancellation requests.</param>
-            <returns>A Task that contains the downloaded data.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.DownloadDataTaskAsync(System.Net.WebClient,System.Uri,System.Threading.CancellationToken,System.IProgress{System.Net.DownloadProgressChangedEventArgs})">
-            <summary>Downloads the resource with the specified URI as a byte array, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI from which to download data.</param>
-            <param name="cancellationToken">The cancellation token to observe for cancellation requests.</param>
-            <param name="progress">An object into which progress is stored.</param>
-            <returns>A Task that contains the downloaded data.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.DownloadFileTaskAsync(System.Net.WebClient,System.String,System.String)">
-            <summary>Downloads the resource with the specified URI to a local file, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI from which to download data.</param>
-            <param name="fileName">The name of the local file that is to receive the data.</param>
-            <returns>A Task that contains the downloaded data.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.DownloadFileTaskAsync(System.Net.WebClient,System.Uri,System.String)">
-            <summary>Downloads the resource with the specified URI to a local file, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI from which to download data.</param>
-            <param name="fileName">The name of the local file that is to receive the data.</param>
-            <returns>A Task that contains the downloaded data.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.DownloadFileTaskAsync(System.Net.WebClient,System.Uri,System.String,System.Threading.CancellationToken)">
-            <summary>Downloads the resource with the specified URI to a local file, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI from which to download data.</param>
-            <param name="fileName">The name of the local file that is to receive the data.</param>
-            <param name="cancellationToken">The cancellation token to observe for cancellation requests.</param>
-            <returns>A Task that contains the downloaded data.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.DownloadFileTaskAsync(System.Net.WebClient,System.Uri,System.String,System.Threading.CancellationToken,System.IProgress{System.Net.DownloadProgressChangedEventArgs})">
-            <summary>Downloads the resource with the specified URI to a local file, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI from which to download data.</param>
-            <param name="fileName">The name of the local file that is to receive the data.</param>
-            <param name="cancellationToken">The cancellation token to observe for cancellation requests.</param>
-            <param name="progress">An object into which progress is stored.</param>
-            <returns>A Task that contains the downloaded data.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.UploadDataTaskAsync(System.Net.WebClient,System.String,System.Byte[])">
-            <summary>Uploads data to the specified resource, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI to which the data should be uploaded.</param>
-            <param name="data">The data to upload.</param>
-            <returns>A Task containing the data in the response from the upload.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.UploadDataTaskAsync(System.Net.WebClient,System.Uri,System.Byte[])">
-            <summary>Uploads data to the specified resource, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI to which the data should be uploaded.</param>
-            <param name="data">The data to upload.</param>
-            <returns>A Task containing the data in the response from the upload.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.UploadDataTaskAsync(System.Net.WebClient,System.String,System.String,System.Byte[])">
-            <summary>Uploads data to the specified resource, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI to which the data should be uploaded.</param>
-            <param name="method">The HTTP method that should be used to upload the data.</param>
-            <param name="data">The data to upload.</param>
-            <returns>A Task containing the data in the response from the upload.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.UploadDataTaskAsync(System.Net.WebClient,System.Uri,System.String,System.Byte[])">
-            <summary>Uploads data to the specified resource, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI to which the data should be uploaded.</param>
-            <param name="method">The HTTP method that should be used to upload the data.</param>
-            <param name="data">The data to upload.</param>
-            <returns>A Task containing the data in the response from the upload.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.UploadFileTaskAsync(System.Net.WebClient,System.String,System.String)">
-            <summary>Uploads a file to the specified resource, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI to which the file should be uploaded.</param>
-            <param name="fileName">A path to the file to upload.</param>
-            <returns>A Task containing the data in the response from the upload.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.UploadFileTaskAsync(System.Net.WebClient,System.Uri,System.String)">
-            <summary>Uploads a file to the specified resource, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI to which the file should be uploaded.</param>
-            <param name="fileName">A path to the file to upload.</param>
-            <returns>A Task containing the data in the response from the upload.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.UploadFileTaskAsync(System.Net.WebClient,System.String,System.String,System.String)">
-            <summary>Uploads a file to the specified resource, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI to which the file should be uploaded.</param>
-            <param name="method">The HTTP method that should be used to upload the file.</param>
-            <param name="fileName">A path to the file to upload.</param>
-            <returns>A Task containing the data in the response from the upload.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.UploadFileTaskAsync(System.Net.WebClient,System.Uri,System.String,System.String)">
-            <summary>Uploads a file to the specified resource, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI to which the file should be uploaded.</param>
-            <param name="method">The HTTP method that should be used to upload the file.</param>
-            <param name="fileName">A path to the file to upload.</param>
-            <returns>A Task containing the data in the response from the upload.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.UploadStringTaskAsync(System.Net.WebClient,System.Uri,System.String,System.String)">
-            <summary>Uploads data in a string to the specified resource, asynchronously.</summary>
-            <param name="webClient">The WebClient.</param>
-            <param name="address">The URI to which the data should be uploaded.</param>
-            <param name="method">The HTTP method that should be used to upload the data.</param>
-            <param name="data">The data to upload.</param>
-            <returns>A Task containing the data in the response from the upload.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.GetUri(System.Net.WebClient,System.String)">
-            <summary>Converts a path to a Uri using the WebClient's logic.</summary>
-            <remarks>Based on WebClient's private GetUri method.</remarks>
-        </member>
-        <member name="M:AsyncCtpExtensions.GetUri(System.Net.WebClient,System.Uri)">
-            <summary>Converts a path to a Uri using the WebClient's logic.</summary>
-            <remarks>Based on WebClient's private GetUri method.</remarks>
-        </member>
-        <member name="M:AsyncCtpExtensions.ReadAsync(System.IO.Stream,System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            Reads a sequence of bytes from the current stream and advances the position within the stream by the number of bytes read.
-            </summary>
-            <returns>A Task that represents the asynchronous read.</returns>
-            <param name="source">The source.</param>
-            <param name="buffer">The buffer to read data into. </param>
-            <param name="offset">The byte offset in  at which to begin reading. </param>
-            <param name="count">The maximum number of bytes to read. </param>
-            <exception cref="T:System.ArgumentException">The array length minus  is less than <paramref name="count" />. </exception>
-            <exception cref="T:System.ArgumentNullException"> is null. </exception>
-            <exception cref="T:System.ArgumentOutOfRangeException"> or <paramref name="count" /> is negative. </exception>
-            <exception cref="T:System.IO.IOException">An asynchronous read was attempted past the end of the file. </exception>
-        </member>
-        <member name="M:AsyncCtpExtensions.WriteAsync(System.IO.Stream,System.Byte[],System.Int32,System.Int32)">
-            <summary>
-            Writes asynchronously a sequence of bytes to the current stream and advances the current position within this stream by the number of bytes written.
-            </summary>
-            <returns>A Task that represents the asynchronous write.</returns>
-            <param name="source">The source.</param>
-            <param name="buffer">The buffer containing data to write to the current stream.</param>
-            <param name="offset">The zero-based byte offset in  at which to begin copying bytes to the current stream.</param>
-            <param name="count">The maximum number of bytes to write. </param>
-            <exception cref="T:System.ArgumentException"> length minus <paramref name="offset" /> is less than <paramref name="count" />. </exception>
-            <exception cref="T:System.ArgumentNullException"> is null. </exception>
-            <exception cref="T:System.ArgumentOutOfRangeException"> or <paramref name="count" /> is negative. </exception>
-            <exception cref="T:System.NotSupportedException">The stream does not support writing. </exception>
-            <exception cref="T:System.ObjectDisposedException">The stream is closed. </exception>
-            <exception cref="T:System.IO.IOException">An I/O error occurred. </exception>
-        </member>
-        <member name="M:AsyncCtpExtensions.GetResponseAsync(System.Net.WebRequest)">
-            <summary>Starts an asynchronous request for a web resource.</summary>
-            <returns>Task that represents the asynchronous request.</returns>
-            <exception cref="T:System.InvalidOperationException">The stream is already in use by a previous call to . </exception>
-            <PermissionSet>    <IPermission class="System.Security.Permissions.FileIOPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />  </PermissionSet>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.GetRequestStreamAsync(System.Net.WebRequest)">
-            <summary>Starts an asynchronous request for a  object to use to write data.</summary>
-            <returns>Task that represents the asynchronous request.</returns>
-            <exception cref="T:System.Net.ProtocolViolationException">The  property is GET and the application writes to the stream. </exception>
-            <exception cref="T:System.InvalidOperationException">The stream is being used by a previous call to . </exception>
-            <exception cref="T:System.ApplicationException">No write stream is available. </exception>
-            <PermissionSet>    <IPermission class="System.Security.Permissions.FileIOPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />  </PermissionSet>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.CloseAsync(System.ServiceModel.ICommunicationObject)">
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.CloseAsync(System.ServiceModel.ICommunicationObject,System.TimeSpan)">
-            <summary>Starts an asynchronous operation invoked when the workflow service host is closed.</summary>
-            <returns>A reference to the asynchronous close operation.</returns>
-            <param name="timeout">The period of time the asynchronous close operation has to complete before timing out.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.OpenAsync(System.ServiceModel.ICommunicationObject)">
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.OpenAsync(System.ServiceModel.ICommunicationObject,System.TimeSpan)">
-            <summary>Starts an asynchronous operation invoked when the workflow service host is opened.</summary>
-            <returns>A reference to the asynchronous operation.</returns>
-            <param name="timeout">The period of time the asynchronous open operation has to complete before timing out.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.WaitForMessageAsync(System.ServiceModel.Channels.IInputChannel,System.TimeSpan)">
-            <summary>Starts an asynchronous wait-for-a-message-to-arrive operation that has a specified time out and state object associated with it. </summary>
-            <returns>The Task that represents the asynchronous operation to wait for a message to arrive.</returns>
-            <param name="timeout">The  that specifies the interval of time to wait for a message to become available.</param>
-            <exception cref="T:System.TimeoutException">The specified  is exceeded before the operation is completed.</exception>
-            <exception cref="T:System.ArgumentOutOfRangeException">The timeout specified is less than zero.</exception>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.SendAsync(System.ServiceModel.Channels.IOutputChannel,System.ServiceModel.Channels.Message)">
-            <summary>Starts an asynchronous operation to transmit a message to the destination of the output channel. </summary>
-            <returns>The Task that represents the asynchronous message transmission. </returns>
-            <param name="message">The  being sent on the output channel. </param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.SendAsync(System.ServiceModel.Channels.IOutputChannel,System.ServiceModel.Channels.Message,System.TimeSpan)">
-            <summary>Starts an asynchronous operation to transmit a message to the destination of the output channel within a specified interval of time.</summary>
-            <returns>The Task that represents the asynchronous send operation.</returns>
-            <param name="message">The  being sent on the output channel.</param>
-            <param name="timeout">The  that specifies how long the send operation has to complete before timing out.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.CloseOutputSessionAsync(System.ServiceModel.Channels.IDuplexSession)">
-            <summary>Starts an asynchronous operation to terminate the outbound session.</summary>
-            <returns>The Task that represents the asynchronous outbound session termination. </returns>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.CloseOutputSessionAsync(System.ServiceModel.Channels.IDuplexSession,System.TimeSpan)">
-            <summary>Starts an asynchronous operation to close an output session on the client that has a specified time out and state object associated with it. </summary>
-            <returns>The Task that represents the asynchronous close operation.</returns>
-            <param name="timeout">The  that specifies how long the close operation has to complete before timing out.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.RequestAsync(System.ServiceModel.Channels.IRequestChannel,System.ServiceModel.Channels.Message)">
-            <summary>Initiates the asynchronous processing of the message.</summary>
-            <returns>An asynchronous result that can be used to poll or wait for results, or both; this value is also required when invoking Task.</returns>
-            <param name="message">The message to be processed.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.RequestAsync(System.ServiceModel.Channels.IRequestChannel,System.ServiceModel.Channels.Message,System.TimeSpan)">
-            <summary>Starts an asynchronous operation to transmit a request message to the reply side of a request-reply message exchange within a specified interval of time.</summary>
-            <returns>The Task that represents the asynchronous message transmission. </returns>
-            <param name="message">The request  to be transmitted.</param>
-            <param name="timeout">The  that specifies the interval of time within which a response must be received. (For defaults, see the Remarks section.)</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.ReplyAsync(System.ServiceModel.Channels.RequestContext,System.ServiceModel.Channels.Message)">
-            <summary>When overridden in a derived class, begins an asynchronous operation to reply to the request associated with the current context.</summary>
-            <returns>The Task that represents the asynchronous reply operation.</returns>
-            <param name="message">The incoming  that contains the request.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.ReplyAsync(System.ServiceModel.Channels.RequestContext,System.ServiceModel.Channels.Message,System.TimeSpan)">
-            <summary>When overridden in a derived class, begins an asynchronous operation to reply to the request associated with the current context within a specified interval of time.</summary>
-            <returns>The Task that represents the asynchronous reply operation.</returns>
-            <param name="message">The incoming  that contains the request.</param>
-            <param name="timeout">The  that specifies the interval of time to wait for the reply to an available request.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.TerminateAsync(System.ServiceModel.Activities.IWorkflowInstanceManagement,System.Guid,System.String)">
-            <summary>Starts an asynchronous operation to terminate the specified workflow instance.</summary>
-            <returns>The Task.</returns>
-            <param name="instanceId">The GUID identifier of the workflow instance to terminate.</param>
-            <param name="reason">The reason to terminate the workflow instance.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.UnsuspendAsync(System.ServiceModel.Activities.IWorkflowInstanceManagement,System.Guid)">
-            <summary>Starts an asynchronous operation that resumes the specified workflow instance within a transaction.</summary>
-            <returns>The Task.</returns>
-            <param name="instanceId">The GUID identifier of the workflow instance to unsuspend.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.TransactedCancelAsync(System.ServiceModel.Activities.IWorkflowInstanceManagement,System.Guid)">
-            <summary>Starts an asynchronous cancel operation in a transaction.</summary>
-            <returns>The Task.</returns>
-            <param name="instanceId">The GUID identifier of the workflow instance to cancel.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.TransactedRunAsync(System.ServiceModel.Activities.IWorkflowInstanceManagement,System.Guid)">
-            <summary>Starts an asynchronous operation that runs a workflow instance within a transaction.</summary>
-            <returns>The Task.</returns>
-            <param name="instanceId">The GUID identifier of the workflow instance to run.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.TransactedSuspendAsync(System.ServiceModel.Activities.IWorkflowInstanceManagement,System.Guid,System.String)">
-            <summary>Starts an asynchronous operation that suspends the specified workflow instance.</summary>
-            <returns>The Task.</returns>
-            <param name="instanceId">The GUID identifier of the workflow instance to suspend.</param>
-            <param name="reason">The reason to suspend the workflow instance.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.TransactedTerminateAsync(System.ServiceModel.Activities.IWorkflowInstanceManagement,System.Guid,System.String)">
-            <summary>Starts an asynchronous operation that terminates a workflow instance within a transaction.</summary>
-            <returns>The Task.</returns>
-            <param name="instanceId">The GUID identifier of the workflow instance to terminate.</param>
-            <param name="reason">The reason to terminate the workflow instance.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.TransactedUnsuspendAsync(System.ServiceModel.Activities.IWorkflowInstanceManagement,System.Guid)">
-            <summary>Starts an asynchronous operation that resumes the specified workflow instance within a transaction.</summary>
-            <returns>The Task.</returns>
-            <param name="instanceId">The GUID identifier of the workflow instance to unsuspend.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.AbandonAsync(System.ServiceModel.Activities.WorkflowControlClient,System.Guid)">
-            <summary>Starts an asynchronous operation that abandons the specified workflow instance.</summary>
-            <returns>The asynchronous abandon operation.</returns>
-            <param name="instanceId">The workflow instance to abandon.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.AbandonAsync(System.ServiceModel.Activities.WorkflowControlClient,System.Guid,System.String)">
-            <summary>Starts an asynchronous operation to abandon the specified workflow instance.</summary>
-            <returns>The Task.</returns>
-            <param name="instanceId">The GUID identifier of the workflow instance to abandon.</param>
-            <param name="reason">The reason for abandoning the workflow instance.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.CancelAsync(System.ServiceModel.Activities.WorkflowControlClient,System.Guid)">
-            <summary>Starts an asynchronous operation to cancel the specified workflow instance.</summary>
-            <returns>Task.</returns>
-            <param name="instanceId">The GUID identifier of the workflow instance to cancel.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.RunAsync(System.ServiceModel.Activities.WorkflowControlClient,System.Guid)">
-            <summary>Starts an asynchronous operation to run the specified workflow instance.</summary>
-            <returns>Task.</returns>
-            <param name="instanceId">The GUID identifier of the workflow instance to run.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.SuspendAsync(System.ServiceModel.Activities.WorkflowControlClient,System.Guid)">
-            <summary>Starts an asynchronous operation that suspends the specified operation.</summary>
-            <returns>The asynchronous suspend operation.</returns>
-            <param name="instanceId">The workflow instance to suspend.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.SuspendAsync(System.ServiceModel.Activities.WorkflowControlClient,System.Guid,System.String)">
-            <summary>Starts an asynchronous operation to suspend the specified workflow instance.</summary>
-            <returns>The Task.</returns>
-            <param name="instanceId">The GUID identifier of the workflow instance to suspend.</param>
-            <param name="reason">The reason to suspend the workflow instance.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.UnsuspendAsync(System.ServiceModel.Activities.WorkflowControlClient,System.Guid)">
-            <summary>Starts an asynchronous operation that resumes the specified workflow instance within a transaction.</summary>
-            <returns>The Task.</returns>
-            <param name="instanceId">The GUID identifier of the workflow instance to unsuspend.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.TerminateAsync(System.ServiceModel.Activities.WorkflowControlClient,System.Guid)">
-            <summary>Starts an asynchronous operation that terminates a workflow instance.</summary>
-            <returns>The asynchronous terminate operation.</returns>
-            <param name="instanceId">The workflow instance to terminate.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.TerminateAsync(System.ServiceModel.Activities.WorkflowControlClient,System.Guid,System.String)">
-            <summary>Starts an asynchronous operation to terminate the specified workflow instance.</summary>
-            <returns>The Task.</returns>
-            <param name="instanceId">The GUID identifier of the workflow instance to terminate.</param>
-            <param name="reason">The reason to terminate the workflow instance.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.AnnounceOnlineAsync(System.ServiceModel.Discovery.AnnouncementClient,System.ServiceModel.Discovery.EndpointDiscoveryMetadata)">
-            <summary>Causes an online announcement (Hello) message to be sent asynchronously with the specified endpoint discovery metadata and user-defined state. The specified  is called when the operation completes.</summary>
-            <returns>Task instance.</returns>
-            <param name="discoveryMetadata">The endpoint discovery metadata.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.AnnounceOfflineAsync(System.ServiceModel.Discovery.AnnouncementClient,System.ServiceModel.Discovery.EndpointDiscoveryMetadata)">
-            <summary>Causes an offline announcement (Bye) message to be sent asynchronously with the specified endpoint discovery metadata and user-defined state. The specified  is called when the operation completes.</summary>
-            <returns>Task instance.</returns>
-            <param name="discoveryMetadata">The endpoint discovery metadata.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.GetContextAsync(System.Net.HttpListener)">
-            <summary>Begins asynchronously retrieving an incoming request.</summary>
-            <returns>Task object that indicates the status of the asynchronous operation.</returns>
-            <exception cref="T:System.Net.HttpListenerException">A Win32 function call failed. Check the exception's  property to determine the cause of the exception.</exception>
-            <exception cref="T:System.InvalidOperationException">This object has not been started or is currently stopped.</exception>
-            <exception cref="T:System.ObjectDisposedException">This object is closed.</exception>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.GetClientCertificateAsync(System.Net.HttpListenerRequest)">
-            <summary>Starts an asynchronous request for the client's X.509 v.3 certificate.</summary>
-            <returns>Task that indicates the status of the operation.</returns>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.AuthenticateAsClientAsync(System.Net.Security.NegotiateStream)">
-            <summary>Called by clients to begin an asynchronous operation to authenticate the client, and optionally the server, in a client-server connection. This method does not block.</summary>
-            <returns>Task object indicating the status of the asynchronous operation. </returns>
-            <exception cref="T:System.Security.Authentication.AuthenticationException">The authentication failed. You can use this object to retry the authentication.</exception>
-            <exception cref="T:System.Security.Authentication.InvalidCredentialException">The authentication failed. You can use this object to retry the authentication.</exception>
-            <exception cref="T:System.ObjectDisposedException">This object has been closed.</exception>
-            <exception cref="T:System.InvalidOperationException">Authentication has already occurred.- or -This stream was used previously to attempt authentication as the server. You cannot use the stream to retry authentication as the client.</exception>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.AuthenticateAsClientAsync(System.Net.Security.NegotiateStream,System.Net.NetworkCredential,System.String)">
-            <summary>Called by clients to begin an asynchronous operation to authenticate the client, and optionally the server, in a client-server connection. The authentication process uses the specified credentials. This method does not block.</summary>
-            <returns>Task object indicating the status of the asynchronous operation. </returns>
-            <param name="credential">The  that is used to establish the identity of the client.</param>
-            <param name="targetName">The Service Principal Name (SPN) that uniquely identifies the server to authenticate.</param>
-            <exception cref="T:System.ArgumentNullException"> is null.- or -<paramref name="targetName" /> is null.</exception>
-            <exception cref="T:System.Security.Authentication.AuthenticationException">The authentication failed. You can use this object to retry the authentication.</exception>
-            <exception cref="T:System.Security.Authentication.InvalidCredentialException">The authentication failed. You can use this object to retry the authentication.</exception>
-            <exception cref="T:System.ObjectDisposedException">This object has been closed.</exception>
-            <exception cref="T:System.InvalidOperationException">Authentication has already occurred.- or -This stream was used previously to attempt authentication as the server. You cannot use the stream to retry authentication as the client.</exception>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.AuthenticateAsClientAsync(System.Net.Security.NegotiateStream,System.Net.NetworkCredential,System.Security.Authentication.ExtendedProtection.ChannelBinding,System.String)">
-            <summary>Called by clients to begin an asynchronous operation to authenticate the client, and optionally the server, in a client-server connection. The authentication process uses the specified credentials and channel binding. This method does not block.</summary>
-            <returns>Task object indicating the status of the asynchronous operation.</returns>
-            <param name="credential">The  that is used to establish the identity of the client.</param>
-            <param name="binding">The  that is used for extended protection.</param>
-            <param name="targetName">The Service Principal Name (SPN) that uniquely identifies the server to authenticate.</param>
-            <exception cref="T:System.ArgumentNullException"> is null.- or -<paramref name="targetName" /> is null.</exception>
-            <exception cref="T:System.Security.Authentication.AuthenticationException">The authentication failed. You can use this object to retry the authentication.</exception>
-            <exception cref="T:System.Security.Authentication.InvalidCredentialException">The authentication failed. You can use this object to retry the authentication.</exception>
-            <exception cref="T:System.InvalidOperationException">Authentication has already occurred.- or -This stream was used previously to attempt authentication as the server. You cannot use the stream to retry authentication as the client.</exception>
-            <exception cref="T:System.ObjectDisposedException">This object has been closed.</exception>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.AuthenticateAsServerAsync(System.Net.Security.NegotiateStream)">
-            <summary>Called by servers to begin an asynchronous operation to authenticate the client, and optionally the server, in a client-server connection. This method does not block.</summary>
-            <returns>Task object indicating the status of the asynchronous operation. </returns>
-            <exception cref="T:System.Security.Authentication.AuthenticationException">The authentication failed. You can use this object to retry the authentication.</exception>
-            <exception cref="T:System.Security.Authentication.InvalidCredentialException">The authentication failed. You can use this object to retry the authentication.</exception>
-            <exception cref="T:System.ObjectDisposedException">This object has been closed.</exception>
-            <exception cref="T:System.NotSupportedException">Windows 95 and Windows 98 are not supported.</exception>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.AuthenticateAsServerAsync(System.Net.Security.NegotiateStream,System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy)">
-            <summary>Called by servers to begin an asynchronous operation to authenticate the client, and optionally the server, in a client-server connection. The authentication process uses the specified extended protection policy. This method does not block.</summary>
-            <returns>Task object indicating the status of the asynchronous operation.</returns>
-            <param name="policy">The  that is used for extended protection.</param>
-            <exception cref="T:System.ArgumentException">The  and <see cref="P:System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy.CustomServiceNames" /> on the extended protection policy passed in the  parameter are both null.</exception>
-            <exception cref="T:System.Security.Authentication.AuthenticationException">The authentication failed. You can use this object to retry the authentication.</exception>
-            <exception cref="T:System.Security.Authentication.InvalidCredentialException">The authentication failed. You can use this object to retry the authentication.</exception>
-            <exception cref="T:System.NotSupportedException">Windows 95 and Windows 98 are not supported.</exception>
-            <exception cref="T:System.ObjectDisposedException">This object has been closed.</exception>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.AuthenticateAsServerAsync(System.Net.Security.NegotiateStream,System.Net.NetworkCredential,System.Net.Security.ProtectionLevel,System.Security.Principal.TokenImpersonationLevel)">
-            <summary>Called by servers to begin an asynchronous operation to authenticate the client, and optionally the server, in a client-server connection. The authentication process uses the specified server credentials and authentication options. This method does not block.</summary>
-            <returns>Task object indicating the status of the asynchronous operation. </returns>
-            <param name="credential">The  that is used to establish the identity of the client.</param>
-            <param name="requiredProtectionLevel">One of the  values, indicating the security services for the stream.</param>
-            <param name="requiredImpersonationLevel">One of the  values, indicating how the server can use the client's credentials to access resources.</param>
-            <exception cref="T:System.ArgumentNullException"> is null.</exception>
-            <exception cref="T:System.ArgumentOutOfRangeException"> must be , <see cref="F:System.Security.Principal.TokenImpersonationLevel.Impersonation" />, or <see cref="F:System.Security.Principal.TokenImpersonationLevel.Delegation" />,</exception>
-            <exception cref="T:System.Security.Authentication.AuthenticationException">The authentication failed. You can use this object to retry the authentication.</exception>
-            <exception cref="T:System.Security.Authentication.InvalidCredentialException">The authentication failed. You can use this object to retry the authentication.</exception>
-            <exception cref="T:System.ObjectDisposedException">This object has been closed.</exception>
-            <exception cref="T:System.InvalidOperationException">Authentication has already occurred.- or -This stream was used previously to attempt authentication as the client. You cannot use the stream to retry authentication as the server.</exception>
-            <exception cref="T:System.NotSupportedException">Windows 95 and Windows 98 are not supported.</exception>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.AuthenticateAsClientAsync(System.Net.Security.SslStream,System.String)">
-            <summary>Called by clients to begin an asynchronous operation to authenticate the server and optionally the client.</summary>
-            <returns>Task object that indicates the status of the asynchronous operation. </returns>
-            <param name="targetHost">The name of the server that shares this .</param>
-            <exception cref="T:System.ArgumentNullException"> is null.</exception>
-            <exception cref="T:System.Security.Authentication.AuthenticationException">The authentication failed and left this object in an unusable state.</exception>
-            <exception cref="T:System.InvalidOperationException">Authentication has already occurred.-or-Server authentication using this  was tried previously.-or- Authentication is already in progress.</exception>
-            <exception cref="T:System.ObjectDisposedException">This object has been closed.</exception>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.AuthenticateAsServerAsync(System.Net.Security.SslStream,System.Security.Cryptography.X509Certificates.X509Certificate)">
-            <summary>Called by servers to begin an asynchronous operation to authenticate the client and optionally the server in a client-server connection.</summary>
-            <returns>Task object indicating the status of the asynchronous operation. </returns>
-            <param name="serverCertificate">The X509Certificate used to authenticate the server.</param>
-            <exception cref="T:System.ArgumentNullException"> is null.</exception>
-            <exception cref="T:System.Security.Authentication.AuthenticationException">The authentication failed and left this object in an unusable state.</exception>
-            <exception cref="T:System.InvalidOperationException">Authentication has already occurred.-or-Client authentication using this  was tried previously.-or- Authentication is already in progress.</exception>
-            <exception cref="T:System.ObjectDisposedException">This object has been closed.</exception>
-            <exception cref="T:System.PlatformNotSupportedException">The  method is not supported on Windows 95, Windows 98, or Windows Millennium.</exception>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.ConnectAsync(System.Net.Sockets.TcpClient,System.String,System.Int32)">
-            <summary>Starts an asynchronous request for a remote host connection. The host is specified by a host name and a port number.</summary>
-            <returns>Task that represents the asynchronous connection.</returns>
-            <param name="hostname">The name of the remote host.</param>
-            <param name="port">The port number of the remote host.</param>
-            <exception cref="T:System.ArgumentNullException"> is null. </exception>
-            <exception cref="T:System.ObjectDisposedException">The  has been closed. </exception>
-            <exception cref="T:System.NotSupportedException">This method is valid for sockets in the  or  families.</exception>
-            <exception cref="T:System.ArgumentOutOfRangeException">The port number is not valid.</exception>
-            <exception cref="T:System.InvalidOperationException">The  is ing.</exception>
-            <PermissionSet>    <IPermission class="System.Security.Permissions.EnvironmentPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />    <IPermission class="System.Security.Permissions.FileIOPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />    <IPermission class="System.Security.Permissions.SecurityPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />    <IPermission class="System.Diagnostics.PerformanceCounterPermission, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />    <IPermission class="System.Net.SocketPermission, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />  </PermissionSet>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.ConnectAsync(System.Net.Sockets.TcpClient,System.Net.IPAddress,System.Int32)">
-            <summary>Starts an asynchronous request for a remote host connection. The host is specified by an  and a port number.</summary>
-            <returns>Task that represents the asynchronous connection.</returns>
-            <param name="address">The  of the remote host.</param>
-            <param name="port">The port number of the remote host.</param>
-            <exception cref="T:System.ArgumentNullException"> is null. </exception>
-            <exception cref="T:System.Net.Sockets.SocketException">An error occurred when attempting to access the socket. See the Remarks section for more information. </exception>
-            <exception cref="T:System.ObjectDisposedException">The  has been closed. </exception>
-            <exception cref="T:System.NotSupportedException">The  is not in the socket family.</exception>
-            <exception cref="T:System.ArgumentOutOfRangeException">The port number is not valid.</exception>
-            <exception cref="T:System.ArgumentException">The length of  is zero.</exception>
-            <exception cref="T:System.InvalidOperationException">The  is ing.</exception>
-            <PermissionSet>    <IPermission class="System.Security.Permissions.EnvironmentPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />    <IPermission class="System.Security.Permissions.FileIOPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />    <IPermission class="System.Security.Permissions.SecurityPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />    <IPermission class="System.Diagnostics.PerformanceCounterPermission, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />    <IPermission class="System.Net.SocketPermission, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />  </PermissionSet>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.ConnectAsync(System.Net.Sockets.TcpClient,System.Net.IPAddress[],System.Int32)">
-            <summary>Starts an asynchronous request for a remote host connection. The host is specified by an  array and a port number.</summary>
-            <returns>Task that represents the asynchronous connections.</returns>
-            <param name="ipAddresses">At least one , designating the remote host.</param>
-            <param name="port">The port number of the remote host.</param>
-            <exception cref="T:System.ArgumentNullException"> is null. </exception>
-            <exception cref="T:System.Net.Sockets.SocketException">An error occurred when attempting to access the socket. See the Remarks section for more information. </exception>
-            <exception cref="T:System.ObjectDisposedException">The  has been closed. </exception>
-            <exception cref="T:System.NotSupportedException">This method is valid for sockets that use  or .</exception>
-            <exception cref="T:System.ArgumentOutOfRangeException">The port number is not valid.</exception>
-            <exception cref="T:System.ArgumentException">The length of  is zero.</exception>
-            <exception cref="T:System.InvalidOperationException">The  is ing.</exception>
-            <PermissionSet>    <IPermission class="System.Security.Permissions.EnvironmentPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />    <IPermission class="System.Security.Permissions.FileIOPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />    <IPermission class="System.Security.Permissions.SecurityPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />    <IPermission class="System.Diagnostics.PerformanceCounterPermission, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />    <IPermission class="System.Net.SocketPermission, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />  </PermissionSet>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.AcceptSocketAsync(System.Net.Sockets.TcpListener)">
-            <summary>Starts an asynchronous operation to accept an incoming connection attempt.</summary>
-            <returns>Task that represents the asynchronous creation of the <see cref="T:System.Net.Sockets.Socket" />.</returns>
-            <exception cref="T:System.Net.Sockets.SocketException">An error occurred while attempting to access the socket. See the Remarks section for more information. </exception>
-            <exception cref="T:System.ObjectDisposedException">The  has been closed. </exception>
-            <PermissionSet>    <IPermission class="System.Security.Permissions.EnvironmentPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />    <IPermission class="System.Security.Permissions.FileIOPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />    <IPermission class="System.Security.Permissions.SecurityPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Flags="UnmanagedCode, ControlEvidence" />    <IPermission class="System.Diagnostics.PerformanceCounterPermission, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />  </PermissionSet>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.AcceptTcpClientAsync(System.Net.Sockets.TcpListener)">
-            <summary>Starts an asynchronous operation to accept an incoming connection attempt.</summary>
-            <returns>Task that represents the asynchronous creation of the <see cref="T:System.Net.Sockets.TcpClient" />.</returns>
-            <exception cref="T:System.Net.Sockets.SocketException">An error occurred while attempting to access the socket. See the Remarks section for more information. </exception>
-            <exception cref="T:System.ObjectDisposedException">The  has been closed. </exception>
-            <PermissionSet>    <IPermission class="System.Security.Permissions.EnvironmentPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />    <IPermission class="System.Security.Permissions.FileIOPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />    <IPermission class="System.Security.Permissions.SecurityPermission, mscorlib, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Flags="UnmanagedCode, ControlEvidence" />    <IPermission class="System.Diagnostics.PerformanceCounterPermission, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" version="1" Unrestricted="true" />  </PermissionSet>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.SendAsync(System.Net.Sockets.UdpClient,System.Byte[],System.Int32,System.Net.IPEndPoint)">
-            <summary>Sends a datagram to a destination asynchronously. The destination is specified by a .</summary>
-            <returns>Task object that represents the asynchronous send.</returns>
-            <param name="dgram">A  array that contains the data to be sent.</param>
-            <param name="bytes">The number of bytes to send.</param>
-            <param name="endPoint">The  that represents the destination for the data.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.SendAsync(System.Net.Sockets.UdpClient,System.Byte[],System.Int32)">
-            <summary>Sends a datagram to a remote host asynchronously. The destination was specified previously by a call to .</summary>
-            <returns>Task object that represents the asynchronous send.</returns>
-            <param name="dgram">A  array that contains the data to be sent.</param>
-            <param name="bytes">The number of bytes to send.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.GetUnicastAddressesAsync(System.Net.NetworkInformation.IPGlobalProperties)">
-            <summary>Starts an asynchronous request to retrieve the stable unicast IP address table on the local computer.</summary>
-            <returns>Task that represents the asynchronous request.</returns>
-            <exception cref="T:System.NotImplementedException">This method is not implemented on the platform. This method uses the native NotifyStableUnicastIpAddressTable function that is supported on Windows Vista and later. </exception>
-            <exception cref="T:System.ComponentModel.Win32Exception">The call to the native NotifyStableUnicastIpAddressTable function failed.</exception>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.GetTokenAsync(System.IdentityModel.Selectors.SecurityTokenProvider,System.TimeSpan)">
-            <summary>Starts an asynchronous operation to get a security token.</summary>
-            <returns>The Task that represents the asynchronous close operation.</returns>
-            <param name="timeout">A  that specifies the timeout value for the message that gets the security token.</param>
-            <filterpriority>2</filterpriority>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.RenewTokenAsync(System.IdentityModel.Selectors.SecurityTokenProvider,System.TimeSpan,System.IdentityModel.Tokens.SecurityToken)">
-            <summary>Starts an asynchronous operation that renews a security token.</summary>
-            <returns>The Task that represents the asynchronous operation.</returns>
-            <param name="timeout">A  that specifies the timeout value for the message that renews the security token.</param>
-            <param name="tokenToBeRenewed">The   to renew.</param>
-            <filterpriority>2</filterpriority>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.CancelTokenAsync(System.IdentityModel.Selectors.SecurityTokenProvider,System.TimeSpan,System.IdentityModel.Tokens.SecurityToken)">
-            <summary>Starts an asynchronous operation to cancel a security token.</summary>
-            <returns>The Task that represents the asynchronous cancel operation.</returns>
-            <param name="timeout">A  that specifies the timeout value for the message that cancels the security token.</param>
-            <param name="token">The   to cancel.</param>
-            <filterpriority>2</filterpriority>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.FlushAsync(System.IO.Log.IRecordSequence,System.IO.Log.SequenceNumber)">
-            <summary>Starts an asynchronous flush operation, using space previously reserved in the sequence. This method cannot be inherited.</summary>
-            <returns>Task that represents the asynchronous flush operation, which could still be pending. </returns>
-            <param name="sequenceNumber">The sequence number of the latest record that must be written. If  is invalid, then all records must be written. </param>
-            <exception cref="T:System.ArgumentException">One or more of the arguments is invalid. is not valid for this sequence. </exception>
-            <exception cref="T:System.ArgumentOutOfRangeException"> is not between the base and last sequence numbers of this sequence.</exception>
-            <exception cref="T:System.IO.IOException">An I/O error occurred while flushing the data. </exception>
-            <exception cref="T:System.ObjectDisposedException">The method was called after the sequence has been disposed of. </exception>
-            <exception cref="T:System.OutOfMemoryException">There is not enough memory to continue the execution of the program.</exception>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.WriteRestartAreaAsync(System.IO.Log.IRecordSequence,System.ArraySegment{System.Byte},System.IO.Log.SequenceNumber,System.IO.Log.ReservationCollection)">
-            <summary>
-            Begins an asynchronous restart area write operation, using space previously reserved in the sequence.
-            </summary>
-            <param name="source"></param>
-            <param name="data">A list of byte array segments that will be concatenated and appended as the record.</param>
-            <param name="newBaseSequenceNumber">
-            The new base sequence number. The specified sequence number must be greater than or equal to the current base sequence number.</param>
-            <param name="reservation">
-            A  System.IO.Log.ReservationCollection that contains the reservation that should be used for this restart area.
-            </param>
-            <returns></returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.WriteRestartAreaAsync(System.IO.Log.IRecordSequence,System.Collections.Generic.IList{System.ArraySegment{System.Byte}},System.IO.Log.SequenceNumber,System.IO.Log.ReservationCollection)">
-            <summary>
-            begins an asynchronous restart area write operation, using space previously reserved in the sequence.
-            </summary>
-            <param name="source">The source.</param>
-            <param name="data">A list of byte array segments that will be concatenated and appended as the record.</param>
-            <param name="newBaseSequenceNumber">
-            The new base sequence number. The specified sequence number must be greater
-            than or equal to the current base sequence number.</param>
-            <param name="reservation">
-            A System.IO.Log.ReservationCollection that contains the reservation that should be used for this restart area.
-            </param>
-            <returns>An System.IAsyncResult that represents the asynchronous restart area write operation, which could still be pending.</returns>
-            <exception cref="T:System.ArgumentException">One or more of the arguments is invalid.</exception>
-            <exception cref="T:System.IO.IOException">An I/O error occurred while writing the restart area.</exception>
-            <exception cref="T:System.IO.Log.SequenceFullException">The record sequence could not make enough free space to contain the new record.</exception>
-            <exception cref="T:System.ObjectDisposedException">The method was called after the sequence has been disposed of.</exception>
-        </member>
-        <member name="M:AsyncCtpExtensions.BindReclaimedLockAsync(System.Runtime.DurableInstancing.InstancePersistenceContext,System.Int64,System.TimeSpan)">
-            <summary>Begin an asynchronous operation to bind a reclaimed lock to the instance view.</summary>
-            <returns>The status of an asynchronous operation.</returns>
-            <param name="instanceVersion">The version of the instance.</param>
-            <param name="timeout">The time period after which the asynchronous operation is aborted.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.ExecuteAsync(System.Runtime.DurableInstancing.InstancePersistenceContext,System.Runtime.DurableInstancing.InstancePersistenceCommand,System.TimeSpan)">
-            <summary>
-            Executes a persistence command asynchronously.
-            </summary>
-            <param name="source">The source.</param>
-            <param name="command">The persistence command to be executed.</param>
-            <param name="timeout">The time-out value for the operation.</param>
-            <returns>A Task that represents the asynchronous execution.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.ExecuteAsync(System.Runtime.DurableInstancing.InstanceStore,System.Runtime.DurableInstancing.InstanceHandle,System.Runtime.DurableInstancing.InstancePersistenceCommand,System.TimeSpan)">
-            <summary>
-            Executes a persistence command asynchronously.
-            </summary>
-            <param name="source">The source.</param>
-            <param name="handle">The handle.</param>
-            <param name="command">The persistence command to be executed.</param>
-            <param name="timeout">The time-out value for the operation.</param>
-            <returns>A Task that represents the asynchronous execution.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.WaitForEventsAsync(System.Runtime.DurableInstancing.InstanceStore,System.Runtime.DurableInstancing.InstanceHandle,System.TimeSpan)">
-            <summary>
-            Begins an asynchronous operation to listen for any events raised by the instance store for a specific instance handle.
-            </summary>
-            <param name="source">The source.</param>
-            <param name="handle">The handle.</param>
-            <param name="timeout">The time-out value for the operation.</param>
-            <returns>A Task that represents the asynchronous waiting.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.AbandonAsync(System.ServiceModel.Activities.IWorkflowInstanceManagement,System.Guid,System.String)">
-            <summary>Starts an asynchronous operation to abandon the specified workflow instance.</summary>
-            <returns>The Task.</returns>
-            <param name="instanceId">The GUID identifier of the workflow instance to abandon.</param>
-            <param name="reason">The reason for abandoning the workflow instance.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.CancelAsync(System.ServiceModel.Activities.IWorkflowInstanceManagement,System.Guid)">
-            <summary>Starts an asynchronous operation to cancel the specified workflow instance.</summary>
-            <returns>Task.</returns>
-            <param name="instanceId">The GUID identifier of the workflow instance to cancel.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.RunAsync(System.ServiceModel.Activities.IWorkflowInstanceManagement,System.Guid)">
-            <summary>Starts an asynchronous operation to run the specified workflow instance.</summary>
-            <returns>Task.</returns>
-            <param name="instanceId">The GUID identifier of the workflow instance to run.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.SuspendAsync(System.ServiceModel.Activities.IWorkflowInstanceManagement,System.Guid,System.String)">
-            <summary>Starts an asynchronous operation to suspend the specified workflow instance.</summary>
-            <returns>The Task.</returns>
-            <param name="instanceId">The GUID identifier of the workflow instance to suspend.</param>
-            <param name="reason">The reason to suspend the workflow instance.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.ReceiveRequestAsync(System.ServiceModel.Channels.IReplyChannel)">
-            <summary>Starts an asynchronous operation to receive an available request with a default timeout.</summary>
-            <returns>The Task that represents the asynchronous reception of the request. </returns>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.ReceiveRequestAsync(System.ServiceModel.Channels.IReplyChannel,System.TimeSpan)">
-            <summary>Starts an asynchronous operation to receive an available request with a specified timeout.</summary>
-            <returns>The Task that represents the asynchronous reception of the request. </returns>
-            <param name="timeout">The  that specifies the interval of time to wait for the reception of an available request.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.WaitForRequestAsync(System.ServiceModel.Channels.IReplyChannel,System.TimeSpan)">
-            <summary>Starts an asynchronous request operation that has a specified time out and state object associated with it. </summary>
-            <returns>The Task that represents the asynchronous operation to wait for a request message to arrive.</returns>
-            <param name="timeout">The  that specifies the interval of time to wait for the reception of an available request.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.AbandonAsync(System.ServiceModel.Channels.ReceiveContext,System.TimeSpan)">
-            <summary>Starts an asynchronous abandon operation with the specified  timeout, asynchronous callback, and user-defined state data.</summary>
-            <returns>A Task that represents the asynchronous abandon operation.</returns>
-            <param name="timeout">The timeout for the abandon operation to complete.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.AbandonAsync(System.ServiceModel.Channels.ReceiveContext,System.Exception,System.TimeSpan)">
-            <summary>Starts an asynchronous abandon operation with the specified exception, timeout, asynchronous callback, and user-defined state data.</summary>
-            <returns>Task that represents the asynchronous abandon operation.</returns>
-            <param name="exception">An exception that contains the reason for the abandon operation.</param>
-            <param name="timeout">The timeout for the abandon operation to complete.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.CompleteAsync(System.ServiceModel.Channels.ReceiveContext,System.TimeSpan)">
-            <summary>Starts an asynchronous complete operation with the specified  timeout, asynchronous callback, and user-defined state data.</summary>
-            <returns>A Task that represents the asynchronous complete operation.</returns>
-            <param name="timeout">The timeout for the complete operation to complete.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.TerminateAsync(System.Activities.WorkflowApplication,System.String)">
-            <summary>Terminates a workflow instance asynchronously using the specified error message, callback method, and user-provided state.</summary>
-            <param name="source">The source.</param>
-            <param name="reason">The reason for terminating the workflow instance.</param>
-            <returns>A Task that represents the asynchronous termination.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.TerminateAsync(System.Activities.WorkflowApplication,System.Exception)">
-            <summary>Terminates a workflow instance asynchronously using the specified exception, callback method, and user-provided state.</summary>
-            <param name="source">The source.</param>
-            <param name="reason">The reason the workflow instance is terminated.</param>
-            <returns>A Task that represents the asynchronous termination.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.TerminateAsync(System.Activities.WorkflowApplication,System.String,System.TimeSpan)">
-            <summary>Terminates a workflow instance asynchronously using the specified error message, time-out interval, callback method, and user-provided state.</summary>
-            <param name="source">The source.</param>
-            <param name="reason">The reason the workflow instance is terminated.</param>
-            <param name="timeout">The interval in which the  operation must complete before the operation is canceled and a <see cref="T:System.TimeoutException" /> is thrown.</param>
-            <returns>A Task that represents the asynchronous termination.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.TerminateAsync(System.Activities.WorkflowApplication,System.Exception,System.TimeSpan)">
-            <summary>Terminates a workflow instance asynchronously using the specified exception, time-out interval, callback method, and user-provided state.</summary>
-            <param name="source">The source.</param>
-            <param name="reason">The reason the workflow instance is terminated.</param>
-            <param name="timeout">The interval in which the  operation must complete before the operation is canceled and a <see cref="T:System.TimeoutException" /> is thrown.</param>
-            <returns>A Task that represents the asynchronous termination.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.CancelAsync(System.Activities.WorkflowApplication)">
-            <summary>Cancels a workflow instance asynchronously using the specified  and user-provided state.</summary>
-            <param name="source">The source.</param>
-            <returns>A Task that represents the asynchronous cancellation.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.CancelAsync(System.Activities.WorkflowApplication,System.TimeSpan)">
-            <summary>Cancels a workflow instance asynchronously using the specified time-out interval, , and user-provided state.</summary>
-            <param name="source">The source.</param>
-            <param name="timeout">The interval in which the cancel operation must complete before the operation is canceled and a  is thrown.</param>
-            <returns>A Task that represents the asynchronous cancellation.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.RunAsync(System.Activities.WorkflowApplication)">
-            <summary>Starts or resumes a workflow instance asynchronously using the specified callback method and user-provided state.</summary>
-            <param name="source">The source.</param>
-            <returns>A Task that represents the asynchronous run.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.RunAsync(System.Activities.WorkflowApplication,System.TimeSpan)">
-            <summary>Starts or resumes a workflow instance asynchronously using the specified time-out interval, callback method, and user-provided state.</summary>
-            <param name="source">The source.</param>
-            <param name="timeout">The interval in which the resume operation must complete before the operation is canceled and a  is thrown.</param>
-            <returns>A Task that represents the asynchronous run.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.LoadRunnableInstanceAsync(System.Activities.WorkflowApplication)">
-            <summary>Initiates an operation to load a runnable workflow instance from the .</summary>
-            <returns>A reference to the asynchronous operation</returns>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.LoadRunnableInstanceAsync(System.Activities.WorkflowApplication,System.TimeSpan)">
-            <summary>Initiates an operation to load a runnable workflow instance from the  using the specified time-out interval.</summary>
-            <returns>A reference to the asynchronous operation</returns>
-            <param name="timeout">The interval in which the load operation must complete before the operation is canceled and a  is thrown.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.LoadAsync(System.Activities.WorkflowApplication,System.Guid)">
-            <summary>Loads a workflow asynchronously from an instance store using the specified instance identifier, callback method, and user-provided state.</summary>
-            <returns>The status of an asynchronous operation.</returns>
-            <param name="instanceId">A globally unique 128-bit identifier for the workflow instance.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.LoadAsync(System.Activities.WorkflowApplication,System.Guid,System.TimeSpan)">
-            <summary>Loads a workflow asynchronously from an instance store using the specified instance identifier, timeout period, callback method, and user-provided state.</summary>
-            <returns>The status of an asynchronous operation.</returns>
-            <param name="instanceId">A globally unique 128-bit identifier for the workflow instance.</param>
-            <param name="timeout">The interval in which the begin load operation must complete before the operation is canceled and a  is thrown.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.PersistAsync(System.Activities.WorkflowApplication)">
-            <summary>Persists a workflow instance to an instance store asynchronously using the specified callback method and user-provided state.</summary>
-            <returns>A reference to the asynchronous persist operation.</returns>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.PersistAsync(System.Activities.WorkflowApplication,System.TimeSpan)">
-            <summary>Persists a workflow instance to an instance store asynchronously using the specified time-out interval, callback method, and user-provided state.</summary>
-            <returns>A reference to the asynchronous persist operation.</returns>
-            <param name="timeout">The interval in which the persist operation must complete before the operation is canceled and a  is thrown.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.ResumeBookmarkAsync(System.Activities.WorkflowApplication,System.String,System.Object)">
-            <summary>Initiates an asynchronous operation to resume the bookmark with the specified name, using the specified value, callback method, and state. The bookmark to be resumed is previously created by an activity within the workflow instance.</summary>
-            <returns>The result of the bookmark resumption operation.</returns>
-            <param name="bookmarkName">The name of the bookmark to be resumed.</param>
-            <param name="value">An object passed as a parameter to the method that is invoked when the bookmark resumes.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.ResumeBookmarkAsync(System.Activities.WorkflowApplication,System.String,System.Object,System.TimeSpan)">
-            <summary>Initiates an asynchronous operation to resume the bookmark with the specified name, using the specified value, time-out interval, callback method, and state. The bookmark to be resumed is previously created by an activity within the workflow instance.</summary>
-            <returns>The result of the bookmark resumption operation.</returns>
-            <param name="bookmarkName">The name of the bookmark to be resumed.</param>
-            <param name="value">An object passed as a parameter to the method that is invoked when the bookmark resumes.</param>
-            <param name="timeout">The time interval during which the bookmark must be resumed.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.ResumeBookmarkAsync(System.Activities.WorkflowApplication,System.Activities.Bookmark,System.Object)">
-            <summary>Initiates an operation to resume a bookmark using the specified value, callback method, and state.</summary>
-            <returns>A reference to the asynchronous bookmark resume operation.</returns>
-            <param name="bookmark">The bookmark to resume.</param>
-            <param name="value">An object passed as a parameter to the method that is invoked when the bookmark resumes.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.ResumeBookmarkAsync(System.Activities.WorkflowApplication,System.Activities.Bookmark,System.Object,System.TimeSpan)">
-            <summary>Initiates an operation to resume a bookmark using the specified value, time-out interval, callback method, and state.</summary>
-            <returns>A reference to the asynchronous bookmark resume operation.</returns>
-            <param name="bookmark">The bookmark to resume.</param>
-            <param name="value">An object passed as a parameter to the method that is invoked when the bookmark resumes.</param>
-            <param name="timeout">The interval in which the resume operation must complete before the operation is canceled and a  is thrown.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.UnloadAsync(System.Activities.WorkflowApplication)">
-            <summary>Persists and disposes a workflow instance asynchronously using the specified callback method and user-provided state.</summary>
-            <returns>A reference to the asynchronous Task operation.</returns>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.UnloadAsync(System.Activities.WorkflowApplication,System.TimeSpan)">
-            <summary>Persists and disposes a workflow instance asynchronously using the specified time-out interval, callback method, and user-provided state.</summary>
-            <returns>A reference to the asynchronous Task operation.</returns>
-            <param name="timeout">The interval in which the  operation must complete before the operation is canceled and a <see cref="T:System.TimeoutException" /> is thrown.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.WaitForConnectionAsync(System.IO.Pipes.NamedPipeServerStream)">
-            <summary>Starts an asynchronous operation to wait for a client to connect.</summary>
-            <returns>An object that represents the asynchronous request.</returns>
-            <exception cref="T:System.InvalidOperationException">The pipe was not opened asynchronously.-or-A pipe connection has already been established.-or-The pipe handle has not been set.</exception>
-            <exception cref="T:System.IO.IOException">The pipe connection has been broken.</exception>
-            <exception cref="T:System.ObjectDisposedException">The pipe is closed.</exception>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.ExecuteNonQueryAsync(System.Data.SqlClient.SqlCommand)">
-            <summary>Initiates the asynchronous execution of the Transact-SQL statement or stored procedure that is described by this , given a callback procedure and state information.</summary>
-            <returns>Task that can be used to poll or wait for results, or both; this value is also needed when invoking <see cref="M:System.Data.SqlClient.SqlCommand.EndExecuteNonQuery(System.IAsyncResult)" />, which returns the number of affected rows.</returns>
-            <exception cref="T:System.Data.SqlClient.SqlException">Any error that occurred while executing the command text.</exception>
-            <exception cref="T:System.InvalidOperationException">The name/value pair "Asynchronous Processing=true" was not included within the connection string defining the connection for this .</exception>
-            <filterpriority>2</filterpriority>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.ExecuteXmlReaderAsync(System.Data.SqlClient.SqlCommand)">
-            <summary>Initiates the asynchronous execution of the Transact-SQL statement or stored procedure that is described by this  and returns results as an <see cref="T:System.Xml.XmlReader" /> object, using a callback procedure.</summary>
-            <returns>Task that can be used to poll, wait for results, or both; this value is also needed when the <see cref="M:System.Data.SqlClient.SqlCommand.EndExecuteXmlReader(System.IAsyncResult)" /> is called, which returns the results of the command as XML.</returns>
-            <exception cref="T:System.Data.SqlClient.SqlException">Any error that occurred while executing the command text.</exception>
-            <exception cref="T:System.InvalidOperationException">The name/value pair "Asynchronous Processing=true" was not included within the connection string defining the connection for this .</exception>
-            <filterpriority>2</filterpriority>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.ExecuteReaderAsync(System.Data.SqlClient.SqlCommand)">
-            <summary>Initiates the asynchronous execution of the Transact-SQL statement or stored procedure that is described by this  and retrieves one or more result sets from the server, given a callback procedure and state information.</summary>
-            <returns>Task that can be used to poll, wait for results, or both; this value is also needed when invoking <see cref="M:System.Data.SqlClient.SqlCommand.EndExecuteReader(System.IAsyncResult)" />, which returns a <see cref="T:System.Data.SqlClient.SqlDataReader" /> instance which can be used to retrieve the returned rows.</returns>
-            <exception cref="T:System.Data.SqlClient.SqlException">Any error that occurred while executing the command text.</exception>
-            <exception cref="T:System.InvalidOperationException">The name/value pair "Asynchronous Processing=true" was not included within the connection string defining the connection for this .</exception>
-            <filterpriority>2</filterpriority>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.ExecuteAsync(System.Data.Services.Client.DataServiceQuery)">
-            <summary>Asynchronously sends a request to execute the data service query.</summary>
-            <returns>Task object that is used to track the status of the asynchronous operation.</returns>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.LoadPropertyAsync(System.Data.Services.Client.DataServiceContext,System.Object,System.String)">
-            <summary>Asynchronously loads the value of the specified property from the data service.</summary>
-            <returns>An IAsyncResult that represents the status of the asynchronous operation.</returns>
-            <param name="entity">The entity that contains the property to load.</param>
-            <param name="propertyName">The name of the property on the specified entity to load.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.LoadPropertyAsync(System.Data.Services.Client.DataServiceContext,System.Object,System.String,System.Uri)">
-            <summary>Asynchronously loads a page of related entities from the data service by using the supplied next link URI.</summary>
-            <returns>Task object that is used to track the status of the asynchronous operation. </returns>
-            <param name="entity">The entity that contains the property to load.</param>
-            <param name="propertyName">The name of the property of the specified entity to load.</param>
-            <param name="nextLinkUri">The URI used to load the next results page.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.LoadPropertyAsync(System.Data.Services.Client.DataServiceContext,System.Object,System.String,System.Data.Services.Client.DataServiceQueryContinuation)">
-            <summary>Asynchronously loads the next page of related entities from the data service by using the supplied query continuation object.</summary>
-            <returns>Task that represents the status of the operation.</returns>
-            <param name="entity">The entity that contains the property to load.</param>
-            <param name="propertyName">The name of the property of the specified entity to load.</param>
-            <param name="continuation">A  object that represents the next page of related entity data to return from the data service.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.GetReadStreamAsync(System.Data.Services.Client.DataServiceContext,System.Object,System.Data.Services.Client.DataServiceRequestArgs)">
-            <summary>Asynchronously gets binary property data for the specified entity as a data stream along with the specified message headers.</summary>
-            <returns>Task object that is used to track the status of the asynchronous operation. </returns>
-            <param name="entity">The entity that has the binary property to retrieve. </param>
-            <param name="args">Instance of the  class that contains settings for the HTTP request message.</param>
-            <exception cref="T:System.ArgumentNullException">Any of the parameters supplied to the method is null.</exception>
-            <exception cref="T:System.ArgumentException">The  is not tracked by this .-or-The <paramref name="entity" /> is in the <see cref="F:System.Data.Services.Client.EntityStates.Added" /> state.-or-The <paramref name="entity" /> is not a Media Link Entry and does not have a binary property.</exception>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.ExecuteAsync``1(System.Data.Services.Client.DataServiceContext,System.Uri)">
-            <summary>
-            Asynchronously sends the request so that this call does not block processing while waiting for the results from the service.
-            </summary>
-            <typeparam name="T">The type returned by the query.</typeparam>
-            <param name="source">The source.</param>
-            <param name="requestUri">
-            The URI to which the query request will be sent. The URI may be any valid data service URI; it can contain $ query parameters.
-            </param>
-            <returns>A Task that is used to track the status of the asynchronous operation.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.SaveChangesAsync(System.Data.Services.Client.DataServiceContext)">
-            <summary>Asynchronously submits the pending changes to the data service collected by the  since the last time changes were saved.</summary>
-            <returns>An IAsyncResult that represents the status of the asynchronous operation.</returns>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.SaveChangesAsync(System.Data.Services.Client.DataServiceContext,System.Data.Services.Client.SaveChangesOptions)">
-            <summary>Asynchronously submits the pending changes to the data service collected by the  since the last time changes were saved.</summary>
-            <returns>Task that represents the status of the asynchronous operation.</returns>
-            <param name="options">The options for how the client can save the pending set of changes.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.SendRequestAsync(System.DirectoryServices.Protocols.DsmlSoapHttpConnection,System.DirectoryServices.Protocols.DsmlRequestDocument)">
-            <summary>The  method begins asynchronously sending the specified <see cref="T:System.DirectoryServices.Protocols.DsmlRequestDocument" /> object to the server.</summary>
-            <returns>An object derived from Task that represents the asynchronous send.</returns>
-            <param name="request">The  object to send.</param>
-            <exception cref="T:System.ArgumentNullException"> is null (Nothing in Visual Basic).</exception>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.WaitForChannelAsync(System.ServiceModel.Channels.IChannelListener,System.TimeSpan)">
-            <summary>When implemented in a derived class, begins an asynchronous operation to wait for a channel to arrive.</summary>
-            <returns>The Task that represents the asynchronous wait for a channel operation. </returns>
-            <param name="timeout">The  that specifies how long the wait for a channel operation has to complete before timing out.</param>
-            <exception cref="T:System.InvalidOperationException">The channel listener has not been opened and so cannot be used.</exception>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.AcceptUpgradeAsync(System.ServiceModel.Channels.StreamUpgradeAcceptor,System.IO.Stream)">
-            <summary>Asynchronous version of .</summary>
-            <returns>Returns a result code that is passed into EndAcceptUpgrade to access the upgraded stream.</returns>
-            <param name="stream">The stream to be upgraded.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.InitiateUpgradeAsync(System.ServiceModel.Channels.StreamUpgradeInitiator,System.IO.Stream)">
-            <summary>This abstract method can be implemented to do asynchronous processing that initiates an upgrade.</summary>
-            <returns>Returns an Task to be passed into the <see cref="M:System.ServiceModel.Channels.StreamUpgradeInitiator.EndInitiateUpgrade(System.IAsyncResult)" /> method.</returns>
-            <param name="stream">The stream to be upgraded.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.FinalizeCorrelationAsync(System.ServiceModel.Channels.CorrelationCallbackMessageProperty,System.ServiceModel.Channels.Message,System.TimeSpan)">
-            <summary>Called by a correlation protocol when all of the correlation information is available to asynchronously construct the correlation.</summary>
-            <returns>A reference to the current asynchronous operation.</returns>
-            <param name="message">The message to be correlated.</param>
-            <param name="timeout">The interval in which correlation must be finalized or else a  is thrown.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.CloseAsync(System.ServiceModel.Security.Tokens.IssuedSecurityTokenProvider)">
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.CloseAsync(System.ServiceModel.Security.Tokens.IssuedSecurityTokenProvider,System.TimeSpan)">
-            <summary>Starts an asynchronous operation invoked when the workflow service host is closed.</summary>
-            <returns>A reference to the asynchronous close operation.</returns>
-            <param name="timeout">The period of time the asynchronous close operation has to complete before timing out.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.OpenAsync(System.ServiceModel.Security.Tokens.IssuedSecurityTokenProvider)">
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.OpenAsync(System.ServiceModel.Security.Tokens.IssuedSecurityTokenProvider,System.TimeSpan)">
-            <summary>Starts an asynchronous operation invoked when the workflow service host is opened.</summary>
-            <returns>A reference to the asynchronous operation.</returns>
-            <param name="timeout">The period of time the asynchronous open operation has to complete before timing out.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.CloseOutputSessionAsync(System.ServiceModel.IDuplexContextChannel,System.TimeSpan)">
-            <summary>Starts an asynchronous operation to close an output session on the client that has a specified time out and state object associated with it. </summary>
-            <returns>The Task that represents the asynchronous close operation.</returns>
-            <param name="timeout">The  that specifies how long the close operation has to complete before timing out.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.DisplayInitializationUIAsync(System.ServiceModel.IClientChannel)">
-            <summary>An asynchronous call to begin using a user interface to obtain credential information.</summary>
-            <returns>The Task to use to call back when processing has completed.</returns>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.GetMetadataAsync(System.ServiceModel.Description.MetadataExchangeClient)">
-            <summary>Starts an asynchronous method call that returns a .</summary>
-            <returns>The metadata.</returns>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.GetMetadataAsync(System.ServiceModel.Description.MetadataExchangeClient,System.Uri,System.ServiceModel.Description.MetadataExchangeClientMode)">
-            <summary>Starts an asynchronous method call that returns a  using the specified address, callback, asynchronous state, and download mechanism.</summary>
-            <returns>The metadata obtained from the specified .</returns>
-            <param name="address">The address of the metadata.</param>
-            <param name="mode">The  value to use when downloading the metadata.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.GetMetadataAsync(System.ServiceModel.Description.MetadataExchangeClient,System.ServiceModel.EndpointAddress)">
-            <summary>Starts an asynchronous method call that returns a  using the specified address, callback, and asynchronous state.</summary>
-            <returns>The metadata obtained from the specified .</returns>
-            <param name="address">The address of the metadata.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.GetAsync(System.ServiceModel.Description.IMetadataExchange,System.ServiceModel.Channels.Message)">
-            <summary>Starts an asynchronous retrieval of metadata.</summary>
-            <returns>Task that can be passed to the <see cref="M:System.ServiceModel.Description.IMetadataExchange.EndGet(System.IAsyncResult)" /> method.</returns>
-            <param name="request">A  that should be processed to determine the metadata to return.</param>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.CommitAsync(System.Transactions.CommittableTransaction)">
-            <summary> attempt to commit the transaction asynchronously.</summary>
-            <returns>Task interface that can be used by the caller to check the status of the asynchronous operation, or to wait for the operation to complete.</returns>
-            <param name="source">The source.</param>
-        </member>
-        <member name="M:AsyncCtpExtensions.SendTaskAsync(System.Net.Mail.SmtpClient,System.String,System.String,System.String,System.String)">
-            <summary>Sends an e-mail message asynchronously.</summary>
-            <param name="smtpClient">The client.</param>
-            <param name="from">A String that contains the address information of the message sender.</param>
-            <param name="recipients">A String that contains the address that the message is sent to.</param>
-            <param name="subject">A String that contains the subject line for the message.</param>
-            <param name="body">A String that contains the message body.</param>
-            <returns>A Task that represents the asynchronous send.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.SendTaskAsync(System.Net.Mail.SmtpClient,System.Net.Mail.MailMessage)">
-            <summary>Sends an e-mail message asynchronously.</summary>
-            <param name="smtpClient">The client.</param>
-            <param name="message">A MailMessage that contains the message to send.</param>
-            <returns>A Task that represents the asynchronous send.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.SendTaskAsyncCore(System.Net.Mail.SmtpClient,System.Object,System.Action{System.Threading.Tasks.TaskCompletionSource{System.Object}})">
-            <summary>The core implementation of SendTaskAsync.</summary>
-            <param name="smtpClient">The client.</param>
-            <param name="userToken">The user-supplied state.</param>
-            <param name="sendAsync">
-            A delegate that initiates the asynchronous send.
-            The provided TaskCompletionSource must be passed as the user-supplied state to the actual SmtpClient.SendAsync method.
-            </param>
-            <returns></returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.FindTaskAsync(System.ServiceModel.Discovery.DiscoveryClient,System.ServiceModel.Discovery.FindCriteria)">
-            <summary>
-            Begins an asynchronous find operation with the specified criteria.
-            </summary>
-            <param name="discoveryClient">The discovery client.</param>
-            <param name="criteria">The criteria for finding services.</param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.FindTaskAsync(System.ServiceModel.Discovery.DiscoveryClient,System.ServiceModel.Discovery.FindCriteria,System.IProgress{System.ServiceModel.Discovery.FindProgressChangedEventArgs})">
-            <summary>
-            Begins an asynchronous find operation with the specified criteria.
-            </summary>
-            <param name="discoveryClient">The discovery client.</param>
-            <param name="criteria">The criteria for finding services.</param>
-            <param name="progress">An object into which to store progress.</param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.ResolveTaskAsync(System.ServiceModel.Discovery.DiscoveryClient,System.ServiceModel.Discovery.ResolveCriteria)">
-            <summary>
-            Begins an asynchronous resolve operation with the specified criteria.
-            </summary>
-            <param name="discoveryClient">The discovery client.</param>
-            <param name="criteria">The criteria for matching a service endpoint.</param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.CopyToAsync(System.IO.Stream,System.IO.Stream)">
-            <summary>
-            Reads all the bytes from the current stream and writes them to the destination stream.
-            </summary>
-            <param name="source">The source stream.</param>
-            <param name="destination">The stream that will contain the contents of the current stream.</param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.CopyToAsync(System.IO.Stream,System.IO.Stream,System.Int32)">
-            <summary>
-            Reads all the bytes from the current stream and writes them to the destination stream.
-            </summary>
-            <param name="source">The source stream.</param>
-            <param name="destination">The stream that will contain the contents of the current stream.</param>
-            <param name="bufferSize">The size of the buffer. This value must be greater than zero. The default size is 4096.</param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.CopyToAsync(System.IO.Stream,System.IO.Stream,System.Int32,System.Threading.CancellationToken)">
-            <summary>
-            Reads all the bytes from the current stream and writes them to the destination stream.
-            </summary>
-            <param name="source">The source stream.</param>
-            <param name="destination">The stream that will contain the contents of the current stream.</param>
-            <param name="bufferSize">The size of the buffer. This value must be greater than zero. The default size is 4096.</param>
-            <param name="cancellationToken">The cancellation token to use to cancel the asynchronous operation.</param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.ReadAsync(System.IO.TextReader,System.Char[],System.Int32,System.Int32)">
-            <summary>
-            Reads a maximum of count characters from the reader asynchronously and writes
-            the data to buffer, beginning at index.
-            </summary>
-            <param name="buffer">
-            When the operation completes, contains the specified character array with the
-            values between index and (index + count - 1) replaced by the characters read
-            from the current source.
-            </param>
-            <param name="count">
-            The maximum number of characters to read. If the end of the stream is reached
-            before count of characters is read into buffer, the current method returns.
-            </param>
-            <param name="index">The place in buffer at which to begin writing.</param>
-            <param name="source">the source reader.</param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-            <remarks>This method is not currently implemented using asynchronous I/O.</remarks>
-        </member>
-        <member name="M:AsyncCtpExtensions.ReadLineAsync(System.IO.TextReader)">
-            <summary>
-            Reads a line of characters from the reader and returns the string asynchronously.
-            </summary>
-            <param name="source">the source reader.</param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-            <remarks>This method is not currently implemented using asynchronous I/O.</remarks>
-        </member>
-        <member name="M:AsyncCtpExtensions.ReadToEndAsync(System.IO.TextReader)">
-            <summary>
-            Reads all characters from the current position to the end of the TextReader
-            and returns them as one string asynchronously.
-            </summary>
-            <param name="source">the source reader.</param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-            <remarks>This method is not currently implemented using asynchronous I/O.</remarks>
-        </member>
-        <member name="M:AsyncCtpExtensions.WriteAsync(System.IO.TextWriter,System.String)">
-            <summary>Writes a string asynchronously to a text stream.</summary>
-            <param name="target">The writer.</param>
-            <param name="value">The string to write.</param>
-            <returns>A Task representing the asynchronous write.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.SendTaskAsync(System.Net.NetworkInformation.Ping,System.Net.IPAddress)">
-            <summary>
-            Asynchronously attempts to send an Internet Control Message Protocol (ICMP) echo message.
-            </summary>
-            <param name="ping">The Ping.</param>
-            <param name="address">An IPAddress that identifies the computer that is the destination for the ICMP echo message.</param>
-            <returns>A task that represents the asynchronous operation.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.SendTaskAsync(System.Net.NetworkInformation.Ping,System.String)">
-            <summary>
-            Asynchronously attempts to send an Internet Control Message Protocol (ICMP) echo message.
-            </summary>
-            <param name="ping">The Ping.</param>
-            <param name="hostNameOrAddress">
-            A String that identifies the computer that is the destination for the ICMP echo message. 
-            The value specified for this parameter can be a host name or a string representation of an IP address.
-            </param>
-            <returns>A task that represents the asynchronous operation.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.SendTaskAsync(System.Net.NetworkInformation.Ping,System.Net.IPAddress,System.Int32)">
-            <summary>
-            Asynchronously attempts to send an Internet Control Message Protocol (ICMP) echo message.
-            </summary>
-            <param name="ping">The Ping.</param>
-            <param name="address">An IPAddress that identifies the computer that is the destination for the ICMP echo message.</param>
-            <param name="timeout">
-            An Int32 value that specifies the maximum number of milliseconds (after sending the echo message) 
-            to wait for the ICMP echo reply message.
-            </param>
-            <returns>A task that represents the asynchronous operation.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.SendTaskAsync(System.Net.NetworkInformation.Ping,System.String,System.Int32)">
-            <summary>
-            Asynchronously attempts to send an Internet Control Message Protocol (ICMP) echo message.
-            </summary>
-            <param name="ping">The Ping.</param>
-            <param name="hostNameOrAddress">
-            A String that identifies the computer that is the destination for the ICMP echo message. 
-            The value specified for this parameter can be a host name or a string representation of an IP address.
-            </param>
-            <param name="timeout">
-            An Int32 value that specifies the maximum number of milliseconds (after sending the echo message) 
-            to wait for the ICMP echo reply message.
-            </param>
-            <returns>A task that represents the asynchronous operation.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.SendTaskAsync(System.Net.NetworkInformation.Ping,System.Net.IPAddress,System.Int32,System.Byte[])">
-            <summary>
-            Asynchronously attempts to send an Internet Control Message Protocol (ICMP) echo message.
-            </summary>
-            <param name="ping">The Ping.</param>
-            <param name="address">An IPAddress that identifies the computer that is the destination for the ICMP echo message.</param>
-            <param name="timeout">
-            An Int32 value that specifies the maximum number of milliseconds (after sending the echo message) 
-            to wait for the ICMP echo reply message.
-            </param>
-            <param name="buffer">
-            A Byte array that contains data to be sent with the ICMP echo message and returned 
-            in the ICMP echo reply message. The array cannot contain more than 65,500 bytes.
-            </param>
-            <returns>A task that represents the asynchronous operation.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.SendTaskAsync(System.Net.NetworkInformation.Ping,System.String,System.Int32,System.Byte[])">
-            <summary>
-            Asynchronously attempts to send an Internet Control Message Protocol (ICMP) echo message.
-            </summary>
-            <param name="ping">The Ping.</param>
-            <param name="hostNameOrAddress">
-            A String that identifies the computer that is the destination for the ICMP echo message. 
-            The value specified for this parameter can be a host name or a string representation of an IP address.
-            </param>
-            <param name="timeout">
-            An Int32 value that specifies the maximum number of milliseconds (after sending the echo message) 
-            to wait for the ICMP echo reply message.
-            </param>
-            <param name="buffer">
-            A Byte array that contains data to be sent with the ICMP echo message and returned 
-            in the ICMP echo reply message. The array cannot contain more than 65,500 bytes.
-            </param>
-            <returns>A task that represents the asynchronous operation.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.SendTaskAsync(System.Net.NetworkInformation.Ping,System.Net.IPAddress,System.Int32,System.Byte[],System.Net.NetworkInformation.PingOptions)">
-            <summary>
-            Asynchronously attempts to send an Internet Control Message Protocol (ICMP) echo message.
-            </summary>
-            <param name="ping">The Ping.</param>
-            <param name="address">An IPAddress that identifies the computer that is the destination for the ICMP echo message.</param>
-            <param name="timeout">
-            An Int32 value that specifies the maximum number of milliseconds (after sending the echo message) 
-            to wait for the ICMP echo reply message.
-            </param>
-            <param name="buffer">
-            A Byte array that contains data to be sent with the ICMP echo message and returned 
-            in the ICMP echo reply message. The array cannot contain more than 65,500 bytes.
-            </param>
-            <param name="options">A PingOptions object used to control fragmentation and Time-to-Live values for the ICMP echo message packet.</param>
-            <returns>A task that represents the asynchronous operation.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.SendTaskAsync(System.Net.NetworkInformation.Ping,System.String,System.Int32,System.Byte[],System.Net.NetworkInformation.PingOptions)">
-            <summary>
-            Asynchronously attempts to send an Internet Control Message Protocol (ICMP) echo message.
-            </summary>
-            <param name="ping">The Ping.</param>
-            <param name="hostNameOrAddress">
-            A String that identifies the computer that is the destination for the ICMP echo message. 
-            The value specified for this parameter can be a host name or a string representation of an IP address.
-            </param>
-            <param name="timeout">
-            An Int32 value that specifies the maximum number of milliseconds (after sending the echo message) 
-            to wait for the ICMP echo reply message.
-            </param>
-            <param name="buffer">
-            A Byte array that contains data to be sent with the ICMP echo message and returned 
-            in the ICMP echo reply message. The array cannot contain more than 65,500 bytes.
-            </param>
-            <param name="options">A PingOptions object used to control fragmentation and Time-to-Live values for the ICMP echo message packet.</param>
-            <returns>A task that represents the asynchronous operation.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.SendTaskAsyncCore(System.Net.NetworkInformation.Ping,System.Object,System.Action{System.Threading.Tasks.TaskCompletionSource{System.Net.NetworkInformation.PingReply}})">
-            <summary>The core implementation of SendTaskAsync.</summary>
-            <param name="ping">The Ping.</param>
-            <param name="userToken">A user-defined object stored in the resulting Task.</param>
-            <param name="sendAsync">
-            A delegate that initiates the asynchronous send.
-            The provided TaskCompletionSource must be passed as the user-supplied state to the actual Ping.SendAsync method.
-            </param>
-            <returns></returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.ResolveAddressTaskAsync(System.Device.Location.ICivicAddressResolver,System.Device.Location.GeoCoordinate)">
-            <summary>Initiates an asynchronous request to resolve a latitude/longitude location to an address.</summary>
-            <param name="civicAddressResolver">The resolver.</param>
-            <param name="coordinate">The latitude/longitude location to resolve to an address.</param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-        </member>
-        <member name="M:AsyncCtpExtensions.ResolveTaskAsync(System.Net.PeerToPeer.PeerNameResolver,System.Net.PeerToPeer.PeerName)">
-            <summary>
-            Begins an asynchronous peer name resolution operation for the specified System.Net.PeerToPeer.PeerName
-            in the specified System.Net.PeerToPeer.Cloud. The resolution operation will
-            resolve no more than maxRecords entries for the specified peer name.
-            </summary>
-            <param name="peerNameResolver">The peer name resolver.</param>
-            <param name="peerName">The peerName to resolve.</param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-            <exception cref="T:System.ArgumentNullException">One or both of the peerName and userState parameters are set to null.</exception>
-        </member>
-        <member name="M:AsyncCtpExtensions.ResolveTaskAsync(System.Net.PeerToPeer.PeerNameResolver,System.Net.PeerToPeer.PeerName,System.Int32)">
-            <summary>
-            Begins an asynchronous peer name resolution operation for the specified System.Net.PeerToPeer.PeerName
-            in the specified System.Net.PeerToPeer.Cloud. The resolution operation will
-            resolve no more than maxRecords entries for the specified peer name.
-            </summary>
-            <param name="peerNameResolver">The peer name resolver.</param>
-            <param name="peerName">The peerName to resolve.</param>
-            <param name="maxRecords">The maximum number of records to obtain from cloud for peerName.</param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-            <exception cref="T:System.ArgumentNullException">One or both of the peerName and userState parameters are set to null.</exception>
-            <exception cref="T:System.ArgumentOutOfRangeException">The maxRecords parameter is less than or equal to zero.</exception>
-        </member>
-        <member name="M:AsyncCtpExtensions.ResolveTaskAsync(System.Net.PeerToPeer.PeerNameResolver,System.Net.PeerToPeer.PeerName,System.Net.PeerToPeer.Cloud)">
-            <summary>
-            Begins an asynchronous peer name resolution operation for the specified System.Net.PeerToPeer.PeerName
-            in the specified System.Net.PeerToPeer.Cloud. The resolution operation will
-            resolve no more than maxRecords entries for the specified peer name.
-            </summary>
-            <param name="peerNameResolver">The peer name resolver.</param>
-            <param name="peerName">The peerName to resolve.</param>
-            <param name="cloud">The cloud in which to resolve peerName.</param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-            <exception cref="T:System.ArgumentNullException">One or both of the peerName and userState parameters are set to null.</exception>
-        </member>
-        <member name="M:AsyncCtpExtensions.ResolveTaskAsync(System.Net.PeerToPeer.PeerNameResolver,System.Net.PeerToPeer.PeerName,System.Net.PeerToPeer.Cloud,System.Int32)">
-            <summary>
-            Begins an asynchronous peer name resolution operation for the specified System.Net.PeerToPeer.PeerName
-            in the specified System.Net.PeerToPeer.Cloud. The resolution operation will
-            resolve no more than maxRecords entries for the specified peer name.
-            </summary>
-            <param name="peerNameResolver">The peer name resolver.</param>
-            <param name="peerName">The peerName to resolve.</param>
-            <param name="cloud">The cloud in which to resolve peerName.</param>
-            <param name="maxRecords">The maximum number of records to obtain from cloud for peerName.</param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-            <exception cref="T:System.ArgumentNullException">One or both of the peerName and userState parameters are set to null.</exception>
-            <exception cref="T:System.ArgumentOutOfRangeException">The maxRecords parameter is less than or equal to zero.</exception>
-        </member>
-        <member name="M:AsyncCtpExtensions.ResolveTaskAsync(System.Net.PeerToPeer.PeerNameResolver,System.Net.PeerToPeer.PeerName,System.Net.PeerToPeer.Cloud,System.Int32,System.IProgress{System.Int32})">
-            <summary>
-            Begins an asynchronous peer name resolution operation for the specified System.Net.PeerToPeer.PeerName
-            in the specified System.Net.PeerToPeer.Cloud. The resolution operation will
-            resolve no more than maxRecords entries for the specified peer name.
-            </summary>
-            <param name="peerNameResolver">The peer name resolver.</param>
-            <param name="peerName">The peerName to resolve.</param>
-            <param name="cloud">The cloud in which to resolve peerName.</param>
-            <param name="maxRecords">The maximum number of records to obtain from cloud for peerName.</param>
-            <param name="progress">An object into which to store progress.</param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-            <exception cref="T:System.ArgumentNullException">One or both of the peerName and userState parameters are set to null.</exception>
-            <exception cref="T:System.ArgumentOutOfRangeException">The maxRecords parameter is less than or equal to zero.</exception>
-        </member>
-        <member name="M:AsyncCtpExtensions.InviteTaskAsync(System.Net.PeerToPeer.Collaboration.Peer)">
-            <summary>
-            Begins an asynchronous invitation operation which sends an invitation to
-            a System.Net.PeerToPeer.Collaboration.Peer to start a specific System.Net.PeerToPeer.Collaboration.PeerApplication.
-            </summary>
-            <param name="peer">The peer.</param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-            <exception cref="T:System.ArgumentException">The application is not registered with the collaboration infrastructure.</exception>
-            <exception cref="T:System.Net.PeerToPeer.PeerToPeerException">
-            An error occurred during the invitation process.The currently executing application
-            is not registered with the collaboration infrastructure.
-            </exception>
-        </member>
-        <member name="M:AsyncCtpExtensions.InviteTaskAsync(System.Net.PeerToPeer.Collaboration.Peer,System.Net.PeerToPeer.Collaboration.PeerApplication,System.String,System.Byte[])">
-            <summary>
-            Begins an asynchronous invitation operation which sends an invitation to
-            a System.Net.PeerToPeer.Collaboration.Peer to start a specific System.Net.PeerToPeer.Collaboration.PeerApplication.
-            </summary>
-            <param name="peer">The peer.</param>
-            <param name="applicationToInvite">The System.Net.PeerToPeer.Collaboration.PeerApplication for which the invitation is sent</param>
-            <param name="message">
-            A message to send to the remote peer along with the application invitation.
-            The maximum size of this message is 255 Unicode characters.
-            </param>
-            <param name="invitationData">
-            A user defined data blob to associate with the invitation. Its size can be no more than 16,384 bytes.
-            </param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-            <exception cref="T:System.ArgumentException">The application is not registered with the collaboration infrastructure.</exception>
-            <exception cref="T:System.ArgumentOutOfRangeException">invitationData is larger than 16,384 bytes.</exception>
-            <exception cref="T:System.Net.PeerToPeer.PeerToPeerException">
-            An error occurred during the invitation process.The currently executing application
-            is not registered with the collaboration infrastructure.
-            </exception>
-        </member>
-        <member name="M:AsyncCtpExtensions.SubscribeTaskAsync(System.Net.PeerToPeer.Collaboration.PeerContact)">
-            <summary>
-            Asynchronously subscribes the calling peer to the System.Net.PeerToPeer.Collaboration.PeerContact,
-            and as a result, the peer will receive any future System.Net.PeerToPeer.Collaboration.PeerCollaboration
-            events associated with the System.Net.PeerToPeer.Collaboration.PeerContact.
-            </summary>
-            <param name="peerContact">The peer contact.</param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-            <exception cref="T:System.InvalidOperationException">The calling peer is not signed in to People Near Me.</exception>
-            <exception cref="T:System.ObjectDisposedException">The System.Net.PeerToPeer.Collaboration.PeerContact object has been disposed.</exception>
-        </member>
-        <member name="M:AsyncCtpExtensions.RefreshDataTaskAsync(System.Net.PeerToPeer.Collaboration.PeerNearMe)">
-            <summary>
-            Initiates a network operation to retrieve the application, object and presence
-            data specific to a System.Net.PeerToPeer.Collaboration.PeerNearMe instance.
-            </summary>
-            <param name="peerNearMe">The peer near me.</param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-            <exception cref="T:System.ObjectDisposedException">The System.Net.PeerToPeer.Collaboration.PeerNearMe object has been disposed.</exception>
-            <exception cref="T:System.Net.PeerToPeer.PeerToPeerException">
-            The prior System.Net.PeerToPeer.Collaboration.PeerNearMe.RefreshDataAsync(System.Object)
-            call has not yet completed.
-            </exception>
-        </member>
-        <member name="M:AsyncCtpExtensions.CreateContactTaskAsync(System.Net.PeerToPeer.Collaboration.ContactManager,System.Net.PeerToPeer.Collaboration.PeerNearMe)">
-            <summary>
-            Creates a contact instance for the specified System.Net.PeerToPeer.Collaboration.PeerNearMe object.
-            </summary>
-            <param name="contactManager"></param>
-            <param name="peerNearMe">
-            The System.Net.PeerToPeer.Collaboration.PeerNearMe to associate with the new System.Net.PeerToPeer.Collaboration.PeerContact instance.
-            </param>
-            <returns>A Task that represents the asynchronous operation.</returns>
-            <exception cref="T:System.ArgumentNullException">peerNearMe is null.</exception>
-            <exception cref="T:System.ObjectDisposedException">The System.Net.PeerToPeer.Collaboration.PeerNearMe object has been disposed.</exception>
-            <exception cref="T:System.Net.PeerToPeer.PeerToPeerException">The specified System.Net.PeerToPeer.Collaboration.PeerNearMe instance has no endpoints set on it.</exception>
-        </member>
-        <member name="T:System.Threading.Tasks.EAPCommon">
-            <summary>
-            Internal helpers for wrapping the event-based asynchronous pattern.
-            </summary>
-        </member>
-        <member name="M:System.Threading.Tasks.EAPCommon.HandleProgress``2(System.Threading.Tasks.TaskCompletionSource{``0},System.ComponentModel.ProgressChangedEventArgs,System.Func{``1},System.IProgress{``1})">
-            <summary>
-            Raises progress callbacks.
-            </summary>
-            <typeparam name="T">Specifies the type of data returned by the Task.</typeparam>
-            <typeparam name="E">Specifies the type of data provided to progress callbacks.</typeparam>
-            <param name="tcs">The TaskCompletionsource.</param>
-            <param name="eventArgs">The progress Event arguments.</param>
-            <param name="getProgress">A function to retrieve the progress data to publish.</param>
-            <param name="callback">The progress callback.</param>
-        </member>
-        <member name="M:System.Threading.Tasks.EAPCommon.HandleCompletion``1(System.Threading.Tasks.TaskCompletionSource{``0},System.Boolean,System.ComponentModel.AsyncCompletedEventArgs,System.Func{``0},System.Action)">
-            <summary>
-            Completes the Task if the user state matches the TaskCompletionSource.
-            </summary>
-            <typeparam name="T">Specifies the type of data returned by the Task.</typeparam>
-            <param name="tcs">The TaskCompletionSource.</param>
-            <param name="e">The completion Event arguments.</param>
-            <param name="requireMatch">Whether we require the tcs to match the e.UserState.</param>
-            <param name="getResult">A function that gets the result with which to complete the task.</param>
-            <param name="unregisterHandler">An action used to unregister work when the operaiton completes.</param>
-        </member>
-        <member name="T:System.Net.DnsEx">
-            <summary>Asynchronous wrappers for .NET Framework operations.</summary>
-        </member>
-        <member name="M:System.Net.DnsEx.GetHostAddressesAsync(System.String)">
-            <summary>Asynchronously returns the Internet Protocol (IP) addresses for the specified host.</summary>
-            <param name="hostNameOrAddress">The host name or IP address to resolve.</param>
-            <returns>An array of type System.Net.IPAddress that holds the IP addresses for the host specified.</returns>
-        </member>
-        <member name="M:System.Net.DnsEx.GetHostEntryAsync(System.Net.IPAddress)">
-            <summary>Asynchronously resolves an IP address to an System.Net.IPHostEntry instance.</summary>
-            <param name="address">The IP address to resolve.</param>
-            <returns>An System.Net.IPHostEntry instance that contains address information about the host.</returns>
-        </member>
-        <member name="M:System.Net.DnsEx.GetHostEntryAsync(System.String)">
-            <summary>Asynchronously resolves an IP address to an System.Net.IPHostEntry instance.</summary>
-            <param name="hostNameOrAddress">The host name or IP address to resolve.</param>
-            <returns>An System.Net.IPHostEntry instance that contains address information about the host.</returns>
-        </member>
-        <member name="T:System.Runtime.CompilerServices.TaskAwaiter">
-            <summary>Provides an awaiter for awaiting a <see cref="T:System.Threading.Tasks.Task"/>.</summary>
-            <remarks>This type is intended for compiler use only.</remarks>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.TaskAwaiter.CONTINUE_ON_CAPTURED_CONTEXT_DEFAULT">
-            <summary>The default value to use for continueOnCapturedContext.</summary>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.TaskAwaiter.m_task">
-            <summary>The task being awaited.</summary>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.TaskAwaiter.#ctor(System.Threading.Tasks.Task)">
-            <summary>Initializes the <see cref="T:System.Runtime.CompilerServices.TaskAwaiter"/>.</summary>
-            <param name="task">The <see cref="T:System.Threading.Tasks.Task"/> to be awaited.</param>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.TaskAwaiter.OnCompleted(System.Action)">
-            <summary>Schedules the continuation onto the <see cref="T:System.Threading.Tasks.Task"/> associated with this <see cref="T:System.Runtime.CompilerServices.TaskAwaiter"/>.</summary>
-            <param name="continuation">The action to invoke when the await operation completes.</param>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="continuation"/> argument is null (Nothing in Visual Basic).</exception>
-            <exception cref="T:System.InvalidOperationException">The awaiter was not properly initialized.</exception>
-            <remarks>This method is intended for compiler user rather than use directly in code.</remarks>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.TaskAwaiter.GetResult">
-            <summary>Ends the await on the completed <see cref="T:System.Threading.Tasks.Task"/>.</summary>
-            <exception cref="T:System.NullReferenceException">The awaiter was not properly initialized.</exception>
-            <exception cref="T:System.InvalidOperationException">The task was not yet completed.</exception>
-            <exception cref="T:System.Threading.Tasks.TaskCanceledException">The task was canceled.</exception>
-            <exception cref="T:System.Exception">The task completed in a Faulted state.</exception>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.TaskAwaiter.ValidateEnd(System.Threading.Tasks.Task)">
-            <summary>
-            Fast checks for the end of an await operation to determine whether more needs to be done
-            prior to completing the await.
-            </summary>
-            <param name="task">The awaited task.</param>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.TaskAwaiter.ThrowForNonSuccess(System.Threading.Tasks.Task)">
-            <summary>Throws an exception to handle a task that completed in a state other than RanToCompletion.</summary>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.TaskAwaiter.OnCompletedInternal(System.Threading.Tasks.Task,System.Action,System.Boolean)">
-            <summary>Schedules the continuation onto the <see cref="T:System.Threading.Tasks.Task"/> associated with this <see cref="T:System.Runtime.CompilerServices.TaskAwaiter"/>.</summary>
-            <param name="task">The awaited task.</param>
-            <param name="continuation">The action to invoke when the await operation completes.</param>
-            <param name="continueOnCapturedContext">Whether to capture and marshal back to the current context.</param>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="continuation"/> argument is null (Nothing in Visual Basic).</exception>
-            <exception cref="T:System.NullReferenceException">The awaiter was not properly initialized.</exception>
-            <remarks>This method is intended for compiler user rather than use directly in code.</remarks>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.TaskAwaiter.PrepareExceptionForRethrow(System.Exception)">
-            <summary>Copies the exception's stack trace so its stack trace isn't overwritten.</summary>
-            <param name="exc">The exception to prepare.</param>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.TaskAwaiter.s_prepForRemoting">
-            <summary>A MethodInfo for the Exception.PrepForRemoting method.</summary>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.TaskAwaiter.s_emptyParams">
-            <summary>An empty array to use with MethodInfo.Invoke.</summary>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.TaskAwaiter.GetPrepForRemotingMethodInfo">
-            <summary>Gets the MethodInfo for the internal PrepForRemoting method on Exception.</summary>
-            <returns>The MethodInfo if it could be retrieved, or else null.</returns>
-        </member>
-        <member name="P:System.Runtime.CompilerServices.TaskAwaiter.IsCompleted">
-            <summary>Gets whether the task being awaited is completed.</summary>
-            <remarks>This property is intended for compiler user rather than use directly in code.</remarks>
-            <exception cref="T:System.NullReferenceException">The awaiter was not properly initialized.</exception>
-        </member>
-        <member name="T:System.Runtime.CompilerServices.TaskAwaiter`1">
-            <summary>Provides an awaiter for awaiting a <see cref="T:System.Threading.Tasks.Task`1"/>.</summary>
-            <remarks>This type is intended for compiler use only.</remarks>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.TaskAwaiter`1.m_task">
-            <summary>The task being awaited.</summary>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.TaskAwaiter`1.#ctor(System.Threading.Tasks.Task{`0})">
-            <summary>Initializes the <see cref="T:System.Runtime.CompilerServices.TaskAwaiter`1"/>.</summary>
-            <param name="task">The <see cref="T:System.Threading.Tasks.Task`1"/> to be awaited.</param>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.TaskAwaiter`1.OnCompleted(System.Action)">
-            <summary>Schedules the continuation onto the <see cref="T:System.Threading.Tasks.Task"/> associated with this <see cref="T:System.Runtime.CompilerServices.TaskAwaiter"/>.</summary>
-            <param name="continuation">The action to invoke when the await operation completes.</param>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="continuation"/> argument is null (Nothing in Visual Basic).</exception>
-            <exception cref="T:System.NullReferenceException">The awaiter was not properly initialized.</exception>
-            <remarks>This method is intended for compiler user rather than use directly in code.</remarks>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.TaskAwaiter`1.GetResult">
-            <summary>Ends the await on the completed <see cref="T:System.Threading.Tasks.Task`1"/>.</summary>
-            <returns>The result of the completed <see cref="T:System.Threading.Tasks.Task`1"/>.</returns>
-            <exception cref="T:System.NullReferenceException">The awaiter was not properly initialized.</exception>
-            <exception cref="T:System.InvalidOperationException">The task was not yet completed.</exception>
-            <exception cref="T:System.Threading.Tasks.TaskCanceledException">The task was canceled.</exception>
-            <exception cref="T:System.Exception">The task completed in a Faulted state.</exception>
-        </member>
-        <member name="P:System.Runtime.CompilerServices.TaskAwaiter`1.IsCompleted">
-            <summary>Gets whether the task being awaited is completed.</summary>
-            <remarks>This property is intended for compiler user rather than use directly in code.</remarks>
-            <exception cref="T:System.NullReferenceException">The awaiter was not properly initialized.</exception>
-        </member>
-        <member name="T:System.Runtime.CompilerServices.ConfiguredTaskAwaitable">
-            <summary>Provides an awaitable object that allows for configured awaits on <see cref="T:System.Threading.Tasks.Task"/>.</summary>
-            <remarks>This type is intended for compiler use only.</remarks>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.ConfiguredTaskAwaitable.m_configuredTaskAwaiter">
-            <summary>The task being awaited.</summary>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.ConfiguredTaskAwaitable.#ctor(System.Threading.Tasks.Task,System.Boolean)">
-            <summary>Initializes the <see cref="T:System.Runtime.CompilerServices.ConfiguredTaskAwaitable"/>.</summary>
-            <param name="task">The awaitable <see cref="T:System.Threading.Tasks.Task"/>.</param>
-            <param name="continueOnCapturedContext">
-            true to attempt to marshal the continuation back to the original context captured; otherwise, false.
-            </param>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.ConfiguredTaskAwaitable.GetAwaiter">
-            <summary>Gets an awaiter for this awaitable.</summary>
-            <returns>The awaiter.</returns>
-        </member>
-        <member name="T:System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter">
-            <summary>Provides an awaiter for a <see cref="T:System.Runtime.CompilerServices.ConfiguredTaskAwaitable"/>.</summary>
-            <remarks>This type is intended for compiler use only.</remarks>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter.m_task">
-            <summary>The task being awaited.</summary>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter.m_continueOnCapturedContext">
-            <summary>Whether to attempt marshaling back to the original context.</summary>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter.#ctor(System.Threading.Tasks.Task,System.Boolean)">
-            <summary>Initializes the <see cref="T:System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter"/>.</summary>
-            <param name="task">The <see cref="T:System.Threading.Tasks.Task"/> to await.</param>
-            <param name="continueOnCapturedContext">
-            true to attempt to marshal the continuation back to the original context captured
-            when BeginAwait is called; otherwise, false.
-            </param>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter.OnCompleted(System.Action)">
-            <summary>Schedules the continuation onto the <see cref="T:System.Threading.Tasks.Task"/> associated with this <see cref="T:System.Runtime.CompilerServices.TaskAwaiter"/>.</summary>
-            <param name="continuation">The action to invoke when the await operation completes.</param>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="continuation"/> argument is null (Nothing in Visual Basic).</exception>
-            <exception cref="T:System.NullReferenceException">The awaiter was not properly initialized.</exception>
-            <remarks>This method is intended for compiler user rather than use directly in code.</remarks>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter.GetResult">
-            <summary>Ends the await on the completed <see cref="T:System.Threading.Tasks.Task"/>.</summary>
-            <returns>The result of the completed <see cref="T:System.Threading.Tasks.Task`1"/>.</returns>
-            <exception cref="T:System.NullReferenceException">The awaiter was not properly initialized.</exception>
-            <exception cref="T:System.InvalidOperationException">The task was not yet completed.</exception>
-            <exception cref="T:System.Threading.Tasks.TaskCanceledException">The task was canceled.</exception>
-            <exception cref="T:System.Exception">The task completed in a Faulted state.</exception>
-        </member>
-        <member name="P:System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter.IsCompleted">
-            <summary>Gets whether the task being awaited is completed.</summary>
-            <remarks>This property is intended for compiler user rather than use directly in code.</remarks>
-            <exception cref="T:System.NullReferenceException">The awaiter was not properly initialized.</exception>
-        </member>
-        <member name="T:System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1">
-            <summary>Provides an awaitable object that allows for configured awaits on <see cref="T:System.Threading.Tasks.Task`1"/>.</summary>
-            <remarks>This type is intended for compiler use only.</remarks>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1.m_configuredTaskAwaiter">
-            <summary>The underlying awaitable on whose logic this awaitable relies.</summary>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1.#ctor(System.Threading.Tasks.Task{`0},System.Boolean)">
-            <summary>Initializes the <see cref="T:System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1"/>.</summary>
-            <param name="task">The awaitable <see cref="T:System.Threading.Tasks.Task`1"/>.</param>
-            <param name="continueOnCapturedContext">
-            true to attempt to marshal the continuation back to the original context captured; otherwise, false.
-            </param>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1.GetAwaiter">
-            <summary>Gets an awaiter for this awaitable.</summary>
-            <returns>The awaiter.</returns>
-        </member>
-        <member name="T:System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1.ConfiguredTaskAwaiter">
-            <summary>Provides an awaiter for a <see cref="T:System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1"/>.</summary>
-            <remarks>This type is intended for compiler use only.</remarks>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1.ConfiguredTaskAwaiter.m_task">
-            <summary>The task being awaited.</summary>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1.ConfiguredTaskAwaiter.m_continueOnCapturedContext">
-            <summary>Whether to attempt marshaling back to the original context.</summary>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1.ConfiguredTaskAwaiter.#ctor(System.Threading.Tasks.Task{`0},System.Boolean)">
-            <summary>Initializes the <see cref="T:System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1.ConfiguredTaskAwaiter"/>.</summary>
-            <param name="task">The awaitable <see cref="T:System.Threading.Tasks.Task`1"/>.</param>
-            <param name="continueOnCapturedContext">
-            true to attempt to marshal the continuation back to the original context captured; otherwise, false.
-            </param>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1.ConfiguredTaskAwaiter.OnCompleted(System.Action)">
-            <summary>Schedules the continuation onto the <see cref="T:System.Threading.Tasks.Task"/> associated with this <see cref="T:System.Runtime.CompilerServices.TaskAwaiter"/>.</summary>
-            <param name="continuation">The action to invoke when the await operation completes.</param>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="continuation"/> argument is null (Nothing in Visual Basic).</exception>
-            <exception cref="T:System.NullReferenceException">The awaiter was not properly initialized.</exception>
-            <remarks>This method is intended for compiler user rather than use directly in code.</remarks>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1.ConfiguredTaskAwaiter.GetResult">
-            <summary>Ends the await on the completed <see cref="T:System.Threading.Tasks.Task`1"/>.</summary>
-            <returns>The result of the completed <see cref="T:System.Threading.Tasks.Task`1"/>.</returns>
-            <exception cref="T:System.NullReferenceException">The awaiter was not properly initialized.</exception>
-            <exception cref="T:System.InvalidOperationException">The task was not yet completed.</exception>
-            <exception cref="T:System.Threading.Tasks.TaskCanceledException">The task was canceled.</exception>
-            <exception cref="T:System.Exception">The task completed in a Faulted state.</exception>
-        </member>
-        <member name="P:System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1.ConfiguredTaskAwaiter.IsCompleted">
-            <summary>Gets whether the task being awaited is completed.</summary>
-            <remarks>This property is intended for compiler user rather than use directly in code.</remarks>
-            <exception cref="T:System.NullReferenceException">The awaiter was not properly initialized.</exception>
-        </member>
-        <member name="T:System.Runtime.CompilerServices.AsyncVoidMethodBuilder">
-            <summary>
-            Provides a builder for asynchronous methods that return void.
-            This type is intended for compiler use only.
-            </summary>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.AsyncVoidMethodBuilder.s_noContextCaptured">
-            <summary>A marker to indicate that no instance was captured.</summary>
-            <remarks>
-            This allows the default value of null to mean that builder was improperly initialized.
-            The instance is used only for its object equality.
-            </remarks>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.AsyncVoidMethodBuilder.m_synchronizationContext">
-            <summary>The synchronization context associated with this operation.</summary>
-            <remarks>This should never be null for a properly initialized builder.</remarks>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.AsyncVoidMethodBuilder.Create">
-            <summary>Initializes a new <see cref="T:System.Runtime.CompilerServices.AsyncVoidMethodBuilder"/>.</summary>
-            <returns>The initialized <see cref="T:System.Runtime.CompilerServices.AsyncVoidMethodBuilder"/>.</returns>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.AsyncVoidMethodBuilder.#ctor(System.Threading.SynchronizationContext)">
-            <summary>Initializes the <see cref="T:System.Runtime.CompilerServices.AsyncVoidMethodBuilder"/>.</summary>
-            <param name="synchronizationContext">The synchronizationContext associated with this operation. This may be null.</param>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.AsyncVoidMethodBuilder.SetCompleted">
-            <summary>TODO: Remove</summary>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.AsyncVoidMethodBuilder.SetResult">
-            <summary>Completes the method builder successfully.</summary>
-            <exception cref="T:System.InvalidOperationException">The builder is not initialized.</exception>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.AsyncVoidMethodBuilder.SetException(System.Exception)">
-            <summary>Faults the method builder with an exception.</summary>
-            <param name="exception">The exception that is the cause of this fault.</param>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="exception"/> argument is null (Nothing in Visual Basic).</exception>
-            <exception cref="T:System.InvalidOperationException">The builder is not initialized.</exception>
-        </member>
-        <member name="T:System.Runtime.CompilerServices.VoidType">
-            <summary>Void type placeholder.</summary>
-        </member>
-        <member name="T:System.Runtime.CompilerServices.AsyncTaskMethodBuilder">
-            <summary>
-            Provides a builder for asynchronous methods that return <see cref="T:System.Threading.Tasks.Task"/>.
-            This type is intended for compiler use only.
-            </summary>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.m_builder">
-            <summary>The generic builder object to which this non-generic instance delegates.</summary>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.Create">
-            <summary>Initializes a new <see cref="T:System.Runtime.CompilerServices.AsyncTaskMethodBuilder"/>.</summary>
-            <returns>The initialized <see cref="T:System.Runtime.CompilerServices.AsyncTaskMethodBuilder"/>.</returns>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.#ctor(System.Runtime.CompilerServices.AsyncTaskMethodBuilder{System.Runtime.CompilerServices.VoidType})">
-            <summary>Initializes the <see cref="T:System.Runtime.CompilerServices.AsyncTaskMethodBuilder"/>.</summary>
-            <param name="underlyingBuilder">The underlying builder used for this builder.</param>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.SetResult">
-            <summary>
-            Completes the <see cref="T:System.Threading.Tasks.Task"/> in the 
-            <see cref="T:System.Threading.Tasks.TaskStatus">RanToCompletion</see> state.
-            </summary>
-            <exception cref="T:System.InvalidOperationException">The builder is not initialized.</exception>
-            <exception cref="T:System.InvalidOperationException">The task has already completed.</exception>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.SetException(System.Exception)">
-            <summary>
-            Completes the <see cref="T:System.Threading.Tasks.Task"/> in the 
-            <see cref="T:System.Threading.Tasks.TaskStatus">Faulted</see> state with the specified exception.
-            </summary>
-            <param name="exception">The <see cref="T:System.Exception"/> to use to fault the task.</param>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="exception"/> argument is null (Nothing in Visual Basic).</exception>
-            <exception cref="T:System.InvalidOperationException">The builder is not initialized.</exception>
-            <exception cref="T:System.InvalidOperationException">The task has already completed.</exception>
-        </member>
-        <member name="P:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.Task">
-            <summary>Gets the <see cref="T:System.Threading.Tasks.Task"/> for this builder.</summary>
-            <returns>The <see cref="T:System.Threading.Tasks.Task"/> representing the builder's asynchronous operation.</returns>
-            <exception cref="T:System.InvalidOperationException">The builder is not initialized.</exception>
-        </member>
-        <member name="T:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.DebugInfo">
-            <summary>
-            For debugging purposes, provides a snapshot of environment information when
-            a task is created to represent an asynchronous method invocation.
-            </summary>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.DebugInfo.#ctor(System.Threading.Tasks.Task)">
-            <summary>Initializes the debugging information.</summary>
-            <param name="task">The task representing the async method.</param>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.DebugInfo.Task">
-            <summary>The task being tracked.</summary>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.DebugInfo.StartingDateTimeOffset">
-            <summary>The date and time at which this instance was created.</summary>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.DebugInfo.StartingThread">
-            <summary>The thread from which this instance was created.</summary>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.DebugInfo.StartingStackTrace">
-            <summary>A stack trace from when this instance was created.</summary>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.DebugInfo.StartingExecutionContext">
-            <summary>The execution context from when this instance was created.</summary>
-            <remarks>
-            While most code in mscorlib uses a special overload of Capture, this code
-            chooses to use the public overload to provide a better debugging experience,
-            e.g. capturing the current SynchronizationContext.
-            </remarks>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.DebugInfo.Dispose">
-            <summary>Disposes of resources used by the instance.</summary>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.DebugInfo.s_debuggingEnabled">
-            <summary>Whether debug tracking of active asynchronous methods is enabled.</summary>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.DebugInfo.s_activeMethods">
-            <summary>For debugging, a collection of information about currently active asynchronous methods.</summary>
-            <remarks>We assume that there's a 1:1 correspondence between a task object and an async method invocation.</remarks>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.DebugInfo.AddMethod(System.Threading.Tasks.Task)">
-            <summary>If debugging is enabled, adds the specified task to the active methods collection.</summary>
-            <param name="task">The task to add.</param>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.DebugInfo.RemoveMethod(System.Threading.Tasks.Task)">
-            <summary>If debugging is enabled, removes the specified task from the active methods collection.</summary>
-            <param name="task">The task to remove.</param>
-        </member>
-        <member name="P:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.DebugInfo.LocationForDebuggerDisplay">
-            <summary>Gets a string representing the stack frame from which this method was instantiated.</summary>
-        </member>
-        <member name="P:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.DebugInfo.IsEnabled">
-            <summary>
-            Enables or disables whether asynchronous method debugging information is
-            tracked from builder creation to completion.
-            </summary>
-            <remarks>
-            This is meant to be consumed from a debugger watch window with code like:
-                System.Runtime.CompilerServices.AsyncTaskMethodBuilder.DebugInfo.IsEnabled = true
-            </remarks>
-        </member>
-        <member name="P:System.Runtime.CompilerServices.AsyncTaskMethodBuilder.DebugInfo.ActiveMethods">
-            <summary>Gets the currently active asynchronous methods being tracked.</summary>
-            <remarks>
-            This is meant to be consumed from a debugger watch window by watching:
-                System.Runtime.CompilerServices.AsyncTaskMethodBuilder.DebugInfo.ActiveMethods
-            </remarks>
-        </member>
-        <member name="T:System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1">
-            <summary>
-            Provides a builder for asynchronous methods that return <see cref="T:System.Threading.Tasks.Task`1"/>.
-            This type is intended for compiler use only.
-            </summary>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.#cctor">
-            <summary>Temporary support for disabling crashing if tasks go unobserved.</summary>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.m_tcs">
-            <summary>The built task.</summary>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.Create">
-            <summary>Initializes a new <see cref="T:System.Runtime.CompilerServices.AsyncTaskMethodBuilder"/>.</summary>
-            <returns>The initialized <see cref="T:System.Runtime.CompilerServices.AsyncTaskMethodBuilder"/>.</returns>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.#ctor(System.Threading.Tasks.TaskCompletionSource{`0})">
-            <summary>Initializes the AsyncTaskMethodBuilder.</summary>
-            <param name="tcs">The task being built by the builder.</param>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.SetResult(`0)">
-            <summary>
-            Completes the <see cref="T:System.Threading.Tasks.Task`1"/> in the 
-            <see cref="T:System.Threading.Tasks.TaskStatus">RanToCompletion</see> state with the specified result.
-            </summary>
-            <param name="result">The result to use to complete the task.</param>
-            <exception cref="T:System.InvalidOperationException">The builder is not initialized.</exception>
-            <exception cref="T:System.InvalidOperationException">The task has already completed.</exception>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.SetException(System.Exception)">
-            <summary>
-            Completes the <see cref="T:System.Threading.Tasks.Task`1"/> in the 
-            <see cref="T:System.Threading.Tasks.TaskStatus">Faulted</see> state with the specified exception.
-            </summary>
-            <param name="exception">The <see cref="T:System.Exception"/> to use to fault the task.</param>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="exception"/> argument is null (Nothing in Visual Basic).</exception>
-            <exception cref="T:System.InvalidOperationException">The builder is not initialized.</exception>
-            <exception cref="T:System.InvalidOperationException">The task has already completed.</exception>
-        </member>
-        <member name="P:System.Runtime.CompilerServices.AsyncTaskMethodBuilder`1.Task">
-            <summary>Gets the <see cref="T:System.Threading.Tasks.Task`1"/> for this builder.</summary>
-            <returns>The <see cref="T:System.Threading.Tasks.Task`1"/> representing the builder's asynchronous operation.</returns>
-            <exception cref="T:System.InvalidOperationException">The builder is not initialized.</exception>
-        </member>
-        <member name="T:System.Threading.Tasks.TaskEx">
-            <summary>Provides methods for creating and manipulating tasks.</summary>
-            <remarks>TaskEx is a placeholder.</remarks>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.Run(System.Action)">
-            <summary>Creates a task that runs the specified action.</summary>
-            <param name="action">The action to execute asynchronously.</param>
-            <returns>A task that represents the completion of the action.</returns>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="action"/> argument is null.</exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.Run(System.Action,System.Threading.CancellationToken)">
-            <summary>Creates a task that runs the specified action.</summary>
-            <param name="action">The action to execute.</param>
-            <param name="cancellationToken">The CancellationToken to use to request cancellation of this task.</param>
-            <returns>A task that represents the completion of the action.</returns>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="action"/> argument is null.</exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.Run``1(System.Func{``0})">
-            <summary>Creates a task that runs the specified function.</summary>
-            <param name="function">The function to execute asynchronously.</param>
-            <returns>A task that represents the completion of the action.</returns>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="function"/> argument is null.</exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.Run``1(System.Func{``0},System.Threading.CancellationToken)">
-            <summary>Creates a task that runs the specified function.</summary>
-            <param name="function">The action to execute.</param>
-            <param name="cancellationToken">The CancellationToken to use to cancel the task.</param>
-            <returns>A task that represents the completion of the action.</returns>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="function"/> argument is null.</exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.RunEx(System.Func{System.Threading.Tasks.Task})">
-            <summary>Creates a task that runs the specified function.</summary>
-            <param name="function">The action to execute asynchronously.</param>
-            <returns>A task that represents the completion of the action.</returns>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="function"/> argument is null.</exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.RunEx(System.Func{System.Threading.Tasks.Task},System.Threading.CancellationToken)">
-            <summary>Creates a task that runs the specified function.</summary>
-            <param name="function">The function to execute.</param>
-            <param name="cancellationToken">The CancellationToken to use to request cancellation of this task.</param>
-            <returns>A task that represents the completion of the function.</returns>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="function"/> argument is null.</exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.RunEx``1(System.Func{System.Threading.Tasks.Task{``0}})">
-            <summary>Creates a task that runs the specified function.</summary>
-            <param name="function">The function to execute asynchronously.</param>
-            <returns>A task that represents the completion of the action.</returns>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="function"/> argument is null.</exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.RunEx``1(System.Func{System.Threading.Tasks.Task{``0}},System.Threading.CancellationToken)">
-            <summary>Creates a task that runs the specified function.</summary>
-            <param name="function">The action to execute.</param>
-            <param name="cancellationToken">The CancellationToken to use to cancel the task.</param>
-            <returns>A task that represents the completion of the action.</returns>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="function"/> argument is null.</exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.Delay(System.Int32)">
-            <summary>Starts a Task that will complete after the specified due time.</summary>
-            <param name="dueTime">The delay in milliseconds before the returned task completes.</param>
-            <returns>The timed Task.</returns>
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            The <paramref name="dueTime"/> argument must be non-negative or -1 and less than or equal to Int32.MaxValue.
-            </exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.Delay(System.TimeSpan)">
-            <summary>Starts a Task that will complete after the specified due time.</summary>
-            <param name="dueTime">The delay before the returned task completes.</param>
-            <returns>The timed Task.</returns>
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            The <paramref name="dueTime"/> argument must be non-negative or -1 and less than or equal to Int32.MaxValue.
-            </exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.Delay(System.TimeSpan,System.Threading.CancellationToken)">
-            <summary>Starts a Task that will complete after the specified due time.</summary>
-            <param name="dueTime">The delay before the returned task completes.</param>
-            <param name="cancellationToken">A CancellationToken that may be used to cancel the task before the due time occurs.</param>
-            <returns>The timed Task.</returns>
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            The <paramref name="dueTime"/> argument must be non-negative or -1 and less than or equal to Int32.MaxValue.
-            </exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.Delay(System.Int32,System.Threading.CancellationToken)">
-            <summary>Starts a Task that will complete after the specified due time.</summary>
-            <param name="dueTime">The delay in milliseconds before the returned task completes.</param>
-            <param name="cancellationToken">A CancellationToken that may be used to cancel the task before the due time occurs.</param>
-            <returns>The timed Task.</returns>
-            <exception cref="T:System.ArgumentOutOfRangeException">
-            The <paramref name="dueTime"/> argument must be non-negative or -1 and less than or equal to Int32.MaxValue.
-            </exception>
-        </member>
-        <member name="F:System.Threading.Tasks.TaskEx.s_preCompletedTask">
-            <summary>An already completed task.</summary>
-        </member>
-        <member name="F:System.Threading.Tasks.TaskEx.s_preCanceledTask">
-            <summary>An already canceled task.</summary>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.WhenAll(System.Threading.Tasks.Task[])">
-            <summary>Creates a Task that will complete only when all of the provided collection of Tasks has completed.</summary>
-            <param name="tasks">The Tasks to monitor for completion.</param>
-            <returns>A Task that represents the completion of all of the provided tasks.</returns>
-            <remarks>
-            If any of the provided Tasks faults, the returned Task will also fault, and its Exception will contain information
-            about all of the faulted tasks.  If no Tasks fault but one or more Tasks is canceled, the returned
-            Task will also be canceled.
-            </remarks>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="tasks"/> argument is null.</exception>
-            <exception cref="T:System.ArgumentException">The <paramref name="tasks"/> argument contains a null reference.</exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.WhenAll``1(System.Threading.Tasks.Task{``0}[])">
-            <summary>Creates a Task that will complete only when all of the provided collection of Tasks has completed.</summary>
-            <param name="tasks">The Tasks to monitor for completion.</param>
-            <returns>A Task that represents the completion of all of the provided tasks.</returns>
-            <remarks>
-            If any of the provided Tasks faults, the returned Task will also fault, and its Exception will contain information
-            about all of the faulted tasks.  If no Tasks fault but one or more Tasks is canceled, the returned
-            Task will also be canceled.
-            </remarks>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="tasks"/> argument is null.</exception>
-            <exception cref="T:System.ArgumentException">The <paramref name="tasks"/> argument contains a null reference.</exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.WhenAll(System.Collections.Generic.IEnumerable{System.Threading.Tasks.Task})">
-            <summary>Creates a Task that will complete only when all of the provided collection of Tasks has completed.</summary>
-            <param name="tasks">The Tasks to monitor for completion.</param>
-            <returns>A Task that represents the completion of all of the provided tasks.</returns>
-            <remarks>
-            If any of the provided Tasks faults, the returned Task will also fault, and its Exception will contain information
-            about all of the faulted tasks.  If no Tasks fault but one or more Tasks is canceled, the returned
-            Task will also be canceled.
-            </remarks>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="tasks"/> argument is null.</exception>
-            <exception cref="T:System.ArgumentException">The <paramref name="tasks"/> argument contains a null reference.</exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.WhenAll``1(System.Collections.Generic.IEnumerable{System.Threading.Tasks.Task{``0}})">
-            <summary>Creates a Task that will complete only when all of the provided collection of Tasks has completed.</summary>
-            <param name="tasks">The Tasks to monitor for completion.</param>
-            <returns>A Task that represents the completion of all of the provided tasks.</returns>
-            <remarks>
-            If any of the provided Tasks faults, the returned Task will also fault, and its Exception will contain information
-            about all of the faulted tasks.  If no Tasks fault but one or more Tasks is canceled, the returned
-            Task will also be canceled.
-            </remarks>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="tasks"/> argument is null.</exception>
-            <exception cref="T:System.ArgumentException">The <paramref name="tasks"/> argument contains a null reference.</exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.WhenAllCore``1(System.Collections.Generic.IEnumerable{System.Threading.Tasks.Task},System.Action{System.Threading.Tasks.Task[],System.Threading.Tasks.TaskCompletionSource{``0}})">
-            <summary>Creates a Task that will complete only when all of the provided collection of Tasks has completed.</summary>
-            <param name="tasks">The Tasks to monitor for completion.</param>
-            <param name="setResultAction">
-            A callback invoked when all of the tasks complete successfully in the RanToCompletion state.
-            This callback is responsible for storing the results into the TaskCompletionSource.
-            </param>
-            <returns>A Task that represents the completion of all of the provided tasks.</returns>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="tasks"/> argument is null.</exception>
-            <exception cref="T:System.ArgumentException">The <paramref name="tasks"/> argument contains a null reference.</exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.WhenAny(System.Threading.Tasks.Task[])">
-            <summary>Creates a Task that will complete when any of the tasks in the provided collection completes.</summary>
-            <param name="tasks">The Tasks to be monitored.</param>
-            <returns>
-            A Task that represents the completion of any of the provided Tasks.  The completed Task is this Task's result.
-            </returns>
-            <remarks>Any Tasks that fault will need to have their exceptions observed elsewhere.</remarks>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="tasks"/> argument is null.</exception>
-            <exception cref="T:System.ArgumentException">The <paramref name="tasks"/> argument contains a null reference.</exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.WhenAny(System.Collections.Generic.IEnumerable{System.Threading.Tasks.Task})">
-            <summary>Creates a Task that will complete when any of the tasks in the provided collection completes.</summary>
-            <param name="tasks">The Tasks to be monitored.</param>
-            <returns>
-            A Task that represents the completion of any of the provided Tasks.  The completed Task is this Task's result.
-            </returns>
-            <remarks>Any Tasks that fault will need to have their exceptions observed elsewhere.</remarks>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="tasks"/> argument is null.</exception>
-            <exception cref="T:System.ArgumentException">The <paramref name="tasks"/> argument contains a null reference.</exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.WhenAny``1(System.Threading.Tasks.Task{``0}[])">
-            <summary>Creates a Task that will complete when any of the tasks in the provided collection completes.</summary>
-            <param name="tasks">The Tasks to be monitored.</param>
-            <returns>
-            A Task that represents the completion of any of the provided Tasks.  The completed Task is this Task's result.
-            </returns>
-            <remarks>Any Tasks that fault will need to have their exceptions observed elsewhere.</remarks>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="tasks"/> argument is null.</exception>
-            <exception cref="T:System.ArgumentException">The <paramref name="tasks"/> argument contains a null reference.</exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.WhenAny``1(System.Collections.Generic.IEnumerable{System.Threading.Tasks.Task{``0}})">
-            <summary>Creates a Task that will complete when any of the tasks in the provided collection completes.</summary>
-            <param name="tasks">The Tasks to be monitored.</param>
-            <returns>
-            A Task that represents the completion of any of the provided Tasks.  The completed Task is this Task's result.
-            </returns>
-            <remarks>Any Tasks that fault will need to have their exceptions observed elsewhere.</remarks>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="tasks"/> argument is null.</exception>
-            <exception cref="T:System.ArgumentException">The <paramref name="tasks"/> argument contains a null reference.</exception>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.Yield">
-            <summary>Creates an awaitable that asynchronously yields back to the current context when awaited.</summary>
-            <returns>
-            A context that, when awaited, will asynchronously transition back into the current context.
-            If SynchronizationContext.Current is non-null, that is treated as the current context.
-            Otherwise, TaskScheduler.Current is treated as the current context.
-            </returns>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.FromResult``1(``0)">
-            <summary>Creates an already completed <see cref="T:System.Threading.Tasks.Task`1"/> from the specified result.</summary>
-            <param name="result">The result from which to create the completed task.</param>
-            <returns>The completed task.</returns>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.ConfigureAwait(System.Threading.Tasks.Task,System.Boolean)">
-            <summary>Creates and configures an awaitable object for awaiting the specified task.</summary>
-            <param name="task">The task to be awaited.</param>
-            <param name="continueOnCapturedContext">
-            true to automatic marshag back to the original call site's current SynchronizationContext
-            or TaskScheduler; otherwise, false.
-            </param>
-            <returns>The instance to be awaited.</returns>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.ConfigureAwait``1(System.Threading.Tasks.Task{``0},System.Boolean)">
-            <summary>Creates and configures an awaitable object for awaiting the specified task.</summary>
-            <param name="task">The task to be awaited.</param>
-            <param name="continueOnCapturedContext">
-            true to automatic marshag back to the original call site's current SynchronizationContext
-            or TaskScheduler; otherwise, false.
-            </param>
-            <returns>The instance to be awaited.</returns>
-        </member>
-        <member name="M:System.Threading.Tasks.TaskEx.AddPotentiallyUnwrappedExceptions(System.Collections.Generic.List{System.Exception}@,System.Exception)">
-            <summary>Adds the target exception to the list, initializing the list if it's null.</summary>
-            <param name="targetList">The list to which to add the exception and initialize if the list is null.</param>
-            <param name="exception">The exception to add, and unwrap if it's an aggregate.</param>
-        </member>
-        <member name="T:AsyncCtpThreadingExtensions">
-            <summary>Provides extension methods for threading-related types.</summary>
-            <remarks>AsyncCtpThreadingExtensions is a placeholder.</remarks>
-        </member>
-        <member name="M:AsyncCtpThreadingExtensions.GetAwaiter(System.Threading.Tasks.Task)">
-            <summary>Gets an awaiter used to await this <see cref="T:System.Threading.Tasks.Task"/>.</summary>
-            <param name="task">The task to await.</param>
-            <returns>An awaiter instance.</returns>
-            <remarks>This method is intended for compiler user rather than use directly in code.</remarks>
-        </member>
-        <member name="M:AsyncCtpThreadingExtensions.GetAwaiter``1(System.Threading.Tasks.Task{``0})">
-            <summary>Gets an awaiter used to await this <see cref="T:System.Threading.Tasks.Task"/>.</summary>
-            <typeparam name="TResult">Specifies the type of data returned by the task.</typeparam>
-            <param name="task">The task to await.</param>
-            <returns>An awaiter instance.</returns>
-            <remarks>This method is intended for compiler user rather than use directly in code.</remarks>
-        </member>
-        <member name="M:AsyncCtpThreadingExtensions.CancelAfter(System.Threading.CancellationTokenSource,System.Int32)">
-            <summary>Cancels the <see cref="T:System.Threading.CancellationTokenSource"/> after the specified duration.</summary>
-            <param name="source">The CancellationTokenSource.</param>
-            <param name="dueTime">The due time in milliseconds for the source to be canceled.</param>
-        </member>
-        <member name="M:AsyncCtpThreadingExtensions.CancelAfter(System.Threading.CancellationTokenSource,System.TimeSpan)">
-            <summary>Cancels the <see cref="T:System.Threading.CancellationTokenSource"/> after the specified duration.</summary>
-            <param name="source">The CancellationTokenSource.</param>
-            <param name="dueTime">The due time for the source to be canceled.</param>
-        </member>
-        <member name="M:AsyncCtpThreadingExtensions.InvokeAsync(System.Windows.Threading.Dispatcher,System.Action)">
-            <summary>Asynchronously invokes an action on the Dispatcher.</summary>
-            <param name="dispatcher">The Dispatcher.</param>
-            <param name="action">The action to invoke.</param>
-            <returns>A Task that represents the execution of the action.</returns>
-        </member>
-        <member name="M:AsyncCtpThreadingExtensions.InvokeAsync``1(System.Windows.Threading.Dispatcher,System.Func{``0})">
-            <summary>Asynchronously invokes a function on the Dispatcher.</summary>
-            <param name="dispatcher">The Dispatcher.</param>
-            <param name="function">The function to invoke.</param>
-            <returns>A Task that represents the execution of the function.</returns>
-        </member>
-        <member name="T:System.ProgressEventHandler`1">
-            <summary>Event handler for progress reports.</summary>
-            <typeparam name="T">Specifies the type of data for the progress report.</typeparam>
-            <param name="sender">The sender of the report.</param>
-            <param name="value">The reported value.</param>
-        </member>
-        <member name="T:System.Progress`1">
-            <summary>
-            Provides an IProgress{T} that invokes callbacks for each reported progress value.
-            </summary>
-            <typeparam name="T">Specifies the type of the progress report value.</typeparam>
-            <remarks>
-            Any handler provided to the constructor or event handlers registered with
-            the <see cref="E:System.Progress`1.ProgressChanged"/> event are invoked through a 
-            <see cref="T:System.Threading.SynchronizationContext"/> instance captured
-            when the instance is constructed.  If there is no current SynchronizationContext
-            at the time of construction, the callbacks will be invoked on the ThreadPool.
-            </remarks>
-        </member>
-        <member name="F:System.Progress`1.m_synchronizationContext">
-            <summary>The synchronization context captured upon construction.  This will never be null.</summary>
-        </member>
-        <member name="F:System.Progress`1.m_handler">
-            <summary>The handler specified to the constructor.  This may be null.</summary>
-        </member>
-        <member name="F:System.Progress`1.m_invokeHandlers">
-            <summary>A cached delegate used to post invocation to the synchronization context.</summary>
-        </member>
-        <member name="M:System.Progress`1.#ctor">
-            <summary>Initializes the <see cref="T:System.Progress`1"/>.</summary>
-        </member>
-        <member name="M:System.Progress`1.#ctor(System.Action{`0})">
-            <summary>Initializes the <see cref="T:System.Progress`1"/> with the specified callback.</summary>
-            <param name="handler">
-            A handler to invoke for each reported progress value.  This handler will be invoked
-            in addition to any delegates registered with the <see cref="E:System.Progress`1.ProgressChanged"/> event.
-            </param>
-            <exception cref="T:System.ArgumentNullException">The <paramref name="handler"/> is null (Nothing in Visual Basic).</exception>
-        </member>
-        <member name="M:System.Progress`1.OnReport(`0)">
-            <summary>Reports a progress change.</summary>
-            <param name="value">The value of the updated progress.</param>
-        </member>
-        <member name="M:System.Progress`1.System#IProgress{T}#Report(`0)">
-            <summary>Reports a progress change.</summary>
-            <param name="value">The value of the updated progress.</param>
-        </member>
-        <member name="M:System.Progress`1.InvokeHandlers(System.Object)">
-            <summary>Invokes the action and event callbacks.</summary>
-            <param name="state">The progress value.</param>
-        </member>
-        <member name="E:System.Progress`1.ProgressChanged">
-            <summary>Raised for each reported progress value.</summary>
-            <remarks>
-            Handlers registered with this event will be invoked on the 
-            <see cref="T:System.Threading.SynchronizationContext"/> captured when the instance was constructed.
-            </remarks>
-        </member>
-        <member name="T:System.ProgressStatics">
-            <summary>Holds static values for <see cref="T:System.Progress`1"/>.</summary>
-            <remarks>This avoids one static instance per type T.</remarks>
-        </member>
-        <member name="F:System.ProgressStatics.DefaultContext">
-            <summary>A default synchronization context that targets the ThreadPool.</summary>
-        </member>
-        <member name="T:System.Threading.Tasks.SR">
-            <summary>String resources for the assembly.</summary>
-        </member>
-        <member name="T:System.Runtime.CompilerServices.YieldAwaitable">
-            <summary>Provides an awaitable context for switching into a target environment.</summary>
-            <remarks>This type is intended for compiler use only.</remarks>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.YieldAwaitable.m_target">
-            <summary>The target environment to which to switch.</summary>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.YieldAwaitable.#ctor(System.Object)">
-            <summary>Initializes the awaitable context.</summary>
-            <param name="target">The target environment into which to switch.</param>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.YieldAwaitable.GetAwaiter">
-            <summary>Gets an awaiter for this <see cref="T:System.Runtime.CompilerServices.YieldAwaitable"/>.</summary>
-            <returns>An awaiter for this awaitable.</returns>
-            <remarks>This method is intended for compiler user rather than use directly in code.</remarks>
-        </member>
-        <member name="T:System.Runtime.CompilerServices.YieldAwaitable.YieldAwaiter">
-            <summary>Provides an awaiter that switches into a target environment.</summary>
-            <remarks>This type is intended for compiler use only.</remarks>
-        </member>
-        <member name="F:System.Runtime.CompilerServices.YieldAwaitable.YieldAwaiter.m_target">
-            <summary>The target environment to which to switch.</summary>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.YieldAwaitable.YieldAwaiter.#ctor(System.Object)">
-            <summary>Initializes the awaiter.</summary>
-            <param name="target">The target environment into which to switch.</param>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.YieldAwaitable.YieldAwaiter.OnCompleted(System.Action)">
-            <summary>Posts the <paramref name="continuation"/> back to the current context.</summary>
-            <param name="continuation">The action to invoke asynchronously.</param>
-            <exception cref="T:System.InvalidOperationException">The awaiter was not properly initialized.</exception>
-        </member>
-        <member name="M:System.Runtime.CompilerServices.YieldAwaitable.YieldAwaiter.GetResult">
-            <summary>Ends the await operation.</summary>
-        </member>
-        <member name="P:System.Runtime.CompilerServices.YieldAwaitable.YieldAwaiter.IsCompleted">
-            <summary>Gets whether a yield is not required.</summary>
-            <remarks>This property is intended for compiler user rather than use directly in code.</remarks>
-        </member>
-    </members>
-</doc>
diff --git a/MPfm/branches/current/MPfm.Library/Lib/System.Reactive.dll b/MPfm/branches/current/MPfm.Library/Lib/System.Reactive.dll
deleted file mode 100644
index 64ad590e..00000000
Binary files a/MPfm/branches/current/MPfm.Library/Lib/System.Reactive.dll and /dev/null differ
diff --git a/MPfm/branches/current/MPfm.Library/Lib/taglib-sharp.dll b/MPfm/branches/current/MPfm.Library/Lib/taglib-sharp.dll
deleted file mode 100644
index 5cd2bcb3..00000000
Binary files a/MPfm/branches/current/MPfm.Library/Lib/taglib-sharp.dll and /dev/null differ
diff --git a/MPfm/branches/current/MPfm.Library/Library.cs b/MPfm/branches/current/MPfm.Library/Library.cs
index 9f5b05e1..b69713fb 100644
--- a/MPfm/branches/current/MPfm.Library/Library.cs
+++ b/MPfm/branches/current/MPfm.Library/Library.cs
@@ -22,18 +22,13 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
-//using System.Data.Linq;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using MPfm.Core;
-using MPfm.Library.Gateway;
+using MPfm.Library.Database;
 using MPfm.Library.Objects;
 using MPfm.Library.UpdateLibrary;
-using MPfm.Sound;
-using MPfm.Player;
 using MPfm.Sound.AudioFiles;
 
 namespace MPfm.Library
@@ -45,7 +40,10 @@ namespace MPfm.Library
     public class Library : ILibrary
     {
         // Background worker for update library process
-        private BackgroundWorker workerUpdateLibrary = null;
+        private readonly BackgroundWorker workerUpdateLibrary = null;
+        public DatabaseFacade Facade { get; private set; }
+        public bool CancelUpdateLibrary { get; set; }
+        private List<AudioFile> _audioFiles;
 
         #region Events
                 
@@ -71,89 +69,20 @@ public class Library : ILibrary
 
         #endregion        
         
-        #region Properties
-
-        /// <summary>
-        /// Private value for the DatabaseVersionMajor property.
-        /// </summary>
-        private static int databaseVersionMajor = 1;
+        #region Properties
+
         /// <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
-            {
-                return databaseVersionMajor;
-            }
-        }
-
-        /// <summary>
-        /// Private value for the DatabaseVersionMinor property.
-        /// </summary>
-        private static int databaseVersionMinor = 4;
+        /// </summary>
+        public static int DatabaseVersionMajor { get; private set; }
+
         /// <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
-            {
-                return databaseVersionMinor;
-            }
-        }
-
-        /// <summary>
-        /// Private value for the Gateway property.
-        /// </summary>
-        private MPfmGateway gateway = null;
-        /// <summary>
-        /// Data access library.
-        /// </summary>
-        public MPfmGateway Gateway
-        {
-            get
-            {
-                return gateway;
-            }
-        }
-
-        /// <summary>
-        /// Private value for the CancelUpdateLibrary property.
-        /// </summary>
-        private bool cancelUpdateLibrary = false;
-        /// <summary>
-        /// When true, cancels an update library process if running.
-        /// </summary>
-        public bool CancelUpdateLibrary
-        {
-            get
-            {
-                return cancelUpdateLibrary;
-            }
-            set
-            {
-                cancelUpdateLibrary = value;
-            }
-        }
-
-        /// <summary>
-        /// Private value for the AudioFiles property.
-        /// </summary>
-        private List<AudioFile> audioFiles = null;
-        /// <summary>
-        /// Local cache of the audio file library.
-        /// </summary>
-        public List<AudioFile> AudioFiles
-        {
-            get
-            {
-                return audioFiles;
-            }
-        }
-
+        /// </summary>
+        public static int DatabaseVersionMinor { get; private set; }
+
         #endregion
 
         #region Constructor
@@ -163,7 +92,10 @@ public List<AudioFile> AudioFiles
         /// </summary>                
         /// <param name="databaseFilePath">Database file path</param>
         public Library(string databaseFilePath)
-        {
+        {
+            _audioFiles = null;
+            CancelUpdateLibrary = false;
+            Facade = null;
             // Check if file path exists
             if (!File.Exists(databaseFilePath))
             {
@@ -172,7 +104,7 @@ public Library(string databaseFilePath)
 
             // Create gateway
             Tracing.Log("Library init -- Initializing gateway...");
-            gateway = new MPfmGateway(databaseFilePath);
+            Facade = new DatabaseFacade(databaseFilePath);
 
             // Create worker process
             Tracing.Log("Library init -- Creating background worker...");
@@ -185,8 +117,14 @@ public Library(string databaseFilePath)
             // Refresh songs
             Tracing.Log("Library init -- Refreshing cache...");
             RefreshCache();
-        }
-
+        }
+
+        static Library()
+        {
+            DatabaseVersionMajor = 1;
+            DatabaseVersionMinor = 4;
+        }
+
         #endregion
 
         #region Database Script Creation/Update
@@ -199,7 +137,7 @@ public Library(string databaseFilePath)
         public static string GetDatabaseVersion(string databaseFilePath)
         {
             // Create gateway
-            MPfmGateway gateway = new MPfmGateway(databaseFilePath);
+            DatabaseFacade gateway = new DatabaseFacade(databaseFilePath);
 
             // Fetch database version
             Setting settingDatabaseVersion = gateway.SelectSetting("DatabaseVersion");
@@ -229,7 +167,7 @@ public static void CheckIfDatabaseVersionNeedsToBeUpdated(string databaseFilePat
             int currentMinor = 0;
 
             // Create gateway
-            MPfmGateway gateway = new MPfmGateway(databaseFilePath);
+            DatabaseFacade gateway = new DatabaseFacade(databaseFilePath);
 
             // Get setting
             Tracing.Log("Main form init -- Fetching database version...");
@@ -313,10 +251,14 @@ public static void CheckIfDatabaseVersionNeedsToBeUpdated(string databaseFilePat
         public static void CreateDatabaseFile(string databaseFilePath)
         {
             // Create database file
-            SQLiteGateway.CreateDatabaseFile(databaseFilePath);
-
+#if ANDROID
+            MonoSQLiteGateway.CreateDatabaseFile(databaseFilePath);
+#else
+            SQLiteGateway.CreateDatabaseFile(databaseFilePath);
+#endif
+
             // Create gateway
-            MPfmGateway gateway = new MPfmGateway(databaseFilePath);
+            DatabaseFacade gateway = new DatabaseFacade(databaseFilePath);
             
             // Get SQL
             string sql = GetEmbeddedSQLScript("MPfm.Library.Scripts.CreateDatabase.sql");
@@ -527,7 +469,7 @@ public void UpdateLibrary(UpdateLibraryMode mode, List<string> filePaths, string
                 bool folderFound = false;
 
                 // Get the list of folders from the database                
-                List<Folder> folders = gateway.SelectFolders();
+                List<Folder> folders = Facade.SelectFolders();
 
                 // Search through folders if the base found can be found
                 foreach (Folder folder in folders)
@@ -549,7 +491,7 @@ public void UpdateLibrary(UpdateLibraryMode mode, List<string> filePaths, string
                     if (folder.FolderPath.Contains(folderPath))
                     {
                         // Delete this configured folder                        
-                        gateway.DeleteFolder(folder.FolderId);
+                        Facade.DeleteFolder(folder.FolderId);
                     }
                 }
 
@@ -557,7 +499,7 @@ public void UpdateLibrary(UpdateLibraryMode mode, List<string> filePaths, string
                 if (!folderFound)
                 {
                     // Add folder to database                    
-                    gateway.InsertFolder(folderPath, true);
+                    Facade.InsertFolder(folderPath, true);
                 }
             }
 
@@ -627,10 +569,10 @@ private void workerUpdateLibrary_DoWork(object sender, DoWorkEventArgs e)
                 }
 
                 // Get the list of audio files from the database (actually the cache)
-                List<string> filePaths = AudioFiles.Select(x => x.FilePath).ToList();
+                List<string> filePaths = _audioFiles.Select(x => x.FilePath).ToList();
 
                 // Get the list of playlist file paths from database
-                List<string> playlistFilePaths = Gateway.SelectPlaylistFiles().Select(x => x.FilePath).ToList();
+                List<string> playlistFilePaths = Facade.SelectPlaylistFiles().Select(x => x.FilePath).ToList();
 
                 // Compare list of files from database with list of files found on hard disk
                 List<string> audioFilesToUpdate = mediaFiles.Except(filePaths).ToList();
@@ -659,7 +601,7 @@ private void workerUpdateLibrary_DoWork(object sender, DoWorkEventArgs e)
 
                 // Compact database
                 UpdateLibraryReportProgress("Compacting database", "Compacting database...", 100);                
-                gateway.CompactDatabase();
+                Facade.CompactDatabase();
             }
             catch (UpdateLibraryException ex)
             {
@@ -704,7 +646,7 @@ public void RefreshCache()
         {
             // Refresh audio file cache
             Tracing.Log("Library --  Refreshing audio file cache...");            
-            this.audioFiles = gateway.SelectAudioFiles();
+            this._audioFiles = Facade.SelectAudioFiles();
         }        
 
         /// <summary>
@@ -713,7 +655,7 @@ public void RefreshCache()
         public void RemoveAudioFilesWithBrokenFilePaths()
         {
             // Get all audio files
-            List<AudioFile> files = gateway.SelectAudioFiles();
+            List<AudioFile> files = Facade.SelectAudioFiles();
 
             // For each audio file
             for (int a = 0; a < files.Count; a++)
@@ -730,7 +672,7 @@ public void RemoveAudioFilesWithBrokenFilePaths()
                 {
                     Tracing.Log("Removing audio files that do not exist anymore on the hard drive..." + files[a].FilePath);
                     UpdateLibraryReportProgress("Removing audio files that do not exist anymore on the hard drive...", files[a].FilePath, (double)((double)a / (double)files.Count) * 100);
-                    gateway.DeleteAudioFile(files[a].Id);
+                    Facade.DeleteAudioFile(files[a].Id);
                 }
             }
         }   
@@ -748,7 +690,7 @@ public List<string> SearchMediaFilesInFolders()
             UpdateLibraryReportProgress("Searching media files", "Searching media files in library folders");
 
             // Get registered folders            
-            List<Folder> folders = gateway.SelectFolders();
+            List<Folder> folders = Facade.SelectFolders();
 
             // For each registered folder
             foreach (Folder folder in folders)
@@ -935,12 +877,12 @@ private void AddAudioFileToLibrary(string filePath, double percentCompleted, int
                 if (audioFile != null)
                 {
                     // Insert audio file                
-                    gateway.InsertAudioFile(audioFile);
+                    Facade.InsertAudioFile(audioFile);
                 }
                 else if (playlistFile != null)
                 {
                     // Insert playlist file                
-                    gateway.InsertPlaylistFile(playlistFile);
+                    Facade.InsertPlaylistFile(playlistFile);
                 }
             }
             catch (Exception ex)
@@ -959,7 +901,7 @@ private void AddAudioFileToLibrary(string filePath, double percentCompleted, int
         public void RemoveSongsFromLibrary(string folderPath)
         {
             // Delete audio files based on path            
-            gateway.DeleteAudioFiles(folderPath);
+            Facade.DeleteAudioFiles(folderPath);
         }
 
         #region Select (strings)
@@ -980,7 +922,7 @@ public List<string> SelectArtistNames()
         /// <returns>List of artist names</returns>
         public List<string> SelectArtistNames(AudioFileFormat audioFileFormat)
         {
-            return gateway.SelectDistinctArtistNames(audioFileFormat);
+            return Facade.SelectDistinctArtistNames(audioFileFormat);
         }
 
         /// <summary>
@@ -1006,7 +948,7 @@ public List<string> SelectArtistAlbumTitles(string artistName, AudioFileFormat a
             try
             {
                 // Basic request
-                IEnumerable<AudioFile> queryAudioFiles = from s in AudioFiles
+                IEnumerable<AudioFile> queryAudioFiles = from s in _audioFiles
                                                          select s;
 
                 // Do we have to filter by sound format?
@@ -1053,7 +995,7 @@ orderby song.AlbumTitle
         /// <returns>List of album titles</returns>
         public Dictionary<string, List<string>> SelectAlbumTitles(AudioFileFormat audioFileFormat)
         {
-            return gateway.SelectDistinctAlbumTitles(audioFileFormat);
+            return Facade.SelectDistinctAlbumTitles(audioFileFormat);
         }
 
         ///// <summary>
@@ -1094,7 +1036,7 @@ public AudioFile SelectAudioFile(Guid audioFileId)
             try
             {
                 // Get audio file
-                audioFile = AudioFiles.FirstOrDefault(s => s.Id == audioFileId);
+                audioFile = _audioFiles.FirstOrDefault(s => s.Id == audioFileId);
             }
             catch (Exception ex)
             {
@@ -1186,7 +1128,7 @@ public List<AudioFile> SelectAudioFiles(AudioFileFormat audioFileFormat, string
                 if (String.IsNullOrEmpty(orderBy))
                 {
                     // Set query
-                    queryAudioFiles = from s in AudioFiles
+                    queryAudioFiles = from s in _audioFiles
                                       orderby s.ArtistName, s.AlbumTitle, s.FileType, s.DiscNumber, s.TrackNumber
                                       select s;
                 }
@@ -1196,14 +1138,14 @@ public List<AudioFile> SelectAudioFiles(AudioFileFormat audioFileFormat, string
                     if (orderByAscending)
                     {
                         // Set query
-                        queryAudioFiles = from s in AudioFiles
+                        queryAudioFiles = from s in _audioFiles
                                           orderby GetPropertyValue(s, orderBy)
                                           select s;
                     }
                     else
                     {
                         // Set query
-                        queryAudioFiles = from s in AudioFiles
+                        queryAudioFiles = from s in _audioFiles
                                           orderby GetPropertyValue(s, orderBy) descending
                                           select s;                        
                     }
@@ -1622,10 +1564,10 @@ public static System.Drawing.Image GetAlbumArtFromID3OrFolder(string filePath)
         public void ResetLibrary()
         {
             // Reset library            
-            gateway.ResetLibrary();
+            Facade.ResetLibrary();
 
             // Compact database            
-            gateway.CompactDatabase();
+            Facade.CompactDatabase();
 
             // Refresh cache
             RefreshCache();
@@ -1638,14 +1580,14 @@ public void ResetLibrary()
         public void UpdateAudioFilePlayCount(Guid audioFileId)
         {
             // Update play count in database            
-            gateway.UpdatePlayCount(audioFileId);
+            Facade.UpdatePlayCount(audioFileId);
 
             // Update play count in cache                  
-            AudioFile audioFile = audioFiles.SingleOrDefault(x => x.Id == audioFileId);
+            AudioFile audioFile = _audioFiles.SingleOrDefault(x => x.Id == audioFileId);
             if (audioFile != null)
             {
                 // Fetch audio file from database
-                AudioFile audioFileDatabase = gateway.SelectAudioFile(audioFile.Id);
+                AudioFile audioFileDatabase = Facade.SelectAudioFile(audioFile.Id);
                 
                 // Is the audio file in the database?
                 if (audioFileDatabase != null)
diff --git a/MPfm/branches/current/MPfm.Library/MPfm.Library.Android.csproj b/MPfm/branches/current/MPfm.Library/MPfm.Library.Android.csproj
index 6a65f2c2..4a359fc8 100644
--- a/MPfm/branches/current/MPfm.Library/MPfm.Library.Android.csproj
+++ b/MPfm/branches/current/MPfm.Library/MPfm.Library.Android.csproj
@@ -84,7 +84,6 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Data.Linq" />
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Security" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
@@ -113,13 +112,9 @@
     <EmbeddedResource Include="Scripts\1.01-1.02.sql" />
     <EmbeddedResource Include="Scripts\1.00-1.01.sql" />
     <EmbeddedResource Include="Scripts\CreateDatabase.sql" />
-    <Content Include="Lib\AsyncCtpLibrary.dll" />
-    <Content Include="Lib\AsyncCtpLibrary.xml" />
     <Content Include="Lib\SQLite.Interop.dll" />
     <Content Include="Lib\System.Data.SQLite.dll" />
     <Content Include="Lib\System.Data.SQLite.Linq.dll" />
-    <Content Include="Lib\System.Reactive.dll" />
-    <Content Include="Lib\taglib-sharp.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -130,14 +125,15 @@
   </Target>
   -->
   <ItemGroup>
-    <Compile Include="Gateway\IMPfmGateway.cs" />
-    <Compile Include="Gateway\ISQLiteGateway.cs" />
-    <Compile Include="Gateway\MPfmGateway.cs" />
+    <Compile Include="Database\MonoSQLiteGateway.cs" />
+    <Compile Include="Database\Interfaces\IDatabaseFacade.cs" />
+    <Compile Include="Database\Interfaces\ISQLiteGateway.cs" />
+    <Compile Include="Database\DatabaseFacade.cs" />
     <Compile Include="ILibrary.cs" />
     <Compile Include="Objects\PlaylistFile.cs" />
     <Compile Include="Objects\History.cs" />
     <Compile Include="Objects\Setting.cs" />
-    <Compile Include="Gateway\SQLiteGateway.cs" />
+    <Compile Include="Database\SQLiteGateway.cs" />
     <Compile Include="Objects\Folder.cs" />
     <Compile Include="Library.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/MPfm/branches/current/MPfm.MVP/Bootstrapper/Bootstrapper.cs b/MPfm/branches/current/MPfm.MVP/Bootstrapper/Bootstrapper.cs
index a442a39a..087e42c1 100644
--- a/MPfm/branches/current/MPfm.MVP/Bootstrapper/Bootstrapper.cs
+++ b/MPfm/branches/current/MPfm.MVP/Bootstrapper/Bootstrapper.cs
@@ -25,14 +25,15 @@
 using System.Linq;
 using System.Reflection;
 using System.Timers;
-using AutoMapper;
+using AutoMapper;
+using MPfm.Library.Database;
+using MPfm.Library.Database.Interfaces;
 using TinyIoC;
 using MPfm.Core;
 using MPfm.Library;
 using MPfm.MVP;
 using MPfm.Player;
-using MPfm.Sound;
-using MPfm.Library.Gateway;
+using MPfm.Sound;
 using MPfm.MVP.Services;
 using MPfm.MVP.Presenters.Interfaces;
 using MPfm.MVP.Presenters;
@@ -58,8 +59,8 @@ static Bootstrapper()
             var container = TinyIoC.TinyIoCContainer.Current;
             
             // Register services
-            //container.Register<IMPfmGateway, MPfmGateway>().UsingConstructor(() => new MPfmGateway(ConfigurationHelper.DatabaseFilePath));
-            container.Register<IMPfmGateway>(new MPfmGateway(ConfigurationHelper.DatabaseFilePath));
+            //container.Register<IDatabaseFacade, DatabaseFacade>().UsingConstructor(() => new DatabaseFacade(ConfigurationHelper.DatabaseFilePath));
+            container.Register<IDatabaseFacade>(new DatabaseFacade(ConfigurationHelper.DatabaseFilePath));
             container.Register<IInitializationService, InitializationService>().AsSingleton();
             container.Register<IPlayerService, PlayerService>().AsSingleton();
             container.Register<ILibraryService, LibraryService>().AsSingleton();
@@ -78,7 +79,7 @@ static Bootstrapper()
             container.Register<IPlaylistPresenter, PlaylistPresenter>().AsSingleton();
             
             // Configure Automapper
-            Mapper.CreateMap<AudioFile, SongInformationEntity>();
+            //Mapper.CreateMap<AudioFile, SongInformationEntity>();
         }
         
         /// <summary>
diff --git a/MPfm/branches/current/MPfm.MVP/Helpers/ConfigurationHelper.cs b/MPfm/branches/current/MPfm.MVP/Helpers/ConfigurationHelper.cs
index e06da8d2..9a55a4e7 100644
--- a/MPfm/branches/current/MPfm.MVP/Helpers/ConfigurationHelper.cs
+++ b/MPfm/branches/current/MPfm.MVP/Helpers/ConfigurationHelper.cs
@@ -52,11 +52,9 @@ static ConfigurationHelper()
 			// Get assembly directory
 			//string assemblyDirectory = System.IO.Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
 			
-#if (MACOSX)
-        	HomeDirectory = Path.Combine(Environment.GetFolderPath(System.Environment.SpecialFolder.Personal), ".MPfm");
-#elif (LINUX)
-			HomeDirectory = Path.Combine(Environment.GetFolderPath(System.Environment.SpecialFolder.Personal), ".MPfm");
-#elif (!MACOSX && !LINUX)						
+#if IOS || ANDROID
+        	HomeDirectory = Environment.GetFolderPath(System.Environment.SpecialFolder.Personal);
+#else
 			HomeDirectory = Path.Combine(Environment.GetFolderPath(System.Environment.SpecialFolder.Personal), ".MPfm");
 #endif
 
diff --git a/MPfm/branches/current/MPfm.MVP/NavigationManager.cs b/MPfm/branches/current/MPfm.MVP/NavigationManager.cs
index 892f4259..00aa5ab8 100644
--- a/MPfm/branches/current/MPfm.MVP/NavigationManager.cs
+++ b/MPfm/branches/current/MPfm.MVP/NavigationManager.cs
@@ -18,13 +18,7 @@
 // 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 System.Collections.Specialized;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using TinyMessenger;
+using System;
 using TinyIoC;
 using MPfm.MVP.Views;
 using MPfm.MVP.Presenters.Interfaces;
@@ -34,89 +28,107 @@ namespace MPfm.MVP
     /// <summary>
     /// Manager class for managing view and presenter instances.
     /// </summary>
-    public abstract class NavigationManager
+    public abstract class NavigationManager
     {
-        ISplashView splashView;
-        ISplashPresenter splashPresenter;
-        
-        IMainView mainView;
-        IMainPresenter mainPresenter;
-        IPlayerPresenter playerPresenter;
-        ILibraryBrowserPresenter libraryBrowserPresenter;
-        ISongBrowserPresenter songBrowserPresenter;
-        
-        IPreferencesView preferencesView;
-        IPreferencesPresenter preferencesPresenter;
-        
-        public virtual void Start()
-        {
-            CreateSplashWindow();
-        }
-        
-        public virtual void CreateSplashWindow()
+        private ISplashView _splashView;
+        private ISplashPresenter _splashPresenter;
+
+        private IMainView _mainView;
+        private IMainPresenter _mainPresenter;
+        private IPlayerPresenter _playerPresenter;
+        private ILibraryBrowserPresenter _libraryBrowserPresenter;
+        private ISongBrowserPresenter _songBrowserPresenter;
+
+        private IPreferencesView _preferencesView;
+        private IPreferencesPresenter _preferencesPresenter;
+
+        private IUpdateLibraryView _updateLibraryView;
+        private IUpdateLibraryPresenter _updateLibraryPresenter;
+
+        public virtual void BindSplashView(ISplashView view, Action onInitDone)
+        {
+            _splashView = view;
+            _splashPresenter = Bootstrapper.GetContainer().Resolve<ISplashPresenter>();
+            _splashPresenter.BindView(view);
+            _splashPresenter.Initialize(onInitDone); // TODO: Should the presenter call NavMgr instead of using an action?
+        }
+
+        public virtual void BindUpdateLibraryView(IUpdateLibraryView view)
+        {
+            _updateLibraryView = view;
+            _updateLibraryPresenter = Bootstrapper.GetContainer().Resolve<IUpdateLibraryPresenter>();
+            _updateLibraryPresenter.BindView(view);
+        }
+
+        public virtual ISplashView CreateSplashView()
+        {
+            // The view invokes the OnViewReady action when the view is ready. This means the presenter can be created and bound to the view.
+            Action onInitDone = () =>
+            {
+                Console.WriteLine("SplashInitDone");
+                CreateMainView();
+            };
+            return CreateSplashView(onInitDone);
+        }
+
+        public virtual ISplashView CreateSplashView(Action onInitDone)
         {
-            // The view invokes the OnViewReady action when the view is ready. This means the presenter can be created and bound to the view.
-            Action onInitDone = () => {
-                Console.WriteLine("SplashInitDone");
-                CreateMainWindow();
-            };
-            Action<IBaseView> onViewReady = (view) => {
-                splashPresenter = Bootstrapper.GetContainer().Resolve<ISplashPresenter>();
-                splashPresenter.BindView((ISplashView)view);
-                splashPresenter.Initialize(onInitDone); // TODO: Should the presenter call NavMgr instead of using an action?
-            };
-            splashView = Bootstrapper.GetContainer().Resolve<ISplashView>(new NamedParameterOverloads() { { "onViewReady", onViewReady } });
-            splashView.OnViewDestroy = () => {
-                splashView = null;
-                splashPresenter = null;
-            };
+            Action<IBaseView> onViewReady = (view) => BindSplashView((ISplashView)view, onInitDone);
+            _splashView = Bootstrapper.GetContainer().Resolve<ISplashView>(new NamedParameterOverloads() { { "onViewReady", onViewReady } });
+            _splashView.OnViewDestroy = () => {
+                _splashView = null;
+                _splashPresenter = null;
+            };
+            return _splashView;
         }
         
-        public virtual void CreateMainWindow()
+        public virtual IMainView CreateMainView()
         {
             // The view invokes the OnViewReady action when the view is ready. This means the presenter can be created and bound to the view.
             Action<IBaseView> onViewReady = (view) => {
-                mainPresenter = Bootstrapper.GetContainer().Resolve<IMainPresenter>();
-                mainPresenter.BindView((IMainView)view);                
-                playerPresenter = Bootstrapper.GetContainer().Resolve<IPlayerPresenter>();
-                playerPresenter.BindView((IPlayerView)view);
-                libraryBrowserPresenter = Bootstrapper.GetContainer().Resolve<ILibraryBrowserPresenter>();
-                libraryBrowserPresenter.BindView((ILibraryBrowserView)view);                
-                songBrowserPresenter = Bootstrapper.GetContainer().Resolve<ISongBrowserPresenter>();
-                songBrowserPresenter.BindView((ISongBrowserView)view);                
+                _mainPresenter = Bootstrapper.GetContainer().Resolve<IMainPresenter>();
+                _mainPresenter.BindView((IMainView)view);                
+                _playerPresenter = Bootstrapper.GetContainer().Resolve<IPlayerPresenter>();
+                _playerPresenter.BindView((IPlayerView)view);
+                _libraryBrowserPresenter = Bootstrapper.GetContainer().Resolve<ILibraryBrowserPresenter>();
+                _libraryBrowserPresenter.BindView((ILibraryBrowserView)view);                
+                _songBrowserPresenter = Bootstrapper.GetContainer().Resolve<ISongBrowserPresenter>();
+                _songBrowserPresenter.BindView((ISongBrowserView)view);                
             };            
-            mainView = Bootstrapper.GetContainer().Resolve<IMainView>(new NamedParameterOverloads() { { "onViewReady", onViewReady } });
-            mainView.OnViewDestroy = () => {
-                mainView = null;
-                mainPresenter = null;
-                playerPresenter.Dispose(); // Dispose unmanaged stuff (i.e. BASS)
-                playerPresenter = null;
-                libraryBrowserPresenter = null;
-                songBrowserPresenter = null;
-            };
+            _mainView = Bootstrapper.GetContainer().Resolve<IMainView>(new NamedParameterOverloads() { { "onViewReady", onViewReady } });
+            _mainView.OnViewDestroy = () => {
+                _mainView = null;
+                _mainPresenter = null;
+                _playerPresenter.Dispose(); // Dispose unmanaged stuff (i.e. BASS)
+                _playerPresenter = null;
+                _libraryBrowserPresenter = null;
+                _songBrowserPresenter = null;
+            };
+            return _mainView;
         }
         
-        public virtual void CreatePreferencesWindow()
+        public virtual IPreferencesView CreatePreferencesView()
         {
             // If the view is still visible, just make it the top level window
-            if(preferencesView != null)
+            if(_preferencesView != null)
             {
-                preferencesView.ShowView(true);
-                return;
+                _preferencesView.ShowView(true);
+                return _preferencesView;
             }
             
             // The view invokes the OnViewReady action when the view is ready. This means the presenter can be created and bound to the view.
             Action<IBaseView> onViewReady = (view) => {
-                preferencesPresenter = Bootstrapper.GetContainer().Resolve<IPreferencesPresenter>();
-                preferencesPresenter.BindView((IPreferencesView)view);                
+                _preferencesPresenter = Bootstrapper.GetContainer().Resolve<IPreferencesPresenter>();
+                _preferencesPresenter.BindView((IPreferencesView)view);                
             };            
             
             // Create view and manage view destruction
-            preferencesView = Bootstrapper.GetContainer().Resolve<IPreferencesView>(new NamedParameterOverloads() { { "onViewReady", onViewReady } });
-            preferencesView.OnViewDestroy = () => {
-                preferencesView = null;
-                preferencesPresenter = null;
-            };
+            _preferencesView = Bootstrapper.GetContainer().Resolve<IPreferencesView>(new NamedParameterOverloads() { { "onViewReady", onViewReady } });
+            _preferencesView.OnViewDestroy = () => {
+                _preferencesView = null;
+                _preferencesPresenter = null;
+            };
+            return _preferencesView;
         }
     }
 }
diff --git a/MPfm/branches/current/MPfm.MVP/Presenters/MainPresenter.cs b/MPfm/branches/current/MPfm.MVP/Presenters/MainPresenter.cs
index 3b0b97a5..4edc312e 100644
--- a/MPfm/branches/current/MPfm.MVP/Presenters/MainPresenter.cs
+++ b/MPfm/branches/current/MPfm.MVP/Presenters/MainPresenter.cs
@@ -65,7 +65,7 @@ void OpenEffectsWindow()
 
         void OpenPreferencesWindow()
         {
-            navigationManager.CreatePreferencesWindow();
+            navigationManager.CreatePreferencesView();
         }
         
     }
diff --git a/MPfm/branches/current/MPfm.MVP/Presenters/PlayerPresenter.cs b/MPfm/branches/current/MPfm.MVP/Presenters/PlayerPresenter.cs
index af07aad6..cc3cb239 100644
--- a/MPfm/branches/current/MPfm.MVP/Presenters/PlayerPresenter.cs
+++ b/MPfm/branches/current/MPfm.MVP/Presenters/PlayerPresenter.cs
@@ -91,15 +91,15 @@ public override void BindView(IPlayerView view)
         {
             base.BindView(view);
             
-            view.OnPlayerPlay = () => { Play(); };
-            view.OnPlayerPause = () => { Pause(); };
-            view.OnPlayerStop = () => { Stop(); };
-            view.OnPlayerPrevious = () => { Previous(); };
-            view.OnPlayerNext = () => { Next(); };
+            view.OnPlayerPlay = Play;
+            view.OnPlayerPause = Pause;
+            view.OnPlayerStop = Stop;
+            view.OnPlayerPrevious = Previous;
+            view.OnPlayerNext = Next;
             //view.OnPlayerSetPitchShifting = (float) => { 
-            view.OnPlayerSetPosition = (pos) => { SetPosition(pos); };
-            view.OnPlayerSetTimeShifting = (val) => { SetTimeShifting(val); };
-            view.OnPlayerSetVolume = (vol) => { SetVolume(vol); };
+            view.OnPlayerSetPosition = SetPosition;
+            view.OnPlayerSetTimeShifting = SetTimeShifting;
+            view.OnPlayerSetVolume = SetVolume;
         }
 
 		#endregion
diff --git a/MPfm/branches/current/MPfm.MVP/Presenters/SplashPresenter.cs b/MPfm/branches/current/MPfm.MVP/Presenters/SplashPresenter.cs
index 1d0f149b..7864d9c2 100644
--- a/MPfm/branches/current/MPfm.MVP/Presenters/SplashPresenter.cs
+++ b/MPfm/branches/current/MPfm.MVP/Presenters/SplashPresenter.cs
@@ -51,7 +51,9 @@ public void Initialize(Action onInitDone)
         {
             Task.Factory.StartNew(() => {
                 Console.WriteLine("SplashPresenter - Starting initialization service...");
-                initializationService.Initialize();
+                View.RefreshStatus("Loading...");
+                initializationService.Initialize();
+                View.RefreshStatus("Initialization done!");
                 Console.WriteLine("SplashPresenter - Initialization service done!");
             }).ContinueWith((a) => {
                 Console.WriteLine("SplashPresenter - Notifying view...");
diff --git a/MPfm/branches/current/MPfm.MVP/Presenters/UpdateLibraryPresenter.cs b/MPfm/branches/current/MPfm.MVP/Presenters/UpdateLibraryPresenter.cs
index b05d8e41..d0fd198f 100644
--- a/MPfm/branches/current/MPfm.MVP/Presenters/UpdateLibraryPresenter.cs
+++ b/MPfm/branches/current/MPfm.MVP/Presenters/UpdateLibraryPresenter.cs
@@ -79,21 +79,14 @@ protected void updateLibraryService_RaiseProcessEndedEvent(object sender, Proces
 
 		#endregion
 		
-		#region IUpdateLibraryPresenter implementation
-			
-//		/// <summary>
-//		/// Binds the view to its implementation.
-//		/// </summary>
-//		/// <param name='view'>Update Library view implementation</param>	
-//		public void BindView(IUpdateLibraryView view)
-//		{
-//			// Validate parameters 
-//			if(view == null)			
-//				throw new ArgumentNullException("The view parameter is null!");
-//			
-//			// Set property
-//			this.view = view;
-//		}
+		#region IUpdateLibraryPresenter implementation
+
+        public override void BindView(IUpdateLibraryView view)
+        {
+            base.BindView(view);
+
+            view.OnStartUpdateLibrary = UpdateLibrary;
+        }
 		
 		/// <summary>
 		/// Starts the update library process in a background thread. 
diff --git a/MPfm/branches/current/MPfm.MVP/Services/InitializationService.cs b/MPfm/branches/current/MPfm.MVP/Services/InitializationService.cs
index 65d35370..a046de40 100644
--- a/MPfm/branches/current/MPfm.MVP/Services/InitializationService.cs
+++ b/MPfm/branches/current/MPfm.MVP/Services/InitializationService.cs
@@ -68,7 +68,13 @@ public void Initialize()
             // Create trace listener and start logging
             CreateTraceListener();
             Tracing.Log("====================================================================");
-            Tracing.Log("MPfm: Music Player for Musicians - " + Assembly.GetExecutingAssembly().GetName().Version.ToString() + " ALPHA");
+
+#if !IOS && !ANDROID // MonoDroid doesn't like Assembly methods
+            Tracing.Log("MPfm: Music Player for Musicians - " + Assembly.GetExecutingAssembly().GetName().Version.ToString() + " ALPHA");
+#else
+            Tracing.Log("MPfm: Music Player for Musicians");
+#endif
+
             Tracing.Log("Started on " + DateTime.Now.ToLongDateString() + " at " + DateTime.Now.ToLongTimeString());
             Tracing.Log("InitializationService.Initialize -- Starting initialization...");   
 
diff --git a/MPfm/branches/current/MPfm.MVP/Services/LibraryService.cs b/MPfm/branches/current/MPfm.MVP/Services/LibraryService.cs
index a3350660..aff72035 100644
--- a/MPfm/branches/current/MPfm.MVP/Services/LibraryService.cs
+++ b/MPfm/branches/current/MPfm.MVP/Services/LibraryService.cs
@@ -21,7 +21,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using MPfm.Library.Gateway;
+using MPfm.Library.Database;
+using MPfm.Library.Database.Interfaces;
 using MPfm.Library.Objects;
 using MPfm.MVP.Services.Interfaces;
 using MPfm.Sound.AudioFiles;
@@ -34,7 +35,7 @@ namespace MPfm.MVP.Services
     public class LibraryService : ILibraryService
     {
 		// Private variables
-		private readonly IMPfmGateway gateway = null;
+		private readonly IDatabaseFacade gateway = null;
 		
 		/// <summary>
 		/// Initializes a new instance of the <see cref="MPfm.Library.UpdateLibraryService"/> class.
@@ -45,7 +46,7 @@ public class LibraryService : ILibraryService
 		/// <exception cref='ArgumentNullException'>
 		/// Is thrown when an argument passed to a method is invalid because it is <see langword="null" /> .
 		/// </exception>
-		public LibraryService(IMPfmGateway gateway)
+		public LibraryService(IDatabaseFacade gateway)
 		{
 			// Check for null
 			if(gateway == null)
diff --git a/MPfm/branches/current/MPfm.MVP/Services/UpdateLibraryService.cs b/MPfm/branches/current/MPfm.MVP/Services/UpdateLibraryService.cs
index ec77615f..212914b1 100644
--- a/MPfm/branches/current/MPfm.MVP/Services/UpdateLibraryService.cs
+++ b/MPfm/branches/current/MPfm.MVP/Services/UpdateLibraryService.cs
@@ -409,8 +409,9 @@ public List<string> SearchMediaFilesInFolders(string folderPath, bool recursive)
             // Check for sub directories if recursive
             if (recursive)
             {
-                // For each directory, search for new directories
-                foreach (DirectoryInfo directoryInfo in rootDirectoryInfo.GetDirectories())
+                // For each directory, search for new directories
+                DirectoryInfo[] directoryInfos = rootDirectoryInfo.GetDirectories();
+                foreach (DirectoryInfo directoryInfo in directoryInfos)
                 {
 					// Make sure this isn't an Apple index directory
                     if (!directoryInfo.Name.StartsWith(".Apple"))
@@ -423,14 +424,15 @@ public List<string> SearchMediaFilesInFolders(string folderPath, bool recursive)
             }
 			
 			string[] extensions = extensionsSupported.Split(new string[]{";"}, StringSplitOptions.RemoveEmptyEntries);
-            // For each extension supported
-            foreach (string extension in extensions)
+            //FileInfo[] fileInfos = rootDirectoryInfo.GetFiles("*." + extension);
+            FileInfo[] fileInfos = rootDirectoryInfo.GetFiles();
+            foreach (FileInfo fileInfo in fileInfos)
             {
-                foreach (FileInfo fileInfo in rootDirectoryInfo.GetFiles("*." + extension))
-                {
-                    // Add file
-                    arrayFiles.Add(fileInfo.FullName);
-                }
+                // Check if file matches supported extensions
+                if (extensions.Contains(fileInfo.Extension.Replace(".", ""), StringComparer.InvariantCultureIgnoreCase))
+                {
+                    arrayFiles.Add(fileInfo.FullName);
+                }
             }
 						
 #endif				
diff --git a/MPfm/branches/current/MPfm.MVP/Views/IUpdateLibraryView.cs b/MPfm/branches/current/MPfm.MVP/Views/IUpdateLibraryView.cs
index 3f7166c2..8006b058 100644
--- a/MPfm/branches/current/MPfm.MVP/Views/IUpdateLibraryView.cs
+++ b/MPfm/branches/current/MPfm.MVP/Views/IUpdateLibraryView.cs
@@ -18,6 +18,9 @@
 // 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.UpdateLibrary;
 using MPfm.MVP.Models;
 
 namespace MPfm.MVP.Views
@@ -25,8 +28,10 @@ namespace MPfm.MVP.Views
 	/// <summary>
 	/// Update Library window view interface.
 	/// </summary>
-    public interface IUpdateLibraryView : IBaseView
-	{
+    public interface IUpdateLibraryView : IBaseView
+	{
+        Action<UpdateLibraryMode, List<string>, string> OnStartUpdateLibrary { get; set; }
+
 		void RefreshStatus(UpdateLibraryEntity entity);
 		void AddToLog(string entry);
 		void ProcessEnded(bool canceled);
diff --git a/MPfm/branches/current/MPfm.Sound/AudioFiles/AudioFile.cs b/MPfm/branches/current/MPfm.Sound/AudioFiles/AudioFile.cs
index 4f81124f..e3cad891 100644
--- a/MPfm/branches/current/MPfm.Sound/AudioFiles/AudioFile.cs
+++ b/MPfm/branches/current/MPfm.Sound/AudioFiles/AudioFile.cs
@@ -19,8 +19,10 @@
 // along with MPfm. If not, see <http://www.gnu.org/licenses/>.
 
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
+using System.Linq;
 using MPfm.Core;
 using MPfm.Core.Attributes;
 using MPfm.Sound.Tags;
diff --git a/MPfm/branches/current/MPfm.Sound/PeakFile.cs b/MPfm/branches/current/MPfm.Sound/PeakFile.cs
index a75ad1de..fb953dbe 100644
--- a/MPfm/branches/current/MPfm.Sound/PeakFile.cs
+++ b/MPfm/branches/current/MPfm.Sound/PeakFile.cs
@@ -21,13 +21,19 @@
 using System;
 using System.Collections.Generic;
 #if (!MACOSX && !LINUX && !IOS && !ANDROID)
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
 using System.Reactive;
 using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Reactive.Threading;
 #endif
+using System.Runtime.InteropServices;
+using MPfm.Core;
 using MPfm.Sound.AudioFiles;
+using MPfm.Sound.Bass.Net;
 
 namespace MPfm.Sound
 {