Add core data workaround.