Implemented new Transaction system