Better model instantiation