Improvements on transactions and notifications