[General] more work on integrating new models (issue #44)