Make scan_saving optional