Move it to the model