Regular/OneOff transactions logic reviewed