Improve transaction behaviour