All UpdateAllData references fixed