[NEW] Support for rollback looping added