Added transaction support and some more method comments