Added some aliases for the different transaction types.
Merge branch 'transaction_types'