Moved this out of the model