Added transaction support / Removed unnecessary dependencies