Added core data stuff