Updated transaction support