Added Dataset and modeler code