Add recheck support