Updates to data handling