Updates to model for simulations