Additional changes for deal/wish workflow