Changes for handling transactions