Added correct transaction support