Moving more things to the model