Switch to on_or_after, before methods for scoping transactions