Global changes before updating to the new architecture