Transaction scope added, fixed console messages