Issue #92: Save file methods refactored