Improved data persistance