Transaction flags

This time the pull request includes only the commit I want!