Added core data support.