Added support for transactions and command timeout