Updated modeler