Added the core data support