More TMCoreData updates