Move the starred methods to the model