Added rerun API support