Updated TransactionHandler