Transaction manager support

Avoid "AssertionError: Transaction must be committed using the transaction manager" error