Improved data saving.