Adapt to changed dwc terms