Adding support for rerun.