Add transaction support, much speeds conversions