Better restart/resubmission support