Updated Deadline Checking and homogenised handlers