Get rid of model package dependency