diff --git a/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_bundle.py b/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_bundle.py
index 3ef2128b81b8e7ce35fb32fa38a5e1fb29eaf07f..a44b5e14b65970a1a62d26a7706469a60d13a679 100644
--- a/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_bundle.py
+++ b/force_bdss/core_plugins/csv_extractor/csv_extractor/csv_extractor_bundle.py
@@ -12,9 +12,9 @@ class CSVExtractorBundle(HasStrictTraits):
 
     def create_model(self, model_data=None):
         if model_data is None:
-            return CSVExtractorModel()
-        else:
-            return CSVExtractorModel.from_json(model_data)
+            model_data = {}
+
+        return CSVExtractorModel(self, **model_data)
 
     def create_data_source(self, application, model):
         return CSVExtractorDataSource(self, application, model)
diff --git a/force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_bundle.py b/force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_bundle.py
index a76456c24a3342b5cb15c820b99428982f2b4c5c..2968895d546ee53e95834f463a7bba515bd33a71 100644
--- a/force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_bundle.py
+++ b/force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_bundle.py
@@ -13,9 +13,9 @@ class KPIAdderBundle(HasStrictTraits):
 
     def create_model(self, model_data=None):
         if model_data is None:
-            return KPIAdderModel()
-        else:
-            return KPIAdderModel.from_json(model_data)
+            model_data = {}
+
+        return KPIAdderModel(self, **model_data)
 
     def create_data_source(self, application, model):
         return KPIAdderCalculator(self, application, model)
diff --git a/force_bdss/core_plugins/dummy_mco/dakota/dakota_bundle.py b/force_bdss/core_plugins/dummy_mco/dakota/dakota_bundle.py
index 13880513717114a424861496583bcfb9f762a8bb..07e4dd366a2c964cbf9de4dcace24170feb3bc6c 100644
--- a/force_bdss/core_plugins/dummy_mco/dakota/dakota_bundle.py
+++ b/force_bdss/core_plugins/dummy_mco/dakota/dakota_bundle.py
@@ -12,9 +12,8 @@ class DakotaBundle(HasStrictTraits):
 
     def create_model(self, model_data=None):
         if model_data is None:
-            return DakotaModel()
-        else:
-            return DakotaModel.from_json(model_data)
+            model_data = {}
+        return DakotaModel(self, **model_data)
 
     def create_optimizer(self, application, model):
         return DakotaOptimizer(self, application, model)
diff --git a/force_bdss/data_sources/base_data_source_model.py b/force_bdss/data_sources/base_data_source_model.py
index f3ebea6f3b3d5a28d1d3a22ca0501a769bc473c5..bf8367f74980953c688634a4b8f5089e3e35fa17 100644
--- a/force_bdss/data_sources/base_data_source_model.py
+++ b/force_bdss/data_sources/base_data_source_model.py
@@ -8,4 +8,4 @@ class BaseDataSourceModel(ABCHasStrictTraits):
 
     def __init__(self, bundle, *args, **kwargs):
         self.bundle = bundle
-        super(BaseDataSourceModel, self).__init__(self, *args, **kwargs)
+        super(BaseDataSourceModel, self).__init__(*args, **kwargs)
diff --git a/force_bdss/kpi/base_kpi_calculator_model.py b/force_bdss/kpi/base_kpi_calculator_model.py
index 512be3e12a38cc5329c97eda20ea22ef90146cc6..9882fa605eeb44712f73c9ed9a8c5c7bdab414f0 100644
--- a/force_bdss/kpi/base_kpi_calculator_model.py
+++ b/force_bdss/kpi/base_kpi_calculator_model.py
@@ -8,4 +8,4 @@ class BaseKPICalculatorModel(ABCHasStrictTraits):
 
     def __init__(self, bundle, *args, **kwargs):
         self.bundle = bundle
-        super(BaseKPICalculatorModel, self).__init__(self, *args, **kwargs)
+        super(BaseKPICalculatorModel, self).__init__(*args, **kwargs)
diff --git a/force_bdss/mco/base_mco_model.py b/force_bdss/mco/base_mco_model.py
index b2630459ef0ec2dbe2a035a5e866cf675ac077a2..2c1bee9cc07f11cc6dfd65adf52de7e7f3035661 100644
--- a/force_bdss/mco/base_mco_model.py
+++ b/force_bdss/mco/base_mco_model.py
@@ -8,4 +8,4 @@ class BaseMCOModel(ABCHasStrictTraits):
 
     def __init__(self, bundle, *args, **kwargs):
         self.bundle = bundle
-        super(BaseMCOModel, self).__init__(self, *args, **kwargs)
+        super(BaseMCOModel, self).__init__(*args, **kwargs)