Transactions CRUD and other minor changes