Refactored lazy save feature