Improved data handling