Fixed rollback functionality with new implementation