Update for rollback infrastructure
Prepare for order reversal