Updates, handle more transaction types, and more