Made more explicit the calls to hazardlib