Improve save and load service