Separated out the persistence strategy