Moved persisting logic entirely into data.