Internal refactoring TransactionBuilder