Improve data saving