Moved transaction trait
Some fixes