WIP better transactions support