Finishing fix of rolback
Implementing breakage infrastructure