Updated with new Publish/Subscribe on transactions