Updates to core data stuff