Add basic persistence logic