Added more options to hazard form