Moved more code from model to concern