Add core data support!