Moved persistence to resources