Fixed transactionnal configuration. Added Branch list. Refactored a little bit.