Unify tx handling