Transaction usage corrected and some other optimizations