Refactor in account manager in the transaction creation logic. That now moved to Account.