Making the changes to get core data back up and running correctly