diff --git a/force_bdss/core/base_factory.py b/force_bdss/core/base_factory.py
index 0171bdf4b3784227221835b88d170b8dfcd636fa..e8daa730591b65ebe6cc89398cc95e59d1cd50af 100644
--- a/force_bdss/core/base_factory.py
+++ b/force_bdss/core/base_factory.py
@@ -17,8 +17,8 @@ class BaseFactory(HasStrictTraits):
     #: in your subclass.
     plugin = Instance(Plugin, allow_none=False)
 
-    def __init__(self, plugin):
-        super(BaseFactory, self).__init__(plugin=plugin)
+    def __init__(self, plugin, *args, **kwargs):
+        super(BaseFactory, self).__init__(plugin=plugin, *args, **kwargs)
 
         self.name = self.get_name()
         identifier = self.get_identifier()
diff --git a/force_bdss/data_sources/base_data_source_factory.py b/force_bdss/data_sources/base_data_source_factory.py
index 206321c4378c60d1a7d8d7ab159d7b38be5e7f65..3793fb49aeb8a1754b7f38bc5878625c4d9e050d 100644
--- a/force_bdss/data_sources/base_data_source_factory.py
+++ b/force_bdss/data_sources/base_data_source_factory.py
@@ -38,8 +38,11 @@ class BaseDataSourceFactory(BaseFactory):
     #: Define this to your DataSourceModel
     model_class = Type(BaseDataSourceModel, allow_none=False)
 
-    def __init__(self, plugin):
-        super(BaseDataSourceFactory, self).__init__(plugin=plugin)
+    def __init__(self, plugin, *args, **kwargs):
+        super(BaseDataSourceFactory, self).__init__(
+            plugin=plugin,
+            *args,
+            **kwargs)
 
         self.data_source_class = self.get_data_source_class()
         self.model_class = self.get_model_class()