5 files changed, 6 insertions, 3 deletions
diff --git a/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs b/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs
index 9e5657e3c..5f5203dae 100644
--- a/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/PluginConfigurationHandler.cs
@@ -12,7 +12,7 @@ namespace MediaBrowser.Api.HttpHandlers
             {
                 string pluginName = QueryString["name"];
 
-                return Kernel.Instance.PluginController.Plugins.First(p => p.Name.Equals(pluginName, StringComparison.OrdinalIgnoreCase)).Configuration;
+                return Kernel.Instance.Plugins.First(p => p.Name.Equals(pluginName, StringComparison.OrdinalIgnoreCase)).Configuration;
             }
         }
     }
diff --git a/MediaBrowser.Api/HttpHandlers/PluginsHandler.cs b/MediaBrowser.Api/HttpHandlers/PluginsHandler.cs
index a558da163..63797026d 100644
--- a/MediaBrowser.Api/HttpHandlers/PluginsHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/PluginsHandler.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Api.HttpHandlers
         {
             get
             {
-                var plugins = Kernel.Instance.PluginController.Plugins.Select(p =>
+                var plugins = Kernel.Instance.Plugins.Select(p =>
                 {
                     return new PluginInfo()
                     {
diff --git a/MediaBrowser.Api/HttpHandlers/UserConfigurationHandler.cs b/MediaBrowser.Api/HttpHandlers/UserConfigurationHandler.cs
index faace9c31..06c3ea86d 100644
--- a/MediaBrowser.Api/HttpHandlers/UserConfigurationHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/UserConfigurationHandler.cs
@@ -11,7 +11,7 @@ namespace MediaBrowser.Api.HttpHandlers
             {
                 Guid userId = Guid.Parse(QueryString["userid"]);
 
-                return Kernel.Instance.ConfigurationController.GetUserConfiguration(userId);
+                return Kernel.Instance.GetUserConfiguration(userId);
             }
         }
     }
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index 25889f983..4560f70a1 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -31,6 +31,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Reactive, Version=1.0.10621.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/MediaBrowser.Api/Plugin.cs b/MediaBrowser.Api/Plugin.cs
index 6ced7a704..ebc2ffcae 100644
--- a/MediaBrowser.Api/Plugin.cs
+++ b/MediaBrowser.Api/Plugin.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.Composition;
 using System.Reactive.Linq;
 using MediaBrowser.Api.HttpHandlers;
 using MediaBrowser.Common.Net;
@@ -9,6 +10,7 @@ using MediaBrowser.Model.Plugins;
 
 namespace MediaBrowser.Api
 {
+    [Export(typeof(BasePlugin))]
     public class Plugin : BaseGenericPlugin<BasePluginConfiguration>
     {
         public override string Name