Index: wflow-py/wflow/wflow_bmi.py
===================================================================
diff -u -rfc125162f11444aaf04a0c95ff5c6019192b27e1 -r4f140b863e38561c0f6d93addbfc2d0a7c6bbce1
--- wflow-py/wflow/wflow_bmi.py	(.../wflow_bmi.py)	(revision fc125162f11444aaf04a0c95ff5c6019192b27e1)
+++ wflow-py/wflow/wflow_bmi.py	(.../wflow_bmi.py)	(revision 4f140b863e38561c0f6d93addbfc2d0a7c6bbce1)
@@ -66,7 +66,9 @@
             import wflow_routing as wf
             self.name = "wflow_routing"
         else:
-            raise ValueError
+            modname = os.path.splitext(os.path.basename(configfile))[0]
+            exec "import wflow." + modname + " as wf"
+            self.name = modname
 
         self.bmilogger.info("initialize: Initialising wflow bmi with ini: " + configfile)
         myModel = wf.WflowModel(wflow_cloneMap, datadir, runid, inifile)
@@ -313,8 +315,7 @@
 
             return inames
 
-        self.outputonlyvars = get_output_only_var_names()
-        self.inputoutputvars = self.get_output_var_names()
+
         self.currenttimestep = 1
         wflow_cloneMap = 'wflow_subcatch.map'
         self.datadir = os.path.dirname(filename)
@@ -346,6 +347,9 @@
         self.dynModel = wf.wf_DynamicFramework(self.myModel, maxNrSteps, firstTimestep = 1)
         self.dynModel.createRunId(doSetupFramework=False,NoOverWrite=0,level=loglevel,model=os.path.basename(filename))
 
+        self.outputonlyvars = get_output_only_var_names(self)
+        self.inputoutputvars = self.get_output_var_names()
+
     def initialize_model(self):
         """
         *Extended functionality*, see https://github.com/eWaterCycle/bmi/blob/master/src/main/python/bmi.py