Changed how models are initiated