More transactions refactoring