Add basic persistence infrastructure