update to handle dwc dynamic fields