Moved save to model