More data handling changes