More core data changes