Transaction handling improved