#666 - switch to TransactionFactory