Added more security checks (deadline check)