Add basic persistance