Adapt to changes for 'WAU'