Updated CoreData saving option