Updates to the model and #170