Updated to most recent dwc standard