Added lazy save feature