update to support new basicmodels
Merge branch 'basicmodels2_compat'