Added a setup file + model api improvment