Change deadline to optional