Refactoring od save/load operations fro modified and new data structures