Refactor transacion message and add more type