Get more models instantiating correctly