Updated transaction handling