Add coredata and real persistence