diff --git a/src/NOCQ/Extensability/Catalog.cs b/src/NOCQ/Extensability/Catalog.cs
index dbbcecb..e49d680 100644
--- a/src/NOCQ/Extensability/Catalog.cs
+++ b/src/NOCQ/Extensability/Catalog.cs
@@ -1,14 +1,15 @@
 using System.ComponentModel.Composition.Hosting;
 using System.ComponentModel.Composition;
+using System.Reflection;
 
 namespace NOCQ
 {
     public class Catalog
     {
-		DirectoryCatalog dcatalog = new DirectoryCatalog("plugins", "*.dll");
-		AssemblyCatalog acatalog = new AssemblyCatalog(Assembly.GetExecutingAssembly());
-		AggregateCatalog catalog = new AggregateCatalog(dcatalog, acatalog);
-		public CompositionContainer Container = new CompositionContainer(catalog);
+        static DirectoryCatalog dcatalog = new DirectoryCatalog("plugins", "*.dll");
+        static AssemblyCatalog acatalog = new AssemblyCatalog(Assembly.GetExecutingAssembly());
+        static AggregateCatalog catalog = new AggregateCatalog(dcatalog, acatalog);
+        static public CompositionContainer Container = new CompositionContainer(catalog);
         public Catalog()
         {
 			Container.ComposeParts(this);
diff --git a/src/NOCQ/Imports/IDataImportHook.cs b/src/NOCQ/Imports/IDataImportHook.cs
index e4c37be..ada4c45 100644
--- a/src/NOCQ/Imports/IDataImportHook.cs
+++ b/src/NOCQ/Imports/IDataImportHook.cs
@@ -3,7 +3,7 @@ using System.ComponentModel.Composition;
 
 namespace NOCQ
 {
-	[Export(typeof(IDataImportHook))]
+    [InheritedExport]
 	public interface IDataImportHook
     {
 		string Name { get; set; }
diff --git a/src/NOCQ/NOCQ.csproj b/src/NOCQ/NOCQ.csproj
index 795c3c1..75b8f50 100644
--- a/src/NOCQ/NOCQ.csproj
+++ b/src/NOCQ/NOCQ.csproj
@@ -33,6 +33,9 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="csredis">
+      <HintPath>..\..\packages\csredis.1.4.7.1\lib\net40\csredis.dll</HintPath>
+    </Reference>
     <Reference Include="System.Composition.AttributedModel">
       <HintPath>..\..\packages\Microsoft.Composition.1.0.27\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
     </Reference>
@@ -51,9 +54,6 @@
     <Reference Include="AE.Net.Mail">
       <HintPath>..\..\packages\AE.Net.Mail.1.7.9.1\lib\net45\AE.Net.Mail.dll</HintPath>
     </Reference>
-    <Reference Include="csredis">
-      <HintPath>..\..\packages\csredis.1.4.7.1\lib\net40\csredis.dll</HintPath>
-    </Reference>
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>