Refactoring Save and Load operations