Refactor transanctional