Merged new Modeler API