Moving some methods into the model