Added transaction support