Improved data saving