Removed core data import from prefix, moved to headers