Add run_on_save option